From a26f7c4f7507ee84a621083e23ee50d3c5ecc092 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 25 Jul 2023 13:47:48 +0100
Subject: [PATCH] fix aparecer

---
 .../create-process/create-process.page.ts     |  2 +-
 src/app/models/Excludetask.ts                 |  3 ++
 src/app/services/processes.service.ts         | 43 ++++++++++++++++++-
 version/git-version.ts                        | 12 +++---
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 038a5880d..0860cfae3 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -343,7 +343,7 @@ export class CreateProcessPage implements OnInit {
               DispatchFolder: this.dispatchFolder,
               AttachmentList: docs
             }
-
+            
             try {
               if (this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
                 await this.despachoService.createParecer(this.postData).toPromise();
diff --git a/src/app/models/Excludetask.ts b/src/app/models/Excludetask.ts
index 1be8935ae..6ea2a1600 100644
--- a/src/app/models/Excludetask.ts
+++ b/src/app/models/Excludetask.ts
@@ -5,6 +5,7 @@ export interface Attachment {
 export interface AttachmentList {
     ProcessInstanceID?: string;
     Attachments?: Attachment[];
+    DraftIds?: any
 }
 export interface Excludetask {
     serialNumber: string;
@@ -13,6 +14,8 @@ export interface Excludetask {
     dataFields: {
         ReviewUserComment?: string,
         Note?: any
+        InstanceIDNew?: any
+        DraftIds?: any
     }
     FolderId?: number;
     AttachmentList?: AttachmentList | any;
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 77579f91b..d07df3825 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -275,6 +275,12 @@ export class ProcessesService {
   }
 
   CompleteTask(body:Excludetask) {
+
+    if(!body.dataFields.DraftIds) {
+      body.dataFields.DraftIds = ""
+    }
+
+    // double check
     const geturl = environment.apiURL + 'Tasks/CompleteTask';
 
     let options = {
@@ -335,7 +341,24 @@ export class ProcessesService {
     return this.http.post<any>(`${geturl}`, body, options)
   }
 
-  postParecer(body:any){
+  postParecer(body:any) {
+
+    try {
+      if(!body.AttachmentList) {
+        body.AttachmentList = {}
+      }
+      if(!body?.dataFields) {
+        body.dataFields = {}
+      }
+      if(!body.dataFields?.DraftIds) {
+        body.dataFields.DraftIds = ""
+      }
+      if(!body.AttachmentList?.DraftIds) {
+        body.AttachmentList.DraftIds = ""
+      }
+    } catch (error) {}
+
+    
     const geturl = environment.apiURL + 'Processes/CreateParecer';
     let options = {
       headers: this.headers,
@@ -343,7 +366,23 @@ export class ProcessesService {
     return this.http.post<any>(`${geturl}`, body, options)
   }
 
-  postParecerPr(body:any){
+  postParecerPr(body:any) {
+    try {      
+      if(!body.AttachmentList) {
+        body.AttachmentList = {}
+      }
+      if(!body?.dataFields) {
+        body.dataFields = {}
+      }
+      if(!body.dataFields?.DraftIds) {
+        body.dataFields.DraftIds = ""
+      }
+      if(!body.AttachmentList?.DraftIds) {
+        body.AttachmentList.DraftIds = ""
+      }
+    } catch(error) {}
+    
+
     const geturl = environment.apiURL + 'Processes/CreateParecerPR';
     let options = {
       headers: this.headers,
diff --git a/version/git-version.ts b/version/git-version.ts
index f9e8b7b12..aa66797d1 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "ba8fce1ec",
-  "SHA": "ba8fce1ec8e391c9ae1327a6da973ffc03561d36",
+  "shortSHA": "54a6fb5b6",
+  "SHA": "54a6fb5b6eb5d1afc53a6067dfd64519c3c3fa87",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jul 24 10:23:03 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "5106",
+  "lastCommitTime": "'Mon Jul 24 13:52:48 2023 +0100'",
+  "lastCommitMessage": "change",
+  "lastCommitNumber": "5107",
   "change": "",
-  "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-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.scss\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts",
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/models/Excludetask.ts\n\tmodified:   src/app/services/processes.service.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file