From 60078f6118a24c765ab7a4e1e9c12c3f80284c3d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 Jul 2023 17:17:28 +0100
Subject: [PATCH] fix

---
 .../document-set-up-meeting.page.ts                |  3 ++-
 src/app/models/eventperson.model.ts                |  1 +
 src/app/pages/agenda/agenda.page.ts                |  6 ++++--
 .../despachos-pr/despacho-pr/despacho-pr.page.ts   |  4 ----
 .../diploma-assinar/diploma-assinar.page.html      |  6 +-----
 .../diploma-assinar/diploma-assinar.page.ts        | 14 ++++----------
 .../book-meeting-modal/book-meeting-modal.page.ts  |  3 ++-
 .../gabinete-digital/gabinete-digital.page.ts      |  2 +-
 .../deploma-options/deploma-options.page.html      |  5 +----
 .../deploma-options/deploma-options.page.ts        |  9 ++++-----
 src/app/tiny-mce/tiny-mce.page.html                |  4 ++--
 version/git-version.ts                             | 14 +++++++-------
 12 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
index a1388a540..06e153184 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
@@ -135,7 +135,8 @@ export class DocumentSetUpMeetingPage implements OnInit {
       this.taskParticipants = [{
         EmailAddress: SessionStore.user.Email,
         IsRequired: true,
-        Name: SessionStore.user.FullName
+        Name: SessionStore.user.FullName,
+        UserType: "GD"
       }]
     }
 
