diff --git a/gabinete-digital-fo.code-workspace b/gabinete-digital-fo.code-workspace index 67ee92d5b..6ea093890 100644 --- a/gabinete-digital-fo.code-workspace +++ b/gabinete-digital-fo.code-workspace @@ -2,6 +2,9 @@ "folders": [ { "path": "." + }, + { + "path": "../_________________" } ], "settings": { diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 7c907e402..a6344e999 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -62,11 +62,22 @@ --> -
AGENDA DO PR
-
AGENDA DO MDGPR
-
Agenda do {{calendars.wxFullName}}
-
- Minha agenda +
+
AGEANDA DO PR
+
AGEANDA DO MDGPR
+
Agenda {{calendars.wxFullName}}
+
+ Minha agenda +
+
+ +
+
{{ environment.agendaPR}}
+
{{ environment.agendaVP}}
+
Agenda {{calendars.wxFullName}}
+
+ Minha agenda +
diff --git a/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts b/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts index 9cdf0a04d..f2dbf4491 100644 --- a/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts +++ b/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts @@ -25,13 +25,20 @@ export class EventToApproveDetailsMapper { } else { color = 'PR' } - let activityInstanceName; if(dto.status == 'Pending') { - activityInstanceName = 'Aprovar Evento' - } else if (dto.status == 'Revision') { - activityInstanceName = 'Editar Evento' + activityInstanceName = 'Aprovar evento' + } else if(dto.status == 'Revision') { + activityInstanceName = 'Editar evento' + } else if (dto.status == 'Approved') { + activityInstanceName = 'Evento Aprovado' + } else if (dto.status == 'Evento Rejeitado') { + activityInstanceName = 'Declined' + } else if (dto.status == 'Evento comunicado') { + activityInstanceName = 'Communicated' + } else if (dto.status == 'Comunicar evento') { + activityInstanceName = 'ToCommunicate' } return { diff --git a/src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts b/src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts index 10610068c..487e82e08 100644 --- a/src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts +++ b/src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts @@ -34,6 +34,23 @@ export class EventListToApproveMapper { // workflowDisplayName = `Agenda ${category}` // } + let activityInstanceName; + + if(dto.status == 'Pending') { + activityInstanceName = 'Aprovar evento' + } else if(dto.status == 'Revision') { + activityInstanceName = 'Editar evento' + } else if (dto.status == 'Approved') { + activityInstanceName = 'Evento Aprovado' + } else if (dto.status == 'Evento Rejeitado') { + activityInstanceName = 'Declined' + } else if (dto.status == 'Evento comunicado') { + activityInstanceName = 'Communicated' + } else if (dto.status == 'Comunicar evento') { + activityInstanceName = 'ToCommunicate' + } + + return { serialNumber: dto.id, taskStatus: dto.status, @@ -41,7 +58,7 @@ export class EventListToApproveMapper { taskReceiveDate: dto.startDate, deadline: null, workflowDisplayName, - activityInstanceName: "", + activityInstanceName, totalDocuments: 0, workflowInstanceDataFields: { Agenda: dto.category, 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 2247248be..fb742836e 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -11,11 +11,22 @@ -
AGENDA DO PR
-
AGENDA DO MDGPR
-
Agenda do {{calendars.wxFullName}}
-
- Minha agenda +
+
AGEANDA DO PR
+
AGEANDA DO MDGPR
+
Agenda {{calendars.wxFullName}}
+
+ Minha agenda +
+
+ +
+
{{ environment.agendaPR}}
+
{{ environment.agendaVP}}
+
Agenda {{calendars.wxFullName}}
+
+ Minha agenda +
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 082fd69d5..d64620c3b 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -56,11 +56,22 @@ -
AGENDA DO PR
-
AGENDA DO MDGPR
-
Agenda do {{calendars.wxFullName}}
-
- Minha agenda +
+
AGEANDA DO PR
+
AGEANDA DO MDGPR
+
Agenda {{calendars.wxFullName}}
+
+ Minha agenda +
+
+ +
+
{{ environment.agendaPR}}
+
{{ environment.agendaVP}}
+
Agenda {{calendars.wxFullName}}
+
+ Minha agenda +