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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-21 10:48:26 +01:00
parent 4143a2d007
commit ad722c0fea
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/popover/deploma-options/deploma-options.page.html
+1 -1
View File
@@ -22,7 +22,7 @@
<button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button> <button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
</div> </div>
<div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'"> <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
<button (click)="openAddNoteModal('Assinar Diploma')" class="btn-cancel" shape="round" >Assinado</button> <button (click)="AssinarNew()" class="btn-cancel" shape="round" >Assinado</button>
</div> </div>
<div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'"> <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
<button (click)="openAddNoteModal('AssinarNew')" class="btn-cancel" shape="round" >Assinar</button> <button (click)="openAddNoteModal('AssinarNew')" class="btn-cancel" shape="round" >Assinar</button>
src/app/shared/popover/deploma-options/deploma-options.page.ts
+3 -3
View File
@@ -74,7 +74,7 @@ export class DiplomaOptionsPage implements OnInit {
}); });
modal.onDidDismiss().then(async (res) => { modal.onDidDismiss().then(async (res) => {
if(res.data){ if(res.data) {
const DocumentToSave = res.data.documents.map((e) => { const DocumentToSave = res.data.documents.map((e) => {
@@ -105,7 +105,7 @@ export class DiplomaOptionsPage implements OnInit {
await this.arquivar(res.data.note, docs); await this.arquivar(res.data.note, docs);
this.goBack(); this.goBack();
} else if (actionName =='AssinarNew') { } else if (actionName =='AssinarNew') {
await this.AssinarNew(res.data.note, docs) await this.AssinarNew()
} }
} }
}, (error) => { }, (error) => {
@@ -235,7 +235,7 @@ export class DiplomaOptionsPage implements OnInit {
} }
} }
async AssinarNew(note:string, documents:any) { async AssinarNew() {
let body = { let body = {
"InstanceId": this.task.InstanceID, "InstanceId": this.task.InstanceID,
"FolderId": this.task.FolderID, "FolderId": this.task.FolderID,
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "65a67902d", "shortSHA": "4143a2d00",
"SHA": "65a67902d43d9ee65d9a8b323b926b96a6085904", "SHA": "4143a2d00718942f0ca98bd09b0e19b38053266e",
"branch": "developer-catch-merge", "branch": "developer-catch-merge",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Jul 21 10:12:55 2023 +0100'", "lastCommitTime": "'Fri Jul 21 10:21:10 2023 +0100'",
"lastCommitMessage": "fix", "lastCommitMessage": "merge",
"lastCommitNumber": "5088", "lastCommitNumber": "5095",
"change": "", "change": "",
"changeStatus": "On branch developer-catch-merge\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tnew file: src/assets/images/error_circle_warning.png\n\tmodified: version/git-version.ts", "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }