added new fecture for presatation day

src/app/modals/add-note/add-note.page.html

@@ -50,6 +50,6 @@
 <ion-footer class="ion-no-border">
   <div class="buttons width-100">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
   </div>
 </ion-footer>

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

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

src/app/modals/dar-parecer/dar-parecer.page.html

@@ -57,7 +57,7 @@
 <ion-footer>
   <div class="buttons">
     <button class="btn-cancel" shape="round" (click)="cancel()">Cancelar</button>
-    <button class="btn-ok" shape="round" (click)="save()">Gravar</button>
+    <button class="btn-ok" shape="round" (click)="save()">Enviar</button>
   </div>
 </ion-footer>
 

src/app/modals/delegar/delegar.page.html

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

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

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

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

@@ -18,7 +18,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
                     <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>
@@ -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()">Gravar</button>
+    <button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
   </div>
 </ion-footer>
 

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

@@ -139,7 +139,7 @@
     </ion-buttons>
     <ion-buttons slot="end" (click)="close()">
       <button class="btn-ok" fill="clear" color="#fff">
-        <ion-label>Gravar</ion-label>
+        <ion-label>Enviar</ion-label>
       </button>
     </ion-buttons>
   </div>

src/app/pages/agenda/edit-event/edit-event.page.html

@@ -240,7 +240,7 @@
                 <div class="list-people flex-grow-1">
                   <ion-item lines="none">
                     <ion-list>
-                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
                       <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                     </ion-list>
                   </ion-item>
@@ -263,7 +263,7 @@
                 <div class="list-people flex-grow-1">
                   <ion-item lines="none">
                     <ion-list>
-                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
                       <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                     </ion-list>
                   </ion-item>
@@ -350,6 +350,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)="save()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
   </div>
 </ion-footer>

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

@@ -324,7 +324,7 @@
     <ion-title></ion-title>
     <ion-buttons slot="end">
       <button class="btn-ok cursor-pointer" fill="clear" color="#fff" (click)="save()">
-        <ion-label>Gravar</ion-label>
+        <ion-label>Enviar</ion-label>
       </button>
     </ion-buttons>
   </ion-toolbar>

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

