diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 5065380c9..f9a4550c0 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -6,7 +6,7 @@
- Editar Evento
+ Editar Evento com divisão
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 e2d3845ee..f45837924 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -8,7 +8,6 @@ import { EventsService } from 'src/app/services/events.service';
import { Event } from '../../../models/event.model';
import { EditEventPage } from '../edit-event/edit-event.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { EventEditPage } from '../../events/edit-event/edit-event.component';
import { ProcessesService } from 'src/app/services/processes.service';
@Component({
@@ -115,7 +114,7 @@ export class ViewEventPage implements OnInit {
}
const modal = await this.modalController.create({
- component: EventEditPage,
+ component: EditEventPage,
componentProps: {
eventId: this.loadedEvent.EventId,
profile: this.profile,
diff --git a/src/app/pages/events/edit-event/app-edit-event-home.page.html b/src/app/pages/events/edit-event/app-edit-event-home.page.html
index 95d9fe4c5..860adfe23 100644
--- a/src/app/pages/events/edit-event/app-edit-event-home.page.html
+++ b/src/app/pages/events/edit-event/app-edit-event-home.page.html
@@ -3,7 +3,7 @@
-
+
- Aprovar
+ Aprovar1
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 61dd1cfc3..692d35783 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -163,7 +163,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
this.closeAllDesktopComponent();
let classs;
- if( window.innerWidth <= 1024){
+ if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html
index 8f9862116..47f43beaa 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.html
+++ b/src/app/shared/agenda/approve-event/approve-event.component.html
@@ -21,7 +21,7 @@
- Aprovar
+ Aprovar3
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 d581aead1..b67787367 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.component.ts
@@ -71,8 +71,12 @@ export class ApproveEventComponent implements OnInit {
})
}
approveTask(serialNumber:string){
-
- this.approveEventDismiss.emit({
+ 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,
"action": "Aprovar",
"saveData": {
@@ -80,7 +84,7 @@ export class ApproveEventComponent implements OnInit {
today: this.today,
customDate: this.customDate
}
- });
+ }); */
}
emendTask(serialNumber:string){
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html
index 8f5e704f3..5475e1375 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.html
+++ b/src/app/shared/agenda/edit-event/edit-event.component.html
@@ -3,7 +3,7 @@
- Editar Evento
+ 2Editar Evento
diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.component.html
index 4eba898ba..8101f01fb 100644
--- a/src/app/shared/agenda/event-list/event-list.component.html
+++ b/src/app/shared/agenda/event-list/event-list.component.html
@@ -49,7 +49,7 @@
+ (click)="openApproveModal(event.serialNumber, event)">
{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 93c3b1d1c..89dfbc49c 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -67,7 +67,7 @@ S
}
async openApproveModal(eventSerialNumber){
let classs;
- if( window.innerWidth <= 1024){
+ if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
@@ -81,7 +81,11 @@ S
cssClass: classs,
});
await modal.present();
- modal.onDidDismiss();
+ modal.onDidDismiss().then((res) => {
+ console.log(res['data']);
+
+ this.LoadToApproveEvents();
+ });
}
doRefresh(event) {