From 9cf58692fbff5ea1c6b2d0fe9823e1b65c89d8b0 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 10 Jun 2021 23:24:42 +0100 Subject: [PATCH 01/14] route problem solved --- src/app/home/home-routing.module.ts | 13 +++++- .../agenda/view-event/view-event.page.html | 2 +- .../agenda/view-event/view-event.page.ts | 27 +++++++++-- src/app/pages/events/events.page.ts | 46 ++++--------------- .../expediente-detail.page.ts | 3 +- src/app/pages/search/search.page.scss | 11 +++-- 6 files changed, 54 insertions(+), 48 deletions(-) diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index c12caa219..8bec22b78 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -25,12 +25,23 @@ const routes: Routes = [ }, { path:':eventId/:caller', - loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule), + loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule), }, { path:':SerialNumber/:caller', loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule), }, + { + path:'expediente', + children: [ + { + path:':SerialNumber/:caller', + loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule) + }, + ] + }, + + ] }, { 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 413857720..e14fa19e3 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -8,7 +8,7 @@
-
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index f1cc51568..53794d8fd 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -12,7 +12,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; @Component({ selector: 'app-view-event', @@ -51,18 +51,25 @@ export class ViewEventPage implements OnInit { private iab: InAppBrowser, private processes: ProcessesService, public popoverController: PopoverController, - private activatedRoute: ActivatedRoute, + private activatedRoute: ActivatedRoute, + private router: Router, ) { this.isEventEdited = false; this.loadedEvent = new Event(); this.eventBody = { BodyType : "1", Text : ""}; this.loadedEvent.Body = this.eventBody; - /* this.eventId = this.navParams.get('eventId'); */ this.activatedRoute.paramMap.subscribe(paramMap =>{ this.eventId = paramMap['params'].eventId; }); + + /* this.activatedRoute.queryParams.subscribe(params => { + if(params["eventId"]) { + this.eventId = params["eventId"]; + console.log(params["eventId"]); + } + }); */ } @@ -82,10 +89,22 @@ export class ViewEventPage implements OnInit { } close(){ - /* console.log(this.isEventEdited); */ + this.modalController.dismiss(this.isEventEdited); } + goBack() { + this.activatedRoute.paramMap.subscribe(params => { + this.router.navigate(['/home',params["params"].caller]); + }); + + /* this.activatedRoute.queryParams.subscribe(params => { + if(params["caller"]) { + this.router.navigate(['/home',params["caller"]]); + } + }); */ + } + loadEvent(){ this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index d41e93e91..779851bbe 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/core'; +import { Component, OnInit, LOCALE_ID, EventEmitter, Output, Renderer2, ElementRef } from '@angular/core'; import { Event } from '../../models/event.model'; import { EventsService } from 'src/app/services/events.service'; @@ -65,7 +65,8 @@ export class EventsPage implements OnInit { loggeduser: User; - constructor(private eventService: EventsService, + constructor( + private eventService: EventsService, private router: Router, private storageService:StorageService, public activatedRoute: ActivatedRoute, @@ -73,7 +74,8 @@ export class EventsPage implements OnInit { private authService: AuthService, private processes:ProcessesService, /* private gabineteService: GabineteDigitalPage, */ - private modalController:ModalController) { + private modalController:ModalController, + ) { this.loggeduser = authService.ValidatedUser; @@ -273,37 +275,7 @@ export class EventsPage implements OnInit { } goToEvent(eventId:any){ - let navigationExtras: NavigationExtras = { - queryParams: { - "eventId": eventId, - "caller": "agenda" - } - }; - this.router.navigate(['/home/agenda', eventId, 'events']); - } - - async viewEventDetail(eventId:any) { - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - const modal = await this.modalController.create({ - component: ViewEventPage, - componentProps:{ - eventId: eventId, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - if(res){ - console.log(res); - this.RefreshEvents(); - } - }); + this.router.navigate(['/home/events', eventId, 'events']); } @@ -334,14 +306,14 @@ export class EventsPage implements OnInit { }); } - goToExpediente(serialNumber:any){ + goToExpediente(SerialNumber:any){ let navigationExtras: NavigationExtras = { queryParams: { - "serialNumber": serialNumber, + "serialNumber": SerialNumber, "caller": "agenda" } }; - this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'events']); + this.router.navigate(['/home/events/expediente', SerialNumber, 'events']); } async viewExpedientDetail(serialNumber:any) { 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 46625566f..619d247c8 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 @@ -75,11 +75,12 @@ export class ExpedienteDetailPage implements OnInit { this.activateRoute.paramMap.subscribe(paramMap => { if (!paramMap["params"].SerialNumber) { + console.log('HERE'); + return; } console.log(paramMap); - /* this.serialnumber = paramMap.get('SerialNumber'); */ this.LoadTaskDetail(this.serialnumber); this.LoadRelatedEvents(this.serialnumber); }); diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 4a61760e4..31d1969c4 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -13,15 +13,18 @@ padding-right: 10px; } .btn-modal-dismiss{ + display: flex; width: 50px !important; - + height: fit-content; padding: 0 !important; margin: 0 !important; margin-left: 25px !important; - /* border: 1px solid red; */ + margin-top: 5px !important; + align-content: center; + align-items: center; - btn-modal-dismiss icon{ - font-size: 45px !important; + ion-icon{ + font-size: 32pt !important; } } .ion-align-content-center{ From 9b95631df1cf78860befa60ac8181d7a6059cddf Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 11 Jun 2021 00:15:26 +0100 Subject: [PATCH 02/14] save --- src/app/home/home-routing.module.ts | 8 +------- src/app/pages/agenda/edit-event/edit-event.page.html | 4 ++-- src/app/pages/events/attendees/attendees.page.html | 8 ++++---- .../shared/event/attendee-modal/attendee-modal.page.html | 8 ++++---- src/global.scss | 5 +++-- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 8bec22b78..b041b09c0 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -27,21 +27,15 @@ const routes: Routes = [ path:':eventId/:caller', loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule), }, - { - path:':SerialNumber/:caller', - loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule), - }, { path:'expediente', children: [ { path:':SerialNumber/:caller', - loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule) + loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule), }, ] }, - - ] }, { 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 74f7a8c1c..d56dcd8d8 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -177,8 +177,8 @@
-
- +
+
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index dc05fb3dc..179d98509 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -12,7 +12,7 @@
- +
@@ -20,7 +20,7 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
+
@@ -41,7 +41,7 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
+
@@ -59,7 +59,7 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
+
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index b0d1bbf8c..d0f026983 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -12,7 +12,7 @@
- +
@@ -20,7 +20,7 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
+
@@ -41,7 +41,7 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
+
@@ -59,7 +59,7 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
+
diff --git a/src/global.scss b/src/global.scss index 1c3077cc9..b87d14657 100644 --- a/src/global.scss +++ b/src/global.scss @@ -284,7 +284,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .modal-desktop{ .modal-wrapper{ - width: 100%; + max-width: 1466px !important; height: 100%; } } @@ -631,7 +631,8 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- // center -app-approve-event ion-content .main-content{ +app-approve-event ion-content .main-content, +app-view-event ion-content .main-content{ max-width: 1366px !important; margin: 0px auto !important; } From 53702ec18bffaa6823a7c098015e6f2308ea23e7 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 11 Jun 2021 10:10:57 +0100 Subject: [PATCH 03/14] save --- src/app/pages/gabinete-digital/pendentes/pendentes.page.ts | 5 +++-- src/app/shared/gabinete-digital/pendentes/pendentes.page.ts | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 4c7d0d072..9ef217a0d 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -173,14 +173,15 @@ export class PendentesPage implements OnInit { } goToExpediente(serialNumber:any){ - let navigationExtras: NavigationExtras = { + /* let navigationExtras: NavigationExtras = { queryParams: { "serialNumber": serialNumber, "from": "pendentes", "type": "pendentes" } }; - this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); + this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); */ + this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 416b07535..540687507 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -173,7 +173,7 @@ export class PendentesPage implements OnInit { goToExpediente(serialNumber:any){ - let navigationExtras: NavigationExtras = { + /* let navigationExtras: NavigationExtras = { queryParams: { "serialNumber": serialNumber, "from": "gabinete", @@ -181,7 +181,8 @@ export class PendentesPage implements OnInit { } } - this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras) + this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras) */ + this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } From e3ccd87ee0257bfddcfcf97679ee6415781f496f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 11 Jun 2021 10:47:18 +0100 Subject: [PATCH 04/14] save --- src/app/pages/events/events.page.html | 11 --- src/app/pages/events/events.page.ts | 90 +------------------ .../pendentes/pendentes.page.ts | 12 +-- .../expedients/expedients.page.ts | 29 ------ .../pendentes/pendentes.page.ts | 13 +-- 5 files changed, 5 insertions(+), 150 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index a85775c8a..dcc5c5cf7 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -27,17 +27,6 @@ - -
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 779851bbe..5508e2f65 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -236,16 +236,6 @@ export class EventsPage implements OnInit { modal.onDidDismiss(); } - async openEventDetail(id:any) { - const modal = await this.modalController.create({ - component: EventDetailModalPage, - componentProps: { - eventId: id, - }, - cssClass: 'my-custom-class' - }); - return await modal.present(); - } LoadList(){ switch (this.loggeduser.Profile) { @@ -260,12 +250,10 @@ export class EventsPage implements OnInit { this.expedientList = result.reverse(); console.log(this.expedientList); }); - break; - + break; default: break; } - } sortArrayISODate(myArray: any){ @@ -278,93 +266,19 @@ export class EventsPage implements OnInit { this.router.navigate(['/home/events', eventId, 'events']); } - - async editEventDetail(eventId:any) { - - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - const modal = await this.modalController.create({ - component: EventEditPage, - componentProps:{ - eventId: eventId, - profile: this.profile, - }, - cssClass: classs, - }); - - await modal.present(); - modal.onDidDismiss().then((res)=>{ - if(res){ - console.log(res); - this.RefreshEvents(); - } - }); - } - goToExpediente(SerialNumber:any){ - let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": SerialNumber, - "caller": "agenda" - } - }; this.router.navigate(['/home/events/expediente', SerialNumber, 'events']); } - async viewExpedientDetail(serialNumber:any) { - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - const modal = await this.modalController.create({ - component: ExpedienteDetailPage, - componentProps:{ - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - if(res){ - /* console.log(res); */ - this.RefreshEvents(); - } - }); - } - viewExpedientListPage(){ if( window.innerWidth <= 1024){ - this.openExpedientList(); + this.router.navigate(['/home/gabinete-digital/expediente']); } else{ let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,} }; this.router.navigate(['/home/gabinete-digital'], navigationExtras); } } - - async openExpedientList(){ - - - const modal = await this.modalController.create({ - component: ExpedientePage, - componentProps:{ - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss(); - } - } diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 9ef217a0d..ede493f6a 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -173,16 +173,8 @@ export class PendentesPage implements OnInit { } goToExpediente(serialNumber:any){ - /* let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": serialNumber, - "from": "pendentes", - "type": "pendentes" - } - }; - this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); */ - this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); - } + this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); + } async openDespacho(serialNumber:string){ diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 69acf33a4..b709a7ceb 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -92,41 +92,12 @@ export class ExpedientsPage implements OnInit { doRefresh() { console.log('refresh expedientes1'); - this.LoadList(); - - setTimeout(() => { - }, 2000); } goToExpediente(serialNumber:any){ - let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": serialNumber, - "from": "gabinete", - "type": "pendentes" - } - }; this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } - async viewExpedientDetail(serialNumber:any) { - console.log(this.profile); - const modal = await this.modalController.create({ - component: ExpedienteDetailPage, - componentProps:{ - enterAnimation: "", - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log('refresh list'); - this.LoadList(); - }); - } - } \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 540687507..b8fe76c37 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -172,20 +172,9 @@ export class PendentesPage implements OnInit { } goToExpediente(serialNumber:any){ - - /* let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": serialNumber, - "from": "gabinete", - "type": "pendentes" - } + this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } - this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras) */ - this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); - - } - async openDespacho(serialNumber:string){ const modal = await this.modalController.create({ From ed65ac2d6a24cbd15387c0768afac1d963114b05 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 11 Jun 2021 10:54:38 +0100 Subject: [PATCH 05/14] save --- src/app/pages/agenda/agenda.page.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index d24fa5631..099a79925 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -657,8 +657,6 @@ export class AgendaPage implements OnInit { case "Pessoal": //Inicializa o array eventSource - alert('pessoal') - if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') { this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { From a289b07497d171637c8c7ca7343aeb00cf20e61e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 11 Jun 2021 11:07:10 +0100 Subject: [PATCH 06/14] Scroll --- src/app/pages/agenda/agenda.page.html | 6 +++--- src/app/pages/agenda/agenda.page.scss | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index bda24ae27..5935ca6e7 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -213,7 +213,7 @@
--> -
+
@@ -254,7 +254,7 @@
-
+
@@ -292,7 +292,7 @@
-
+
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 9228e1166..332dd05fc 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -63,11 +63,11 @@ ion-slide{ padding: 0 !important; background: #ecf8ff; } - .div-title{ + .div-title { padding: 0!important; float: left; } - .title{ + .title { font-size: 25px; } .div-icon{ @@ -698,4 +698,9 @@ app-approve-event{ display: flex; align-items: center; height: 100%; -} \ No newline at end of file +} + + +.fs-timeline { + border-right: 2px solid #909090; +} From 810e10b65b8e808f2a9137d8e9505d75c33817ed Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 11 Jun 2021 11:26:25 +0100 Subject: [PATCH 07/14] Improve search --- src/app/pages/agenda/agenda.page.html | 6 +++--- src/app/pages/search/search.page.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 5935ca6e7..26c0a87d3 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -171,7 +171,7 @@
-
+
-
+
-
@@ -38,8 +7,8 @@
-
- {{loadedEvent.Subject}} +
+

{{loadedEvent.Subject}}

@@ -49,7 +18,6 @@ -
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 5202cb708..4de679580 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -4,10 +4,9 @@ ion-content{ --padding-start: 20px; --padding-end: 20px; font-size: 18px; + overflow: auto; } -ion-menu{ - - } + .header-toolbar{ --background:transparent; --opacity: 1; @@ -22,11 +21,14 @@ ion-menu{ padding: 30px 0px 0px 0px; color:#000; transform: translate3d(0, 1px, 0); + overflow: auto; .title-content{ + width: 100% !important; margin: 0px auto; padding: 0 !important; background: #fff; + overflow: auto; .left{ width: 37px; @@ -35,10 +37,17 @@ ion-menu{ } .middle{ - padding: 0 0 0 10px !important; - float: left; - margin: 2.5px 0 0 0; + width: calc(100% - 138.5px) !important; + padding: 0 !important; + float: left; + margin: 0 !important; + overflow: auto; + + p{ + margin: 0 !important; } + } + .header-icon-right{ width: 45px; font-size: 45px; @@ -46,14 +55,15 @@ ion-menu{ } .div-icon{ - width: 136px; + width: fit-content; + height: fit-content; display: flex; align-items: flex-start; - justify-content: start; + justify-content:flex-start; float: right; padding: 1px !important; top: 0 !important; - margin: 0 !important; + margin: 0 0 0 15px !important; } .div-icon .edit{ @@ -81,10 +91,13 @@ ion-menu{ margin: 0 auto; background-color: #fff; padding: 15px 0px 0 0px; + overflow: auto !important; .upper-content{ - margin-left: 50px; - font-size: 18px; + width: calc(100%-50px); + margin-left: 50px; + font-size: 18px; + overflow: auto; .content-location{ width: 100%; @@ -92,12 +105,13 @@ ion-menu{ padding: 0 !important; overflow: auto; - .date{ + width: calc(100% - 105px); float: left; } .label{ + width: fit-content; border-radius: 20px; background: #ffb703; float: right !important; @@ -128,10 +142,14 @@ ion-menu{ } } .line{ + width: 100% !important; margin-top: 15px; border-top: 1px solid #d8d8d8; } - .middle-conten{ + .middle-content{ + width: 100% !important; + overflow: auto; + .middle-content h3, .middle-content p{ font-size: 16px; } From 1788eeec5a77ea397aeea53d179fa031ab802a7a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 11 Jun 2021 14:05:17 +0100 Subject: [PATCH 12/14] Improve --- .../expediente/book-meeting-modal/book-meeting-modal.page.ts | 2 +- src/global.scss | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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 29dc86172..f30920797 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 @@ -382,7 +382,7 @@ export class BookMeetingModalPage implements OnInit { componentProps: { message: message || 'Processo não efetuado' , }, - cssClass: 'modal modal-desktop' + cssClass: 'notification-modal' }); modal.present() diff --git a/src/global.scss b/src/global.scss index 24093d71a..9428fbef0 100644 --- a/src/global.scss +++ b/src/global.scss @@ -824,8 +824,6 @@ ion-icon{ } - - .hide-scroll::-webkit-scrollbar { display: none !important; } From b2723f2f89855d25d78cd55276d46d05394676d5 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 11 Jun 2021 15:38:08 +0100 Subject: [PATCH 13/14] save --- .../agenda/view-event/view-event.page.html | 6 +-- .../agenda/view-event/view-event.page.scss | 41 +++++++++++++++---- .../agenda/view-event/view-event.page.html | 2 +- 3 files changed, 37 insertions(+), 12 deletions(-) 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 e14fa19e3..fbff5023d 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -12,10 +12,10 @@
-
- {{loadedEvent.Subject}} +
+

{{loadedEvent.Subject}}

-
+
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 96ecbac6d..7a51dd599 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -5,6 +5,7 @@ ion-content{ --padding-start: 20px; --padding-end: 20px; font-size: 18px; */ + overflow: auto; } ion-menu{ --height: 225px; @@ -14,15 +15,18 @@ ion-menu{ --opacity: 1; } .main-header{ + width: 100%; /* 400px */ font-family: Roboto; background-color: #fff; color:#000; transform: translate3d(0, 1px, 0); .title-content{ + width: 100% !important; margin: 0px auto; - overflow: auto; + padding: 0 !important; background: #fff; + overflow: auto; .left{ width: 37px; @@ -30,19 +34,29 @@ ion-menu{ font-size: 35px; } .middle{ - //width: 230px; - padding: 0!important; - float: left; - //margin: 2.5px 0 0 0; + width: calc(100% - 138.5px) !important; + padding: 0 !important; + float: left; + margin: 0 !important; + overflow: auto; + + p{ + margin: 0 !important; } + } .header-icon-right{ width: 45px; font-size: 45px; float: right; } .menu-options{ + width: fit-content; + height: fit-content; + align-items: flex-start; + justify-content: flex-start; float: right; padding: 1px; + margin-left: 15px; } .menu-options .edit{ font-size: 35px; @@ -64,6 +78,7 @@ ion-menu{ } .main-content{ + width: 100%; font-family: Roboto; background-color: #fff !important; border-top-left-radius: 25px; @@ -77,15 +92,21 @@ ion-menu{ } .upper-content{ - margin-left: 50px; - overflow: auto; - font-size: 18px; + width: calc(100%-50px); + margin-left: 50px; + overflow: auto; + font-size: 18px; .content-location{ width: 100%; margin: 0 auto; padding: 0; overflow: auto; + + .date{ + width: calc(100% - 105px); + float: left; + } .label{ border-radius: 20px; @@ -149,10 +170,14 @@ ion-menu{ } } .line{ + width: 100% !important; margin-top: 15px; border-top: 1px solid #d8d8d8; } .middle-conten{ + width: 100% !important; + overflow: auto; + .middle-content h3, .middle-content p{ font-size: 16px; } 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 6f93a5214..3719467ba 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -7,7 +7,7 @@
-
+

{{loadedEvent.Subject}}

From 5fe02d1040c6c2d560a793c6009fbeef7dd9e743 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 11 Jun 2021 15:50:03 +0100 Subject: [PATCH 14/14] save --- src/app/shared/agenda/view-event/view-event.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3719467ba..6f93a5214 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -7,7 +7,7 @@
-
+

{{loadedEvent.Subject}}