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

add event to approve options

Browse Source
This commit is contained in:
Peter Maquiran
2024-05-31 13:33:10 +01:00
parent 3b91d41b3b
commit 2159692018
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+2 -2
View File
@@ -5,7 +5,7 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="right-icons font-28" src="assets/images/icons-received-event.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="right-icons font-28" src="assets/images/icons-received-event.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov'" class="right-icons font-28" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov'" class="right-icons font-28" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
<div style="color: black;"> <div style="color: black;">
Evento Pendente de Aprovação 5 Evento Pendente de Aprovação
</div> </div>
<!-- Events to approve details mobile --> <!-- Events to approve details mobile -->
</div> </div>
@@ -104,7 +104,7 @@
</div> </div>
</div> </div>
<div *ngIf="loadedAttachments" class="aside-right flex-column height-100"> <div class="aside-right flex-column height-100">
<div class="aside-buttons" > <div class="aside-buttons" >
<button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button> <button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button> <button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button>
src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts
+1 -1
View File
@@ -64,7 +64,7 @@ export class EventToApproveDetailsMapper {
// "OriginatorComments": "", // "OriginatorComments": "",
"Status": "Active", "Status": "Active",
//"TimeZone": "", //"TimeZone": "",
"Agenda": "Oficial", "Agenda": category ,
"EventType": "Reunião", "EventType": "Reunião",
//"EventID": "", //"EventID": "",
//"HasAttachments": true, //"HasAttachments": true,
src/app/services/Repositorys/Agenda/model/eventDTOOutput.ts
+1 -1
View File
@@ -47,7 +47,7 @@ export const EventOutputDTOSchema = z.object({
startDate: z.string(), startDate: z.string(),
endDate: z.string(), endDate: z.string(),
type: z.string(), type: z.string(),
category: z.string(), category: z.enum(['Oficial','Pessoal']),
attendees: z.array(AttendeeSchema), attendees: z.array(AttendeeSchema),
isRecurring: z.boolean(), isRecurring: z.boolean(),
eventRecurrence: z.null(), eventRecurrence: z.null(),
src/app/shared/agenda/approve-event/approve-event.page.html
+1
View File
@@ -46,6 +46,7 @@
<p> <p>
<span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span> <span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
{{ loadedEvent.workflowDisplayName }}
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;"> <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;">
{{loadedEvent.workflowInstanceDataFields.Agenda}} {{loadedEvent.workflowInstanceDataFields.Agenda}}
</span> </span>