From 225e050df3b94b7ca25f6e08ff769783af8d24ea Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 14 Feb 2023 16:24:45 +0100
Subject: [PATCH] Improve

---
 .../expediente-detail.page.html               |  4 +-
 .../expediente-pr/expediente-pr.page.html     |  4 +-
 .../agenda/edit-event/edit-event.page.ts      | 69 +++++++++----------
 .../opts-expediente-pr.page.html              |  4 +-
 .../opts-expediente/opts-expediente.page.html |  4 +-
 version/git-version.ts                        | 12 ++--
 6 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 72e94874d..c81ba5f26 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/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>
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index 98f198d7b..f87548b03 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/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>
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 81a806fc8..6b9f55c37 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -122,9 +122,6 @@ export class EditEventPage implements OnInit {
     }
 
     this.initCalendarName = this.postEvent.CalendarName;
-
-    this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
-
     this.getRecurrenceTypes();
 
     setTimeout(() => {
@@ -136,7 +133,7 @@ export class EditEventPage implements OnInit {
   }
 
   ngOnChanges(changes: any): void {
-    this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
+    this.loadedEventAttachments = this.postEvent.Attachments
   }
 
   close() {
@@ -472,43 +469,43 @@ export class EditEventPage implements OnInit {
 
   }
 
-  async getDoc() {
+  // async getDoc() {
 
-    const modal = await this.modalController.create({
-      component: SearchPage,
-      cssClass: 'modal-width-100-width-background modal',
-      componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect',
-        showSearchInput: true,
-        select: true,
-      }
-    });
-    await modal.present();
-    modal.onDidDismiss().then( async (res)=>{
-      if(res){
-        const data = res.data;
+  //   const modal = await this.modalController.create({
+  //     component: SearchPage,
+  //     cssClass: 'modal-width-100-width-background modal',
+  //     componentProps: {
+  //       type: 'AccoesPresidenciais & ArquivoDespachoElect',
+  //       showSearchInput: true,
+  //       select: true,
+  //     }
+  //   });
+  //   await modal.present();
+  //   modal.onDidDismiss().then( async (res)=>{
+  //     if(res){
+  //       const data = res.data;
 
-        const ApplicationIdDocumentToSave: any = {
-          SourceName: data.selected.Assunto,
-          ParentId: this.postEvent.EventId,
-          SourceId: data.selected.Id,
-          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',
-          Link: '',
-          SerialNumber: '',
-        }
+  //       const ApplicationIdDocumentToSave: any = {
+  //         SourceName: data.selected.Assunto,
+  //         ParentId: this.postEvent.EventId,
+  //         SourceId: data.selected.Id,
+  //         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',
+  //         Link: '',
+  //         SerialNumber: '',
+  //       }
 
         
-        this.loadedEventAttachments.push(ApplicationIdDocumentToSave)
+  //       this.loadedEventAttachments.push(ApplicationIdDocumentToSave)
 
-      }
-    });
-  }
+  //     }
+  //   });
+  // }
 
 
 }
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html
index 34f938ca0..c31e8b565 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html
+++ b/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>
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
index 71c28949f..162041115 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html
+++ b/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>
diff --git a/version/git-version.ts b/version/git-version.ts
index 12f7b4486..a52a87ac8 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "1e34f3de6",
-  "SHA": "1e34f3de62905bb24425504f6d4263d71d40559b",
+  "shortSHA": "b136664c4",
+  "SHA": "b136664c480ec58453bd73b7a165d9cc597b2edd",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Feb 14 10:40:05 2023 +0100'",
-  "lastCommitMessage": "spelling",
-  "lastCommitNumber": "4780",
+  "lastCommitTime": "'Tue Feb 14 11:07:13 2023 +0100'",
+  "lastCommitMessage": "Fix alignment",
+  "lastCommitNumber": "4781",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.scss",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\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/edit-event/edit-event.page.ts\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",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file