diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
index 89bfe9f74..ce85bd675 100644
--- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
@@ -72,7 +72,6 @@ export class ApproveEventModalPage implements OnInit {
approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
this.processes.PostTaskAction(body);
- this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
@@ -87,7 +86,6 @@ export class ApproveEventModalPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
this.processes.PostTaskAction(body);
- this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
@@ -132,7 +130,6 @@ export class ApproveEventModalPage implements OnInit {
}
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
- this.alertService.presentAlert('Operação realizada com sucesso!');
}
else{
//this.alertService.presentAlert('Operação cancelada!');
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index ce8e2d8fc..ed7ce6f2e 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -96,7 +96,10 @@ export class ViewEventPage implements OnInit {
buttons: ['OK']
});
- await alert.present();
+ setTimeout(()=>{
+ alert.dismiss();
+ }, 1500);
+
this.close();
});
}
diff --git a/src/app/pages/events/edit-event/edit-event.component.ts b/src/app/pages/events/edit-event/edit-event.component.ts
index 7c8a50542..c55f493cb 100644
--- a/src/app/pages/events/edit-event/edit-event.component.ts
+++ b/src/app/pages/events/edit-event/edit-event.component.ts
@@ -150,7 +150,9 @@ export class EventEditPage implements OnInit {
buttons: ['OK']
});
- await alert.present();
+ setTimeout(()=>{
+ alert.dismiss();
+ }, 1500);
this.router.navigate(['/home/events']);
});
@@ -169,13 +171,15 @@ export class EventEditPage implements OnInit {
this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
{
- const alert = await this.alertController.create({
+ const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento actualizado',
buttons: ['OK']
});
- await alert.present();
+ setTimeout(()=>{
+ alert.dismiss();
+ }, 1500);
});
}
}
diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
index eeaa26845..76304f437 100644
--- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
+++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
@@ -144,7 +144,9 @@ export class EventDetailModalPage implements OnInit {
buttons: ['OK']
});
- await alert.present();
+ setTimeout(()=>{
+ alert.dismiss();
+ }, 1500);
this.router.navigate(['/home/events']);
});
@@ -163,7 +165,9 @@ export class EventDetailModalPage implements OnInit {
buttons: ['OK']
});
- await alert.present();
+ setTimeout(()=>{
+ alert.dismiss();
+ }, 1500);
});
}
}
diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts
index 34f214407..e52d331a7 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -144,13 +144,13 @@ export class EventDetailPage implements OnInit {
{
this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () =>
{
- const alert = await this.alertController.create({
+ /* const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento removido',
buttons: ['OK']
});
- await alert.present();
+ await alert.present(); */
this.router.navigate(['/home/events']);
});
@@ -175,7 +175,9 @@ export class EventDetailPage implements OnInit {
buttons: ['OK']
});
- await alert.present();
+ setTimeout(()=>{
+ alert.dismiss();
+ }, 1500);
});
}
}
diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
index 05fe484c6..928ab7673 100644
--- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
+++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
@@ -1,24 +1,29 @@
-
+
+
+
Nota: Ao efectuar esta operação não será possível tratar este expediente a partir da caixa de correspondência
+
-
-
-
- Não
- Sim
-
-
+
+
+ Não
+
+
+
+ Sim
+
diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss
index 1b7daff49..5f5de2e9d 100644
--- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss
+++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss
@@ -1,8 +1,11 @@
+ion-content{
+ --padding-top:15px;
+ --padding-start: 15px;
+ --padding-end: 15px;
+}
.header-content{
- width: 360px;
overflow: auto;
margin: 0 auto;
- padding: 25px;
}
.header-icon-left{
width: 36px;
@@ -11,13 +14,19 @@
float: right;
}
.header-title{
- width: 264px;
font-family: Roboto;
- font-size: 25px;
+ font-size: 20px;
margin: 0 5px 0 5px;
color:#000;
float: left;
+ align-items: center;
+ justify-content: center;
}
+.header-body{
+ margin: 0 5px 0 5px;
+ width: 100%;
+}
+
.buttons{
width: 320px;
margin: 0 auto;
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index 4a7d05a0f..6266e55b3 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -80,7 +80,6 @@ export class ApproveEventModalPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
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);
}
@@ -98,7 +97,6 @@ export class ApproveEventModalPage 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);
}
@@ -145,7 +143,6 @@ export class ApproveEventModalPage 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!');
}
else{
//this.alertService.presentAlert('Operação cancelada!');
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 41bdde68a..ae7f414d8 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -77,7 +77,6 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
this.processes.PostTaskAction(body);
- this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
}
@@ -93,7 +92,6 @@ export class ApproveEventPage 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.close();
}
@@ -140,7 +138,6 @@ export class ApproveEventPage 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!');
}
else {
//this.alertService.presentAlert('Operação cancelada!');
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 123b90ad5..75abd66eb 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -26,10 +26,10 @@
- Normal
- Urgente
- Muito Urgente
- Urgentíssimo
+ Normal (4 dias para a execução da tarefa)
+ Urgente (2 dias para a execução da tarefa)
+ Muito Urgente (1 dia para a execução da tarefa)
+ Urgentíssimo (8 horas para a execução da tarefa)
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index a778c11f2..43f2e1793 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -153,7 +153,7 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
}
console.log(this.postData);
- this.processes.postDespatcho(this.postData);
+ //this.processes.postDespatcho(this.postData);
break;
case '1':
this.postData = {
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts
index e94152a2b..d077b09ac 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.component.ts
@@ -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{
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index 2b4669490..6c6dbee09 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -99,7 +99,9 @@ export class ViewEventPage implements OnInit {
buttons: ['OK']
});
- await alert.present();
+ setTimeout(()=>{
+ alert.dismiss();
+ }, 1500);
this.close();
});
}