mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
Merge branch 'feature/agenda-new-api-peter' into feature/agenda-new-api-eudes
This commit is contained in:
@@ -1,15 +1,13 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { AgendaDataService } from './agenda-data.service';
|
||||
import { catchError, map } from 'rxjs/operators';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { ListEventMapper } from './mapper/EventListMapper';
|
||||
import { EventMapper } from './mapper/EventDetailsMapper';
|
||||
import { Utils } from './utils';
|
||||
import { EventInputDTO } from './agendaDataModels';
|
||||
import { Event } from 'src/app/models/event.model';
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { EventListToApproveMapper } from './mapper/eventToApproveListMapper';
|
||||
import { err, ok } from 'neverthrow';
|
||||
import { of } from 'rxjs';
|
||||
import { HttpErrorResponse } from '@angular/common/http';
|
||||
import { EventToApproveDetailsMapper } from './mapper/EventToApproveDetailsMapper';
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ export class EventToApproveDetailsMapper {
|
||||
// "OriginatorComments": "",
|
||||
"Status": "Active",
|
||||
//"TimeZone": "",
|
||||
"Agenda": "Oficial",
|
||||
"Agenda": category ,
|
||||
"EventType": "Reunião",
|
||||
//"EventID": "",
|
||||
//"HasAttachments": true,
|
||||
|
||||
@@ -26,12 +26,13 @@ export class EventListToApproveMapper {
|
||||
if(dto.ownerType == 'PR') {
|
||||
color = 'PR'
|
||||
workflowDisplayName = `Agenda ${category} ${color}`
|
||||
} else if(dto.ownerType == 'MD') {
|
||||
} else {
|
||||
color = 'MDGPR'
|
||||
workflowDisplayName = `Agenda ${category} ${color}`
|
||||
} else {
|
||||
workflowDisplayName = `Agenda ${category}`
|
||||
}
|
||||
// else {
|
||||
// workflowDisplayName = `Agenda ${category}`
|
||||
// }
|
||||
|
||||
return {
|
||||
serialNumber: dto.id,
|
||||
|
||||
@@ -47,7 +47,7 @@ export const EventOutputDTOSchema = z.object({
|
||||
startDate: z.string(),
|
||||
endDate: z.string(),
|
||||
type: z.string(),
|
||||
category: z.string(),
|
||||
category: z.enum(['Oficial','Pessoal']),
|
||||
attendees: z.array(AttendeeSchema),
|
||||
isRecurring: z.boolean(),
|
||||
eventRecurrence: z.null(),
|
||||
|
||||
Reference in New Issue
Block a user