From c13080d2adeaded0769e72e4f32b22e4403581fa Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 21 Sep 2021 10:04:42 +0100 Subject: [PATCH] add change year and month button --- src/app/pages/agenda/agenda.page.html | 56 +++++++++++++- src/app/pages/agenda/agenda.page.scss | 47 ++++++++++++ src/app/pages/agenda/agenda.page.ts | 75 +++++++++++++++---- src/app/pages/events/events.page.html | 12 +-- src/app/pages/events/events.page.ts | 3 + .../list-box.service.spec.ts | 0 .../{ageanda => agenda}/list-box.service.ts | 0 .../group-messages/group-messages.module.ts | 3 + src/plugin/momentG.js | 2 + 9 files changed, 172 insertions(+), 26 deletions(-) rename src/app/services/{ageanda => agenda}/list-box.service.spec.ts (100%) rename src/app/services/{ageanda => agenda}/list-box.service.ts (100%) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 6711edcf9..d1b28a770 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -35,8 +35,60 @@ -

{{ viewTitle }}

- - @@ -44,8 +42,6 @@
- -
- +
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 273348121..8beaab76f 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -65,6 +65,9 @@ export class EventsPage implements OnInit { toDayEventStorage = ToDayEventStorage expedienteGdStore = ExpedienteGdStore + + pdfSrc = "https://www.tabularium.pt/file-upload/FSovLiyEa8Hqy2iDA/TK-Justificativo.pdf"; + expedienteTaskPipe = new ExpedienteTaskPipe() @Output() openExpedientListPage:EventEmitter = new EventEmitter(); diff --git a/src/app/services/ageanda/list-box.service.spec.ts b/src/app/services/agenda/list-box.service.spec.ts similarity index 100% rename from src/app/services/ageanda/list-box.service.spec.ts rename to src/app/services/agenda/list-box.service.spec.ts diff --git a/src/app/services/ageanda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts similarity index 100% rename from src/app/services/ageanda/list-box.service.ts rename to src/app/services/agenda/list-box.service.ts diff --git a/src/app/shared/chat/group-messages/group-messages.module.ts b/src/app/shared/chat/group-messages/group-messages.module.ts index 0e76cfcae..da3bacc59 100644 --- a/src/app/shared/chat/group-messages/group-messages.module.ts +++ b/src/app/shared/chat/group-messages/group-messages.module.ts @@ -11,6 +11,7 @@ import { SharedModule } from 'src/app/shared/shared.module'; import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.module'; import { NewEventPageModule } from '../../agenda/new-event/new-event.module'; +import { PdfViewerModule } from 'ng2-pdf-viewer'; @NgModule({ imports: [ @@ -19,6 +20,8 @@ import { NewEventPageModule } from '../../agenda/new-event/new-event.module'; IonicModule, ChatPopoverPageModule, GroupMessagesPageRoutingModule, + // + PdfViewerModule ], exports: [GroupMessagesPage], declarations: [GroupMessagesPage] diff --git a/src/plugin/momentG.js b/src/plugin/momentG.js index dedd24f3a..8b7ff0970 100644 --- a/src/plugin/momentG.js +++ b/src/plugin/momentG.js @@ -29,6 +29,8 @@ class momentG { let toChange = {} + // console.log(date.getDay(), date.getDay(), date.getMonth()) + var e = { d : (date.getDate()).toString() , M : (date.getMonth()).toString() ,