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

---
 .../deploma-options/deploma-options.page.html        |  2 +-
 .../popover/deploma-options/deploma-options.page.ts  |  6 +++---
 version/git-version.ts                               | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

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 adbbaf691..9e372b2d5 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.html
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.html
@@ -22,7 +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)="openAddNoteModal('Assinar Diploma')" class="btn-cancel" shape="round" >Assinado</button>
+        <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>
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 d741c83da..4fa197085 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -74,7 +74,7 @@ export class DiplomaOptionsPage implements OnInit {
     });
 
     modal.onDidDismiss().then(async (res) => {
-      if(res.data){
+      if(res.data) {
 
 
         const DocumentToSave = res.data.documents.map((e) => {
@@ -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(res.data.note, docs)
+          await this.AssinarNew()
         }
       }
     }, (error) => {
@@ -235,7 +235,7 @@ export class DiplomaOptionsPage implements OnInit {
     }
   }
 
-  async AssinarNew(note:string, documents:any) {
+  async AssinarNew() {
     let body = {
       "InstanceId": this.task.InstanceID,
       "FolderId": this.task.FolderID,
diff --git a/version/git-version.ts b/version/git-version.ts
index 91945d8c8..a468bb902 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "65a67902d",
-  "SHA": "65a67902d43d9ee65d9a8b323b926b96a6085904",
+  "shortSHA": "4143a2d00",
+  "SHA": "4143a2d00718942f0ca98bd09b0e19b38053266e",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Jul 21 10:12:55 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "5088",
+  "lastCommitTime": "'Fri Jul 21 10:21:10 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "5095",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\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/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\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/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tnew file:   src/assets/images/error_circle_warning.png\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file