@@ -88,7 +88,7 @@ ion-content{
       .ion-input-class-no-height{
         border: 1px solid #ebebeb;
         border-radius: 5px;
-        flex: 1;
+        height: 12px;
       }
       .list-people{
         width: 250px;

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>Gravar</ion-label>
+        <ion-label>Enviar</ion-label>
       </button>
     </ion-buttons>
   </ion-toolbar>

src/app/pages/events/edit-event/edit-event.page.html

@@ -195,7 +195,7 @@
 <ion-footer>
   <ion-toolbar>
     <div class="event-detail-buttons">
-      <button class="btn-ok" fill="clear" color="#fff" shape="round" (click)="Save()">Gravar</button>
+      <button class="btn-ok" fill="clear" color="#fff" shape="round" (click)="Save()">Enviar</button>
     </div>
   </ion-toolbar>
 </ion-footer>

src/app/pages/events/event-detail-modal/event-detail-modal.page.html

@@ -208,7 +208,7 @@
 <ion-footer>
   <ion-toolbar>
     <div class="event-detail-buttons">
-      <ion-button shape="round" (click)="Save()">Gravar</ion-button>
+      <ion-button shape="round" (click)="Save()">Enviar</ion-button>
     </div>
   </ion-toolbar>
 </ion-footer>

src/app/pages/events/event-detail/event-detail.page.html

@@ -208,7 +208,7 @@
 <ion-footer>
   <ion-toolbar>
     <div class="event-detail-buttons">
-      <button class="btn-ok" fill="clear" color="#fff" shape="round" (click)="Save()">Gravar</button>
+      <button class="btn-ok" fill="clear" color="#fff" shape="round" (click)="Save()">Enviar</button>
     </div>
   </ion-toolbar>
 </ion-footer>

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -214,16 +214,15 @@ export class ApproveEventPage implements OnInit {
 
     try {
       await this.processes.PostTaskAction(body).toPromise()
-      this.toastService._successMessage();
       this.goBack();
-      this.toastService._successMessage('Evento Aprovar')
+      this.toastService._successMessage('Evento aprovado')
 
     } catch (error) {
       if(error.status == 0) {
         this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
       } else {
        
-        this.toastService._badRequest('Evento não aprovar')
+        this.toastService._badRequest('Evento não aprovado')
       }
     }
     finally {

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

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

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()">Gravar</button>
+    <button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
   </div>
 </ion-footer>

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

@@ -102,7 +102,7 @@
         <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>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para pendentes</button>
         <button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
         <div class="solid"></div>
@@ -113,7 +113,7 @@
 
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
-        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html

@@ -112,7 +112,7 @@
         <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Aprovar</button>
         <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <div class="solid"></div>
-        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
         <div hidden class="solid"></div>
         <button hidden class="btn-cancel" shape="round" >Delegar</button>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
@@ -120,7 +120,7 @@
       </div>
       <div *ngIf="loggeduser.Profile =='PR' " class="buttons">
         <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
-        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>

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

@@ -138,7 +138,7 @@
 
           <!-- This is the box view -->
           <div  *ngSwitchCase="'boxview'"  class="aside overflow-y-auto d-flex  flex-wrap width-100 height-100">
-            <div *ngIf="loadCount">
+            <div *ngIf="loadCount" class="center-box">
               
               <!-- List -->
               <div *ngIf="hideInMobile" (click)="openAllProcessesPage()" [class.active]="selectedElement == 'allProcessesTag'"  class="box-hover exp-card d-flex flex-column" >

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

@@ -678,3 +678,10 @@ ion-content{
     display: none !important;
   }
 }
+
+.center-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+}

src/app/pages/publications/edit-action/edit-action.page.html

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

src/app/pages/publications/new-publication/new-publication.page.html

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

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>Gravar</ion-label>
+        <ion-label>Enviar</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>
       </button>
     </ion-buttons>

src/app/services/events/edit-event/edit-event.page.html

@@ -195,7 +195,7 @@
 <ion-footer>
   <ion-toolbar>
     <div class="event-detail-buttons">
-      <button class="btn-ok" fill="clear" color="#fff" shape="round" (click)="Save()">Gravar</button>
+      <button class="btn-ok" fill="clear" color="#fff" shape="round" (click)="Save()">Enviar</button>
     </div>
   </ion-toolbar>
 </ion-footer>

src/app/services/events/event-detail-modal/event-detail-modal.page.html

@@ -208,7 +208,7 @@
 <ion-footer>
   <ion-toolbar>
     <div class="event-detail-buttons">
-      <ion-button shape="round" (click)="Save()">Gravar</ion-button>
+      <ion-button shape="round" (click)="Save()">Enviar</ion-button>
     </div>
   </ion-toolbar>
 </ion-footer>

src/app/services/events/event-detail/event-detail.page.html

@@ -208,7 +208,7 @@
 <ion-footer>
   <ion-toolbar>
     <div class="event-detail-buttons">
-      <button class="btn-ok" fill="clear" color="#fff" shape="round" (click)="Save()">Gravar</button>
+      <button class="btn-ok" fill="clear" color="#fff" shape="round" (click)="Save()">Enviar</button>
     </div>
   </ion-toolbar>
 </ion-footer>

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()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Enviar</button>
   </div>
 </ion-footer>

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

@@ -226,7 +226,7 @@
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
-                <div *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</div>
+                <div *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</div>
                 <div *ngFor="let participant of taskParticipants">{{participant.Name}}</div>
               </ion-list>
             </ion-item>
@@ -321,7 +321,7 @@
     <ion-title></ion-title>
     <ion-buttons slot="end">
       <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
-        <ion-label>Gravar</ion-label>
+        <ion-label>Enviar</ion-label>
       </button>
     </ion-buttons>
   </ion-toolbar>

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

@@ -123,8 +123,6 @@ export class EditEventPage implements OnInit {
 
     this.initCalendarName = this.postEvent.CalendarName;
 
-    this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
-
     this.getRecurrenceTypes();
 
     setTimeout(() => {
@@ -136,7 +134,7 @@ export class EditEventPage implements OnInit {
   }
 
   ngOnChanges(changes: any): void {
-    this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
+    this.loadedEventAttachments = this.postEvent.Attachments
   }
 
   close() {
@@ -484,8 +482,8 @@ export class EditEventPage implements OnInit {
       }
     });
     await modal.present();
-    modal.onDidDismiss().then( async (res)=>{
+    modal.onDidDismiss().then( async (res) => { 
-      if(res){
+      if(res) {
         const data = res.data;
 
         const ApplicationIdDocumentToSave: any = {
@@ -495,7 +493,6 @@ export class EditEventPage implements OnInit {
           Stakeholders: data.selected.Stakeholders | data.selected.EntidadeOrganicaNome,
           ApplicationId: data.selected.ApplicationType.toString(),
           CreateDate: data.selected.Data,
-          // needed to attach this document
           Id: 'add',
           SourceTitle: data.selected.Assunto,
           Source: '1',
@@ -503,7 +500,6 @@ export class EditEventPage implements OnInit {
           SerialNumber: '',
         }
 
-        
         this.loadedEventAttachments.push(ApplicationIdDocumentToSave)
 
       }

src/app/shared/agenda/new-event/new-event.page.html

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

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>Gravar</ion-label>
+        <ion-label>Enviar</ion-label>
       </button>
     </ion-buttons>
   </ion-toolbar>

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

@@ -324,6 +324,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)="save()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
   </div>
 </ion-footer>

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

@@ -12,14 +12,14 @@
       <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Aprovar</button>
       <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
       <div class="solid"></div>
-      <button (click)="distartExpedientModal('descartar')" full class="btn-cancel" shape="round" >Descartar</button>
+      <button (click)="distartExpedientModal('descartar')" full class="btn-cancel" shape="round" >Arquivar</button>
       <div hidden class="solid"></div>
       <button hidden class="btn-cancel" shape="round" >Delegar</button>
       <button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documento</button>
     </div>
     <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="buttons">
       <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
-      <button (click)="distartExpedientModal('descartar')" full class="btn-cancel" shape="round" >Descartar</button>
+      <button (click)="distartExpedientModal('descartar')" full class="btn-cancel" shape="round" >Arquivar</button>
       <div class="solid"></div>
       <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
       <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>

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

@@ -19,7 +19,7 @@
         <button *ngIf="!p.userRole(['PR']) && !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()" 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>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
         <button (click)="sendExpedienteToPending()" *ngIf="(task.Status || '') != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para Pendentes</button>
         <button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
       </div>
@@ -27,7 +27,7 @@
     <!-- <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
       <div class="flex-grow-1">
         <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
-        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>

src/app/shared/publication/edit-action/edit-action.page.html

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

src/app/shared/publication/new-publication/new-publication.page.html

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

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "a4d7ed01c",
+  "shortSHA": "8359af12c",
-  "SHA": "a4d7ed01c7178781989e066472037f75f7c33036",
+  "SHA": "8359af12c93641521563f9d49a28e23cccc22de2",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Tue Feb 14 10:50:50 2023 +0100'",
+  "lastCommitTime": "'Tue Feb 14 16:37:33 2023 +0100'",
-  "lastCommitMessage": "Peter solved new event action on chat",
+  "lastCommitMessage": "bus solved",
-  "lastCommitNumber": "4782",
+  "lastCommitNumber": "4783",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 4 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/forward/forward.page.html\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 3 and 4 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/add-note/add-note.page.html\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified:   src/app/modals/delegar/delegar.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/modals/profile/edit-profile/edit-profile.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.scss\n\tmodified:   src/app/pages/events/attendees/attendees.page.html\n\tmodified:   src/app/pages/events/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/events/event-detail-modal/event-detail-modal.page.html\n\tmodified:   src/app/pages/events/event-detail/event-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified:   src/app/services/events/attendees/attendees.page.html\n\tmodified:   src/app/services/events/edit-event/edit-event.page.html\n\tmodified:   src/app/services/events/event-detail-modal/event-detail-modal.page.html\n\tmodified:   src/app/services/events/event-detail/event-detail.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified:   src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified:   src/app/shared/publication/edit-action/edit-action.page.html\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.html",
   "changeAuthor": "eudes.inacio"
 }