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

pull made2

Browse Source
This commit is contained in:
Eudes Inácio
2023-07-21 13:09:53 +01:00
parent 2e5b287359 3d14c66d98
commit 9967f52c80
14 changed files with 68 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+1 -1
View File
@@ -20,7 +20,7 @@
<p><span class="date">{{customDate}}</span></p>
</ion-label>
<ion-label>
<p><span class="color-red">{{ task.Deadline }}</span></p>
<p><span class="color-red">{{ task.DeadlineType }}</span></p>
</ion-label>
<ion-label>
<p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
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>
</div>
<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 class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
<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) => {
if(res.data){
if(res.data) {
const DocumentToSave = res.data.documents.map((e) => {
@@ -105,7 +105,7 @@ export class DiplomaOptionsPage implements OnInit {
await this.arquivar(res.data.note, docs);
this.goBack();
} else if (actionName =='AssinarNew') {
await this.AssinarNew(res.data.note, docs)
await this.AssinarNew()
}
}
}, (error) => {
@@ -235,7 +235,7 @@ export class DiplomaOptionsPage implements OnInit {
}
}
async AssinarNew(note:string, documents:any) {
async AssinarNew() {
let body = {
"InstanceId": this.task.InstanceID,
"FolderId": this.task.FolderID,
src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts
+5 -4
View File
@@ -76,10 +76,11 @@ export class EventDetailsDocumentsOptionsPage implements OnInit {
"path": document.path,
"ownerId": document.ownerId
}
this.processService.SaveDraftByID(document.DocId, objectDraft).subscribe((res) => [
this.erroHandler.httpsSucessMessagge('Draft Save'),
this.modalController.dismiss()
],(error) => {
this.processService.SaveDraftByID(document.DocId, objectDraft).subscribe((res) => {
this.erroHandler.httpsSucessMessagge('Draft Save');
this.modalController.dismiss();
window['tinyupdate']()
},(error) => {
this.erroHandler.httpStatusHandle(error)
})