From 9e8bb92b9661c6ce4fbb415f07891e2cca809137 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 25 Jul 2023 16:49:51 +0100
Subject: [PATCH] fix issue 27

---
 .../diplomas/diploma/diploma.page.ts          | 53 +++++++++++--------
 src/app/services/processes.service.ts         |  6 +--
 version/git-version.ts                        | 12 ++---
 3 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index b9a9ee327..1d1283f9c 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -44,6 +44,10 @@ export class DiplomaPage implements OnInit {
   customDate: any;
   mergedArray: any = [];
 
+
+  DraftNames = ""
+  DraftIds = ""
+
   constructor(
     private processes: ProcessesService,
     public popoverController: PopoverController,
@@ -520,29 +524,34 @@ export class DiplomaPage implements OnInit {
       this.mergedArray.push(docObject);
     });
   }
-  getDraft(split_stringDraft: string[]) {
-    split_stringDraft.forEach(element => {
-      console.log('List of ids', element)
-      this.processes.GetDraftByID(element).subscribe((resd) => {
-        let object = {
-          "ApplicationId": "",
-          "Assunto": resd.data.description,
-          "DocDate": "",
-          "DocId": resd.data.id,
-          "DocNumber": "",
-          "FolderId": "",
-          "Sender": "",
-          "SourceDocId": "",
-          "content": resd.data.content,
-          "path": resd.data.path,
-          "ownerId": resd.data.ownerId,
-          "status": resd.data.status,
-        }
-        this.mergedArray.push(object)
-        console.log('List of draff', resd)
-      })
+  async getDraft(split_stringDraft: string[]) {
+    this.DraftNames = ""
 
-    });
+    for(const strg of split_stringDraft) {
+      console.log('List of ids', strg)
+      const resd = await this.processes.GetDraftByID(strg).toPromise()
+
+      let object = {
+        "ApplicationId": "",
+        "Assunto": resd.data.description,
+        "DocDate": "",
+        "DocId": resd.data.id,
+        "DocNumber": "",
+        "FolderId": "",
+        "Sender": "",
+        "SourceDocId": "",
+        "content": resd.data.content,
+        "path": resd.data.path,
+        "ownerId": resd.data.ownerId,
+        "status": resd.data.status,
+      }
+      this.mergedArray.push(object)
+      this.DraftNames = this.DraftNames + resd.data.description+";"
+      console.log('List of draff', resd)
+    }
+
+    this.DraftNames = this.DraftNames.slice(0, -1);
+    this.DraftIds = this.DraftIds.slice(0, -1);
   }
 
 
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index d07df3825..5e2408f94 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -276,10 +276,6 @@ export class ProcessesService {
 
   CompleteTask(body:Excludetask) {
 
-    if(!body.dataFields.DraftIds) {
-      body.dataFields.DraftIds = ""
-    }
-
     // double check
     const geturl = environment.apiURL + 'Tasks/CompleteTask';
 
@@ -289,7 +285,7 @@ export class ProcessesService {
     return this.http.post<any>(`${geturl}`, body, options)
   }
 
-  CompleteParecerPrTask(body:any){
+  CompleteParecerPrTask(body:any) {
     const geturl = environment.apiURL + 'Tasks/CompleteTaskParecerPr';
 
     let options = {
diff --git a/version/git-version.ts b/version/git-version.ts
index 10e78a90a..772c9508b 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "a26f7c4f7",
-  "SHA": "a26f7c4f7507ee84a621083e23ee50d3c5ecc092",
+  "shortSHA": "2628bc91e",
+  "SHA": "2628bc91e881fa3ee5f559cac57dace1fa1ccf41",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Jul 25 13:47:48 2023 +0100'",
-  "lastCommitMessage": "fix aparecer",
-  "lastCommitNumber": "5108",
+  "lastCommitTime": "'Tue Jul 25 15:56:42 2023 +0100'",
+  "lastCommitMessage": "clear",
+  "lastCommitNumber": "5109",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/services/contacts.service.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts",
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/services/processes.service.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file