mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
change button description
This commit is contained in:
@@ -55,7 +55,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container-div width-100" >
|
||||
<!-- <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>
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="container-div width-100">
|
||||
<div class="ion-item-class-2 width-100 d-flex">
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
|
||||
<div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
||||
<div class="buttons">
|
||||
<button (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinado</button>
|
||||
<button (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
|
||||
<div class="solid"></div>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
|
||||
+2
-5
@@ -227,7 +227,6 @@ export class DiplomaAssinarPage implements OnInit {
|
||||
},
|
||||
}
|
||||
|
||||
const loader = this.toastService.loading()
|
||||
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise()
|
||||
@@ -235,9 +234,7 @@ export class DiplomaAssinarPage implements OnInit {
|
||||
} catch (error) {
|
||||
this.httpErroHandle.httpStatusHandle(error)
|
||||
}
|
||||
finally {
|
||||
loader.remove()
|
||||
}
|
||||
finally {}
|
||||
|
||||
}
|
||||
|
||||
@@ -251,7 +248,7 @@ export class DiplomaAssinarPage implements OnInit {
|
||||
|
||||
const loader = this.toastService.loading()
|
||||
|
||||
|
||||
|
||||
try {
|
||||
await this.processes.presidentialActionsSignature(body).toPromise()
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="container-div">
|
||||
<!-- <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-description.svg"></ion-icon>
|
||||
@@ -54,12 +54,12 @@
|
||||
<ion-input [disabled]=true autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="CalendarNameOwnerName"></ion-input>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Error messages -->
|
||||
<!-- <span class="error ion-padding" >
|
||||
Campo obrigatório
|
||||
</span> -->
|
||||
|
||||
</div>
|
||||
<span class="error ion-padding" >
|
||||
Campo obrigatório
|
||||
</span>
|
||||
|
||||
</div> -->
|
||||
|
||||
<div *ngIf="Form && validateFrom" >
|
||||
<div *ngIf="Form.get('Location').invalid " class="input-errror-message">
|
||||
|
||||
@@ -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('AssinarNew')" class="btn-cancel" shape="round" >Assinado</button>
|
||||
<button (click)="openAddNoteModal('AssinarNew')" class="btn-cancel" shape="round" >Assinar</button>
|
||||
</div>
|
||||
<div class="buttons width-100">
|
||||
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||
|
||||
@@ -218,7 +218,6 @@ export class DiplomaOptionsPage implements OnInit {
|
||||
},
|
||||
}
|
||||
|
||||
const loader = this.toastService.loading()
|
||||
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise()
|
||||
@@ -229,9 +228,7 @@ export class DiplomaOptionsPage implements OnInit {
|
||||
} else {
|
||||
this.toastService._badRequest()
|
||||
}
|
||||
} finally {
|
||||
loader.remove()
|
||||
}
|
||||
} finally {}
|
||||
}
|
||||
|
||||
async AssinarNew(note, doc) {
|
||||
@@ -247,8 +244,7 @@ export class DiplomaOptionsPage implements OnInit {
|
||||
await this.processes.presidentialActionsSignature(body).toPromise()
|
||||
await this.sign(note, doc)
|
||||
this.TaskService.loadDiplomas()
|
||||
this.popoverController.dismiss("")
|
||||
this.close();
|
||||
this.goBack();
|
||||
} catch (error) {
|
||||
this.httpErroHandle.httpStatusHandle(error)
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "4b8032c44",
|
||||
"SHA": "4b8032c44dfe783cf0282b5a02ee312931afafd3",
|
||||
"shortSHA": "5dd9c2471",
|
||||
"SHA": "5dd9c24712004793ce58596ad18a3f244b7b791d",
|
||||
"branch": "developer-catch-merge",
|
||||
"lastCommitAuthor": "'Peter Maquiran'",
|
||||
"lastCommitTime": "'Fri Jul 21 17:28:15 2023 +0100'",
|
||||
"lastCommitTime": "'Sun Jul 23 20:45:21 2023 +0100'",
|
||||
"lastCommitMessage": "fix",
|
||||
"lastCommitNumber": "5102",
|
||||
"lastCommitNumber": "5103",
|
||||
"change": "",
|
||||
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts",
|
||||
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\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.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.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts",
|
||||
"changeAuthor": "peter.maquiran"
|
||||
}
|
||||
Reference in New Issue
Block a user