diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 142865d25..92f0fd0ce 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -31,7 +31,7 @@
{{customDate}}
- das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+ das12 {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
(Não se repete)
Repete
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 559075eae..41e20eb7a 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
@@ -11,6 +11,7 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
+import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-approve-event',
@@ -46,7 +47,8 @@ export class ApproveEventPage implements OnInit {
private menu: MenuController,
private alertService: AlertService,
private iab: InAppBrowser,
- private animationController: AnimationController
+ private animationController: AnimationController,
+ private toastService: ToastService,
) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
@@ -61,17 +63,7 @@ export class ApproveEventPage implements OnInit {
}
goBack() {
- let navigationExtras: NavigationExtras = {
- queryParams: {
- "eventos": true,
- }
- };
- if( window.innerWidth < 801) {
- this.router.navigate(['/home/gabinete-digital/event-list']);
- }
- else {
- this.router.navigate(['/home/gabinete-digital'], navigationExtras);
- }
+ window.history.back();
}
async getTask(){
@@ -91,9 +83,10 @@ export class ApproveEventPage implements OnInit {
console.log(body);
try {
- await this.processes.PostTaskAction(body).toPromise()
- this.successMessage()
- this.goBack();
+ //await this.processes.PostTaskAction(body).toPromise()
+ //this.successMessage()
+ this.toastService.successMessage('Evento rejeitado!');
+ //this.goBack();
} catch (error) {
this.badRequest()
}
@@ -116,13 +109,13 @@ export class ApproveEventPage implements OnInit {
}
async rejectTask(serialNumber:string){
-
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
try {
this.processes.PostTaskAction(body).toPromise();
- await this.successMessage('Processo rejeitado');
+ //await this.successMessage('Processo rejeitado');
+ await this.toastService.successMessage('Processo rejeitado');
this.goBack();
} catch (error) {
this.badRequest()
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 60305a958..1ca515558 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -39,7 +39,7 @@ export class ToastService {
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
- .duration(7000)
+ .duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
@@ -62,7 +62,7 @@ export class ToastService {
setTimeout(()=>{
modal.dismiss()
- },3000)
+ },7000)
}
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index 1015447c2..f0eba1f3d 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -11,33 +11,6 @@
-->
-