diff --git a/src/app/app.module.ts b/src/app/app.module.ts index caa421c4d..34aae5a53 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -79,9 +79,7 @@ import { BrowserTracing } from '@sentry/tracing'; import { AngularFireModule } from '@angular/fire'; import { AngularFireMessagingModule } from '@angular/fire/messaging'; import { firebaseConfig } from '../firebase-config'; -import { EditorModule } from '@tinymce/tinymce-angular'; -import { DeplomaOptionsPageModule } from './shared/popover/desktop/deploma-options/deploma-options.module'; -import { DiplomaOptionsPage } from './shared/popover/desktop/deploma-options/deploma-options.page'; +import { EditorModule } from '@tinymce/tinymce-angular';; import { CreateProcessPageModule } from './modals/create-process/create-process.module'; import { CreateProcessPage } from './modals/create-process/create-process.page'; import { LoggingInterceptorService } from './services/logging-interceptor.service'; @@ -91,6 +89,8 @@ import { tokenInterceptor } from './interceptors/token.interceptors'; import { InputFilterDirective } from './services/directives/input-filter.directive'; import { VisibilityDirective } from './services/directives/visibility.directive'; +import { DeplomaOptionsPageModule } from './shared/popover/deploma-options/deploma-options.module'; +import { DiplomaOptionsPage } from './shared/popover/deploma-options/deploma-options.page'; // import { ServiceWorkerModule } from '@angular/service-worker'; // import { AngularFireModule } from '@angular/fire'; // import { AngularFireMessagingModule } from '@angular/fire/messaging'; diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index aa2c261c1..53b16aa2f 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -314,7 +314,7 @@ const routes: Routes = [ }, { path: 'request-options', - loadChildren: () => import('../shared/popover/desktop/request-options/request-options.module').then( m => m.RequestOptionsPageModule) + loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule) }, ], diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 4a8e06453..9f1754db3 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -62,7 +62,7 @@ export class CreateProcessPage implements OnInit { taskDescription: string; loadedAttachments: any; subjectTypes: any; - selectedTypes: string[] = []; + selectedTypes: string = ''; placeholderSubject: string; postData: Despacho; @@ -127,7 +127,7 @@ export class CreateProcessPage implements OnInit { this.participants = this.participants = new Array(); //Initialize SubjectTypes Array with the value "Indefinido" if(this.loggeduser.Profile == 'PR') { - this.selectedTypes = ['99999850']; + this.selectedTypes = '99999850'; this.placeholderSubject = 'Indefinido' } else { this.placeholderSubject = 'Selecione o tipo de assunto*' @@ -199,7 +199,7 @@ export class CreateProcessPage implements OnInit { this.selectedTypes = ev.filter(data => data != '99999850'); } if (ev.length == 0) { - this.selectedTypes = ["99999850"]; + this.selectedTypes = "99999850"; } } @@ -211,6 +211,8 @@ export class CreateProcessPage implements OnInit { this.processes.GetSubjectType().subscribe(res => { // console.log('subjectTypes',res) this.subjectTypes = res; + this.placeholderSubject = 'Selecione o tipo de assunto*' + this.selectedTypes = '99999844'; }); } diff --git a/src/app/models/agenda/AgendaEventList.ts b/src/app/models/agenda/AgendaEventList.ts index 5698c013d..2e9711cd9 100644 --- a/src/app/models/agenda/AgendaEventList.ts +++ b/src/app/models/agenda/AgendaEventList.ts @@ -40,4 +40,4 @@ export interface days { activeEvent: number events: CustomCalendarEvent[] } -} \ No newline at end of file +} diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index fb1e5b581..bd5079888 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -33,9 +33,29 @@ export class Event{ EventRecurrence: EventRecurrence; Name?: string Attachments?: Attachment[]; + HumanDate?: string; + IsAllDayEvent?: boolean; } +interface EventList { + HasAttachments: boolean; + IsAllDayEvent: boolean; + EventId: string; + Subject: string; + Location: string; + CalendarId: string; + CalendarName: string; + StartDate: string; + EndDate: string; + Schedule: string; + RequiredAttendees: any; // Adjust type as per your data + OptionalAttendees: any; // Adjust type as per your data + HumanDate: string; + TimeZone: string; + IsPrivate: boolean; +} + // event to approve details ================================================ export interface Originator { email: string; diff --git a/src/app/models/folder.model.ts b/src/app/models/folder.model.ts index da5aab8bf..2fdae71d3 100644 --- a/src/app/models/folder.model.ts +++ b/src/app/models/folder.model.ts @@ -6,6 +6,6 @@ export class Folder{ SourceType:string; SourceId:string; DeadlineType: string; - SubjectTypes: string[]; + SubjectTypes: string; NumberPDPP:string; -} \ No newline at end of file +} diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index f4ceae277..a06bfde06 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -260,7 +260,8 @@
{{event.event.Subject}}