diff --git a/src/app/models/GetTasksListType.ts b/src/app/models/GetTasksListType.ts index 816beebd0..cf2615c4a 100644 --- a/src/app/models/GetTasksListType.ts +++ b/src/app/models/GetTasksListType.ts @@ -9,4 +9,5 @@ export let GetTasksListType: "Agenda Pessoal PR" | "Agenda Oficial PR" | "image/x-icon" | -"Despacho" \ No newline at end of file +"Despacho" | +"Agendar Evento" \ No newline at end of file diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index 2b603aae9..9b9e0ed27 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -76,5 +76,29 @@ + +
+
+
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

+

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

+
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.Subject}}

+
+
{{ event.activityInstanceName }}
+
+
+
+
+
+
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 9b69eb327..920b0a441 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -18,6 +18,7 @@ export class EventListPage implements OnInit { showLoader: boolean; eventsPRList: any = [] eventsMDGPRList: any = [] + eventsGenericList: any = [] eventPerson: EventPerson; eventBody: EventBody; categories: string[]; @@ -42,6 +43,9 @@ export class EventListPage implements OnInit { ngOnInit() { this.segment = this.loggeduser.Profile; + if(this.segment != "PR" && this.segment != "MDGPR") { + this.segment = "Unknown"; + } const pathname = window.location.pathname @@ -86,6 +90,12 @@ export class EventListPage implements OnInit { this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); } this.showLoader = false; + } else { + let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); + if(genericEvents.length > 0) { + this.eventsGenericList = this.sortService.sortArrayByDate(genericEvents).reverse(); + } + this.showLoader = false; } }