From 408e7c30eaf993d3f5f514f9845fea53e0e516e3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 22 Oct 2021 15:43:57 +0100 Subject: [PATCH] Change icons --- .../modals/create-process/create-process.page.html | 6 ++++-- src/app/modals/create-process/create-process.page.ts | 5 ++++- src/app/modals/delegar/delegar.page.html | 3 ++- src/app/modals/delegar/delegar.page.ts | 3 +++ .../document-set-up-meeting.page.html | 6 ++++-- .../document-set-up-meeting.page.ts | 5 ++++- src/app/modals/forward/forward.page.html | 3 ++- src/app/modals/forward/forward.page.ts | 3 +++ src/app/pages/agenda/agenda.page.html | 12 ++++++++---- src/app/pages/agenda/edit-event/edit-event.page.html | 6 ++++-- src/app/pages/agenda/edit-event/edit-event.page.ts | 3 +++ src/app/pages/agenda/new-event/new-event.page.html | 6 ++++-- src/app/pages/agenda/new-event/new-event.page.ts | 2 ++ src/app/pages/agenda/view-event/view-event.page.html | 3 ++- src/app/pages/agenda/view-event/view-event.page.ts | 5 ++++- src/app/pages/chat/chat.page.ts | 6 ------ .../event-list/approve-event/approve-event.page.ts | 5 ++++- .../book-meeting-modal/book-meeting-modal.page.html | 6 ++++-- .../book-meeting-modal/book-meeting-modal.page.ts | 3 +++ .../expedient-task-modal.page.html | 6 ++++-- .../expedient-task-modal.page.ts | 5 ++++- .../edit-event-to-approve.page.html | 6 ++++-- .../edit-event-to-approve.page.ts | 3 +++ .../shared/agenda/edit-event/edit-event.page.html | 6 ++++-- src/app/shared/agenda/edit-event/edit-event.page.ts | 3 +++ src/app/shared/agenda/new-event/new-event.page.html | 6 ++++-- src/app/shared/agenda/new-event/new-event.page.ts | 3 +++ .../shared/agenda/view-event/view-event.page.html | 6 ++++-- src/app/shared/agenda/view-event/view-event.page.ts | 5 ++++- .../edit-event-to-approve/edit-event.page.html | 6 ++++-- .../edit-event-to-approve/edit-event.page.ts | 3 ++- .../images/theme/gov/icons-arrow-arrow-down.svg | 3 +++ src/assets/images/theme/gov/icons-arrow-forward.svg | 3 +++ .../images/theme/gov/icons-calendar-arrow-left.svg | 3 +++ .../images/theme/gov/icons-calendar-arrow-right.svg | 3 +++ src/assets/images/theme/gov/icons-edit.svg | 8 ++++++++ 36 files changed, 127 insertions(+), 42 deletions(-) create mode 100644 src/assets/images/theme/gov/icons-arrow-arrow-down.svg create mode 100644 src/assets/images/theme/gov/icons-arrow-forward.svg create mode 100644 src/assets/images/theme/gov/icons-calendar-arrow-left.svg create mode 100644 src/assets/images/theme/gov/icons-calendar-arrow-right.svg create mode 100644 src/assets/images/theme/gov/icons-edit.svg diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 385eb23e1..238b5e42c 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -101,7 +101,8 @@
- + +
@@ -122,7 +123,8 @@
- + +
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index a566bfdcc..a2ef20d21 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -20,6 +20,8 @@ import { PermissionService } from 'src/app/services/worker/permission.service'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { PedidoService } from 'src/app/Rules/pedido.service' import { fullTask } from 'src/app/models/dailyworktask.model'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -97,7 +99,8 @@ export class CreateProcessPage implements OnInit { private toastService: ToastService, public p: PermissionService, private despachoService: DespachoService, - private pedidoService: PedidoService + private pedidoService: PedidoService, + public ThemeService: ThemeService ) { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index fea6be656..13b29df72 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -24,7 +24,8 @@
- + +
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 1a1116285..81e57b3ca 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -13,6 +13,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { SearchList } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-delegar', @@ -52,6 +54,7 @@ export class DelegarPage implements OnInit { private alertService: AlertService, private animationController: AnimationController, private toastService: ToastService, + public ThemeService: ThemeService ) { this.task = this.navParams.get('task'); this.postData = new Event(); diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index f34b17ec6..fe1858adb 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -276,7 +276,8 @@
- + +
@@ -297,7 +298,8 @@
- + +
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 947058b71..3d2429b35 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 @@ -17,6 +17,8 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick import { EventsService } from 'src/app/services/events.service'; import { EventService } from 'src/app/services/rules/event.service'; import { EventPipe } from 'src/app/pipes/event.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -96,7 +98,8 @@ export class DocumentSetUpMeetingPage implements OnInit { authService: AuthService, private toastService: ToastService, private calendarService: EventsService, - private eventService: EventService + private eventService: EventService, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; this.document = this.navParams.get('document') diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index b8c0e22b6..837e47811 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -24,7 +24,8 @@
- + +
diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index ede8b6f3b..d56c77b7a 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -15,6 +15,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { SearchList } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-forward', @@ -53,6 +55,7 @@ export class ForwardPage implements OnInit { private alertService: AlertService, private animationController: AnimationController, private toastService: ToastService, + public ThemeService: ThemeService ) { this.task = this.navParams.get('task'); this.postData = new Event(); diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 7be7347da..53e4bfa2b 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -30,7 +30,8 @@
@@ -40,7 +41,8 @@ {{ viewTitle }}
- + +
@@ -99,7 +101,8 @@ -->
- + +
@@ -200,7 +203,8 @@
{{timelineFilterState}}
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 928c7d14f..8073765e1 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -205,7 +205,8 @@
- + +
@@ -226,7 +227,8 @@
- + +
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 37ee65584..8cd58e2f1 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -11,6 +11,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../models/event.model'; import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-edit-event', @@ -56,6 +58,7 @@ export class EditEventPage implements OnInit { private attachmentsService: AttachmentsService, private toastService: ToastService, private router: Router, + public ThemeService: ThemeService ) { this.postEvent = new Event(); diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index b7aa03b6c..5b09bead6 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -209,7 +209,8 @@
- + +
@@ -236,7 +237,8 @@
- + +
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 fb5d5d4e4..2c9954bcd 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -15,6 +15,7 @@ import { SearchPage } from '../../search/search.page'; import { ThemePalette } from '@angular/material/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { EventRecurrence } from 'src/app/models/agenda/eventrecurrence.model'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ @@ -67,6 +68,7 @@ export class NewEventPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, userService: AuthService, + public ThemeService: ThemeService ) { this.loggeduser = userService.ValidatedUser; this.postEvent = new Event(); diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 88e6d3afa..65b1a2ff9 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -23,7 +23,8 @@
- + +
@@ -297,7 +298,8 @@
- + +
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 a563b56ee..7411339b3 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 @@ -19,6 +19,8 @@ import * as _moment from 'moment'; import * as _rollupMoment from 'moment'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { ThemeService } from 'src/app/services/theme.service' + const moment = _rollupMoment || _moment; @@ -125,6 +127,7 @@ export class BookMeetingModalPage implements OnInit { authService: AuthService, private toastService: ToastService, private activatedRoute: ActivatedRoute, + public ThemeService: ThemeService ) { this.taskParticipants = []; this.loggeduser = authService.ValidatedUser; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 3a830460c..8e1c308f6 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -143,7 +143,8 @@
- + +
@@ -164,7 +165,8 @@
- + +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 6e36b5227..66a2f128e 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -22,6 +22,8 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker' import { task } from 'src/app/models/ExpedientTaskModalPage'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -106,7 +108,8 @@ export class ExpedientTaskModalPage implements OnInit { private alertController: AlertService, private userAuth: AuthService, private toastService: ToastService, - private despachoService: DespachoService + private despachoService: DespachoService, + public ThemeService: ThemeService ) { this.loggeduser = userAuth.ValidatedUser; 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 1c484cf20..ce3d140fa 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 @@ -290,7 +290,8 @@
- + +
@@ -311,7 +312,8 @@
- + +
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 347c6d60c..5570ca88b 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 @@ -13,6 +13,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { EventToApproveEdit } from 'src/app/models/event.model'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -125,6 +127,7 @@ export class EditEventToApprovePage implements OnInit { private attachmentsService: AttachmentsService, private processes:ProcessesService, private toastService: ToastService, + public ThemeService: ThemeService ) { this.isEventEdited = false; } 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 7005206c6..6d69a901a 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -230,7 +230,8 @@
@@ -253,7 +254,8 @@
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 ef090f493..682380246 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -12,6 +12,8 @@ import { Attachment } from 'src/app/models/attachment.model'; import { ToastService } from 'src/app/services/toast.service'; 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', @@ -89,6 +91,7 @@ export class EditEventPage implements OnInit { public alertController: AlertController, private attachmentsService: AttachmentsService, private toastService: ToastService, + public ThemeService: ThemeService ) {} ngOnInit() { 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 0dce0afc6..c41132d62 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -248,7 +248,8 @@
- + +
@@ -271,7 +272,8 @@
- + +
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index c3976d055..bcf7d5dc4 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -24,6 +24,8 @@ import { ThemePalette } from '@angular/material/core'; import { ViewChild } from '@angular/core'; import { FormGroup, Validators } from '@angular/forms'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { ThemeService } from 'src/app/services/theme.service' + const moment = _rollupMoment || _moment; @@ -118,6 +120,7 @@ export class NewEventPage implements OnInit { private toastService: ToastService, private userService: AuthService, private dateAdapter: DateAdapter, + public ThemeService: ThemeService // private translate: TranslateService ) { this.dateAdapter.setLocale('pt'); diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index af3cd398f..a9e48023c 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -4,7 +4,8 @@
@@ -13,7 +14,8 @@
- + +
@@ -305,7 +306,8 @@
- + +
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 78837cf93..2c00a6a17 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 @@ -12,7 +12,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { Event, EventToApproveEdit } from '../../../models/event.model'; import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { NavigationExtras, Router } from '@angular/router'; - +import { ThemeService } from 'src/app/services/theme.service' const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -117,6 +117,7 @@ export class EditEventToApproveComponent implements OnInit { private animationController: AnimationController, private toastService: ToastService, private router:Router, + public ThemeService: ThemeService ) { // Edit event to approve this.serialNumber = this.navParams.get('serialNumber'); diff --git a/src/assets/images/theme/gov/icons-arrow-arrow-down.svg b/src/assets/images/theme/gov/icons-arrow-arrow-down.svg new file mode 100644 index 000000000..b464cabbf --- /dev/null +++ b/src/assets/images/theme/gov/icons-arrow-arrow-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-arrow-forward.svg b/src/assets/images/theme/gov/icons-arrow-forward.svg new file mode 100644 index 000000000..177a9f643 --- /dev/null +++ b/src/assets/images/theme/gov/icons-arrow-forward.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-calendar-arrow-left.svg b/src/assets/images/theme/gov/icons-calendar-arrow-left.svg new file mode 100644 index 000000000..e0763dca8 --- /dev/null +++ b/src/assets/images/theme/gov/icons-calendar-arrow-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-calendar-arrow-right.svg b/src/assets/images/theme/gov/icons-calendar-arrow-right.svg new file mode 100644 index 000000000..0c68f3d31 --- /dev/null +++ b/src/assets/images/theme/gov/icons-calendar-arrow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-edit.svg b/src/assets/images/theme/gov/icons-edit.svg new file mode 100644 index 000000000..38611c651 --- /dev/null +++ b/src/assets/images/theme/gov/icons-edit.svg @@ -0,0 +1,8 @@ + + + + + + + +