diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 6d7709ce4..8bf16461c 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -423,6 +423,7 @@
[class.transparent]="mobileComponent.transparentEventToApprove"
[serialNumber] = "eventToaprove.serialNumber"
[InstanceId] = "eventToaprove.InstanceId"
+ [saveData] = "eventToaprove.saveData"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
(closeEventToApprove)="closeEventToApprove()"
(AproveEventEditEvent)="AproveEventEditEvent($event)"
@@ -437,6 +438,7 @@
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
[serialNumber] = "eventToaprove.serialNumber"
+ [saveData] = "eventToaprove.saveData"
(setContact)="setContact($event)"
(clearContact)="clearContact()"
(openAttendeesComponent)="openAttendeesComponent($event)"
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index b5b0ebb83..5a3de6de5 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { NavigationExtras, Router } from '@angular/router';
-import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { 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';
@@ -8,12 +8,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
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 '../../gabinete-digital/edit-event-to-approve/edit-event.page';
-import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
-import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
import { ToastService } from 'src/app/services/toast.service';
-
@Component({
selector: 'app-approve-event',
templateUrl: './approve-event.page.html',
@@ -47,13 +43,11 @@ export class ApproveEventPage implements OnInit {
private processes:ProcessesService,
private attachmentsService: AttachmentsService,
private popoverController: PopoverController,
- private menu: MenuController,
private alertService: AlertService,
private iab: InAppBrowser,
- private animationController: AnimationController,
private toastService: ToastService
- ) {
- // $$$
+ ) {
+ // Event to approve list
}
@@ -87,7 +81,6 @@ export class ApproveEventPage implements OnInit {
async approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
- console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise()
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 7aa91df30..9affec0a4 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
@@ -1,18 +1,17 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { FormControl } from '@angular/forms';
-import { AlertController, AnimationController, ModalController } from '@ionic/angular';
+import { AlertController, ModalController } from '@ionic/angular';
import * as moment from 'moment';
import { Attachment } from 'src/app/models/attachment.model';
import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document';
-import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
import { SearchPage } from 'src/app/pages/search/search.page';
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, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -65,7 +64,6 @@ export class EditEventToApprovePage implements OnInit {
@Input() serialNumber: string
-
loadedAttachments: Attachment[]= []
eventProcess = {
@@ -90,8 +88,6 @@ export class EditEventToApprovePage implements OnInit {
}
show = false
-
- postEvent: Event;
isRecurring:string;
isEventEdited: boolean;
segment:string = "true";
@@ -121,25 +117,30 @@ export class EditEventToApprovePage implements OnInit {
public alertController: AlertController,
private attachmentsService: AttachmentsService,
private processes:ProcessesService,
- private animationController: AnimationController,
private toastService: ToastService,
) {
/* this.serialNumber = this.navParams.get('serialNumber'); */
this.isEventEdited = false;
- this.dateControlStart = new FormControl(moment(new Date()));
- this.dateControlEnd = new FormControl(moment(new Date()));
}
ngOnInit() {
+
+ if(!this.restoreTemporaryData()){
+
+ } else {
+ alert('restore!!')
+ }
+
this.getTask();
- console.log(this.serialNumber);
+
+ // console.log(this.serialNumber);
}
async getTask() {
- console.log('this.eventProcess', this.eventProcess);
+ // console.log('this.eventProcess', this.eventProcess);
const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{
this.eventProcess = result
@@ -253,64 +254,31 @@ export class EditEventToApprovePage implements OnInit {
}
- /* async openAttendees() {
-
- if(window.innerWidth <= 1024) {
- const modal = await this.modalController.create({
- component: AttendeesPageModal,
- componentProps: {
- adding: this.adding,
- taskParticipants: this.taskParticipants,
- taskParticipantsCc: this.taskParticipantsCc
- },
- cssClass: 'attendee modal modal-desktop',
- backdropDismiss: false
- });
+ // setIntervenient(data){
+ // this.taskParticipants = data;
+ // this.postEvent.Attendees = data;
+ // }
- await modal.present();
-
- modal.onDidDismiss().then((data) => {
-
- if(data){
- data = data['data'];
+ // setIntervenientCC(data) {
+ // this.taskParticipantsCc = data;
+ // }
- const newAttendees: EventPerson[] = data['taskParticipants'];
- const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+ // addParticipants(){
+ // this.adding = 'intervenient'
- this.setIntervenient(newAttendees);
- this.setIntervenientCC(newAttendeesCC);
- }
- });
- } else {
- this.showAttendees = true
- }
- }
+ // this.openAttendees();
+ // }
- setIntervenient(data){
- this.taskParticipants = data;
- this.postEvent.Attendees = data;
- }
-
- setIntervenientCC(data) {
- this.taskParticipantsCc = data;
- }
-
- addParticipants(){
- this.adding = 'intervenient'
-
- this.openAttendees();
- }
-
- addParticipantsCC(){
+ // addParticipantsCC(){
- this.adding = 'CC'
- this.openAttendees();
- }
+ // this.adding = 'CC'
+ // this.openAttendees();
+ // }
- dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){
+ dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
this.taskParticipants = taskParticipants;
this.taskParticipantsCc = taskParticipantsCc;
- } */
+ }
async addParticipants() {
@@ -340,13 +308,31 @@ export class EditEventToApprovePage implements OnInit {
this.getDatepickerData()
- window['temp.path:/home/agenda/edit-event-to-approve.page.ts'] = {
- postEvent: this.postEvent,
- segment: this.segment
+ window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {
+ eventProcess: this.eventProcess
}
}
+ restoreTemporaryData(): boolean {
+
+
+ const restoredData = window['temp.path:/shared/agenda/edit-event-to-approve.ts']
+
+ if(JSON.stringify(restoredData) != "{}" && undefined != restoredData) {
+ this.eventProcess = restoredData.eventProcess
+
+ // restore dater for date and hours picker
+ this.restoreDatepickerData()
+ return true;
+ } else {
+
+ return false;
+ }
+ }
+
+
+
async getAttachments() {
let result: any = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
@@ -357,7 +343,7 @@ export class EditEventToApprovePage implements OnInit {
this.loadedAttachments = result
- console.log('this.loadedAttachments', this.loadedAttachments, result)
+ // console.log('this.loadedAttachments', this.loadedAttachments, result)
}
deleteAttachment(attachment: Attachment, index) {