merge

src/app/modals/create-process/create-process.page.html

@@ -186,7 +186,7 @@
 <ion-footer>
   <div class="buttons">
     <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
-    <button *ngIf="taskType == '0'" class="btn-ok" shape="round" (click)="saveTask()">Despachar</button>
+    <button *ngIf="taskType == '0'" class="btn-ok" shape="round" (click)="saveTask()">Concluir</button>
     <button *ngIf="taskType == '1'" class="btn-ok" shape="round" (click)="saveTask()">Solicitar</button>
   </div>
 </ion-footer>

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html

@@ -354,7 +354,7 @@
 <ion-footer>
   <div class="buttons">
     <button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
+    <button class="btn-ok" shape="round" (click)="saveTask()">Adicionar</button>
   </div>
 </ion-footer>
 

src/app/modals/forward/forward.page.html

@@ -78,7 +78,7 @@
 <ion-footer>
   <div class="buttons">
     <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
-    <button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
+    <button class="btn-ok" shape="round" (click)="saveTask()">Adicionar</button>
   </div>
 </ion-footer>
 

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

@@ -90,7 +90,7 @@
     </ion-buttons>
     <ion-buttons class="flex-grow-1" slot="end">
       <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
-        <ion-label>Selecionar</ion-label>
+        <ion-label>Adicionar</ion-label>
       </button>
     </ion-buttons>
   </ion-toolbar>

src/app/pages/events/events.page.html

@@ -32,25 +32,25 @@
           <div class="wrap d-flex float-left">
             <div class="event-box pointer" (click)="goToAllTaskFilter('ForToDay')">
               <!-- <p>correspondencia com prazo para hoje</p> -->
-              <p>Tarefas que terminam hoje</p>
+              <p>Correspondências com prazo para hoje</p>
               <span>{{ TaskService.deadline }}</span>
             </div>
             
             <div class="event-box pointer" (click)="goToAllTaskFilter('OverdueTasks')">
               <!-- <p>correspondencia em atraso</p> -->
-              <p>Tarefas em atraso</p>
+              <p>Correspondências em atraso</p>
               <span>{{ TaskService.overdueTasks }}</span>
             </div>
         
             <div class="event-box pointer" (click)="goToAllTaskFilter('New')">
               <!-- <p>Novas correspondencia</p> -->
-              <p>Novas tarefas</p>
+              <p>Novas Correspondências</p>
               <span>{{ TaskService.new }}</span>
             </div>
         
             <div class="event-box pointer" (click)="goToAllTaskFilter('unread')">
               <!-- <p>correspondencia não lidas</p> -->
-              <p>Tarefas não lidas</p>
+              <p>Correspondências não lidas</p>
               <span>{{ TaskService.unread }}</span>
             </div>
           </div>

src/app/pages/events/events.page.scss

@@ -580,8 +580,8 @@ ion-title{
   }
   .event-box {
     background-color: #ffb81c2b;
-    width: 130px;
+    width: 150px;
-    height: 73px;
+    height: 90px;
     margin:5px;
     flex-direction: column;
     display: flex;

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -235,6 +235,6 @@
 <ion-footer>
   <div class="buttons">
     <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
-    <button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
+    <button class="btn-ok" shape="round" (click)="saveTask()">Concluir</button>
   </div>
 </ion-footer>

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

@@ -427,8 +427,8 @@
                   <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
                 </div>
                 <p class="text-center exp-card-title ">Eventos para Aprovação <br>
-                  <span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} correspondências novas</span>
+                  <span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} eventos novos</span>
-                  <span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} correspondência nova</span>
+                  <span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} evento novo</span>
                 </p>
                 <p class="text-center exp-card-content"> 
                   {{TaskService.eventoaprovacaostore.countAll}} 

src/app/services/events/attendees/attendees.page.html

@@ -85,7 +85,7 @@
     </ion-buttons>
     <ion-buttons class="flex-grow-1" slot="end">
       <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
-        <ion-label>Enviar</ion-label>
+        <ion-label>Adicionar</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>
       </button>
     </ion-buttons>

src/app/services/notifications.service.ts

