From c674ec0bcaa092b6c1aec2efe42b9bafae732421 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 20 Sep 2023 20:25:48 +0100 Subject: [PATCH] change text, fixe create and edit event --- .../agenda/edit-event/edit-event.page.ts | 80 +++++++++---------- .../despachos-pr/despachos-pr.page.html | 2 +- .../despachos-pr/despachos-pr.page.ts | 36 +++++---- .../diplomas-assinar.page.html | 5 +- .../diplomas-assinar.page.scss | 19 ++--- .../diplomas-assinar/diplomas-assinar.page.ts | 6 +- .../agenda/edit-event/edit-event.page.ts | 54 ++++++------- .../despachos-pr/despachos-pr.page.html | 2 +- .../despachos-pr/despachos-pr.page.ts | 25 ++++-- .../diplomas-assinar.page.html | 31 +++---- .../diplomas-assinar/diplomas-assinar.page.ts | 17 ++-- 11 files changed, 149 insertions(+), 128 deletions(-) diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 052aaf203..9c12e2bb7 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -87,7 +87,7 @@ export class EditEventPage implements OnInit { sesseionStora = SessionStore environment = environment - + constructor( private modalController: ModalController, private navParams: NavParams, @@ -111,7 +111,7 @@ export class EditEventPage implements OnInit { this.initCalendarName = this.postEvent.CalendarName; - + for(const index in this.postEvent.Attendees) { const user = this.postEvent.Attendees[index] @@ -119,7 +119,7 @@ export class EditEventPage implements OnInit { if(userData) { this.postEvent.Attendees[index].UserType = userData.UserType } - + } @@ -199,13 +199,13 @@ export class EditEventPage implements OnInit { } goBack() { - + this.router.navigate(['/home',this.caller]); } getRecurrenceTypes() { this.eventsService.getRecurrenceTypes().subscribe(res=>{ - + this.recurringTypes = res; }); } @@ -216,7 +216,7 @@ export class EditEventPage implements OnInit { date.setSeconds(0); if(minutes % 15 != 0) { - + if (minutes > 45) { date.setMinutes(60) } else if (minutes > 30) { @@ -227,7 +227,7 @@ export class EditEventPage implements OnInit { date.setMinutes(15) } - } + } return date } @@ -236,15 +236,15 @@ export class EditEventPage implements OnInit { const _date = new Date(date); const minutes = _date .getMinutes(); _date .setMinutes(minutes + 15) - return _date + return _date } onSelectedRecurringChanged(ev?:any) { this.calculetedLastOccurrence(ev); - + if(ev.length > 1){ - + this.selectedRecurringType = ev.filter(data => data != '-1'); } if(ev.length == 0){ @@ -254,7 +254,7 @@ export class EditEventPage implements OnInit { calculetedLastOccurrence(type:number){ // console.log(type); - var valor; + var valor; var opcao: boolean; if (type == 0) { valor = 7; @@ -280,15 +280,15 @@ export class EditEventPage implements OnInit { this.postEvent.EventRecurrence.LastOccurrence = time; } else { time = new Date( - time.getFullYear() + valor, - time.getMonth(), - time.getDate(), - time.getHours(), + time.getFullYear() + valor, + time.getMonth(), + time.getDate(), + time.getHours(), time.getMinutes() ); this.postEvent.EventRecurrence.LastOccurrence = time; } - + } @@ -332,7 +332,7 @@ export class EditEventPage implements OnInit { openInicio() { let input: any = document.querySelector('#new-inicio') if(input) { - + input.click() } } @@ -366,7 +366,7 @@ export class EditEventPage implements OnInit { this.postEvent.EventRecurrence.Type = this.selectedRecurringType; - if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { + if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { if(window['reloadCalendar']) { @@ -374,7 +374,7 @@ export class EditEventPage implements OnInit { } if(this.initCalendarName != this.postEvent.CalendarName) { - + let body = { "EventId": this.postEvent.EventId, "CalendarDestinationName": this.postEvent.CalendarName, @@ -384,11 +384,11 @@ export class EditEventPage implements OnInit { } catch (error) {} finally { } - + } - + this.httpErrorHandle.httpsSucessMessagge('Editar evento') - + }, error => { this.httpErrorHandle.httpStatusHandle(error) }); @@ -398,9 +398,9 @@ export class EditEventPage implements OnInit { if(window['reloadCalendar']) { window['reloadCalendar']() } - + if(this.initCalendarName != this.postEvent.CalendarName) { - + let body = { "EventId": this.postEvent.EventId, "CalendarDestinationName": this.postEvent.CalendarName, @@ -410,22 +410,22 @@ export class EditEventPage implements OnInit { } catch (error) {} finally { } - + } - + this.httpErrorHandle.httpsSucessMessagge('Editar evento') - + }, error => { this.httpErrorHandle.httpStatusHandle(error) }); } - + this.isEventEdited = true; - /* await this.saveDocument() */ + await this.saveDocument() this.goBack(); } @@ -434,7 +434,7 @@ export class EditEventPage implements OnInit { async saveDocument() { try { - + for( let e of this.loadedEventAttachments) { const id: any = e.Id const remove = e['remove'] @@ -452,7 +452,7 @@ export class EditEventPage implements OnInit { SerialNumber: '', }; - await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise(); + // await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise(); } else if(remove) { await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise() @@ -461,7 +461,7 @@ export class EditEventPage implements OnInit { } catch (error) { } finally { - + } this.modalController.dismiss({ @@ -545,13 +545,13 @@ export class EditEventPage implements OnInit { if(this.postEvent.HasAttachments) { this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{ this.loadedEventAttachments = res; - + },((erro) => { console.error('editgetAttchament', erro) - })); + })); } - + } deleteAttachment(attachmentID: string, index) { @@ -597,7 +597,7 @@ export class EditEventPage implements OnInit { SerialNumber: '', } - + this.loadedEventAttachments.push(ApplicationIdDocumentToSave) this.postEvent.Attachments = this.loadedEventAttachments; @@ -613,17 +613,17 @@ export class EditEventPage implements OnInit { setTimeout(() => { if(this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial'] && this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) { - + this.CalendarNamesOptions = ['Oficial', 'Pessoal'] - + } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial']) { this.CalendarNamesOptions = ['Oficial'] this.postEvent.CalendarName = 'Oficial' - + } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) { this.CalendarNamesOptions = ['Pessoal'] this.postEvent.CalendarName = 'Pessoal' - + } else { this.CalendarNamesOptions = ['Oficial', 'Pessoal'] } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 94e6676e0..f3946c927 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -1,7 +1,7 @@ { this.LoadList() }); - + this.dynamicSearch() } @@ -115,7 +123,7 @@ export class DespachosPrPage implements OnInit { async dynamicSearch() { if(this.showSearch && this.searchSubject) { - + const searchedList =this.TaskService.despachoprstore.list.filter((task) => { let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject subject = subject.toLowerCase(); @@ -124,7 +132,7 @@ export class DespachosPrPage implements OnInit { this.list = this.TaskService.reorderList(this.ordinance, searchedList) } else { - + const list = this.TaskService.despachoprstore.list this.list = this.TaskService.reorderList(this.ordinance, list) } @@ -144,7 +152,7 @@ export class DespachosPrPage implements OnInit { } openExpedientDetailPage(data) { - + } async LoadList() { @@ -156,25 +164,25 @@ export class DespachosPrPage implements OnInit { let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); this.despachoList = []; this.skeletonLoader = false; - + let despachosPr; let despachos = this.sortService.sortArrayByDate(result); if(SessionStore.user.Profile != "PR") { - - + + if(SessionStore.user.Profile != 'Consultant') { despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); } else { despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma"); } - + } else if (SessionStore.user.Profile == "PR") { despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho"); } - + despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active"); despachosPr.forEach((element, index) => { @@ -188,12 +196,12 @@ export class DespachosPrPage implements OnInit { this.despachoList.push(task); }); - + this.despachoList = this.sortService.sortDate(this.despachoList, 'CreateDate') this.despachoprstore.reset(this.despachoList) } catch(error) { - + } this.skeletonLoader = false @@ -217,7 +225,7 @@ export class DespachosPrPage implements OnInit { } async viewExpedientDetail(serialNumber: any) { - + let classs; if (window.innerWidth <= 800) { @@ -235,9 +243,9 @@ export class DespachosPrPage implements OnInit { }, cssClass: classs, }); - + modal.onDidDismiss().then((res) => { - + this.LoadList(); }, (error) => { console.log(error) diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 477a074d0..599547d08 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -50,7 +50,8 @@
-

Diplomas por Assinar PR

+

Diplomas por Assinar PR

+

Diplomas para Assinar PR

 @@ -143,4 +144,4 @@ - \ No newline at end of file + diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss index 4d56b6331..03a490d5c 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss @@ -3,21 +3,21 @@ :host{ margin: 0; } - + .header-2 { border-top-right-radius: 24px; border-top-left-radius: 24px; } - + ion-content, .header-2, .main-content{ padding: 30px 20px 0 20px !important; background-color: white; } - + .main-content { padding-top: 0px !important; } - + .title{ font-family: Roboto; font-size: rem(25); @@ -42,7 +42,7 @@ .bottom-text{ font-size: rem(15) !important; font-family: Roboto !important; - color: #0d89d1 !important; + color: black !important; } } .item-list-small{ @@ -51,7 +51,7 @@ } .ion-item-class{ padding: 0; - + } .label-text{ width: 100%; @@ -97,7 +97,7 @@ ion-item{ .div-icon ion-icon{ display: block; margin: 0 auto; - + } .div-content-expediente p, .div-content-pendentes p{ font-size: rem(19); @@ -176,7 +176,7 @@ ion-item{ .exp-workflow{ float: left; margin: 0 !important; - + .label{ border-radius: 15px; background: var(--label-bg-color); @@ -239,4 +239,5 @@ ion-item{ font-size: rem(45); float: right; margin-right: 10px; -} \ No newline at end of file +} + diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index fc78769e4..4a580e8ae 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -7,6 +7,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { DeplomasStore } from 'src/app/store/deplomas.service'; import { TaskService } from 'src/app/services/task.service' import { RouteService } from 'src/app/services/route.service'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-diplomas-assinar', @@ -37,7 +38,8 @@ export class DiplomasAssinarPage implements OnInit { private router: Router, public ThemeService: ThemeService, public TaskService: TaskService, - private RouteService: RouteService,) { + private RouteService: RouteService, + public p: PermissionService,) { } ngOnInit() { @@ -69,7 +71,7 @@ export class DiplomasAssinarPage implements OnInit { async dynamicSearch() { if(this.showSearch && this.searchSubject) { - + const list = this.TaskService.despachoStore.list.filter((task) => { let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject subject = subject.toLowerCase(); diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 4625091dc..1918cea0a 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -117,7 +117,7 @@ export class EditEventPage implements OnInit { } - + for(const index in this._postEvent.Attendees) { const user = this._postEvent.Attendees[index] @@ -127,7 +127,7 @@ export class EditEventPage implements OnInit { } else { console.log('user not set') } - + } if (this._postEvent.Attendees != null) { @@ -149,7 +149,7 @@ export class EditEventPage implements OnInit { setTimeout(() => { this._postEvent.EventRecurrence.Type = this._postEvent.EventRecurrence.Type.toString(); - + }, 500); @@ -188,7 +188,7 @@ export class EditEventPage implements OnInit { getRecurrenceTypes() { this.eventsService.getRecurrenceTypes().subscribe(res=>{ - + this.recurringTypes = res; }); } @@ -234,7 +234,7 @@ export class EditEventPage implements OnInit { openInicio() { let input: any = document.querySelector('#new-inicio') if(input) { - + input.click() } } @@ -259,7 +259,7 @@ export class EditEventPage implements OnInit { date.setSeconds(0); if(minutes % 15 != 0) { - + if (minutes > 45) { date.setMinutes(60) } else if (minutes > 30) { @@ -270,7 +270,7 @@ export class EditEventPage implements OnInit { date.setMinutes(15) } - } + } return date } @@ -279,15 +279,15 @@ export class EditEventPage implements OnInit { const _date = new Date(date); const minutes = _date .getMinutes(); _date .setMinutes(minutes + 15) - return _date + return _date } onSelectedRecurringChanged(ev:any){ this.calculetedLastOccurrence(ev); - + if(ev.length > 1){ - + this._postEvent.EventRecurrence.Type = ev.filter(data => data != '-1'); } if(ev.length == 0){ @@ -296,7 +296,7 @@ export class EditEventPage implements OnInit { } calculetedLastOccurrence(type:number){ - var valor; + var valor; var opcao: boolean; if (type == 0) { valor = 7; @@ -322,15 +322,15 @@ export class EditEventPage implements OnInit { this._postEvent.EventRecurrence.LastOccurrence = time; } else { time = new Date( - time.getFullYear() + valor, - time.getMonth(), - time.getDate(), - time.getHours(), + time.getFullYear() + valor, + time.getMonth(), + time.getDate(), + time.getHours(), time.getMinutes() ); this._postEvent.EventRecurrence.LastOccurrence = time; } - + } @@ -358,14 +358,14 @@ export class EditEventPage implements OnInit { this.showLoader = true; try { - if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { + if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { await this.eventsService.editEvent(this._postEvent, 2, 3).toPromise() if(this.initCalendarName != this._postEvent.CalendarName) { let body = { "EventId": this._postEvent.EventId, "CalendarDestinationName": this._postEvent.CalendarName, } - + try { await this.eventsService.changeAgenda(body).toPromise(); } catch (e) {} @@ -379,7 +379,7 @@ export class EditEventPage implements OnInit { "EventId": this._postEvent.EventId, "CalendarDestinationName": this._postEvent.CalendarName, } - + try { await this.eventsService.changeAgenda(body).toPromise(); } catch (e) {} @@ -397,7 +397,7 @@ export class EditEventPage implements OnInit { this.clearPostEvent.emit(); this.deleteTemporaryData(); - /* await this.saveDocument() */ + await this.saveDocument() this.close(); } @@ -407,7 +407,7 @@ export class EditEventPage implements OnInit { try { - + for( let e of this.loadedEventAttachments) { const id: any = e.Id const remove = e['remove'] @@ -425,7 +425,7 @@ export class EditEventPage implements OnInit { SerialNumber: '', }; - await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise(); + // await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise(); } else if(remove) { await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise() @@ -527,7 +527,7 @@ export class EditEventPage implements OnInit { } }); - modal.onDidDismiss().then( async (res) => { + modal.onDidDismiss().then( async (res) => { if(res) { const data = res.data; @@ -559,17 +559,17 @@ export class EditEventPage implements OnInit { setTimeout(() => { if(this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial'] && this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) { - + this.CalendarNamesOptions = ['Oficial', 'Pessoal'] - + } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial']) { this.CalendarNamesOptions = ['Oficial'] this._postEvent.CalendarName = 'Oficial' - + } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) { this.CalendarNamesOptions = ['Pessoal'] this._postEvent.CalendarName = 'Pessoal' - + } else { this.CalendarNamesOptions = ['Oficial', 'Pessoal'] } diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 405ca43f6..23ca25a16 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -2,7 +2,7 @@ { - + this.dynamicSearch() - + } }) @@ -103,7 +112,7 @@ constructor ( async dynamicSearch() { if(this.showSearch && this.searchSubject) { - + const list = this.despachosprstore.list.filter((task) => { let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject subject = subject.toLowerCase(); @@ -142,14 +151,14 @@ constructor ( doRefresh(event) { if (event) { setTimeout(() => { - + try { event?.target?.complete(); } catch(error) {} - + }, 2000); } - + setTimeout(() => { this.LoadList(); try { diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index ec266d2c3..543e37761 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -1,7 +1,8 @@
-
Diplomas para assinar
+
Diplomas por Assinar PR
+
Diplomas para assinar PR
- +
- +
@@ -48,33 +49,33 @@
- + Para hoje - + Novas - + Lidas - + Não lidas - - + + Em atraso - + Todas - - + +
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 30e497b9c..7b3a01d14 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -1,12 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { NavigationStart, Router } from '@angular/router'; -import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model'; -import { ProcessesService } from 'src/app/services/processes.service'; import { DeplomasStore } from 'src/app/store/deplomas.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; -import { SortService } from 'src/app/services/functions/sort.service'; import { ThemeService } from 'src/app/services/theme.service' import { TaskService } from 'src/app/services/task.service' +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-diplomas-assinar', @@ -21,7 +19,7 @@ export class DiplomasAssinarPage implements OnInit { deplomasStore = DeplomasStore customTaskPipe = new CustomTaskPipe() filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - // + // showSearch = false searchSubject = '' list = [] @@ -36,7 +34,8 @@ export class DiplomasAssinarPage implements OnInit { constructor( private router: Router, public ThemeService: ThemeService, - public TaskService: TaskService + public TaskService: TaskService, + public p: PermissionService, ) {} ngOnInit() { @@ -48,9 +47,9 @@ export class DiplomasAssinarPage implements OnInit { this.listSubscription = this.deplomasStore.registerCallback({ id: import.meta.url, funx:() => { - + this.dynamicSearch() - + } }) @@ -69,7 +68,7 @@ export class DiplomasAssinarPage implements OnInit { ngOnDestroy() { this.listSubscription.delete() - + this.routerSubscription?.unsubscribe(); } @@ -84,7 +83,7 @@ export class DiplomasAssinarPage implements OnInit { async dynamicSearch() { if(this.showSearch && this.searchSubject) { - + const list = this.deplomasStore.diplomasParaAssinarList.filter((task) => { let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject subject = subject.toLowerCase();