This commit is contained in:
Peter Maquiran
2021-06-08 16:56:48 +01:00
parent 1a9c8eec0d
commit 574aac6615
26 changed files with 86 additions and 84 deletions
@@ -41,7 +41,7 @@ export class EventActionsPopoverPage implements OnInit {
console.log(body);
try {
try {
this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
@@ -51,7 +51,7 @@ export class EventActionsPopoverPage implements OnInit {
}
}
emendarTask(){
emendarTask() {
let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" }
console.log(body);
@@ -206,10 +206,10 @@ export class DespachoPrPage implements OnInit {
}
try {
await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.successMessage('Processo arquivado')
this.close();
} catch (error) {
this.badRequest()
this.badRequest('Processo não arquivado')
}
}
@@ -227,10 +227,10 @@ export class DespachoPrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.successMessage('Processo criado')
this.close();
} catch (error) {
this.badRequest()
this.badRequest('Processo não criado')
}
}
@@ -247,7 +247,7 @@ export class DespachoPrPage implements OnInit {
}
try {
await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.successMessage('')
this.close();
} catch (error) {
this.badRequest()
@@ -280,6 +280,8 @@ export class DespachoPrPage implements OnInit {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.close();
this.successMessage('Processo enviado para pendentes')
});
}
@@ -183,9 +183,9 @@ export class DespachoPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.successMessage()
this.successMessage('Processo criado')
} catch(error) {
this.badRequest()
this.badRequest("Processo não criado")
}
}
@@ -201,10 +201,10 @@ export class DespachoPage implements OnInit {
}
try {
await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.successMessage('Processo descartado')
this.close();
} catch (error) {
this.badRequest()
this.badRequest("Processo não descartado")
}
}
@@ -235,10 +235,10 @@ export class DespachoPage implements OnInit {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.close();
this.successMessage()
this.successMessage('Processo enviado para despacho')
},
error => {
this.badRequest()
this.badRequest("Processo não enviado para despacho")
});
}
@@ -191,7 +191,7 @@ export class DiplomaPage implements OnInit {
}
try {
await this.processes.CompleteTask(body).toPromise();
this.successMessage()
this.successMessage('Processo concluído')
} catch (error) {
this.badRequest()
}
@@ -102,9 +102,9 @@ export class ApproveEventModalPage implements OnInit {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage()
this.successMessage('Evento aprovado')
} catch (error) {
this.badRequest()
this.badRequest('Evento não aprovado')
}
@@ -127,9 +127,9 @@ export class ApproveEventModalPage implements OnInit {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.successMessage()
this.successMessage('Evento rejeitado')
} catch (error) {
this.badRequest()
this.badRequest('Evento não rejeitado')
}
this.modalController.dismiss(null);
@@ -122,7 +122,7 @@ export class ApproveEventPage implements OnInit {
try {
this.processes.PostTaskAction(body).toPromise();
await this.successMessage();
await this.successMessage('Processo rejeitado');
this.goBack();
} catch (error) {
this.badRequest()
@@ -139,7 +139,7 @@ export class BookMeetingModalPage implements OnInit {
this.distartExpedientModal();
this.successMessage('Reunião criada')
} catch (error) {
this.badRequest()
this.badRequest('Reunião não criada')
}
@@ -111,7 +111,7 @@ export class ExpedienteDetailPage implements OnInit {
this.goBack();
},
(error)=>{
this.badRequest()
this.badRequest('Processo não enviado para pendentes')
});
}
@@ -246,10 +246,10 @@ export class ExpedienteDetailPage implements OnInit {
try {
await this.processes.CompleteTask(otherbody).toPromise()
this.successMessage();
this.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.badRequest()
this.badRequest('Processo não descartado')
}
}
@@ -261,10 +261,10 @@ export class ExpedienteDetailPage implements OnInit {
if(res['data']== 'Yes'){
try {
await this.processes.CompleteTask(body).toPromise();
this.successMessage();
this.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.badRequest()
this.badRequest('Processo não descartado')
}
@@ -106,7 +106,7 @@ export class ExpedientePrPage implements OnInit {
this.goBack();
},
(error)=>{
this.badRequest()
this.badRequest('Processo não enviado para pendentes')
});
}
@@ -201,9 +201,9 @@ export class ExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.successMessage()
this.successMessage('Processo aprovado')
} catch(error) {
this.badRequest()
this.badRequest('Processo não aprovado')
}
}
@@ -329,9 +329,9 @@ export class ExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(otherbody).toPromise();
this.successMessage()
this.successMessage('Processo descartado')
} catch (error) {
this.badRequest()
this.badRequest('Processo não descartado')
}
@@ -221,7 +221,7 @@ export class PedidoPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.successMessage('Processo arquivado')
this.close();
} catch (error) {
this.badRequest()
@@ -45,10 +45,10 @@ export class NewActionPage implements OnInit {
try {
await this.publication.CreatePublicationFolder(this.folder).toPromise()
this.successMessage()
this.successMessage("Ação presidencial criado")
this.close();
} catch (error) {
this.badRequest()
this.badRequest("Ação presidencial não criado")
}
}
@@ -100,7 +100,7 @@ export class NewActionPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -130,9 +130,9 @@ export class NewActionPage implements OnInit {
leaveAnimation,
component: BadRequestPage,
componentProps: {
message: 'Processo não realizado com sucesso',
message: message || 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -83,10 +83,10 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
this.successMessage()
this.successMessage('Publicação eliminado')
this.close();
} catch (error) {
this.badRequest()
this.badRequest('Publicação não eliminado')
}
}
@@ -166,7 +166,7 @@ export class PublicationDetailPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -196,9 +196,9 @@ export class PublicationDetailPage implements OnInit {
leaveAnimation,
component: BadRequestPage,
componentProps: {
message: 'Processo não realizado com sucesso',
message: message || 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -83,13 +83,13 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
this.successMessage()
this.successMessage('Publicaçao eliminado')
this.close();
//this.goBackToViewPublications.emit();
} catch (error) {
this.badRequest()
this.badRequest('Publicaçao não eliminado')
}
}
@@ -168,7 +168,7 @@ export class PublicationDetailPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -200,7 +200,7 @@ export class PublicationDetailPage implements OnInit {
componentProps: {
message: 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()