From 36e84a9eb3e87c37e1d93b436a7c07ad74e8821f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 1 Feb 2021 11:16:15 +0100 Subject: [PATCH 1/6] save --- src/app/pages/agenda/agenda.page.html | 4 ++-- src/app/pages/agenda/agenda.page.ts | 22 ++++++++++++++++--- .../agenda/edit-event/edit-event.page.html | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 236c85eaa..ef10ad7f5 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -36,8 +36,8 @@ - - + + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index fcc8bbe48..240ee011b 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -19,16 +19,18 @@ import { DAYS_OF_WEEK, } from 'angular-calendar'; import { CustomDateFormatter } from './custom-date-formatter.provider'; +import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page'; +import { EventListPage } from '../gabinete-digital/event-list/event-list.page'; @Component({ selector: 'app-agenda', templateUrl: './agenda.page.html', styleUrls: ['./agenda.page.scss'], providers: [ - /* { + { provide: CalendarDateFormatter, useClass: CustomDateFormatter, - }, */ + }, ], }) export class AgendaPage implements OnInit { @@ -216,8 +218,10 @@ export class AgendaPage implements OnInit { // Show information of the event for timeline eventClicked({ event }: { event: CalendarEvent }): void { console.log('Event clicked', event); + this.eventSelectedDate = event.start; - this.router.navigate(["/home/agenda", event.id, 'agenda']); + this.viewEventDetail(event.id); + /* this.router.navigate(["/home/agenda", event.id, 'agenda']); */ } //Show information of the event @@ -536,6 +540,18 @@ export class AgendaPage implements OnInit { }); } + async viewEventsToApprove(){ + const modal = await this.modalCtrl.create({ + component: EventListPage, + componentProps:{ + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + } 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 2244d20fa..45faa3d00 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -37,7 +37,7 @@
- Date: Mon, 1 Feb 2021 12:05:17 +0100 Subject: [PATCH 2/6] Add customization and calendar Pr vision --- package-lock.json | 3 --- src/app/pages/agenda/agenda.page.html | 29 +++++++++++++-------------- src/app/pages/agenda/agenda.page.scss | 14 ++++++++++--- src/app/pages/agenda/agenda.page.ts | 5 ++++- src/global.scss | 2 ++ 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index e71453e96..fad490215 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3072,14 +3072,11 @@ "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" }, -<<<<<<< HEAD "@types/date-fns": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/@types/date-fns/-/date-fns-0.0.2.tgz", "integrity": "sha1-px0uCyq1e7jegchD5ez24WF3m4w=" }, -======= ->>>>>>> 662e62a926fd922d43a5b9de69a7aabbcdaee977 "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 236c85eaa..b7c49d97e 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -20,14 +20,14 @@

{{ viewTitle }}

