From c572418109b0e86df914b456bde967afc2cf45ab Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 30 Nov 2021 15:03:39 +0100 Subject: [PATCH 1/5] Improve --- src/app/pages/agenda/agenda.page.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 044c38f94..af488bee7 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -413,6 +413,7 @@ Date: Tue, 30 Nov 2021 15:06:07 +0100 Subject: [PATCH 2/5] Imprve --- src/app/pages/agenda/agenda.page.html | 1 - .../shared/popover/opts-expediente/opts-expediente.page.html | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index af488bee7..044c38f94 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -413,7 +413,6 @@
- - + +
From 4545ef0698f9a27b3d7b13850ea120c544593915 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 1 Dec 2021 15:21:51 +0100 Subject: [PATCH 3/5] Improve --- src/app/pages/agenda/agenda.page.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 136a6a819..04cf0752f 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -514,7 +514,7 @@ export class AgendaPage implements OnInit { this.CalendarStore.pushEvent(response, 'md'); console.log('CALENDAR STORE', this.CalendarStore.eventSource) - this.trasnformData(response,'md'); + this.listToPresent = this.CalendarStore.eventSource this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -541,7 +541,7 @@ export class AgendaPage implements OnInit { this.CalendarStore.removeRange(startTime, endTime, 'pr') // calendar this.CalendarStore.pushEvent(response, 'pr'); - this.trasnformData(response,'pr'); + this.listToPresent = this.CalendarStore.eventSource this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -571,7 +571,7 @@ export class AgendaPage implements OnInit { // startTime = 1, endTime = 31 this.CalendarStore.removeRange(startTime, endTime, 'pr') this.CalendarStore.pushEvent(response, 'pr'); - this.trasnformData(response,'pr') + this.listToPresent = this.CalendarStore.eventSource this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -609,7 +609,7 @@ export class AgendaPage implements OnInit { // loop this.CalendarStore.pushEvent(eventsList, 'md'); - this.trasnformData(response,'md') + this.listToPresent = this.CalendarStore.eventSource this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -640,10 +640,10 @@ export class AgendaPage implements OnInit { let eventsList = response; // clear the current month only - /* this.CalendarStore.removeRange(startTime, endTime, 'pr') + this.CalendarStore.removeRange(startTime, endTime, 'pr') - this.CalendarStore.pushEvent(eventsList, 'pr'); */ - this.trasnformData(response,'pr') + this.CalendarStore.pushEvent(eventsList, 'pr'); + this.listToPresent = this.CalendarStore.eventSource this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -688,7 +688,7 @@ export class AgendaPage implements OnInit { this.CalendarStore.removeRange(startTime, endTime, 'pr') this.CalendarStore.pushEvent(eventsList, 'pr'); - this.trasnformData(eventsList,'pr') + this.listToPresent = this.CalendarStore.eventSource this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) From fc780613b19fa86599a6eaed8fde01ccb8a46335 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 6 Dec 2021 15:09:59 +0100 Subject: [PATCH 4/5] imporve --- .../agenda/edit-event/edit-event.page.ts | 21 ++++++++++--------- .../agenda/edit-event/edit-event.page.ts | 2 +- .../agenda/view-event/view-event.page.scss | 2 +- .../despachos-options.page.ts | 8 +++---- src/index.html | 2 +- src/theme/variables.scss | 9 ++++++++ 6 files changed, 27 insertions(+), 17 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 8cd58e2f1..368bdc781 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -41,13 +41,11 @@ export class EditEventPage implements OnInit { recurringTypes: any; selectedRecurringType: any; - loadedEventAttachments: Attachment[] = []; taskParticipants: any = []; taskParticipantsCc: any = []; adding: "intervenient" | "CC" = "intervenient"; - showAttendees = false; constructor( @@ -196,19 +194,22 @@ export class EditEventPage implements OnInit { this.postEvent.EventRecurrence.Type = this.selectedRecurringType; this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { - if(this.initCalendarName != this.postEvent.CalendarName){ + + if(this.initCalendarName != this.postEvent.CalendarName) { + let body = { "EventId": this.postEvent.EventId, "CalendarDestinationName": this.postEvent.CalendarName, - } - try { - await this.eventsService.changeAgenda(body).toPromise(); - } catch (error) {} - finally { - this.goBack(); + } + try { + await this.eventsService.changeAgenda(body).toPromise(); + } catch (error) {} + finally { + this.goBack(); + } + } - } this.toastService.successMessage(); }, error => { 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 f66e97819..609cc47d9 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -14,7 +14,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ParticipantsPipe } from 'src/app/pipes/participants.pipe'; import { ThemeService } from 'src/app/services/theme.service' - @Component({ selector: 'app-edit-event', templateUrl: './edit-event.page.html', @@ -127,6 +126,7 @@ export class EditEventPage implements OnInit { } } + this.initCalendarName = this.postEvent.CalendarName; this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index 4f044aa5f..039695b83 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -176,7 +176,7 @@ ion-content{ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index bd0343cf6..b87751e16 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -216,19 +216,19 @@ export class DespachosOptionsPage implements OnInit { Attachments: DocumentToSave, } - if(actionName == 'Executado'){ + if(actionName == 'Executado') { await this.executado(res.data.note, docs); } else if(actionName == 'Arquivar'){ await this.arquivar(res.data.note, docs); } - else if(actionName == 'Gerar Diploma'){ + else if(actionName == 'Gerar Diploma') { await this.generateDiploma(res.data.note, docs); } - else if(actionName == 'Concluido'){ + else if(actionName == 'Concluido') { //this.concluir(res.data.note, docs); } - else if(actionName == 'Reexecução'){ + else if(actionName == 'Reexecução') { await this.reexecutar(res.data.note, docs); } this.goBack(); diff --git a/src/index.html b/src/index.html index 2d40cbfe9..2d125ea04 100644 --- a/src/index.html +++ b/src/index.html @@ -11,7 +11,7 @@ --> - diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 84d552a9d..79c7281e0 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -715,6 +715,10 @@ body { } } } + + .desk{ + color: black !important; + } } .gov { @@ -794,6 +798,10 @@ body { } } } + + .desk{ + color: black !important; + } } // blue @@ -913,6 +921,7 @@ body { } } } + } .font-awesome { From b6511f29d296fcf3cb7a33d728e326bfb003e1ec Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 6 Dec 2021 15:20:06 +0100 Subject: [PATCH 5/5] fix --- src/app/pages/agenda/view-event/view-event.page.scss | 2 +- src/app/shared/agenda/edit-event/edit-event.page.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index 44837e303..828a438d8 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -198,7 +198,7 @@ ion-menu{ .attach-title-item{ width: 100%; font-size: 15px; - color:var(--title-text-color); + color: var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss index 9eb41d3a8..4ef1fdcce 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.scss +++ b/src/app/shared/agenda/edit-event/edit-event.page.scss @@ -117,7 +117,7 @@ ion-content{ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color: var(--title-text-color); } /* SPAN */ .span-left{