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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-12-06 16:02:47 +01:00
parent 1c9b3ba36a b6511f29d2
commit b0c93ae348
21 changed files with 245 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/popover/despachos-options/despachos-options.page.ts
+4 -4
View File
@@ -216,19 +216,19 @@ export class DespachosOptionsPage implements OnInit {
Attachments: DocumentToSave,
}
if(actionName == 'Executado'){
if(actionName == 'Executado') {
await this.executado(res.data.note, docs);
}
else if(actionName == 'Arquivar'){
await this.arquivar(res.data.note, docs);
}
else if(actionName == 'Gerar Diploma'){
else if(actionName == 'Gerar Diploma') {
await this.generateDiploma(res.data.note, docs);
}
else if(actionName == 'Concluido'){
else if(actionName == 'Concluido') {
//this.concluir(res.data.note, docs);
}
else if(actionName == 'Reexecução'){
else if(actionName == 'Reexecução') {
await this.reexecutar(res.data.note, docs);
}
this.goBack();
src/app/shared/popover/opts-expediente/opts-expediente.page.html
+2 -2
View File
@@ -28,8 +28,8 @@
</div>
<div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
<div class="flex-grow-1">
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>