This commit is contained in:
Peter Maquiran
2023-07-21 10:12:55 +01:00
parent 4d7c80a739
commit 65a67902d4
5 changed files with 79 additions and 51 deletions
@@ -31,18 +31,7 @@
</div>
</div>
<div class="container-div width-100" >
<div class="ion-item-class-2 d-flex width-100">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1 justify-center align-center material-inputs " [class.input-error]="Form?.get('CalendarName')?.invalid && validateFrom ">
<ion-input [disabled]=true autocomplete="on" autocorrect="on" spellcheck="true" placeholder="CalendarName*" [(ngModel)]="CalendarNameOwnerName"></ion-input>
</div>
</div>
</div>
<div class="container-div width-100">
<div class="ion-item-class-2">
@@ -66,6 +55,19 @@
</div>
</div>
<div class="container-div width-100" >
<div class="ion-item-class-2 d-flex width-100">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1 justify-center align-center material-inputs " >
<ion-input [disabled]=true autocomplete="on" autocorrect="on" spellcheck="true" placeholder="CalendarName*" [(ngModel)]="CalendarNameOwnerName"></ion-input>
</div>
</div>
</div>
<div class="container-div width-100">
<div class="ion-item-class-2 width-100 d-flex">
<div class="ion-icon-class">
@@ -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);
}
}