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

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-09 16:34:14 +01:00
parent 4674baa0bd
commit 762b6b9f83
37 changed files with 282 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.ts
+8 -2
View File
@@ -234,7 +234,7 @@ export class EditEventPage implements OnInit {
});
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -273,12 +273,15 @@ export class EditEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -316,6 +319,9 @@ export class EditEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+8 -2
View File
@@ -92,7 +92,7 @@ export class EventActionsPopoverPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -131,12 +131,15 @@ export class EventActionsPopoverPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -174,6 +177,9 @@ export class EventActionsPopoverPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/agenda/new-event/new-event.page.ts
+8 -2
View File
@@ -169,7 +169,7 @@ export class NewEventPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -208,12 +208,15 @@ export class NewEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -251,6 +254,9 @@ export class NewEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+9 -3
View File
@@ -174,7 +174,7 @@ export class DespachoPrPage implements OnInit {
this.modalController.dismiss();
}
async executado(note:string, documents:any){
async executado(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Conhecimento",
@@ -464,7 +464,7 @@ export class DespachoPrPage implements OnInit {
return await popover.present();
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -503,11 +503,14 @@ export class DespachoPrPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -545,6 +548,9 @@ export class DespachoPrPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+8 -2
View File
@@ -424,7 +424,7 @@ export class DespachoPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -463,12 +463,15 @@ export class DespachoPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -506,6 +509,9 @@ export class DespachoPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+8 -2
View File
@@ -161,7 +161,7 @@ export class DiplomaAssinarPage implements OnInit {
this.modalController.dismiss();
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -200,12 +200,15 @@ export class DiplomaAssinarPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -243,6 +246,9 @@ export class DiplomaAssinarPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+8 -2
View File
@@ -272,7 +272,7 @@ export class DiplomaPage implements OnInit {
this.modalController.dismiss();
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -311,12 +311,15 @@ export class DiplomaPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -354,6 +357,9 @@ export class DiplomaPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+19 -7
View File
@@ -102,9 +102,12 @@ export class ApproveEventModalPage implements OnInit {
console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage('Evento aprovado')
this.successMessage('Evento aprovado', ()=>{
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
})
} catch (error) {
this.badRequest('Evento não aprovado')
}
@@ -125,9 +128,12 @@ export class ApproveEventModalPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.successMessage('Evento rejeitado', () =>{
this.router.navigate(['/home/gabinete-digital/event-list']);
})
this.successMessage('Evento rejeitado')
} catch (error) {
this.badRequest('Evento não rejeitado')
}
@@ -214,7 +220,7 @@ export class ApproveEventModalPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -253,12 +259,15 @@ export class ApproveEventModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -296,6 +305,9 @@ export class ApproveEventModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+18 -8
View File
@@ -74,7 +74,7 @@ export class ApproveEventPage implements OnInit {
}
async getTask(){
async getTask() {
this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise();
console.log(this.loadedEvent);
@@ -86,15 +86,17 @@ export class ApproveEventPage implements OnInit {
this.getAttachments(instanceId);
}
async approveTask(serialNumber:string){
async approveTask(serialNumber:string) {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise()
//this.successMessage()
this.toastService.successMessage('Evento aprovado');
this.goBack();
this.toastService.successMessage('Evento aprovado', ()=>{
this.goBack();
});
} catch (error) {
this.badRequest()
}
@@ -122,8 +124,10 @@ export class ApproveEventPage implements OnInit {
try {
this.processes.PostTaskAction(body).toPromise();
//await this.successMessage('Processo rejeitado');
await this.toastService.successMessage('Processo rejeitado');
this.goBack();
await this.toastService.successMessage('Processo rejeitado', ()=>{
this.goBack();
});
} catch (error) {
this.badRequest()
}
@@ -231,7 +235,7 @@ export class ApproveEventPage implements OnInit {
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -270,12 +274,15 @@ export class ApproveEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -313,6 +320,9 @@ export class ApproveEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+5 -2
View File
@@ -305,7 +305,7 @@ export class BookMeetingModalPage implements OnInit {
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -350,7 +350,7 @@ export class BookMeetingModalPage implements OnInit {
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -388,6 +388,9 @@ export class BookMeetingModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+8 -2
View File
@@ -528,7 +528,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -567,12 +567,15 @@ export class ExpedientTaskModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -610,6 +613,9 @@ export class ExpedientTaskModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+8 -2
View File
@@ -364,7 +364,7 @@ export class ExpedienteDetailPage implements OnInit {
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -403,12 +403,15 @@ export class ExpedienteDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -446,6 +449,9 @@ export class ExpedienteDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+5 -2
View File
@@ -440,7 +440,7 @@ export class ExpedientePrPage implements OnInit {
return await popover.present();
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -479,12 +479,15 @@ export class ExpedientePrPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+5 -2
View File
@@ -418,7 +418,7 @@ export class PedidoPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -457,12 +457,15 @@ export class PedidoPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
src/app/pages/login/login.page.html
+1 -1
View File
@@ -1,6 +1,6 @@
<ion-content class="text-white">
<div class="main-wrapper">
<div class="wrapper" *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint">
<div class="wrapper" *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint ">
<div class="bg-1 d-flex justify-center align-center">
<div class="bg-2 d-flex justify-center align-center">
src/app/pages/login/login.page.ts
+6 -4
View File
@@ -58,12 +58,11 @@ export class LoginPage implements OnInit {
if (userData.hasOwnProperty('loginPreference')) {
this.userLoginPreference = userData.loginPreference
this.pin = true
this.setPint = false
} else {
this.userLoginPreference = ''
this.setPint = true
this.setPint = false
this.pin = false
}
@@ -206,7 +205,7 @@ export class LoginPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -245,12 +244,15 @@ export class LoginPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
src/app/pages/publications/new-action/new-action.page.ts
+8 -2
View File
@@ -56,7 +56,7 @@ export class NewActionPage implements OnInit {
this.modalController.dismiss();
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -95,12 +95,15 @@ export class NewActionPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -138,6 +141,9 @@ export class NewActionPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/publications/publication-detail/publication-detail.page.ts
+8 -2
View File
@@ -122,7 +122,7 @@ export class PublicationDetailPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -161,12 +161,15 @@ export class PublicationDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -204,6 +207,9 @@ export class PublicationDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+8 -2
View File
@@ -124,7 +124,7 @@ export class PublicationDetailPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -163,12 +163,15 @@ export class PublicationDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -206,6 +209,9 @@ export class PublicationDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}