diff --git a/src/app/Rules/aprove-event.service.ts b/src/app/Rules/aprove-event.service.ts index 9311edf6c..40e6f7de2 100644 --- a/src/app/Rules/aprove-event.service.ts +++ b/src/app/Rules/aprove-event.service.ts @@ -38,9 +38,8 @@ export class AproveEventService { async GetTasksListEventosPR() { try { - let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); - let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); - let eventsPRList = prEventsOficial.concat(prEventsPessoal); + let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); + let eventsPRList = prEventsOficial eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento') return eventsPRList; diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index f5b0e38f2..d37a9b6ea 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -164,7 +164,7 @@ export class DocumentSetUpMeetingPage implements OnInit { setEndDate() { if(!this.postData.EndDate) { - this.postData.EndDate = this.postData.StartDate; + this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate); } } @@ -463,6 +463,13 @@ export class DocumentSetUpMeetingPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + checkRoleInArray(str) { return this._eventService.calendarRole.includes(str); } diff --git a/src/app/modals/view-event/view-event.page.html b/src/app/modals/view-event/view-event.page.html index 2c8945d3b..e53b7f520 100644 --- a/src/app/modals/view-event/view-event.page.html +++ b/src/app/modals/view-event/view-event.page.html @@ -86,7 +86,7 @@
Detalhes
-
+ 
{{ loadedEvent.Body.Text }}
diff --git a/src/app/models/GetTasksListType.ts b/src/app/models/GetTasksListType.ts index cf2615c4a..cfc62c2fe 100644 --- a/src/app/models/GetTasksListType.ts +++ b/src/app/models/GetTasksListType.ts @@ -10,4 +10,6 @@ export let GetTasksListType: "Agenda Oficial PR" | "image/x-icon" | "Despacho" | -"Agendar Evento" \ No newline at end of file +"Agendar Evento" | +"Agenda Oficial MDGPR,Agenda Pessoal MDGPR" | +"Agenda Oficial PR,Agenda Pessoal PR" \ No newline at end of file diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index e67ac9d92..7f2baa253 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -134,7 +134,6 @@ 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 e62cd8684..e30588840 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -62,13 +62,11 @@ export class EditEventPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate = new Date().toISOString().slice(0,10) public endMinDate = new Date(new Date().getTime() + 15 * 60000).toISOString().slice(0,10) public maxDate: any; public stepHour = 1; public stepMinute = 15; public stepSecond = 15; - currentDate = this.roundTimeQuarterHour(); loadedEventAttachments: Attachment[] = []; taskParticipants: any = []; @@ -193,6 +191,13 @@ export class EditEventPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + onSelectedRecurringChanged(ev?:any) { this.calculetedLastOccurrence(ev); diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 7c59d1f29..804edb193 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -51,7 +51,6 @@ export class NewEventPage implements OnInit { public stepMinute = 15; public stepSecond = 15; public color: ThemePalette = 'primary'; - currentDate = this.roundTimeQuarterHour(); Form: FormGroup; validateFrom = false @@ -87,6 +86,7 @@ export class NewEventPage implements OnInit { autoEndTime; CalendarNamesOptions = ['Oficial', 'Pessoal'] roomId:string; + globalEnd = new Date('1999') constructor( private modalController: ModalController, @@ -189,7 +189,7 @@ export class NewEventPage implements OnInit { setDefaultTime() { this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); - this.postEvent.EndDate = this.postEvent.StartDate; + this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate); } close() { @@ -218,6 +218,12 @@ export class NewEventPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } setStartDate() { if(!this.postEvent.StartDate) { this.postEvent.StartDate = this.roundTimeQuarterHour(); diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index b8bbd202a..6b98b8450 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -57,7 +57,7 @@
Detalhes
-

+ 
{{ fulltask.workflowInstanceDataFields.TaskMessage }}
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index b4a49a6b2..44434b0a6 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -55,7 +55,7 @@
Detalhes
-

+ 
{{ fulltask.workflowInstanceDataFields.TaskMessage }}
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html index 773282f43..175e404a9 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html @@ -54,7 +54,7 @@
Detalhes
-

+ 
{{ fulltask.workflowInstanceDataFields.TaskMessage }}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html index f2db050cc..b0e5484f0 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html @@ -53,7 +53,7 @@
Detalhes
-

+ 
{{ fulltask.workflowInstanceDataFields.TaskMessage }}
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index ed948f68f..30062f8df 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -56,7 +56,7 @@
Detalhes
-

+ 
{{ fulltask.workflowInstanceDataFields.TaskMessage }}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index 5b82fb495..31f2befd4 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -83,7 +83,7 @@
Detalhes
-
+ 
{{ loadedEvent.workflowInstanceDataFields.Body }}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index a90f16d22..0b10b0992 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -85,7 +85,7 @@
Detalhes
-

+ 
{{loadedEvent.workflowInstanceDataFields.Body }}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 8ace81ef5..21365a0f8 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -156,9 +156,8 @@ export class EventListPage implements OnInit { if (this.segment != 'PR') { - let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); - let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); - this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); + let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); + this.eventsMDGPRList = mdEventsOficial this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate') this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) @@ -170,9 +169,9 @@ export class EventListPage implements OnInit { } else if (this.segment == 'PR') { - let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); - let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); - this.eventsPRList = prEventsOficial.concat(prEventsPessoal); + let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); + + this.eventsPRList = prEventsOficial this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate') this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index f7e0292f9..b4a954c92 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -135,8 +135,9 @@ export class BookMeetingModalPage implements OnInit { this.postData.Subject = this.task.Folio; this.postData.CalendarName = "Oficial"; - this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour())); - this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour()))); + let startDate = this.roundTimeQuarterHour() + this.dateControlStart = new FormControl(moment(startDate)); + this.dateControlEnd = new FormControl(moment(this.roundTimeQuarterHourPlus15(startDate))); this.postData.Category = 'Reunião' @@ -201,7 +202,7 @@ export class BookMeetingModalPage implements OnInit { setDefaultTime() { this.postData.StartDate = this.roundTimeQuarterHour(); - this.postData.EndDate = (new Date(this.postData.StartDate.getTime() + 15 * 60000)) + this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate); } getAttachments() { @@ -521,6 +522,15 @@ export class BookMeetingModalPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + + + setStartDate() { this.postData.StartDate = this.roundTimeQuarterHour(); } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index fb1087d1b..72e94874d 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -51,7 +51,7 @@
Detalhes
-

+ 
{{ task.Note }}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index 1d2c86be3..98f198d7b 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -59,7 +59,7 @@
Detalhes
-

+ 
{{ fulltask.workflowInstanceDataFields.TaskMessage }}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 172493ee9..6c977b307 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -193,6 +193,20 @@

{{ deplomasStore.deplomasReviewCount }} Documentos

+ + +
+
+ + + + + +
+

Diplomas para Assinar

+

{{ deplomasStore.diplomasParaAssinartCount }} Documentos

+
+
@@ -206,18 +220,6 @@

{{ deplomasStore.countDiplomasAssinadoListCount }} Documentos

- -
-
- - - - - -
-

Diplomas para Assinar

-

{{ deplomasStore.diplomasParaAssinartCount }} Documentos

-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 3808f3ac2..70bea67d8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -147,6 +147,9 @@ export class GabineteDigitalPage implements OnInit { } this.checkRoutes(); + + window['all-process-gabinete'] = this.updateAllProcess + } closeAllDesktopComponent() { this.desktopComponent = { @@ -593,7 +596,7 @@ export class GabineteDigitalPage implements OnInit { this.showDiplomasGerar = false } - updateAllProcess() { + updateAllProcess = () => { this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list) @@ -609,6 +612,10 @@ export class GabineteDigitalPage implements OnInit { // .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) // .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList) // } + if(window['all-process']) { + window['all-process']() + } + } get getAllProcessCount() { @@ -725,9 +732,8 @@ export class GabineteDigitalPage implements OnInit { this.updateAllProcess() } - let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); - let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); - let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); + let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); + let eventsMDGPRList = mdEventsOficial eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento') @@ -735,9 +741,8 @@ export class GabineteDigitalPage implements OnInit { this.eventoaprovacaostore.resetmd(eventsMDGPRList); this.updateAllProcess() - let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise(); - let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise(); - let eventsPRList = prEventsOficial.concat(prEventsPessoal); + let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); + let eventsPRList = prEventsOficial eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento') this.eventoaprovacaostore.countPr = eventsPRList.length diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index a7f0c7ddf..f2fb679b9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -57,7 +57,7 @@
Detalhes
-

+ 
{{ task.Note }}
diff --git a/src/app/pages/publications/edit-action/edit-action.page.html b/src/app/pages/publications/edit-action/edit-action.page.html index 2933fc864..ce5c80a40 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.html +++ b/src/app/pages/publications/edit-action/edit-action.page.html @@ -37,7 +37,6 @@ diff --git a/src/app/pages/publications/new-action/new-action.module.ts b/src/app/pages/publications/new-action/new-action.module.ts index 3924eab40..421c27f06 100644 --- a/src/app/pages/publications/new-action/new-action.module.ts +++ b/src/app/pages/publications/new-action/new-action.module.ts @@ -18,7 +18,6 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatSelectModule } from '@angular/material/select'; import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; -import { MAT_DATE_LOCALE } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatInputModule } from '@angular/material/input'; import { MatDialogModule } from '@angular/material/dialog'; diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index 07555701b..575f1121d 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -73,7 +73,7 @@ export class NewActionPage implements OnInit { this.folder = new PublicationFolder(); this.dateControlStart = new FormControl(this.roundTimeQuarterHour()); - this.dateControlEnd = new FormControl(this.dateControlStart.value); + this.dateControlEnd = new FormControl(this.roundTimeQuarterHourPlus15(this.dateControlStart.value)); } @@ -177,4 +177,11 @@ export class NewActionPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + } diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index a1d40cc9c..66fbb19d6 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -92,7 +92,7 @@
Detalhes
-

+ 
{{ loadedEvent.workflowInstanceDataFields.Body }}
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 19b9bb9fb..bb16d8e5c 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -158,7 +158,6 @@ diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 4ee2b2875..3ea1ebd98 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -119,7 +119,6 @@ [(ngModel)]="postEvent.StartDate" [max]="maxDate" [disabled]="disabled" - [min]="currentDate" > 0) { this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); @@ -115,19 +114,17 @@ export class EventListPage implements OnInit { try { if(this.segment == 'MDGPR') { - let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); - let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); - - let allEvents = mdEventsOficial.concat(mdEventsPessoal); + let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); + + let allEvents = mdEventsOficial if(allEvents.length > 0) { this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse(); } this.showLoader = false; } else if(this.segment == 'PR') { - let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); - let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); - let allEvents = prEventsOficial.concat(prEventsPessoal); + let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); + let allEvents = prEventsOficial if(allEvents.length > 0) { this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 71f9e9bd5..2ff97f65a 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -136,7 +136,6 @@ placeholder="Data Inicio*" [(ngModel)]="postEvent.StartDate" [disabled]="disabled" - [min]="currentDate" > { - try { - event?.target?.complete(); -} catch(error) {} + try { + event?.target?.complete(); + } catch(error) {} }, 2000); } setTimeout(() => { @@ -79,7 +81,7 @@ export class AllProcessesPage implements OnInit { }, 1000); } - updateAllProcess() { + updateAllProcess = () => { this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list) @@ -155,7 +157,7 @@ export class AllProcessesPage implements OnInit { else if (activityName == 'Diploma Assinado') { this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']); } else { - alert('Bug!'); + throw('Bug!'); } } else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') { diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 39d3d3d43..cd22a5879 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -113,7 +113,6 @@ placeholder="Choose a date" [(ngModel)]="startDate" [disabled]="disabled" - [min]="currentDate" >
Detalhes
-

+ 
{{ fulltask.workflowInstanceDataFields.TaskMessage }}
diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html index 8223373e4..d79b24285 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.html +++ b/src/app/shared/publication/edit-action/edit-action.page.html @@ -37,7 +37,6 @@ diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 87683b872..c52d4fb31 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -185,6 +185,13 @@ export class NewActionPage implements OnInit { return date } + + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } setStartDate() { @@ -192,6 +199,6 @@ export class NewActionPage implements OnInit { } setEndDate() { - this.folder.DateEnd = this.folder.DateBegin; + this.folder.DateEnd = this.roundTimeQuarterHourPlus15(this.folder.DateBegin); } } diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts index 0c65d82e6..b14581d85 100644 --- a/src/app/store/deplomas.service.ts +++ b/src/app/store/deplomas.service.ts @@ -105,6 +105,12 @@ export class DeplomasService { this._diplomasAssinadoListCount = value.length this._diplomasAssinadoList = value this.saveDiplomasAssinadoList() + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } resetDiplomasParaAssinar(value: any[]) { @@ -112,12 +118,26 @@ export class DeplomasService { this._diplomasListCount = value.length this._diplomasParaAssinar = value this.saveDiplomasParaAssinar() + + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } resetDiplomasReview(value: any[]) { this._diplomasReviewList =value this._diplomasReviewCount = value.length this.saveDiplomasReviewList() + + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } resetDiplomaGerar(value: any[]) { @@ -126,6 +146,12 @@ export class DeplomasService { this._diplomasGerarList = value this.savetDiplomaGerar() + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts index af4871c7e..36038eb1e 100644 --- a/src/app/store/despacho-store.service.ts +++ b/src/app/store/despacho-store.service.ts @@ -109,6 +109,13 @@ export class DespachoStoreService { reset(eventsList: any) { this._list = eventsList this.save({dynamicCount:true}) + + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } private save = ({dynamicCount = false})=> { diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts index 684c80161..dd76d51d0 100644 --- a/src/app/store/despachospr-store.service.ts +++ b/src/app/store/despachospr-store.service.ts @@ -38,6 +38,13 @@ reset(eventsList: any) { this.count = this._list.length this.save() + + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } private save() { diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index 78802a652..d6d5ce341 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -63,7 +63,15 @@ export class EventoaprovacaoStoreService { this.count = this.countPr + this.countMd this.savePr() + + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } + } resetmd(eventsList: any) { @@ -73,6 +81,14 @@ export class EventoaprovacaoStoreService { this.countMd = this._listMd.length this.count = this.countPr + this.countMd this.saveMd() + + + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } } diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts index 4c12344be..66b580228 100644 --- a/src/app/store/expedientegd-store.service.ts +++ b/src/app/store/expedientegd-store.service.ts @@ -36,6 +36,13 @@ export class ExpedientegdStoreService { reset(eventsList: any) { this._list = eventsList this.save() + + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } private save() { diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts index ec683d1b5..13f5abcad 100644 --- a/src/app/store/pedidos-store.service.ts +++ b/src/app/store/pedidos-store.service.ts @@ -62,6 +62,12 @@ export class PedidosStoreService { this.countparecer = this._listParecer.length this.saveDeferimento() + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } resetdeferimento(list: any) { @@ -69,6 +75,12 @@ export class PedidosStoreService { this.countdeferimento =this._listDeferimento.length this.saveParecer() + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } private saveParecer() { diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts index da0a04b44..7863633f6 100644 --- a/src/app/store/pendestes-store.service.ts +++ b/src/app/store/pendestes-store.service.ts @@ -42,6 +42,12 @@ export class PendestesStoreService { this.count = this._list.length this.save() + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } private save() { diff --git a/src/app/store/presidential-actions-store.service.ts b/src/app/store/presidential-actions-store.service.ts index 7ea3adae0..6132fe909 100644 --- a/src/app/store/presidential-actions-store.service.ts +++ b/src/app/store/presidential-actions-store.service.ts @@ -32,6 +32,12 @@ export class PresidentialActionsStoreService { this._list = list this.save(this._list) + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } private save(list: Publication[]) { diff --git a/src/app/store/to-day-event-storage.service.ts b/src/app/store/to-day-event-storage.service.ts index 2bc45749d..8c21af6d6 100644 --- a/src/app/store/to-day-event-storage.service.ts +++ b/src/app/store/to-day-event-storage.service.ts @@ -38,6 +38,12 @@ export class ToDayEventStorageService { reset(eventsList: EventList[]) { this._eventsList = eventsList this.save() + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } } private save() { diff --git a/version/git-version.ts b/version/git-version.ts index e572dd138..4cd78851a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "c82029edf", - "SHA": "c82029edf82df3c59548d76d6fd8d454872ae974", + "shortSHA": "34c0447d2", + "SHA": "34c0447d24ccdb21f79d2331b48c74495baa999f", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Feb 13 16:35:38 2023 +0100'", - "lastCommitMessage": "Bug fix presenting role", - "lastCommitNumber": "4767", + "lastCommitTime": "'Mon Feb 13 18:57:15 2023 +0100'", + "lastCommitMessage": "required field solved and other bug", + "lastCommitNumber": "4768", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 7 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/Rules/aprove-event.service.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.html\n\tmodified: src/app/models/GetTasksListType.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.module.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts\n\tmodified: src/app/store/deplomas.service.ts\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts\n\tmodified: src/app/store/pedidos-store.service.ts\n\tmodified: src/app/store/pendestes-store.service.ts\n\tmodified: src/app/store/presidential-actions-store.service.ts\n\tmodified: src/app/store/to-day-event-storage.service.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file