Removed synchro services

config.xml

@@ -3,7 +3,7 @@
     <name>gabinete digital</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
-    <content original-src="index.html" src="http://localhost:8100" />
+    <content src="index.html" />
     <access origin="*" />
     <allow-navigation href="*" />
     <allow-navigation href="*" />

src/app/pages/chat/messages/messages.page.ts

@@ -12,7 +12,6 @@ import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
 import { FileService } from 'src/app/services/functions/file.service';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { NewEventPage } from 'src/app/shared/agenda/new-event/new-event.page';
 import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
@@ -45,7 +44,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   members:any;
   scrollingOnce:boolean = true;
 
-  synchro  = synchro;
   chatMessageStore = ChatMessageStore
   chatUserStorage = ChatUserStorage
 

src/app/pages/events/events.page.ts

@@ -17,7 +17,6 @@ import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
-import { synchro } from '../../services/socket/synchro.service';
 import { NetworkConnectionService } from 'src/app/services/network-connection.service'
 import { BackgroundService } from 'src/app/services/background.service';
 
@@ -79,7 +78,6 @@ export class EventsPage implements OnInit {
   loggeduser: LoginUserRespose;
 
   existingScreenOrientation: string;
-  synch = synchro
 
   constructor(
     private eventService: EventsService,

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -21,7 +21,6 @@ import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
 import { SqliteService } from 'src/app/services/sqlite.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
 import { BackgroundService } from 'src/app/services/background.service';
 
 @Component({

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -19,7 +19,6 @@ import { AttachmentList } from 'src/app/models/Excludetask';
 import { PermissionService } from 'src/app/services/worker/permission.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
-import { synchro } from 'src/app/services/socket/synchro.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { Platform } from '@ionic/angular';
 import { BackgroundService } from 'src/app/services/background.service';
@@ -47,8 +46,6 @@ export class DespachoPage implements OnInit {
   intervenientes: any;
   cc: any = [];
 
-  synch = synchro;
-
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
     private iab: InAppBrowser,

src/app/pages/gabinete-digital/despachos/despachos.page.ts

@@ -4,7 +4,6 @@ import { DespachoService } from 'src/app/Rules/despacho.service';
 import { DespachoStore } from 'src/app/store/despacho-store.service';
 
 import { SqliteService } from 'src/app/services/sqlite.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
 import { Platform } from '@ionic/angular';
 import { isThisHour } from 'date-fns';
 import { BackgroundService } from 'src/app/services/background.service';
@@ -18,7 +17,6 @@ import { BackgroundService } from 'src/app/services/background.service';
 export class DespachosPage implements OnInit {
 
   despachoStore = DespachoStore;
-  synch = synchro;
   listToPresent = [];
 
   constructor(

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -14,7 +14,6 @@ import { Location } from '@angular/common';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
 import { SqliteService } from 'src/app/services/sqlite.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
 import { BackgroundService } from 'src/app/services/background.service';
 
 @Component({

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -26,7 +26,6 @@ import { PermissionService } from 'src/app/services/worker/permission.service';
 
 
 import { SqliteService } from '../../services/sqlite.service';
-import { synchro } from '../../services/socket/synchro.service';
 import { Platform } from '@ionic/angular';
 import { BackgroundService } from 'src/app/services/background.service';
 
@@ -110,9 +109,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   //
   // pipe
 
-  synch = synchro;
-
-
   customTaskPipe = new CustomTaskPipe()
 
   @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage;

src/app/pages/publications/publication-detail/publication-detail.page.ts

@@ -7,7 +7,7 @@ import { ImageModalPage } from '../gallery/image-modal/image-modal.page';
 import { NewPublicationPage } from '../new-publication/new-publication.page';
 import { Location } from '@angular/common';
 import { SqliteService } from 'src/app/services/sqlite.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
+import { BackgroundService } from 'src/app/services/background.service';
 
 
 @Component({
@@ -28,7 +28,8 @@ export class PublicationDetailPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     private location: Location,
-    private sqliteservice: SqliteService ) {
+    private sqliteservice: SqliteService,
+    private backgroundservice: BackgroundService ) {
 
       this.publicationId = this.navParams.get('publicationId');
       /* this.folderId = this.navParams.get('folderIdId'); */
@@ -81,11 +82,7 @@ export class PublicationDetailPage implements OnInit {
   }
 
   getFromDB() {
-    if(synchro.connected === true) {
 
-    } else {
-      
-    }
   }
 
   close() {

src/app/pages/publications/publications.page.ts

@@ -14,7 +14,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
 import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
+import { BackgroundService } from 'src/app/services/background.service';
 
 @Component({
   selector: 'app-publications',
@@ -64,14 +64,28 @@ export class PublicationsPage implements OnInit {
     private animationController: AnimationController,
     private publications: PublicationsService,
     private toastService: ToastService,
-    private sqliteservice: SqliteService
+    private sqliteservice: SqliteService,
+    private backgroundservice: BackgroundService
   ) {
     this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
     this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
   }
 
   ngOnInit() {
-    this.getFromDB();
+
+    const pathname = window.location.pathname
+
+    this.router.events.forEach((event) => {
+      if (event instanceof NavigationEnd && event.url == pathname) {
+        this.getActions();
+      }
+    });
+    this.hideRefreshButton();
+
+    this.backgroundservice.registerBackService('Online', () => {
+      this.getActions();
+    })
+
   }
 
   hideRefreshButton() {
@@ -153,22 +167,13 @@ export class PublicationsPage implements OnInit {
       });
 
 
+    }, (error) => {
+      this.getFromDB();
     });
   }
 
   getFromDB() {
 
-    if (synchro.connected === true) {
-      const pathname = window.location.pathname
-
-      this.router.events.forEach((event) => {
-        if (event instanceof NavigationEnd && event.url == pathname) {
-          this.getActions();
-        }
-      });
-
-      this.hideRefreshButton();
-    } else {
     this.sqliteservice.getAllActions().then((actions: any[]) => {
 
       console.log('offline publi', actions)
@@ -197,7 +202,6 @@ export class PublicationsPage implements OnInit {
 
     })
   }
-  }
 
   async editAction(folderId?: string) {
     const modal = await this.modalController.create({

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -11,7 +11,7 @@ import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-f
 import { NewPublicationPage } from '../new-publication/new-publication.page';
 import { PublicationDetailPage } from './publication-detail/publication-detail.page';
 import { SqliteService } from 'src/app/services/sqlite.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
+import { BackgroundService } from 'src/app/services/background.service';
 
 @Component({
   selector: 'app-view-publications',
@@ -42,7 +42,8 @@ export class ViewPublicationsPage implements OnInit {
     private publications: PublicationsService,
     private activatedRoute: ActivatedRoute,
     private router: Router,
-    private sqliteservice: SqliteService) {
+    private sqliteservice: SqliteService,
+    private backgroundservice: BackgroundService) {
 
     this.item = new PublicationFolder();
     this.activatedRoute.paramMap.subscribe(params => {
@@ -63,7 +64,16 @@ export class ViewPublicationsPage implements OnInit {
       this.folderId = this.folderId['ProcessId']
     }
 
-    this.getFromDB();
+    this.getPublicationDetail();
+    setTimeout(() => {
+      this.getPublications();
+    }, 5000);
+
+    this.backgroundservice.registerBackService('Online',() => {
+      this.getPublicationDetail();
+      this.getPublications();
+
+    })
 
   }
 
@@ -129,6 +139,9 @@ export class ViewPublicationsPage implements OnInit {
       this.showLoader = false;
     },
       (error) => {
+        if(error.status == '0') {
+          this.getFromDB();
+        }
         if (error.status == '404') {
           this.error = 'Sem publicações disponíveis!';
           this.publicationList = [];
@@ -142,13 +155,6 @@ export class ViewPublicationsPage implements OnInit {
   }
 
   getFromDB() {
-    if (synchro.connected === true) {
-      this.getPublicationDetail();
-      setTimeout(() => {
-        this.getPublications();
-      }, 5000);
-
-    } else {
 
     this.sqliteservice.getActionById(this.folderId).then((publications) => {
       console.log('publications', publications)
@@ -181,8 +187,6 @@ export class ViewPublicationsPage implements OnInit {
 
       this.getpublication = publicationArray;
     })
-
-    }
   }
 
   async AddPublication(publicationType: any, folderId: any) {

src/app/services/background.service.ts

@@ -6,7 +6,7 @@ import { Injectable } from '@angular/core';
 export class BackgroundService {
 
   callBacks: {
-    type: 'Offline' | 'Online',
+    type: 'Offline' | 'Online' | 'Notification',
     object?: string
     funx: Function
   }[] = []
@@ -39,7 +39,7 @@ export class BackgroundService {
     })
   }
 
-  registerBackService(type: 'Offline' | 'Online', funx: Function, object = '') {
+  registerBackService(type: 'Offline' | 'Online' | 'Notification', funx: Function, object = '') {
     this.callBacks.push({
       type,
       funx,

src/app/services/events.service.ts

@@ -8,9 +8,9 @@ import { UserSession } from '../models/user.model';
 import { EventList } from '../models/agenda/AgendaEventList';
 import { ChangeProfileService } from './change-profile.service';
 import { OfflineManagerService } from 'src/app/services/offline-manager.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
 import { catchError } from "rxjs/operators";
 import { Storage } from '@ionic/storage';
+import { BackgroundService } from 'src/app/services/background.service';
 
 
 @Injectable({
@@ -36,8 +36,8 @@ export class EventsService {
     public user: AuthService,
     private changeProfileService: ChangeProfileService,
     private offlinemanager: OfflineManagerService,
-    private storage: Storage) 
+    private storage: Storage,
-    {
+    private backgroundservice: BackgroundService) {
 
     this.loggeduser = this.user.ValidatedUser;
 
@@ -293,8 +293,7 @@ export class EventsService {
     return this.http.get<Event>(`${geturl}`, options);
   }
 
-  putEvent(event: Event, conflictResolutionMode:number, sendInvitationsOrCancellationsMode:number, sharedagenda:string): Observable<Event>
+  putEvent(event: Event, conflictResolutionMode: number, sendInvitationsOrCancellationsMode: number, sharedagenda: string): Observable<Event> {
-  {
     const puturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'PutEvent');
 
     let params = new HttpParams();
@@ -310,14 +309,10 @@ export class EventsService {
     return this.http.put<Event>(`${puturl}`, event, options)
   }
 
-  editEvent(event: Event, conflictResolutionMode:number, sendInvitationsOrCancellationsMode:number): Observable<Event>
+  editEvent(event: Event, conflictResolutionMode: number, sendInvitationsOrCancellationsMode: number): Observable<Event> {
-  {
     let arrayReq = [];
+    arrayReq.push(event);
     const puturl = environment.apiURL + 'calendar/PutEvent';
-    if(synchro.connected === false) {
-      arrayReq.push(event)
-      return from(this.storage.set('storedreq', arrayReq))
-    } else {
     let params = new HttpParams();
 
     params = params.set("conflictResolutionMode", conflictResolutionMode.toString());
@@ -351,12 +346,11 @@ export class EventsService {
 
     return this.http.put<Event>(`${puturl}`, event, options).pipe(
       catchError(err => {
-          this.offlinemanager.storeRequest(puturl, 'PUT', event);
+        this.offlinemanager.storeRequest(puturl, 'PUT', arrayReq);
         throw new Error(err);
       })
     )
   }
-  }
 
   changeAgenda(body: any) {
     const puturl = environment.apiURL + 'Calendar/MoveEvent';
@@ -381,8 +375,7 @@ export class EventsService {
     return this.http.post<Event>(`${puturl}`, event, options)
   } */
 
-  postEventMd(event:Event, calendarName:string)
+  postEventMd(event: Event, calendarName: string) {
-  {
     const puturl = environment.apiURL + 'calendar/md';
     let params = new HttpParams();
 
@@ -410,8 +403,7 @@ export class EventsService {
     return this.http.post<string>(`${puturl}`, event, options)
   }
 
-  postEventPr(event:Event, calendarName:string)
+  postEventPr(event: Event, calendarName: string) {
-  {
     const puturl = environment.apiURL + 'calendar/pr';
     let params = new HttpParams();
 
@@ -439,8 +431,7 @@ export class EventsService {
     return this.http.post<string>(`${puturl}`, event, options)
   }
 
-  deleteEvent(eventid:string, eventDeleteType:number, calendarName:string)
+  deleteEvent(eventid: string, eventDeleteType: number, calendarName: string) {
-  {
     const puturl = environment.apiURL + 'calendar/DeleteEvent';
     let params = new HttpParams();
 

src/app/services/notifications.service.ts

@@ -12,7 +12,7 @@ import { ModalController, AlertController, AnimationController, Platform } from
 import { NavigationExtras,Router } from '@angular/router';
 import { ToastService } from '../services/toast.service';
 import { JsonStore } from './jsonStore.service';
-import { synchro } from './socket/synchro.service';
+import { BackgroundService } from './background.service';
 import { v4 as uuidv4 } from 'uuid';
 import { EventTrigger } from '../services/eventTrigger.service';
 import { SessionStore } from '../store/session.service';
@@ -44,7 +44,8 @@ export class NotificationsService {
     private zone: NgZone,
     private activeroute: ActivatedRoute,
     private jsonstore: JsonStore,
-    private eventtrigger: EventTrigger) { 
+    private eventtrigger: EventTrigger,
+    private backgroundservice: BackgroundService) { 
 
       this.storageService.get("Notifications").then((value) => {
   
@@ -60,7 +61,7 @@ export class NotificationsService {
     const id = uuidv4()
     this.callbacks.push({type, funx, id})
     if(!object.hasOwnProperty('desktop') && object['desktop'] != false) {
-      synchro.registerCallback('Notification',funx, type)
+      this.backgroundservice.registerBackService('Notification',funx, type)
     }
 
     return id;
@@ -178,7 +179,7 @@ export class NotificationsService {
               })
               var data = JSON.parse(message.payload);
 
-              synchro.$send(data)
+              //synchro.$send(data)
               
               console.log('data.Service', data.Service); // module
               console.log('data.IdObject', data.IdObject); // Object id

src/app/services/socket/synchro.service.ts

@@ -21,7 +21,7 @@ export interface wss {
   providedIn: 'root'
 })
 class SynchroService {
-  [x: string]: any;
+ /*  [x: string]: any;
 
   private connection!: WebSocket;
   private id: string = uuidv4();
@@ -204,12 +204,12 @@ class SynchroService {
 
   private onerror = (event: any) => {
     console.log(`[error] ${event.message}`);
-  }
+  } */
 }
 
 
-export const synchro = new SynchroService()
+/* export const synchro = new SynchroService()
 synchro.setUrl()
 synchro.connect()
 
-window['synchro'] = synchro
+window['synchro'] = synchro */

src/app/shared/chat/messages/messages.page.ts

@@ -8,7 +8,6 @@ import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popo
 import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 import { Router } from '@angular/router';
-import { synchro } from 'src/app/services/socket/synchro.service';
 import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page';
 import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
 import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
@@ -45,7 +44,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   @Output() getDirectMessages:EventEmitter<any> = new EventEmitter<any>();
 
 
-  synchro  = synchro;
   chatMessageStore = ChatMessageStore
   chatUserStorage = ChatUserStorage
 
@@ -198,7 +196,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   sendMessage() {
 
-    this.synchro.$send({})
+    //this.synchro.$send({})
 
     let body = {
       "message":

src/app/shared/gabinete-digital/all-processes/all-processes.page.ts

@@ -5,7 +5,6 @@ import { AuthService } from 'src/app/services/auth.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js';
 import { SqliteService } from '../../../services/sqlite.service';
-import { synchro } from '../../../services/socket/synchro.service';
 import { Platform } from '@ionic/angular';
 import { SortService } from 'src/app/services/functions/sort.service';
 
@@ -20,8 +19,6 @@ export class AllProcessesPage implements OnInit {
   allProcessesList: any[] = [];
   loggeduser: LoginUserRespose;
 
-  synch = synchro;
-
   constructor(
     private processesService: ProcessesService,
     private router: Router,