-
+
@@ -35,7 +35,7 @@ - + @@ -174,6 +174,17 @@
+ + + + + Hoje, {{ timelineDate }} + + +
@@ -187,18 +198,6 @@ - - - - - Hoje, {{ timelineDate }} - - -
Todos
- - - -
Date: Mon, 1 Feb 2021 12:24:24 +0100 Subject: [PATCH 3/6] timeline fix null --- src/app/pages/agenda/agenda.page.html | 2 +- src/app/pages/agenda/agenda.page.ts | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index b7c49d97e..232d2fe5c 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -178,7 +178,7 @@ - Hoje, {{ timelineDate }} + Hoje,   {{ timelineDate }} + >
{{task.CreateDate | date: 'd/M/yy'}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 76a839975..acd02700d 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -16,6 +16,7 @@ import { ProcessesService } from '../../services/processes.service'; import { DailyWorkTask } from '../../models/dailyworktask.model'; import { ViewEventPage } from '../agenda/view-event/view-event.page'; import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page'; +import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; @Component({ selector: 'app-events', @@ -317,11 +318,11 @@ export class EventsPage implements OnInit { }); } - async viewExpedient(serialNumber:any) { + async viewExpedientDetail(serialNumber:any) { console.log(this.profile); const modal = await this.modalController.create({ - component: ExpedientePage, + component: ExpedienteDetailPage, componentProps:{ serialNumber: serialNumber, profile: this.profile, diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 0fdabeb78..5df27b85f 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -50,7 +50,7 @@ - -
-
- + + +
+
+ +
+ Detalhes do Expediente +
+
+ + + +
+
- -
- -
-
- + + + @@ -80,7 +84,7 @@ Data {{ task.CreateDate | date: 'dd-MM-yy | hh:mm'}} - + Ver documento @@ -121,9 +125,12 @@
- + +

{{event.StartDate | date: 'hh:mm'}}

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 580bc51fe..b906a9f52 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -1,3 +1,82 @@ +@import '~src/function.scss'; +.header-toolbar{ + --background:transparent; + --opacity: 1; + + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .header-top{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 280px; + margin: 2.5px 0 0 5px; + display: flex; + align-items: center; + + } + .right{ + padding: 0!important; + float: right; + font-size: 25px; + color: #0782c9; + margin: 5px 0 0 0; + } + } + .header-bottom{ + width: 310px; + overflow: auto; + margin: 0 auto; + + .header-bottom-icon{ + width: 30px; + font-size: 25px; + float: left; + padding: 2px; + + } + .header-bottom-contacts{ + width: 275px; + font-size: 15px; + color: #797979; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + float: left; + padding: 5px; + margin: 1px; + } + } + + .title{ + font-size: 25px; + overflow: auto; + float: left; + } + .div-icon{ + width: 40px; + float: right; + font-size: 35px; + overflow: auto; + padding: 1px; + } + } + } ion-item-group{ margin: 15px; } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index ecc6680a0..1fca509aa 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -7,10 +7,11 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, Router } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { MenuController, ModalController } from '@ionic/angular'; +import { MenuController, ModalController, NavParams } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; +import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; @Component({ selector: 'app-expediente-detail', @@ -19,6 +20,12 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p }) export class ExpedienteDetailPage implements OnInit { + task: any; + fulltask:any; + eventsList: Event[]; + serialnumber:string; + profile: string; + constructor(private activateRoute: ActivatedRoute, private processes:ProcessesService, private iab: InAppBrowser, @@ -27,13 +34,11 @@ export class ExpedienteDetailPage implements OnInit { private menu: MenuController, private router:Router, private modalController: ModalController, - private alertService: AlertService) { } - - task: any; - fulltask:any; - eventsList: Event[]; - serialnumber:string; - profile: string; + private navParams: NavParams, + private alertService: AlertService) { + this,this.serialnumber = this.navParams.get('serialNumber'); + this,this.profile = this.navParams.get('profile'); + } ngOnInit() { this.profile = "mdgpr"; @@ -45,6 +50,8 @@ export class ExpedienteDetailPage implements OnInit { this.LoadTaskDetail(this.serialnumber); this.LoadRelatedEvents(this.serialnumber); }); + this.LoadTaskDetail(this.serialnumber); + this.LoadRelatedEvents(this.serialnumber); } @@ -127,4 +134,23 @@ export class ExpedienteDetailPage implements OnInit { await modal.present(); modal.onDidDismiss(); } + + async viewEventDetail(eventId:any) { + console.log(this.profile); + + const modal = await this.modalController.create({ + component: ViewEventPage, + componentProps:{ + eventId: eventId, + profile: this.profile, + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + if(res){ + } + }); + } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.module.ts b/src/app/pages/gabinete-digital/expediente/expediente.module.ts index 8f7f442d7..960a04fd2 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.module.ts @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { ExpedientePageRoutingModule } from './expediente-routing.module'; import { ExpedientePage } from './expediente.page'; +import { SharedModule } from 'src/app/shared/shared.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + SharedModule, ExpedientePageRoutingModule ], declarations: [ExpedientePage], diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index d655c4c36..91feec0b9 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -1,22 +1,13 @@ - - -
-
- + + +
+
+ +
+ Gabinete Digital +
+
- -
- -
-
- - - - - - Gabinete Digital @@ -55,8 +46,13 @@
--> - + +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss index 71a0a03f8..467df29ea 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss @@ -1,3 +1,82 @@ +@import '~src/function.scss'; +.header-toolbar{ + --background:transparent; + --opacity: 1; + + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .header-top{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 280px; + margin: 2.5px 0 0 5px; + display: flex; + align-items: center; + + } + .right{ + padding: 0!important; + float: right; + font-size: 25px; + color: #0782c9; + margin: 5px 0 0 0; + } + } + .header-bottom{ + width: 310px; + overflow: auto; + margin: 0 auto; + + .header-bottom-icon{ + width: 30px; + font-size: 25px; + float: left; + padding: 2px; + + } + .header-bottom-contacts{ + width: 275px; + font-size: 15px; + color: #797979; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + float: left; + padding: 5px; + margin: 1px; + } + } + + .title{ + font-size: 25px; + overflow: auto; + float: left; + } + .div-icon{ + width: 40px; + float: right; + font-size: 35px; + overflow: auto; + padding: 1px; + } + } + } /* CONTENT */ .item-list-small{ font-size: 11px; diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index c11edd1fb..dd7735e71 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -1,12 +1,13 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { ModalController, NavParams } from '@ionic/angular'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { formatDate } from '@angular/common'; import { LoadingService } from 'src/app/services/loading.service'; +import { ModalController, NavParams } from '@ionic/angular'; +import { ExpedienteDetailPage } from './expediente-detail/expediente-detail.page'; @Component({ selector: 'app-expediente', @@ -16,6 +17,7 @@ import { LoadingService } from 'src/app/services/loading.service'; export class ExpedientePage implements OnInit { segment:string; + profile:string; @ViewChild(CalendarComponent) myCal: CalendarComponent; @@ -23,10 +25,11 @@ export class ExpedientePage implements OnInit { serialNumber:string; constructor( - private modalCtrl: ModalController, + private processes:ProcessesService, + private modalController: ModalController, private navParams: NavParams, - private processes:ProcessesService) { - this.serialNumber = this.navParams.get('serialNumber'); + ) { + this.profile = this.navParams.get('profile'); } ngOnInit() { @@ -61,5 +64,23 @@ export class ExpedientePage implements OnInit { }, 2000); } + async viewExpedientDetail(serialNumber:any) { + console.log(this.profile); + + const modal = await this.modalController.create({ + component: ExpedienteDetailPage, + componentProps:{ + serialNumber: serialNumber, + profile: this.profile, + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + + }); + } + } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index e243f5c28..029286d0e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -49,7 +49,9 @@

{{count_ev_md+count_ev_pr}} Documentos

-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index c2d17e3e9..7932e8caa 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -4,6 +4,7 @@ import { AlertService } from 'src/app/services/alert.service'; import { EventsService } from 'src/app/services/events.service'; import { ModalController } from '@ionic/angular'; import { EventListPage } from './event-list/event-list.page'; +import { ExpedientePage } from './expediente/expediente.page'; @Component({ selector: 'app-gabinete-digital', @@ -14,6 +15,7 @@ export class GabineteDigitalPage implements OnInit { segment:string; showLoader: boolean; + public profile:string; constructor( private processesbackend:ProcessesService, @@ -41,6 +43,8 @@ export class GabineteDigitalPage implements OnInit { count_ev_md=0; ngOnInit() { + //Initialize profile as mdgpr + this.profile = "mdgpr"; this.LoadCounts(); /* this.eventService.getAllMdEvents.subscribe(res=>{ console.log(res); @@ -100,4 +104,17 @@ this.processesbackend.GetActionsList().subscribe(res=>{ modal.onDidDismiss(); } + async openExpedientList(){ + const modal = await this.modalController.create({ + component: ExpedientePage, + componentProps:{ + profile: this.profile, + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + } From 2aeac80a57a06c4c897f549dc3a0a737a06f23a6 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 1 Feb 2021 13:45:40 +0100 Subject: [PATCH 6/6] save --- src/app/pages/gabinete-digital/gabinete-digital.page.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 5aec5c1aa..5273c3948 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -80,7 +80,7 @@ ion-content{ .title-content{ width: 360px; margin: 0px auto; - overflow: auto; + overflow: hidden; padding: 0 !important; background: #ecf8ff; }