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

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-06 09:45:44 +01:00
parent dcff115816 f1f8243f23
commit 72bd8ff8cf
17 changed files with 875 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+5 -5
View File
@@ -3,12 +3,12 @@
</ion-header>
<!-- Progress bar -->
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<ion-content id="timeline-conteiner agenda-container pt-20" class="timeline ">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="d-flex container-wrapper">
<div class="calendar-timeline d-flex flex-column height-100 bg-blue">
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+2 -2
View File
@@ -206,13 +206,13 @@ export class ApproveEventModalPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.toastService._successMessage()
this.toastService._successMessage('Evento enviado para revisão');
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest()
this.toastService._badRequest('Evento não enviado para revisão');
}
this.router.navigate(['/home/gabinete-digital/event-list']);
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+12 -10
View File
@@ -216,13 +216,14 @@ export class ApproveEventPage implements OnInit {
await this.processes.PostTaskAction(body).toPromise()
this.toastService._successMessage();
this.goBack();
this.toastService._successMessage('Evento Aprovar')
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest()
this.toastService._badRequest('Evento não aprovar')
}
}
finally {
@@ -266,14 +267,14 @@ export class ApproveEventPage implements OnInit {
this.offlineManager.storeRequestData('event-listRever', body);
});
this.toastService._successMessage('Pedido enviado');
this.toastService._successMessage('Evento enviado para revisão');
this.goBack();
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest();
this.toastService._badRequest('Evento não enviado para revisão');
}
} finally {
loader.remove()
@@ -299,7 +300,7 @@ export class ApproveEventPage implements OnInit {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest()
this.toastService._badRequest('Evento não rejeitado')
}
}
finally {
@@ -379,13 +380,14 @@ export class ApproveEventPage implements OnInit {
await this.processes.PostTaskAction(body).toPromise();
this.toastService._successMessage();
this.goBack();
this.toastService._successMessage('Evento enviado para revisão');
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest();
}
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Evento não enviado para revisão');
}
} finally {
loader.remove()
}
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+4 -1
View File
@@ -166,6 +166,7 @@ export class GabineteDigitalPage implements OnInit {
}
this.LoadCounts();
this.updateAllProcess()
const pathname = window.location.pathname
this.router.events.forEach((event) => {
@@ -176,9 +177,11 @@ export class GabineteDigitalPage implements OnInit {
if(this.NotificationsService.active === false) {
this.checkRoutes();
this.LoadCounts();
this.updateAllProcess()
} else {
this.checkRoutes();
this.LoadCounts();
this.updateAllProcess()
}
}
})
@@ -786,7 +789,7 @@ export class GabineteDigitalPage implements OnInit {
if (event) {
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
else {