some changes

package-lock.json

@@ -152,7 +152,6 @@
         "ngx-socket-io": "^3.2.0",
         "pdfjs": "^2.4.6",
         "pdfjs-dist": "^2.9.359",
-        "puppeteer": "^15.1.1",
         "rocket.chat.realtime.api.rxjs": "^2.1.1",
         "rxjs": "~6.6.3",
         "rxjs-compat": "^6.6.7",
@@ -6791,6 +6790,7 @@
       "version": "2.10.0",
       "license": "MIT",
       "optional": true,
+      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -10974,13 +10974,6 @@
         "yarn": ">=1"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.5",
-      "license": "MIT",
-      "dependencies": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "license": "MIT",
@@ -12032,8 +12025,10 @@
       }
     },
     "node_modules/devtools-protocol": {
-      "version": "0.0.1011705",
+      "version": "0.0.869402",
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "peer": true
     },
     "node_modules/di": {
       "version": "0.0.1",
@@ -13270,6 +13265,7 @@
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "debug": "^4.1.1",
         "get-stream": "^5.1.0",
@@ -13288,6 +13284,7 @@
     "node_modules/extract-zip/node_modules/get-stream": {
       "version": "5.2.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -26073,30 +26070,34 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "15.3.0",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
+      "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
+      "deprecated": "< 18.1.0 is no longer supported",
       "hasInstallScript": true,
-      "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
-        "cross-fetch": "3.1.5",
+        "debug": "^4.1.0",
-        "debug": "4.3.4",
+        "devtools-protocol": "0.0.869402",
-        "devtools-protocol": "0.0.1011705",
+        "extract-zip": "^2.0.0",
-        "extract-zip": "2.0.1",
+        "https-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "5.0.1",
+        "node-fetch": "^2.6.1",
-        "pkg-dir": "4.2.0",
+        "pkg-dir": "^4.2.0",
-        "progress": "2.0.3",
+        "progress": "^2.0.1",
-        "proxy-from-env": "1.1.0",
+        "proxy-from-env": "^1.1.0",
-        "rimraf": "3.0.2",
+        "rimraf": "^3.0.2",
-        "tar-fs": "2.1.1",
+        "tar-fs": "^2.0.0",
-        "unbzip2-stream": "1.4.3",
+        "unbzip2-stream": "^1.3.3",
-        "ws": "8.8.0"
+        "ws": "^7.2.3"
       },
       "engines": {
-        "node": ">=14.1.0"
+        "node": ">=10.18.1"
       }
     },
     "node_modules/puppeteer/node_modules/debug": {
       "version": "4.3.4",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -26109,25 +26110,6 @@
         }
       }
     },
