diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index e9e23a859..2b27f0440 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -546,7 +546,7 @@ export class CreateProcessPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'attendee', + cssClass: 'attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 043316723..82c919f89 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -213,7 +213,6 @@ export class ProfilePage implements OnInit { logout() { SessionStore.setInativity(false) - window['inactivity/function']() setTimeout(() => { this.router.navigate(['/inactivity']); diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index 2ce647677..dfa36d7d0 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -127,6 +127,7 @@ export interface EventToApproveEdit { MDEmail: string; IsAllDayEvent: boolean; Status: string; + Category: string EventType: string; IsRecurring: boolean; ParticipantsList: ParticipantsList[]; @@ -140,4 +141,59 @@ export interface EventToApproveEdit { InstanceId?: string; } -// ================================================================================ \ No newline at end of file +// // ================================================================================ +// export interface EventToApproveDetails { +// serialNumber: string; +// originator: { +// email: string; +// manager: string; +// displayName: string; +// fqn: string; +// username: string; +// }[] +// actions: string[]; +// activityInstanceName: string; +// workflowInstanceFolio: string; +// taskStartDate: string; +// workflowID: number; +// workflowInstanceID: number; +// workflowName: string; +// workflowDisplayName: string; +// formURL: string; +// workflowInstanceDataFields: { +// Body: string; +// Location: string; +// Subject: string; +// StartDate: string; +// EndDate: string; +// Participants: string; +// CC: string; +// Private: boolean; +// ReviewUserComment: string; +// MDName: string; +// MDEmail: string; +// OriginatorComments: string; +// Agenda: string; +// EventType: string; +// TimeZone: string; +// EventID: string; +// HasAttachments: boolean; +// ParticipantsList: { +// $type?: any; +// EmailAddress: string; +// Name: string; +// IsRequired: boolean; +// }[] +// EventOrganizer: string; +// CreatEvent: string; +// IsAllDayEvent: boolean; +// MDwxUserID: number; +// SerializedItem: string; +// DeserializedItem: string; +// Status: string; +// Message: string; +// InstanceId: string; +// } +// totalDocuments?: any; +// Documents?: any; +// } diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 346b38167..b6609a129 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -265,7 +265,7 @@ export class EditEventPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'attendee', + cssClass: 'modal attendee modal-desktop', backdropDismiss: false }); @@ -279,8 +279,13 @@ export class EditEventPage implements OnInit { const newAttendees: EventPerson[] = data['taskParticipants']; const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; - this.setIntervenient(newAttendees); - this.setIntervenientCC(newAttendeesCC); + if(newAttendees.length) { + this.setIntervenient(newAttendees); + } + if(newAttendeesCC) { + this.setIntervenientCC(newAttendeesCC); + } + } }); } diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index b7aa03b6c..8819a796a 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -3,7 +3,7 @@
- Novo Evento + Novo Evento 21313123
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 77d96de29..fb5d5d4e4 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -296,9 +296,9 @@ export class NewEventPage implements OnInit { const modal = await this.modalController.create({ component: AttendeesPageModal, componentProps: { - eventAttendees: this.postEvent.Attendees, adding: this.adding, - taskParticipants: this.taskParticipants + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, cssClass: 'attendee modal modal-desktop', backdropDismiss: false @@ -308,19 +308,27 @@ export class NewEventPage implements OnInit { modal.onDidDismiss().then((data) => { - if(data){ + if(data) { data = data['data']; + if(data) { - const newAttendees: EventPerson[] = data['taskParticipants']; - const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + if(newAttendees.length) { + this.setIntervenient(newAttendees); + } + if(newAttendeesCC) { + this.setIntervenientCC(newAttendeesCC); + } + + } - this.setIntervenient(newAttendees); - this.setIntervenientCC(newAttendeesCC); } }); } - setIntervenient(data){ + setIntervenient(data) { this.taskParticipants = data; this.postEvent.Attendees = data; } @@ -329,7 +337,7 @@ export class NewEventPage implements OnInit { this.taskParticipantsCc = data; } - addParticipants(){ + addParticipants() { this.adding = 'intervenient' this.openAttendees(); } diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index da7264405..31f6eec64 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -219,7 +219,9 @@ export class NotificationsService { //this.jsonstore.createCollection('Notifications',message); this.DataArray.push(message) console.log("On ReceiveNotification", this.DataArray) - this.storageService.store("Notifications",JSON.stringify(this.DataArray)) + this.storageService.store("Notifications",JSON.stringify(this.DataArray)).then(()=>{ + + }) console.log(message); var data = JSON.parse(message.payload); diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index e78d25b29..22078a985 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -87,6 +87,48 @@ +
+
+
+ +
+
+ + + Reunião + Viagem + Conferência + Encontro + + + + + + + + Reunião + + + Viagem + + + Conferência + + + Encontro + + + + + +
+
+
+
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 9d979c58b..0f85c7b4e 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 @@ -72,6 +72,7 @@ export class EditEventToApprovePage implements OnInit { workflowInstanceDataFields:{ Body: "", OccurrenceType: '', + Category: '', LastOccurrence: '', IsRecurring: false, ParticipantsList: [], @@ -146,7 +147,7 @@ export class EditEventToApprovePage implements OnInit { async getTask() { - this.processes.GetTask(this.serialNumber).subscribe( result =>{ + this.processes.GetTask(this.serialNumber).subscribe( (result) =>{ this.eventProcess = result this.restoreDatepickerData() @@ -302,6 +303,7 @@ export class EditEventToApprovePage implements OnInit { LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence, }, ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList, + Category: this.eventProcess.workflowInstanceDataFields.Category } try { diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index bea2a9c55..1c7c50fc6 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -55,7 +55,7 @@
- + 123123
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 2c3d99fac..b20c12395 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -68,6 +68,49 @@
+ +
+
+
+ +
+
+ + + Reunião + Viagem + Conferência + Encontro + + + + + + + + Reunião + + + Viagem + + + Conferência + + + Encontro + + + + + +
+
+
+
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 2fe029dd4..49cc677c1 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -68,6 +68,7 @@ export class EditEventToApproveComponent implements OnInit { workflowInstanceDataFields:{ Body: "", OccurrenceType: '', + Category: '', LastOccurrence: '', ParticipantsList: [], Agenda: '', @@ -132,41 +133,42 @@ export class EditEventToApproveComponent implements OnInit { async getTask() { const result = await this.processes.GetTask(this.serialNumber).toPromise(); - console.log(result); + console.log(result); this.eventProcess = result + this.eventProcess.workflowInstanceDataFields.Category = result.workflowInstanceDataFields.EventType - this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate); - this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate); + this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate); + this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate); - // description - let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '') - this.eventProcess.workflowInstanceDataFields.Body = body - this.Location = this.eventProcess.workflowInstanceDataFields.Location + // description + let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '') + this.eventProcess.workflowInstanceDataFields.Body = body + this.Location = this.eventProcess.workflowInstanceDataFields.Location - this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId - try { - this.getAttachments() + this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId + try { + this.getAttachments() - } catch (error) { + } catch (error) { + } + + + if(this.eventProcess.workflowInstanceDataFields.IsRecurring == false) { + this.isRecurring = "Não se repete"; + } + 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.IsRecurring == false) { - this.isRecurring = "Não se repete"; - } - else { - this.isRecurring = "Repete"; - } - - this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => { - if(e.IsRequired) { - this.taskParticipants.push(e); - } else { - this.taskParticipantsCc.push(e); - } - }) + }) /* }) */ } @@ -254,6 +256,7 @@ export class EditEventToApproveComponent implements OnInit { LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence, }, ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList, + Category: this.eventProcess.workflowInstanceDataFields.Category } console.log(event); @@ -307,14 +310,19 @@ export class EditEventToApproveComponent implements OnInit { modal.onDidDismiss().then((data) => { - if(data){ + if(data) { data = data['data']; const newAttendees: EventPerson[] = data['taskParticipants']; const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; - this.setIntervenient(newAttendees); - this.setIntervenientCC(newAttendeesCC); + if(newAttendees.length) { + this.setIntervenient(newAttendees); + } + if(newAttendeesCC) { + this.setIntervenientCC(newAttendeesCC); + } + } }); } else {