@@ -151,8 +151,9 @@ export class NotificationsService {
       (notification: PushNotificationSchema) => {
         this.active = true
         
-
+        console.log(notification)
         this.storageService.get("Notifications").then((store) => {
+          
           store.push(notification)
           this.storageService.store("Notifications", store)
         }).catch((error) => {
@@ -178,6 +179,7 @@ export class NotificationsService {
     PushNotifications.addListener('pushNotificationActionPerformed',
       (notification: ActionPerformed) => {
         this.active = true
+        console.log(notification)
         /*  this.DataArray.push(notification.notification)
          
          this.storageService.store("Notifications", this.DataArray)
@@ -274,6 +276,12 @@ export class NotificationsService {
 
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', notification.notification.data.IdObject, 'gabinete-digital']));
     }
+
+    else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diploma-revisao") {
+
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.notification.data.IdObject, 'gabinete-digital']));
+    }
+
     else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expedientes-pr") {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.notification.data.IdObject, 'gabinete-digital']));
     } else if (notification.notification.data.Service === "chat") {

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -15,6 +15,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { EventToApproveEdit } from 'src/app/models/event.model';
 import { ThemeService } from 'src/app/services/theme.service'
 import { Router } from '@angular/router';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -131,6 +132,7 @@ export class EditEventToApprovePage implements OnInit {
     private processes:ProcessesService,
     private toastService: ToastService,
     public ThemeService: ThemeService,
+    public httpErrorHandler: HttpErrorHandle
   ) {
     this.isEventEdited = false;
   }
@@ -362,9 +364,10 @@ export class EditEventToApprovePage implements OnInit {
       
       this.close()
 
-      this.toastService._successMessage('Evento editado');
+      this.httpErrorHandler.httpsSucessMessagge('Editar evento');
 
     } catch(e) {
+      this.httpErrorHandler.httpStatusHandle(e);
       this.toastService._badRequest('Evento não editado');
     }
   

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

@@ -87,7 +87,7 @@
     </ion-buttons>
     <ion-buttons slot="end">
       <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
-        <ion-label>Selecionar</ion-label>
+        <ion-label>Adicionar</ion-label>
       </button>
     </ion-buttons>
   </ion-toolbar>

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

@@ -4,7 +4,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { TaskService } from 'src/app/services/task.service'
-import MiniSearch from 'minisearch'
+/* import MiniSearch from 'minisearch' */
 
 @Component({
   selector: 'app-all-processes',
@@ -21,10 +21,10 @@ export class AllProcessesPage implements OnInit {
   
   filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'|  'OverdueTasks' | 'Todos' = 'Todos'
 
-  miniSearch = new MiniSearch({
+  /* miniSearch = new MiniSearch({
     fields: ['Folio', 'Senders'], // fields to index for full-text search
     idField: 'DocId'
-  })
+  }) */
 
   AllProcess = []
   ordinance: string =  'old'

src/environments/environment.prod.ts

@@ -3,4 +3,5 @@ import { oaprProd } from './suport/oapr'
 import { doneITProd } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
-export const environment: Environment = DevDev;
+
+export const environment: Environment = oaprProd;

src/environments/environment.ts

@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = DevDev
+export const environment: Environment = oaprDev

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "2688b1e01",
+  "shortSHA": "72f396a3b",
-  "SHA": "2688b1e0128c17f8ad7d85518287afbfb3f8f4d9",
+  "SHA": "72f396a3b93a365f5f7738b5f2eb9b9f6fd3cfe0",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sun Jun 11 20:17:10 2023 +0100'",
+  "lastCommitTime": "'Sun Jun 11 20:18:21 2023 +0100'",
-  "lastCommitMessage": "performance",
+  "lastCommitMessage": "remove code",
-  "lastCommitNumber": "4977",
+  "lastCommitNumber": "4978",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts",
+  "changeStatus": "On branch feature/gabinete-search\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/create-process/create-process.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/modals/forward/forward.page.html\n\tmodified:   src/app/pages/events/attendees/attendees.page.html\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/events/events.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/services/events/attendees/attendees.page.html\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified:   src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }