git version

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

@@ -16,7 +16,7 @@ import { MessagesPage } from './messages/messages.page';
 import { NewGroupPage } from './new-group/new-group.page';
 import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
 import { Subject } from "rxjs/Rx";
-import { NavigationStart, Router, NavigationEnd } from '@angular/router';
+import { NavigationStart, Router, NavigationEnd, ActivatedRoute } from '@angular/router';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { environment } from 'src/environments/environment';
@@ -113,6 +113,7 @@ export class ChatPage implements OnInit {
     private platform: Platform,
     private storageservice: StorageService,
     public ChatSystemService: ChatSystemService,
+    private activatedRoute: ActivatedRoute,
   ) {
 
     this.headers = new HttpHeaders();
@@ -141,14 +142,39 @@ export class ChatPage implements OnInit {
 
 
     this.router.events.forEach((event) => {
-
       if (event instanceof NavigationEnd && event.url == '/home/chat' || 
       event instanceof NavigationEnd && event.url == "/home/chat?gbCreateGroup=true") {
         this.checkCreateGroup();
       }
-
     });
 
+    this.router.events.forEach((event) => {
+      if (event instanceof NavigationEnd && event.url.startsWith('/home/chat')) {
+        this.routeCheck()
+      }
+    });
+
+    this.routeCheck()
+  }
+
+  routeCheck() {
+
+    const urlParams = new URLSearchParams(window.location.search);
+    const roomId = urlParams.get('roomId');
+    
+    if(roomId) {
+      const room = this.ChatSystemService.getRoomById(roomId);
+
+      if(room.isGroup) {
+        this.segment = 'Grupos'
+        this.openGroupMessagesPage(roomId)
+      } else {
+        this.segment = 'Contactos'
+        this.openMessagesPage(roomId)
+      }
+    }
+
+
   }
 
   checkCreateGroup() {

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

@@ -334,8 +334,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async goToEvent(event: any) {
-
-    // console.log(event)
     
     let classs;
     if (window.innerWidth < 701) {

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -99,7 +99,7 @@
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Outras opções</div> </div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+        <button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>

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

@@ -166,8 +166,8 @@ export class GabineteDigitalPage implements OnInit {
     }
 
     const pathname = window.location.pathname
-    //this.router.events.forEach((event) => {
-      //if (event instanceof NavigationEnd && event.url == pathname) {
+    this.router.events.forEach((event) => {
+      if (event instanceof NavigationEnd && event.url == pathname) {
         this.waitForDomService.selector({
           selector: 'app-gabinete-digital ion-content .aside-wrapper',
           callback: () => {
@@ -180,8 +180,8 @@ export class GabineteDigitalPage implements OnInit {
             }
           }
         })
-      //}
-    //});
+      }
+    });
 
     this.hideRefreshButton();
 
@@ -637,7 +637,6 @@ export class GabineteDigitalPage implements OnInit {
 
     expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
     
-    this.expedientegbstore.count = expedientes.length;
     this.expedientegbstore.reset(expedientes);
     this.updateAllProcess()
 

src/app/shared/agenda/event-list/event-list.page.ts

@@ -58,6 +58,9 @@ export class EventListPage implements OnInit {
 
   ngOnChanges() {
     this.LoadToApproveEvents();
+    setTimeout(() => {
+      this.LoadToApproveEvents();
+    }, 3000)
   }
 
   segmentChanged(ev: any) {

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -16,7 +16,7 @@
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+        <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>

src/app/store/despacho-store.service.ts

@@ -98,7 +98,7 @@ export class DespachoStoreService {
   }
 
   get count() {
-    return this._count || 0
+    return this._list.length || 0
   }
   
   set count(value: number) {

src/app/store/despachospr-store.service.ts

@@ -11,7 +11,6 @@ export class DespachosprStoreService {
 private _list: [] = []
 // local storage keyName
 private keyName: string; 
-private _count = 0
 
 constructor() {
 
@@ -21,7 +20,6 @@ constructor() {
   setTimeout(()=>{ 
     let restore = localstoreService.get(this.keyName, {})
     this._list = restore.list || []
-    this._count = parseInt(restore.count) || 0
   }, 10)
 
 }
@@ -30,9 +28,8 @@ get list() {
   return this._list || []
 }
 
-get count() { return this._count  || 0 }
+get count() { return this._list.length  || 0 }
 set count(value: number) {
-  this._count = value
   this.save()
 }
 
@@ -46,11 +43,9 @@ reset(eventsList: any) {
 private save() {
   setTimeout(()=>{ 
     localstoreService.set(this.keyName,{
-      list: this._list,
-      count:this._count
+      list: this._list
     })
   }, 10)
-  
 }
 
 }

src/app/store/expedientegd-store.service.ts

@@ -30,17 +30,11 @@ export class ExpedientegdStoreService {
     return this._list
   }
   get count() {
-    return this._count  || 0
-  }
-  set count(value: number) {
-    this._count = value
-    this.save()
+    return this._list.length  || 0
   }
 
   reset(eventsList: any) {
     this._list = eventsList
-
-    this.count = this._list.length
     this.save()
   }
 

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "32fb80f1b",
-  "SHA": "32fb80f1bb3ab1f94c9ae0c4f2f1987ae6dda323",
+  "shortSHA": "7b4105ef1",
+  "SHA": "7b4105ef1d19efc75dd17b0cde15d2efac4d2c1f",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Mon Jan 30 15:08:00 2023 +0100'",
-  "lastCommitMessage": "Notificaion from chat added",
-  "lastCommitNumber": "4691",
+  "lastCommitTime": "'Mon Jan 30 18:01:29 2023 +0100'",
+  "lastCommitMessage": "post notification edit",
+  "lastCommitNumber": "4693",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 3 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/document-detail/document-detail.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/chat/messages/messages.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/pages/search/search.page.ts\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified:   src/app/shared/popover/request-options/request-options.page.html\n\tmodified:   src/app/shared/popover/searched-document-options/searched-document-options.page.html\n\tmodified:   src/environments/suport/oapr.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/pages/chat/chat.page.ts\n\tmodified:   src/app/pages/chat/messages/messages.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified:   src/app/store/despacho-store.service.ts\n\tmodified:   src/app/store/despachospr-store.service.ts\n\tmodified:   src/app/store/expedientegd-store.service.ts",
   "changeAuthor": "eudes.inacio"
 }