-    "node_modules/puppeteer/node_modules/ws": {
-      "version": "8.8.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/q": {
       "version": "1.5.1",
       "license": "MIT",
@@ -36462,6 +36444,7 @@
     "node_modules/unbzip2-stream": {
       "version": "1.4.3",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
@@ -43086,6 +43069,7 @@
     "@types/yauzl": {
       "version": "2.10.0",
       "optional": true,
+      "peer": true,
       "requires": {
         "@types/node": "*"
       }
@@ -45788,12 +45772,6 @@
         "cross-spawn": "^7.0.1"
       }
     },
-    "cross-fetch": {
-      "version": "3.1.5",
-      "requires": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "cross-spawn": {
       "version": "7.0.3",
       "requires": {
@@ -46443,7 +46421,10 @@
       "version": "1.0.1"
     },
     "devtools-protocol": {
-      "version": "0.0.1011705"
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "peer": true
     },
     "di": {
       "version": "0.0.1",
@@ -47285,6 +47266,7 @@
     },
     "extract-zip": {
       "version": "2.0.1",
+      "peer": true,
       "requires": {
         "@types/yauzl": "^2.9.1",
         "debug": "^4.1.1",
@@ -47294,6 +47276,7 @@
       "dependencies": {
         "get-stream": {
           "version": "5.2.0",
+          "peer": true,
           "requires": {
             "pump": "^3.0.0"
           }
@@ -55860,31 +55843,31 @@
       }
     },
     "puppeteer": {
-      "version": "15.3.0",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
+      "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
+      "peer": true,
       "requires": {
-        "cross-fetch": "3.1.5",
+        "debug": "^4.1.0",
-        "debug": "4.3.4",
+        "devtools-protocol": "0.0.869402",
-        "devtools-protocol": "0.0.1011705",
+        "extract-zip": "^2.0.0",
-        "extract-zip": "2.0.1",
+        "https-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "5.0.1",
+        "node-fetch": "^2.6.1",
-        "pkg-dir": "4.2.0",
+        "pkg-dir": "^4.2.0",
-        "progress": "2.0.3",
+        "progress": "^2.0.1",
-        "proxy-from-env": "1.1.0",
+        "proxy-from-env": "^1.1.0",
-        "rimraf": "3.0.2",
+        "rimraf": "^3.0.2",
-        "tar-fs": "2.1.1",
+        "tar-fs": "^2.0.0",
-        "unbzip2-stream": "1.4.3",
+        "unbzip2-stream": "^1.3.3",
-        "ws": "8.8.0"
+        "ws": "^7.2.3"
       },
       "dependencies": {
         "debug": {
           "version": "4.3.4",
+          "peer": true,
           "requires": {
             "ms": "2.1.2"
           }
-        },
-        "ws": {
-          "version": "8.8.0",
-          "requires": {}
         }
       }
     },
@@ -63019,6 +63002,7 @@
     },
     "unbzip2-stream": {
       "version": "1.4.3",
+      "peer": true,
       "requires": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"

package.json

@@ -162,7 +162,6 @@
     "ngx-socket-io": "^3.2.0",
     "pdfjs": "^2.4.6",
     "pdfjs-dist": "^2.9.359",
-    "puppeteer": "^15.1.1",
     "rocket.chat.realtime.api.rxjs": "^2.1.1",
     "rxjs": "~6.6.3",
     "rxjs-compat": "^6.6.7",

src/app/home/home.page.ts

@@ -39,7 +39,6 @@ export class HomePage implements OnInit {
   toDayEventStorage = ToDayEventStorage
   totalDocumentStore = TotalDocumentStore
   expedienteGdStore = ExpedienteGdStore
-
   adding: "intervenient" | "CC" = "intervenient";
   mobileComponent = {
     showAddNewEvent: false,
@@ -126,12 +125,6 @@ export class HomePage implements OnInit {
 
       }
 
-      window.addEventListener('storage', (event) => {
-        // When local storage changes, dump the list to
-        // the console.
-        console.log(event);
-      });
-
   }
 
   goto(url) {

src/app/modals/profile/edit-profile/edit-profile.page.html

@@ -98,10 +98,10 @@
               <img style="width: 40px;" src="assets/images/logo-removebg-preview.png"/>
             </div>
 
-            <div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('doneIt')" >
+            <!-- <div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('doneIt')" >
               <img *ngIf="ThemeService.currentTheme == 'gov'" style="width: 40px;" src="assets/images/theme/doneIt/governoangola_A.png"/>
               <img *ngIf="ThemeService.currentTheme != 'gov'" style="width: 40px;" src="assets/images/theme/doneIt/governoangola_A1.png"/>
-            </div>
+            </div> -->
 
           </div>
         </div>

src/app/pages/agenda/new-event/new-event.page.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController, NavParams, Platform } from '@ionic/angular';
 import { EventAttachment } from 'src/app/models/attachment.model';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
@@ -91,7 +91,8 @@ export class NewEventPage implements OnInit {
     public eventService: EventsService,
     private attachmentsService: AttachmentsService,
     private toastService: ToastService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private platform: Platform,
   ) {
     this.loggeduser = SessionStore.user;
     this.postEvent = new Event();
@@ -106,7 +107,10 @@ export class NewEventPage implements OnInit {
   }
 
   ngOnInit() {
-    this.taskParticipants = [];
+    if (this.platform.is('desktop')) {
+      this.taskParticipants = [];
+    }
+    
     this.CalendarName = this.loggeduser.Profile;
     this.selectedRecurringType = "-1";
     

src/app/pages/chat/group-messages/group-messages.page.html

@@ -62,12 +62,12 @@
           <ion-label *ngIf="msg.delate == true">{{msg.msg}}</ion-label>
 
           <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
             <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
             <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-            <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+            <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
             <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
           </ion-label>
           {{last ? scrollToBottom() : ''}}
@@ -103,12 +103,12 @@
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image" >
                 <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                 <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-                  <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                  <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                   <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                   <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                   <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                   <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                  <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                  <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
                   <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
                 </ion-label>
               </div>
@@ -159,13 +159,13 @@
                     </ion-label>
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
                       
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                       <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                       <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                      <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                      <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                      <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                      <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()"> Tentar</div>
                     </ion-label>
                   </div>
               </div>

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

@@ -60,12 +60,12 @@
 
               <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
-                <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                 <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                 <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                 <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                 <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
                 <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
               </ion-label>
             </div>
@@ -99,12 +99,12 @@
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
                 
                 <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-                  <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                  <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                   <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                   <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                   <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                   <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                  <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                  <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
                   <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
                 </ion-label>
               
@@ -165,12 +165,12 @@
 
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
                     
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                       <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                       <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                      <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                      <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
                       <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
                     </ion-label>
                     

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

@@ -81,9 +81,9 @@ export class AttendeesPageModal implements OnInit {
     
   }
 
-  remove(itm: EventPerson){
+  remove(itm: EventPerson) {
 
-    if(this.adding == "intervenient"){
+    if(this.adding == "intervenient") {
 
       this.taskParticipants = this.taskParticipants.filter((contact, index) =>{
 
@@ -135,10 +135,23 @@ export class AttendeesPageModal implements OnInit {
           });
         }
 
-        this.contacts = result;
+        this.contacts = this.sort(result as any);
         this.showLoader = false;
       }
     );
   }
 
+
+  sort(data: []) {
+    return data.sort(function (a: any, b: any) {
+      if (a.Name > b.Name) {
+          return -1;
+      }
+      if (b.Name > a.Name) {
+          return 1;
+      }
+      return 0;
+  }).reverse()
+  }
+
 }

src/app/pages/publications/new-action/new-action.page.ts

@@ -98,9 +98,9 @@ export class NewActionPage implements OnInit {
     var validado: boolean;
 
     if (window.innerWidth <= 800) {
-      if ((this.folder.DateBegin < this.folder.DateEnd) && (new Date(this.folder.DateBegin).getTime() > this.currentDate.getTime())) {
+      if ((this.folder.DateBegin < this.folder.DateEnd)) {
         validado = true;
-      }else{
+      } else {
         validado = false;
       }
       return validado == true ? ['ok']: [];
@@ -111,7 +111,7 @@ export class NewActionPage implements OnInit {
 
   runValidation() {
     this.validateFrom  = true;
-    if(new Date(this.folder.DateBegin).toISOString() > new Date(this.folder.DateEnd).toISOString()){
+    if(new Date(this.folder.DateBegin).getTime() > new Date(this.folder.DateEnd).getTime()){
       this.toastService._badRequest("A data de início não pode ser superior a data de fim");
     }
   }

src/app/pages/publications/publications.page.html

@@ -15,7 +15,7 @@
     <!-- Left -->
     <div class="aside-left app-default-padding d-flex flex-grow-1 flex-column width-30 ">
       <!-- Header -->
-      <ion-progress-bar type="indeterminate" *ngIf="showLoader || skeletonLoader"></ion-progress-bar>
+      <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-toolbar >
 
         <div class="main-header">

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

@@ -24,7 +24,7 @@ import { PermissionService } from 'src/app/services/permission.service';
   styleUrls: ['./publications.page.scss'],
 })
 export class PublicationsPage implements OnInit {
-  showLoader: boolean;
+  showLoader: boolean = false
   publicationFolder: PublicationFolder;
   publication: Publication;
 
@@ -57,7 +57,6 @@ export class PublicationsPage implements OnInit {
   hideRefreshBtn = true;
   showSlidingOptions = true;
   idSelected: string;
-  skeletonLoader: boolean;
 
   constructor(
     private router: Router,
@@ -138,13 +137,10 @@ export class PublicationsPage implements OnInit {
     return this.theDate.getDate() + " de " + (this.months[this.theDate.getMonth()]) + " de " + this.theDate.getFullYear()
   }
 
-  loadList = false
 
   getActions() {
-    if(this.loadList == false) {
+    if(this.showLoader == false) {
-      this.loadList = true
       this.showLoader = true;
-      this.skeletonLoader = true;
       this.publications.GetPublicationFolderList().subscribe(async res => {
 
         const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
@@ -162,13 +158,9 @@ export class PublicationsPage implements OnInit {
         }
   
         this.showLoader = false;
-        this.skeletonLoader = false;
-        this.loadList = false
   
       }, (error) => {
         this.showLoader = false;
-        this.skeletonLoader = false;
-        this.loadList = false
       });
     }
 

src/app/services/auth.service.ts

@@ -80,6 +80,8 @@ export class AuthService {
 
     }
 
+    // async UpdateLogin() {}
+
     SetSession(response: LoginUserRespose, user:UserForm) {
       const session: UserSession = Object.assign(SessionStore.user, response)
 

src/app/services/chat/chat-system.service.ts

@@ -96,7 +96,7 @@ export class ChatSystemService {
   }
 
   loadChat() {
-    if(SessionStore.user.ChatData) {
+    if(SessionStore.user?.ChatData?.data) {
       this.ReLoadChat()
     }
   }
@@ -184,14 +184,18 @@ export class ChatSystemService {
   async getAllRooms () {
     this.loadingWholeList = true
     var rooms;
-    try {
+
-      rooms = await this.RochetChatConnectorService.getRooms();
+    if(this.RochetChatConnectorService.isLogin) {
-    } catch (error) {
-      console.error('chatgetrooms',error)
-    }
       try {
-      await this.storage.remove('Rooms');
+        rooms = await this.RochetChatConnectorService.getRooms();
-    } catch(e) {}
+      } catch (error) {
+        this.loadingWholeList = false
+        console.error('chatgetrooms',error)
+      }
+      try {
+        await this.storage.remove('Rooms');
+      } catch(e) {} 
+    }
 
     let index = 0
 

src/app/services/first-enter.service.ts

@@ -11,7 +11,6 @@ import { SessionStore } from '../store/session.service';
 export class FirstEnterService {
 
   constructor(private router:Router,
-    private platform: Platform,
     public p: PermissionService,
     private alertController: AlertController) { }
 

src/app/services/notifications.service.ts

@@ -1,22 +1,17 @@
 /* eslint-disable */
 /* tslint:disable */
 import { Injectable, NgZone } from '@angular/core';
-import { ActivatedRoute } from '@angular/router'
 import { HttpClient } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
 import { AuthConnstants } from 'src/app/config/auth-constants';
 import { Tokenn } from '../models/token.model';
-import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
+import { AlertController, Platform } from '@ionic/angular';
-import { NavigationExtras, Router } from '@angular/router';
+import { Router } from '@angular/router';
-import { ToastService } from '../services/toast.service';
-import { BackgroundService } from './background.service';
-import { v4 as uuidv4 } from 'uuid';
 import { EventTrigger } from '../services/eventTrigger.service';
 import { SessionStore } from '../store/session.service';
 import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
 import { notificationObject } from '../models/notifications';
-/* import { Events } from 'ionic-angular' */
 
 @Injectable({
   providedIn: 'root'

src/app/shared/chat/group-messages/group-messages.page.html

@@ -59,12 +59,12 @@
 
           <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
-            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
             <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
             <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-            <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+            <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
             <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
           </ion-label>
           {{last ? scrollToBottom() : ''}}
@@ -108,13 +108,13 @@
                     <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                       <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                       <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
                       <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
-                      <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                      <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()"> Tentar</div>
                     </ion-label>
 
                   </div>
@@ -165,12 +165,12 @@
                         </ion-label>
                         <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
-                          <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                          <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                           <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                           <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                           <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                           <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                          <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                          <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
                           <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
                         </ion-label>
                     </div>
@@ -272,7 +272,7 @@
           <ion-icon name="add"></ion-icon>
         </ion-fab-button>
         <ion-fab-list side="top">
-          <ion-fab-button title="Nova Reunião" (click)="bookMeeting()" color="light">
+          <ion-fab-button *ngIf="p.userPermission([p.permissionList.Agenda.access])" title="Nova Reunião" (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
           <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">

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

@@ -28,6 +28,7 @@ import { File } from '@awesome-cordova-plugins/file/ngx';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 import { SessionStore } from 'src/app/store/session.service';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-group-messages',
@@ -103,6 +104,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     private file: File,
     private platform: Platform,
     private fileOpener: FileOpener,
+    public p: PermissionService,
   ) {
     
     this.loggedUserChat = SessionStore.user.ChatData['data'];

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

@@ -60,12 +60,12 @@
           <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
             
             
-            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
             <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
             <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-            <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+            <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
             <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
           </ion-label>
           {{last ? scrollToBottom() : ''}}
@@ -106,12 +106,12 @@
                   <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
                   <ion-label class="float-status-all float-status"  *ngIf="msg.u.username==sessionStore.user.UserName">
                     
-                    <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                    <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                     <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                     <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                     <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                     <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                    <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                    <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
                     <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
                   </ion-label>
                 </div>
@@ -174,13 +174,12 @@
                     </ion-label>
                     <ion-label class="float-status-all float-status"  *ngIf="msg.u.username==sessionStore.user.UserName">
                       
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado">Enviado</span>
+                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
                       <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                       <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                      <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                      <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                      <span *ngIf="msg.viewed.length >= 1" >Lida</span>
                       <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
                     </ion-label>
                   </div>
@@ -254,7 +253,7 @@
           <ion-icon name="add"></ion-icon>
         </ion-fab-button>
         <ion-fab-list side="top">
-          <ion-fab-button title="Nova Reunião" (click)="bookMeeting()" color="light">
+          <ion-fab-button *ngIf="p.userPermission([p.permissionList.Agenda.access])" title="Nova Reunião" (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
           <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">

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

@@ -34,6 +34,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { Howl } from 'howler';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ChatMessageDebuggingPage } from 'src/app/shared/popover/chat-message-debugging/chat-message-debugging.page';
+import { PermissionService } from 'src/app/services/permission.service';
 
 
 const IMAGE_DIR = 'stored-images';
@@ -121,6 +122,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private file: File,
     private platform: Platform,
     private fileOpener: FileOpener,
+    public p: PermissionService,
   ) {
     // update
     this.checkAudioPermission()

src/app/shared/event/attendee-modal/attendee-modal.page.ts

@@ -92,7 +92,7 @@ export class AttendeePage implements OnInit {
 
   }
 
-  async selectContact(itm: EventPerson){
+  async selectContact(itm: EventPerson) {
 
     if(this.adding == "intervenient") {
 

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -11,7 +11,7 @@
     <button (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
     <button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>
     <div class="solid"></div>
-    <button (click)="bookMeeting()" class="btn-ok" shape="round" >Novo Evento</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="bookMeeting()" class="btn-ok" shape="round" >Novo Evento</button>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>
 

src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts

@@ -6,6 +6,7 @@ import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { environment } from 'src/environments/environment';
 import { ThemeService } from 'src/app/services/theme.service'
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-chat-options-popover',
@@ -22,7 +23,8 @@ export class ChatOptionsPopoverPage implements OnInit {
     private popoverController: PopoverController,
     private modalController: ModalController,
     private navParams: NavParams,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public p: PermissionService,
   ) {
 
     this.members = this.navParams.get('members');

src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html

@@ -3,7 +3,7 @@
     <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
     <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
     <div class="solid"></div>
-    <button (click)="openExpedientActionsModal('0')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button (click)="openExpedientActionsModal('1')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
     <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
     <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
     <button class="btn-cancel" shape="round"  (click)="close()">Cancelar</button>

src/app/store/localstore.service.ts

@@ -10,6 +10,12 @@ export class LocalstoreService {
   private prefix = environment.version.lastCommitNumber+"-";
   private previewPrefix = 'v17-';
 
+  callbacks:  {[key: string]:  {
+    path: string,
+    funx: Function,
+    id: string
+  }} = {}
+
   constructor() {
 
     const key =  SHA1('version').toString()
@@ -68,6 +74,22 @@ export class LocalstoreService {
     localStorage.removeItem(keyName)
   }
 
+  private async change(changeType: 'set' | 'delete') {
+    const currentPath = window.location.pathname
+
+    for (const [key, value] of Object.entries(this.callbacks)) {
+
+      if(currentPath.startsWith(value.path)) {}
+      const dontRepeat = await value.funx({event:{type: changeType}})
+      if(dontRepeat) {
+        delete this.callbacks[key]
+      }
+    }
+
+  }
+
+  listener() {}
+
 }
 
 export const localstoreService = new LocalstoreService()

src/environments/environment.ts

@@ -15,8 +15,8 @@ export const environment = {
   apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */
   production: false,
   domain: 'equilibrium.co.ao',
-  defaultuser: '',//evandre.dasilva@equilibrium.co.ao
+  defaultuser: 'evandre.dasilva@equilibrium.co.ao',//evandre.dasilva@equilibrium.co.ao
-  defaultuserpwd: '', //Luand@1219,
+  defaultuserpwd: 'Luand@1219', //Luand@1219,
   chatOffline: true,
   presidencia: false,
   version: versionData,

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "706729155",
+  "shortSHA": "2c97264f5",
-  "SHA": "706729155ce64fdc379cb6fed746a4cd2104760a",
+  "SHA": "2c97264f56e6fc130a559901b134a6d1de92e8ed",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Thu Jan 19 10:29:34 2023 +0100'",
+  "lastCommitTime": "'Thu Jan 19 14:38:10 2023 +0100'",
-  "lastCommitMessage": "pull of peter changes 3",
+  "lastCommitMessage": "Envirement changed",
-  "lastCommitNumber": "4663",
+  "lastCommitNumber": "4664",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/environments/environment.prod.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 8 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:   package-lock.json\n\tmodified:   package.json\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified:   src/app/pages/chat/messages/messages.page.html\n\tmodified:   src/app/pages/events/attendees/attendees.page.ts\n\tmodified:   src/app/pages/publications/new-action/new-action.page.ts\n\tmodified:   src/app/pages/publications/publications.page.html\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/services/auth.service.ts\n\tmodified:   src/app/services/chat/chat-system.service.ts\n\tmodified:   src/app/services/first-enter.service.ts\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/shared/chat/messages/messages.page.html\n\tmodified:   src/app/shared/chat/messages/messages.page.ts\n\tmodified:   src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified:   src/app/shared/popover/chat-options-popover/chat-options-popover.page.html\n\tmodified:   src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts\n\tmodified:   src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified:   src/app/store/localstore.service.ts\n\tmodified:   src/environments/environment.ts",
   "changeAuthor": "eudes.inacio"
 }