peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-07-21 12:57:42 +01:00
parent 21c5a1d9eb 4143a2d007
commit 2e5b287359
5 changed files with 79 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.html
+14 -12
View File
@@ -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">
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+44 -27
View File
@@ -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);
}
}
src/app/shared/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -48,9 +48,9 @@
<div class="container-div">
<div class="ion-item-class-2 width-100 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
<div class="ion-input-class flex-grow-1" >
<ion-input [disabled]=true autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="CalendarNameOwnerName"></ion-input>
</div>
</div>
src/app/shared/popover/deploma-options/deploma-options.page.ts
+13 -4
View File
@@ -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)
}
version/git-version.ts
+6 -6
View File
@@ -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 <file>...\" 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"
}