peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

change labels

Browse Source
This commit is contained in:
Peter Maquiran
2024-06-11 16:39:56 +01:00
parent c37d3f5f7f
commit 7de2960bc2
6 changed files with 80 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.html
+16 -5
View File
@@ -62,11 +62,22 @@
</ion-segment-button> -->
<ion-segment-button *ngFor="let calendars of calendarData" value="{{calendars.wxUserId}}" >
<div *ngIf="calendars.roleId == RoleIdService.PRES">AGENDA DO PR </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">AGENDA DO MDGPR</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName"> Agenda do {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
<div *ngIf="environment.presidential">
<div *ngIf="calendars.roleId == RoleIdService.PRES">AGEANDA DO PR </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">AGEANDA DO MDGPR</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId "> Agenda {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
</div>
</div>
<div *ngIf="!environment.presidential">
<div *ngIf="calendars.roleId == RoleIdService.PRES">{{ environment.agendaPR}} </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">{{ environment.agendaVP}}</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId "> Agenda {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
</div>
</div>
</ion-segment-button>
src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts
+11 -4
View File
@@ -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 {
src/app/services/Repositorys/Agenda/mapper/eventToApproveListMapper.ts
+18 -1
View File
@@ -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,
src/app/shared/agenda/event-list/event-list.page.html
+16 -5
View File
@@ -11,11 +11,22 @@
<ion-toolbar *ngIf="(sharedCalendar | async) as calendarData">
<ion-segment [(ngModel)]="selectedUserCalendar" (ionChange)="segmentChanged($event)" *ngIf="SessionStore.user.RoleID !== 100000014">
<ion-segment-button *ngFor="let calendars of calendarData" value="{{calendars.wxUserId}}" >
<div *ngIf="calendars.roleId == RoleIdService.PRES">AGENDA DO PR </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">AGENDA DO MDGPR</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId"> Agenda do {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
<div *ngIf="environment.presidential">
<div *ngIf="calendars.roleId == RoleIdService.PRES">AGEANDA DO PR </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">AGEANDA DO MDGPR</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId "> Agenda {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
</div>
</div>
<div *ngIf="!environment.presidential">
<div *ngIf="calendars.roleId == RoleIdService.PRES">{{ environment.agendaPR}} </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">{{ environment.agendaVP}}</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId "> Agenda {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
</div>
</div>
</ion-segment-button>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+16 -5
View File
@@ -56,11 +56,22 @@
<ion-segment [(ngModel)]="selectedUserCalendar" (ionChange)="segmentChanged($event)" *ngIf="SessionStore.user.RoleID !== 100000014 && (sharedCalendar | async) as calendarData" >
<ion-segment-button *ngFor="let calendars of calendarData" value="{{calendars.wxUserId}}" >
<div *ngIf="calendars.roleId == RoleIdService.PRES">AGENDA DO PR </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">AGENDA DO MDGPR</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId"> Agenda do {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
<div *ngIf="environment.presidential">
<div *ngIf="calendars.roleId == RoleIdService.PRES">AGEANDA DO PR </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">AGEANDA DO MDGPR</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId "> Agenda {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
</div>
</div>
<div *ngIf="!environment.presidential">
<div *ngIf="calendars.roleId == RoleIdService.PRES">{{ environment.agendaPR}} </div>
<div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">{{ environment.agendaVP}}</div>
<div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId "> Agenda {{calendars.wxFullName}} </div>
<div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
Minha agenda
</div>
</div>
</ion-segment-button>