diff --git a/src/app/models/eventperson.model.ts b/src/app/models/eventperson.model.ts
index 4955c9f72..66afcf99f 100644
--- a/src/app/models/eventperson.model.ts
+++ b/src/app/models/eventperson.model.ts
@@ -2,4 +2,5 @@ export class EventPerson{
     EmailAddress: string;
     Name: string;
     IsRequired: boolean;
+    UserType: string;
 }
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index b6f928d48..188e07b23 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -916,7 +916,8 @@ export class AgendaPage implements OnInit {
       let taskParticipants = [{
         EmailAddress: SessionStore.user.Email,
         IsRequired: true,
-        Name: SessionStore.user.FullName
+        Name: SessionStore.user.FullName,
+        UserType: "GD"
       }]
       const modal = await this.modalCtrl.create({
         component: NewEventPage,
@@ -944,7 +945,8 @@ export class AgendaPage implements OnInit {
       this.taskParticipants = [{
         EmailAddress: SessionStore.user.Email,
         IsRequired: true,
-        Name: SessionStore.user.FullName
+        Name: SessionStore.user.FullName,
+        UserType: "GD"
       }]
     }
   }
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index d73eba33f..7f965076b 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -82,10 +82,6 @@ export class DespachoPrPage implements OnInit {
 
     this.LoadTaskDetail(this.serialNumber);
     // this.LoadRelatedEvents(this.serialNumber);
-
-    this.backgroundservice.registerBackService('Online', () => {
-      this.LoadTaskDetail(this.serialNumber);
-    });
   }
 
   close() {
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
index a5463819a..6e057cba2 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
@@ -17,11 +17,7 @@
 
     <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
-        <button (click)="Assinar()" class="btn-cancel" shape="round" >Assinado</button>
-        <div class="solid"></div>
-      </div>
-      <div class="buttons">
-        <button (click)="AssinarNew()" class="btn-cancel" shape="round" >Assinar</button>
+        <button (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinado</button>
         <div class="solid"></div>
       </div>
       <div class="buttons">
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
index 2e265d2ad..2d5710c19 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
@@ -231,10 +231,6 @@ export class DiplomaAssinarPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise()
-
-      this.httpErroHandle.httpsSucessMessagge('Assinado')
-      this.TaskService.loadDiplomas()
-      this.goBack();
     } catch (error) {
     this.httpErroHandle.httpStatusHandle(error)
     }
@@ -244,7 +240,7 @@ export class DiplomaAssinarPage implements OnInit {
 
   }
 
-  async AssinarNew() {
+  async AssinarDraft() {
     let body = {
       "InstanceId": this.task.InstanceID,
       "FolderId": this.task.FolderID,
@@ -252,22 +248,20 @@ export class DiplomaAssinarPage implements OnInit {
       "OriginalFileName": this.DraftNames
     }
 
-    console.log(body)
-
     const loader = this.toastService.loading()
 
     try {
       await this.processes.presidentialActionsSignature(body).toPromise()
 
-      this.httpErroHandle.httpsSucessMessagge('Assinado')
-      this.TaskService.loadDiplomas()
+      await this.Assinar();
+      this.TaskService.loadDiplomas();
+      this.goBack();
     } catch (error) {
     this.httpErroHandle.httpStatusHandle(error)
     }
     finally {
       loader.remove()
     }
-
   }
 
   async openAddNoteModal(actionName: string) {
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index cbd55f6f5..760c116c9 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -157,7 +157,8 @@ export class BookMeetingModalPage implements OnInit {
       this.taskParticipants = [{
         EmailAddress: SessionStore.user.Email,
         IsRequired: true,
-        Name: SessionStore.user.FullName
+        Name: SessionStore.user.FullName,
+        UserType: "GD"
       }]
     }
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index ce897623f..0b2438c5c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -290,7 +290,7 @@ export class GabineteDigitalPage implements OnInit {
     if(currentFilter != this.filterName) {
       this.dynamicSearch()
     }
-    console.log('this.filterName', this.filterName)
+    // console.log('this.filterName', this.filterName)
   } 
 
 
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.html b/src/app/shared/popover/deploma-options/deploma-options.page.html
index 9e372b2d5..2b3b70561 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.html
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.html
@@ -22,10 +22,7 @@
         <button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
       </div>
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
-        <button (click)="AssinarNew()" class="btn-cancel" shape="round" >Assinado</button>
-      </div>
-      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
-        <button (click)="openAddNoteModal('AssinarNew')" class="btn-cancel" shape="round" >Assinar</button>
+        <button (click)="openAddNoteModal('AssinarNew')" class="btn-cancel" shape="round" >Assinado</button>
       </div>
       <div class="buttons width-100">
         <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index 4fa197085..1458c3435 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -105,7 +105,7 @@ export class DiplomaOptionsPage implements OnInit {
           await this.arquivar(res.data.note, docs);
           this.goBack();
         } else if (actionName =='AssinarNew') {
-          await this.AssinarNew()
+          await this.AssinarNew(res.data.note, docs)
         }
       }
     }, (error) => {
@@ -222,7 +222,6 @@ export class DiplomaOptionsPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise()
-      this.close();
       this.toastService._successMessage()
     } catch (error) {
       if(error.status == 0) {
@@ -235,7 +234,7 @@ export class DiplomaOptionsPage implements OnInit {
     }
   }
 
-  async AssinarNew() {
+  async AssinarNew(note, doc) {
     let body = {
       "InstanceId": this.task.InstanceID,
       "FolderId": this.task.FolderID,
@@ -246,10 +245,10 @@ export class DiplomaOptionsPage implements OnInit {
 
     try {
       await this.processes.presidentialActionsSignature(body).toPromise()
-
-      this.httpErroHandle.httpsSucessMessagge('Assinado')
+      await this.sign(note, doc)
       this.TaskService.loadDiplomas()
       this.popoverController.dismiss("")
+      this.close();
     } catch (error) {
     this.httpErroHandle.httpStatusHandle(error)
     }
diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html
index 35b3ff341..356a848a8 100644
--- a/src/app/tiny-mce/tiny-mce.page.html
+++ b/src/app/tiny-mce/tiny-mce.page.html
@@ -18,8 +18,8 @@
 </div>
 
 <editor
-apiKey="wr5dk69kive0qr9ig6y5spqvlj3a0tsiwnzdsexnz241k69p"
-[(ngModel)]="editorContent"
+  apiKey="wr5dk69kive0qr9ig6y5spqvlj3a0tsiwnzdsexnz241k69p"
+  [(ngModel)]="editorContent"
   [init]="{ 
     height: 600,
     menubar: false,
diff --git a/version/git-version.ts b/version/git-version.ts
index 09d4f2d3c..2b99648a1 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "2e5b28735",
-  "SHA": "2e5b287359258af05812a1a4c5bbcbbcc260d09e",
+  "shortSHA": "9967f52c8",
+  "SHA": "9967f52c80a10822db8da79c1aedd94217df76cf",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Fri Jul 21 12:57:42 2023 +0100'",
-  "lastCommitMessage": "pull made",
-  "lastCommitNumber": "5097",
+  "lastCommitTime": "'Fri Jul 21 13:09:53 2023 +0100'",
+  "lastCommitMessage": "pull made2",
+  "lastCommitNumber": "5100",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 2 and 2 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/models/dailyworktask.model.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified:   src/app/pipes/custom-task.pipe.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified:   src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts",
-  "changeAuthor": "eudes.inacio"
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/models/eventperson.model.ts\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified:   src/app/tiny-mce/tiny-mce.page.html",
+  "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file