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

Fixe merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-28 11:43:42 +01:00
parent a7277f0f90 32109edb8a
commit ed8aac110f
52 changed files with 1211 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.component.html
+3 -3
View File
@@ -25,7 +25,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Emendar</ion-label>
<ion-label>Adicionar Nota</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
@@ -99,7 +99,7 @@
<div class="aside-buttons">
<button hidden full class="btn-ok" shape="round" >Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-ok" shape="round" >Aprovar</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Emendar</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Adicionar Nota</button>
<div class="solid"></div>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
</div>
@@ -108,7 +108,7 @@
</ion-content>
<ion-footer class="display-none-{{showAside}}">
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
<ion-menu-button (click)="openMenu()" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
src/app/shared/agenda/approve-event/approve-event.component.ts
-3
View File
@@ -74,7 +74,6 @@ export class ApproveEventComponent implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.modalController.dismiss(serialNumber);
/* this.approveEventDismiss.emit({
"serialNumber": serialNumber,
@@ -99,7 +98,6 @@ export class ApproveEventComponent implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
@@ -148,7 +146,6 @@ export class ApproveEventComponent implements OnInit {
console.log(body);
this.processes.PostTaskAction(body);
//this.router.navigate(['/home/gabinete-digital/event-list']);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.goToEventsToApprove();
}
else{
src/app/shared/agenda/view-event/view-event.page.ts
+3 -1
View File
@@ -104,7 +104,9 @@ export class ViewEventPage implements OnInit {
buttons: ['OK']
});
await alert.present();
setTimeout(()=>{
alert.dismiss();
}, 1500);
this.close();
});
}