fix merge

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

@@ -371,6 +371,6 @@
 <ion-footer class="background-whit">
   <div class="buttons">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Enviar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Gravar</button>
   </div>
 </ion-footer>

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -6,6 +6,7 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SortService } from 'src/app/services/functions/sort.service';
 import { Storage } from '@ionic/storage';
+import { EventTrigger } from 'src/app/services/eventTrigger.service';
 
 @Component({
   selector: 'app-expedients',
@@ -29,9 +30,16 @@ export class ExpedientsPage implements OnInit {
     private router: Router,
     public ThemeService: ThemeService,
     private sortService: SortService,
-    private storage: Storage
+    private storage: Storage,
+    private eventTriger: EventTrigger
   ) {
     this.profile = 'mdgpr';
+    this.eventTriger.getObservable().subscribe((event) => {
+      if(event.expedienteDetail == "update") {
+        this.LoadList();
+      }
+      console.log(event)
+    })
 
   }
 

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

@@ -5,6 +5,9 @@ import { ToastService } from 'src/app/services/toast.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
 import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
+import { HttpErrorResponse } from '@angular/common/http';
+import { SessionStore } from 'src/app/store/session.service';
+import { GroupContactsPage } from '../../chat/group-messages/group-contacts/group-contacts.page';
 
 
 @Component({
@@ -17,6 +20,7 @@ export class ChatPopoverPage implements OnInit {
   room: any;
   members:any;
   isAdmin = false;
+  isGroupCreated: boolean;
 
   constructor(
     private popoverController: PopoverController,

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

@@ -12,9 +12,11 @@
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
         <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar despacho</button>
+        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
+        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        
+        
         <div class="solid"></div>
       </div>
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Diploma Assinado'">

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

@@ -294,14 +294,9 @@ export class OptsExpedientePage implements OnInit {
     try {
       await this.processes.CompleteTask(body).toPromise();
       this.close();
-      this.toastService._successMessage('Processo aprovado')
+      this.httpErrorHanlde.httpsSucessMessagge('Avaliação Superiror')
     } catch(error) {
-      if(error.status == 0) {
-        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
-      } else {
-       
-        this.toastService._badRequest('Processo não aprovado')
-      }
+      this.httpErrorHanlde.httpStatusHandle(error)
     }  finally {
       loader.remove()
     }

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -126,7 +126,7 @@ export class ViewPublicationsPage implements OnInit {
         const found = this.publicationList[folderId].find( e => e.DocumentId == publicationId )
 
         if(!found) {
-          // PublicationModel.create(publicationDetails)
+          /* PublicationModel.create(publicationDetails) */
           this.publicationList[folderId].push(publicationDetails)
         }
       }