Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/services/chat/ws-chat-methods.service.ts

@@ -33,7 +33,7 @@ export class WsChatMethodsService {
   _dm: RoomService[] = []
   _group: RoomService[] = []
 
-  loadingWholeList = false
+  loadingWholeList = false;
 
   dmCount = 0;
   groupCount = 0;
@@ -121,7 +121,7 @@ export class WsChatMethodsService {
     this._dm = []
     this._group = []
 
-    this.loadingWholeList = false
+    this.loadingWholeList = false;
 
     this.dmCount = 0;
     this.groupCount = 0;
@@ -177,13 +177,13 @@ export class WsChatMethodsService {
       const roomId = this.getRoomId(roomData);
 
       if(roomData.t == 'd') {
-        
+
         const res = await this.chatService.getMembers(roomId).toPromise();
-  
+
         const members = res['members'];
         const users = members.filter(data => data.username != this.loggedUser.me.username);
         rooms.result.update[index]['members'] = users
-  
+
         await this.prepareRoom(roomData);
       } else {
         if (roomData.t === 'p') {
@@ -209,7 +209,7 @@ export class WsChatMethodsService {
     console.log('save rooms', rooms)
     await this.storage.set('Rooms', rooms);
 
-    
+
     setTimeout(()=>{
       this.sortRoomList()
     }, 1000)
@@ -218,7 +218,7 @@ export class WsChatMethodsService {
     setTimeout(()=>{
       this.sortRoomList()
     }, 10000)
-    
+
     this.loadingWholeList = false
   }
 

src/app/services/route.service.ts

@@ -88,4 +88,13 @@ export class RouteService {
 
   }
 
+
+  getLastRoute() {
+    return this.history[this.history.length - 1]
+  }
+
+  getLastRouteA() {
+    return this.history[this.history.length - 2]
+  }
+
 }

src/app/services/worker/document-counter.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { DocumentCounterService } from './document-counter.service';
-
-describe('DocumentCounterService', () => {
-  let service: DocumentCounterService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(DocumentCounterService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

src/app/services/worker/document-counter.service.ts

@@ -1,39 +0,0 @@
-import { Injectable } from '@angular/core';
-import { DespachoStore } from 'src/app/store/despacho-store.service';
-import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
-import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
-import { PendentesStore } from 'src/app/store/pendestes-store.service';
-import { PedidosStore } from 'src/app/store/pedidos-store.service';
-import { DespachosprStore } from 'src/app/store/despachospr-store.service';
-import { DeplomasStore } from 'src/app/store/deplomas.service';
-
-
-@Injectable({
-  providedIn: 'root'
-})
-export class DocumentCounterService {
-
-  expedienteGbStore = ExpedienteGdStore;
-  pendentesStore = PendentesStore;
-  despachoStore = DespachoStore;
-  eventoAprovacaoStore = EventoAprovacaoStore;
-  pedidosStore = PedidosStore;
-  // expedientePrStore = ExpedienteprStore;
-  despachoPrStore = DespachosprStore;
-  deplomasStore = DeplomasStore
-
-  constructor() { }
-
-  // falta a contagem dos deplomas
-  get mdTotalDocument(): number {
-    return this.despachoStore.count + /** this.expedientePrStore.count + */  this.pedidosStore.countdeferimento
-    + this.pedidosStore.countparecer + this.expedienteGbStore.count + this.despachoPrStore.count + this.pendentesStore.count
-    + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount
-  }
-
-  get prTotalDocument(): number {
-    return this.despachoStore.count + /** this.expedientePrStore.count + */  this.pedidosStore.countdeferimento
-    + this.pedidosStore.countparecer + this.expedienteGbStore.count + this.despachoPrStore.count + this.pendentesStore.count
-    + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount
-  }
-}