+
+
+
+
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 3a0ea4da1..555792820 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
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -9,8 +9,6 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
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({
@@ -20,8 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
})
export class ApproveEventPage implements OnInit {
event: Event;
- loadedEvent:any;
- loadedEvent1:any;
+ loadedEvent:any = false
loadedAttachments:any;
customDate:any;
today:any;
@@ -51,7 +48,6 @@ export class ApproveEventPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
) {
-
this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"]);
@@ -260,9 +256,7 @@ export class ApproveEventPage implements OnInit {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
-
async editar(serialNumber: string) {
-
const modal = await this.modalController.create({
component: EditEventToApproveComponent,
@@ -282,7 +276,4 @@ export class ApproveEventPage implements OnInit {
}
-
-
-
}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 7c7d75437..900815593 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -1,11 +1,10 @@
import { Component, OnInit } from '@angular/core';
import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model';
-import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
-import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, Router } from '@angular/router';
@Component({
selector: 'app-event-list',
@@ -13,11 +12,13 @@ import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angula
styleUrls: ['./event-list.page.scss'],
})
export class EventListPage implements OnInit {
+ // [desktop] event list to approve
+
profile:string;
segment:string;
showLoader: boolean;
- eventsPRList: any;
- eventsMDGPRList: any;
+ eventsPRList: any = []
+ eventsMDGPRList: any = []
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -27,8 +28,7 @@ export class EventListPage implements OnInit {
constructor(
private processes:ProcessesService,
private modalController: ModalController,
- private router: Router,
- private activatedRoute: ActivatedRoute,
+ private router: Router
) { }
ngOnInit() {
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 8fd44044b..482453ad1 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -13,7 +13,7 @@
-->
-
+
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index 9affec0a4..687e93447 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -10,10 +10,8 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
-import { Event } from '../../../models/event.model';
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
-
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
dateInput: "YYYY-MMMM-DD HH:mm"
@@ -163,19 +161,23 @@ export class EditEventToApprovePage implements OnInit {
else {
this.isRecurring = "Repete";
}
-
- this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
- if(e.IsRequired) {
- this.taskParticipants.push(e);
- } else {
- this.taskParticipantsCc.push(e);
- }
- })
+
+ if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
+ this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
+ if(e.IsRequired) {
+ this.taskParticipants.push(e);
+ } else {
+ this.taskParticipantsCc.push(e);
+ }
+ })
+ }
+
})
}
close() {
- console.log('CLOSE');
+
+ window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
this.closeComponent.emit();
/* this.setIntervenient.emit([]);
@@ -316,7 +318,6 @@ export class EditEventToApprovePage implements OnInit {
restoreTemporaryData(): boolean {
-
const restoredData = window['temp.path:/shared/agenda/edit-event-to-approve.ts']
if(JSON.stringify(restoredData) != "{}" && undefined != restoredData) {
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 9096aa845..4fad35895 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -12,7 +12,7 @@ import { NavigationEnd, Router } from '@angular/router';
styleUrls: ['./event-list.page.scss'],
})
export class EventListPage implements OnInit {
-
+ // [desktop] event list to approve
showLoader: boolean;
eventsPRList: any;
@@ -38,7 +38,7 @@ export class EventListPage implements OnInit {
/* console.log(this.profile); */
- if(this.profile == "mdgpr"){
+ if(this.profile == "mdgpr") {
this.profile = 'MDGPR'
} else {
this.profile = 'PR'
@@ -53,7 +53,7 @@ export class EventListPage implements OnInit {
});
}
- LoadToApproveEvents(){
+ LoadToApproveEvents() {
this.showLoader = true;
this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
@@ -65,22 +65,20 @@ export class EventListPage implements OnInit {
this.eventsMDGPRList = res;
});
}
- async openApproveModal(eventSerialNumber, data){
+ async openApproveModal(eventSerialNumber, data) {
let a =this.eventsMDGPRList.filter((elem)=>{
console.log(eventSerialNumber," ",elem.serialNumber)
return eventSerialNumber == elem.serialNumber
});
- console.log(a);
-
this.approveEventDismiss.emit({
"serialNumber": eventSerialNumber,
"action": "Aprovar",
"saveData": data
});
-
}
+
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');