From f19b1a3397c3c1dd2e647463835db0aa4d7c3c2c Mon Sep 17 00:00:00 2001 From: "gilson.manuel" Date: Wed, 7 Apr 2021 12:27:20 +0100 Subject: [PATCH 1/4] save --- src/app/pages/events/events.page.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 9e42d1831..3263e4690 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -34,7 +34,6 @@

{{totalEvent}} eventos agendados para hoje

 -
{{currentHoursMinutes | date: 'HH:mm'}}
"{{currentEvent}}"
From 4f0ee6047a96ef7cb75f76efee93ddcd7f6c694d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 14:07:50 +0100 Subject: [PATCH 2/4] save --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index d29307cc4..4c8e1798a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -13,6 +13,7 @@

Gabinete Digital

+
From ffe95fc190b847c5300f0ee1ffbf7c98a18a58cd Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 14:08:05 +0100 Subject: [PATCH 3/4] save --- src/app/home/home-routing.module.ts | 4 +++ .../emend-message-modal.page.ts | 6 ++-- .../gabinete-digital/gabinete-digital.page.ts | 31 ++++++++++++++++--- .../approve-event/approve-event.component.ts | 16 ++++++++-- .../agenda/new-event/new-event.component.ts | 2 +- 5 files changed, 50 insertions(+), 9 deletions(-) diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 75c242352..34837370e 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -76,6 +76,10 @@ const routes: Routes = [ path: 'edit-event', loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule) }, + { + path: 'emend-message-modal', + loadChildren: () => import('../pages/agenda/emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule) + }, ] }, { diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts index 937b1c0f2..bec2232f3 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts @@ -11,12 +11,14 @@ export class EmendMessageModalPage implements OnInit { constructor( private modalController: ModalController, - ) { } + ) { + this.emendMessage = ''; + } ngOnInit() { } close(){ - this.modalController.dismiss(this.emendMessage); + this.modalController.dismiss(); } save(){ this.modalController.dismiss(this.emendMessage); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 692d35783..07e3f3810 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -5,7 +5,7 @@ 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'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; @Component({ selector: 'app-gabinete-digital', @@ -44,7 +44,8 @@ export class GabineteDigitalPage implements OnInit { private processesbackend:ProcessesService, private modalController: ModalController, private alertService: AlertService, - private route: ActivatedRoute, + private activatedRoute: ActivatedRoute, + private router: Router, ) { window.onresize = (event) => { @@ -57,10 +58,23 @@ export class GabineteDigitalPage implements OnInit { this.adjastModalHeight(); - this.route.queryParams.subscribe(params => { + /* this.activatedRoute.queryParams.subscribe(params => { if(params["show"]){ this.openExpedientListPage(); - } + } + else if(params["events-to-approve"]){ + this.openEventsToApprovePage("MDGPR"); + } + }); */ + + this.activatedRoute.paramMap.subscribe(paramMap =>{ + if (paramMap.has("show")){ + this.openExpedientListPage(); + } + else if(paramMap.has("events")){ + this.openEventsToApprovePage("MDGPR"); + this.LoadCounts(); + } }); } @@ -93,6 +107,15 @@ export class GabineteDigitalPage implements OnInit { ngOnInit() { //Initialize profile as mdgpr this.profile = "MDGPR"; + + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == this.router.url) { + this.LoadCounts(); + } + }); + + + this.LoadCounts(); /* this.eventService.getAllMdEvents.subscribe(res=>{ console.log(res); diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts index b67787367..3c2eb46e0 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; -import { Router } from '@angular/router'; +import { NavigationExtras, Router } from '@angular/router'; import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { Event } from 'src/app/models/event.model'; import { AlertService } from 'src/app/services/alert.service'; @@ -136,6 +136,8 @@ export class ApproveEventComponent implements OnInit { await modal.present(); modal.onDidDismiss().then(res => { + console.log(res.data); + if(res.data !== ''){ let body = { "serialNumber": serialNumber, "action": "Emendar", @@ -145,8 +147,9 @@ export class ApproveEventComponent implements OnInit { } console.log(body); this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); + //this.router.navigate(['/home/gabinete-digital/event-list']); this.alertService.presentAlert('Operação realizada com sucesso!'); + this.goToEventsToApprove(); } else{ this.alertService.presentAlert('Operação cancelada!'); @@ -154,4 +157,13 @@ export class ApproveEventComponent implements OnInit { }); } + goToEventsToApprove(){ + let navigationExtras: NavigationExtras = { + queryParams: { + "events": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts index 1e0375581..91a55acca 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.component.ts @@ -58,7 +58,7 @@ export class NewEventPage implements OnInit { Body: this.eventBody, Location: '', CalendarId: '', - CalendarName: this.selectedSegment, + CalendarName: '', StartDate: selectedStartdDate, EndDate: new Date(selectedEndDate), EventType: 'Reunião', From 87b17e09f3ad495e5c4f8c40f0b6cd943d00ce66 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 15:01:03 +0100 Subject: [PATCH 4/4] save --- .../emend-message-modal/emend-message-modal.page.html | 10 +++------- .../emend-message-modal/emend-message-modal.page.scss | 9 ++++++++- .../emend-message-modal/emend-message-modal.page.ts | 2 +- .../pages/gabinete-digital/gabinete-digital.page.html | 5 ++++- .../pages/gabinete-digital/gabinete-digital.page.scss | 9 +++++++++ .../pages/gabinete-digital/gabinete-digital.page.ts | 2 ++ .../events-to-approve/events-to-approve.page.html | 5 ++++- .../events-to-approve/events-to-approve.page.scss | 9 +++++++++ 8 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index cccbb6bd7..48207f9d6 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -15,12 +15,8 @@ - -
- - Cancelar - Gravar - +
+ +
- diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss index 54851ac15..58229d622 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss @@ -1,5 +1,5 @@ .header-content{ - width: 360px; + //width: 360px; overflow: auto; margin: 25px auto; } @@ -38,4 +38,11 @@ border-radius: 22.5px; --background: #42b9fe; margin: 0 0px 0 12px; + } + .buttons{ + display: flex; + width: 100% !important; + justify-content: space-between; + padding: 15px; + overflow: auto; } \ No newline at end of file diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts index bec2232f3..241c43cb1 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts @@ -18,7 +18,7 @@ export class EmendMessageModalPage implements OnInit { ngOnInit() { } close(){ - this.modalController.dismiss(); + this.modalController.dismiss(''); } save(){ this.modalController.dismiss(this.emendMessage); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 4c8e1798a..1ead4f280 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -12,7 +12,10 @@
-

Gabinete Digital

+
+ Gabinete Digital + +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 16aecaf24..438588a29 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -11,6 +11,15 @@ ion-content{ ion-card-title{ text-align: center; } + .title-container{ + margin-bottom: 15px; + .title-icon{ + float: right; + margin-right: 20px; + font-size: 30px; + color: #0782c9; + } + } ion-card{ background-color: #d4d5ca; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 07e3f3810..be7cb9a58 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -160,6 +160,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{ } doRefresh(event) { + this.closeAllDesktopComponents(); + this.showEmptyContainer = true; this.LoadCounts(); setTimeout(() => { diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 77933ac48..dfa1cf7bb 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -1,6 +1,9 @@
- +
+ + +
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss index 7727a9871..3ccafbb04 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss @@ -2,6 +2,15 @@ padding: 30px 20px 0 20px !important; margin: 0; } +.title-container{ + margin-bottom: 15px; + .title-icon{ + float: right; + margin-right: 20px; + font-size: 30px; + color: #0782c9; + } +} .title{ font-family: Roboto; font-size: 25px;