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 eeaac17a4..1c484cf20 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 @@ -87,7 +87,7 @@
-
+
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index d96328a0e..ed9222302 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -73,7 +73,7 @@ export class EditEventToApprovePage implements OnInit { Body: "", OccurrenceType: '', Category: '', - LastOccurrence: '', + LastOccurrence: new Date(), IsRecurring: false, ParticipantsList: [], Agenda: '', @@ -127,7 +127,6 @@ export class EditEventToApprovePage implements OnInit { private toastService: ToastService, ) { this.isEventEdited = false; - } ngOnInit() { @@ -147,6 +146,8 @@ export class EditEventToApprovePage implements OnInit { this.processes.GetTask(this.serialNumber).subscribe( (result) =>{ this.eventProcess = result + this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence) + this.restoreDatepickerData() // description 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 4dedc8a17..308b74d4b 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -11,7 +11,6 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { Attachment } from 'src/app/models/attachment.model'; import { ToastService } from 'src/app/services/toast.service'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import * as moment from 'moment'; import { ParticipantsPipe } from 'src/app/pipes/participants.pipe'; @Component({ @@ -65,11 +64,8 @@ export class EditEventPage implements OnInit { @Output() setIntervenientCC = new EventEmitter(); @Output() clearPostEvent = new EventEmitter(); - showLoader = false - - @ViewChild('picker') picker: any; @ViewChild('fim') fim: any; @ViewChild('inicio') inicio: any; diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 73d6f0bb3..bcc74b0c2 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -1,9 +1,8 @@ import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; import { EventBody } from 'src/app/models/eventbody.model'; import { EventPerson } from 'src/app/models/eventperson.model'; -import { Event } from 'src/app/models/event.model'; import { ProcessesService } from 'src/app/services/processes.service'; -import { ModalController, NavParams } from '@ionic/angular'; +import { ModalController } from '@ionic/angular'; import { NavigationEnd, Router } from '@angular/router'; import { AuthService } from 'src/app/services/auth.service'; import { LoginUserRespose } from 'src/app/models/user.model'; diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index cbc419510..079995aa6 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -1,8 +1,6 @@ import { Component, OnInit} from '@angular/core'; - import { customTask} from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; - import { AuthService } from 'src/app/services/auth.service'; import { LoginUserRespose } from 'src/app/models/user.model'; import { NavigationStart, Router } from '@angular/router'; 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 663009d0d..22d37ee80 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 @@ -8,7 +8,7 @@
- Editar evento por aprovar gg + Editar evento por aprovar
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index c7bc0343d..169268a04 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -69,7 +69,7 @@ export class EditEventToApproveComponent implements OnInit { Body: "", OccurrenceType: '', Category: '', - LastOccurrence: '', + LastOccurrence: new Date(), ParticipantsList: [], Agenda: '', EndDate: '', @@ -134,9 +134,10 @@ export class EditEventToApproveComponent implements OnInit { const result = await this.processes.GetTask(this.serialNumber).toPromise(); console.log(result); - + this.eventProcess = result this.eventProcess.workflowInstanceDataFields.Category = result.workflowInstanceDataFields.EventType + this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence) this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate); this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate); diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index cf5076fb4..8b0b434f7 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -63,6 +63,4 @@ export class LocalstoreService { } -export const localstoreService = new LocalstoreService() - -console.log( AES.encrypt( 'pode ser qualquer', 'ayrton').toString() ) +export const localstoreService = new LocalstoreService() \ No newline at end of file From 83c6dc4cb227f792c2fc48306ef4dd80586b076b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 3 Sep 2021 16:37:00 +0100 Subject: [PATCH 2/2] Agenda add functionality to change year and month --- src/app/pages/agenda/agenda.page.ts | 28 +++++++++++++++++++ .../despacho-pr/despacho-pr.page.html | 1 - src/app/services/ageanda/list-box.service.ts | 3 +- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 6d3035652..f3a6069eb 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -191,6 +191,9 @@ export class AgendaPage implements OnInit { }, 1000) + + window['year'] = this.changeYear + } ngOnInit() { @@ -738,6 +741,31 @@ export class AgendaPage implements OnInit { } + changeYear = (year) => { + const a = this.calendar.currentDate + this.calendar.currentDate = new Date(`${year}-${a.getMonth()}-${a.getDay()}`); + + try { + this.myCal.update(); + this.myCal.loadEvents(); + } catch(e) {} + + this.updateEventListBox() + + } + + changeMonth = (month) => { + const a = this.calendar.currentDate + this.calendar.currentDate = new Date(`${a.getFullYear()}-${month}-${a.getDay()}`); + + try { + this.myCal.update(); + this.myCal.loadEvents(); + } catch(e) {} + + this.updateEventListBox() + } + get viewEventMonth () { return this.viewDate.getMonth() 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 35ea31958..2d91d5205 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 @@ -40,7 +40,6 @@
- .. {{ cc | json }} ..
Com conhecimento
diff --git a/src/app/services/ageanda/list-box.service.ts b/src/app/services/ageanda/list-box.service.ts index dc8a988b1..04066f1da 100644 --- a/src/app/services/ageanda/list-box.service.ts +++ b/src/app/services/ageanda/list-box.service.ts @@ -156,7 +156,8 @@ export class ListBoxService { push(event: any, selectedDate: Date) { - return new Date(event.start).getMonth() == selectedDate.getMonth() + return new Date(event.start).getMonth() == selectedDate.getMonth() && + new Date(event.start).getFullYear() == selectedDate.getFullYear() } encapsulation(eventsList:EventListStore[], profile): CustomCalendarEvent[] {