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 bd846a6fb..2f6721424 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
@@ -37,6 +37,8 @@ export class DiplomaAssinarPage implements OnInit {
customDate: any;
caller:string;
mergedArray: any = [];
+ DraftIds = ""
+ DraftNames = ""
constructor(
private processes: ProcessesService,
@@ -78,7 +80,9 @@ export class DiplomaAssinarPage implements OnInit {
serialNumber: this.task.SerialNumber,
task: this.task,
showEnviarPendentes: false,
- fulltask: this.fulltask
+ fulltask: this.fulltask,
+ DraftNames: this.DraftNames,
+ DraftIds: this.DraftIds
},
translucent: true
@@ -110,11 +114,15 @@ export class DiplomaAssinarPage implements OnInit {
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"activityInstanceName": res.activityInstanceName,
"Deadline": res.deadline,
- "TaskStartDate": res.taskStartDate
+ "TaskStartDate": res.taskStartDate,
+ "InstanceID": res.workflowInstanceDataFields.InstanceID,
+ "FolderID": res.workflowInstanceDataFields.FolderID,
}
this.fulltask = res;
let stringDraft = res.workflowInstanceDataFields.DraftIds;
+ this.DraftIds = stringDraft
+
let split_stringDraft = stringDraft?.split(";").filter(Boolean);
try {
@@ -233,10 +241,12 @@ export class DiplomaAssinarPage implements OnInit {
let body = {
"InstanceId": this.task.InstanceID,
"FolderId": this.task.FolderID,
- "DraftIds": "163;164;77",
- "OriginalFileName": "Doc1;Doc2;Doc3"
+ "DraftIds": this.DraftIds,
+ "OriginalFileName": this.DraftNames
}
+ console.log(body)
+
const loader = this.toastService.loading()
try {
@@ -244,7 +254,6 @@ export class DiplomaAssinarPage implements OnInit {
this.httpErroHandle.httpsSucessMessagge('Assinado')
this.TaskService.loadDiplomas()
- this.goBack();
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
}
@@ -418,29 +427,37 @@ export class DiplomaAssinarPage 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/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index ff197c9cc..d7ce4ee39 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -48,9 +48,9 @@
-
+
-
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 6b4bb0e38..d741c83da 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -25,6 +25,8 @@ export class DiplomaOptionsPage implements OnInit {
profile: string;
task: any
fulltask: any
+ DraftIds = ""
+ DraftNames= ""
constructor(
@@ -41,6 +43,13 @@ export class DiplomaOptionsPage implements OnInit {
this.serialNumber = this.navParams.get('serialNumber');
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
+
+ this.DraftIds = this.navParams.get("DraftIds");
+ this.DraftNames = this.navParams.get("DraftNames");
+
+
+ console.log('this.task', this.task)
+
}
ngOnInit() {
@@ -200,6 +209,7 @@ export class DiplomaOptionsPage implements OnInit {
"action": "Assinado",
"ActionTypeId": 99999842,
"dataFields": {
+ "DraftIds": "",
"ReviewUserComment": note,
"InstanceIDNew": this.task.InstanceID,
},
@@ -229,10 +239,9 @@ export class DiplomaOptionsPage implements OnInit {
let body = {
"InstanceId": this.task.InstanceID,
"FolderId": this.task.FolderID,
- "DraftIds": "163;164;77",
- "OriginalFileName": "Doc1;Doc2;Doc3"
+ "DraftIds": this.DraftIds,
+ "OriginalFileName": this.DraftNames
}
-
const loader = this.toastService.loading()
try {
@@ -240,7 +249,7 @@ export class DiplomaOptionsPage implements OnInit {
this.httpErroHandle.httpsSucessMessagge('Assinado')
this.TaskService.loadDiplomas()
- this.goBack();
+ this.popoverController.dismiss("")
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
}
diff --git a/version/git-version.ts b/version/git-version.ts
index 5a4986edf..ca282575d 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "eaea73436",
- "SHA": "eaea73436fbd0d0d4cebe86d9213f78a8e323d08",
+ "shortSHA": "21c5a1d9e",
+ "SHA": "21c5a1d9eb7be271dc2cb611d1d836f3f28302a1",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Eudes Inácio'",
- "lastCommitTime": "'Fri Jul 21 09:39:40 2023 +0100'",
- "lastCommitMessage": "tiny changes",
- "lastCommitNumber": "5093",
+ "lastCommitTime": "'Fri Jul 21 10:25:33 2023 +0100'",
+ "lastCommitMessage": "task details update css",
+ "lastCommitNumber": "5094",
"change": "",
- "changeStatus": "On branch developer-catch-merge\nYour branch is up to date with 'origin/developer-catch-merge'.\n\nChanges to be committed:\n (use \"git restore --staged
...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss",
+ "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 1 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/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file