From 769a7941ceeec53a083de7ac84c32e377165ad39 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 3 Mar 2021 16:24:16 +0100 Subject: [PATCH] Improve gabinete page --- src/app/pages/agenda/agenda.page.scss | 1 + src/app/pages/agenda/agenda.page.ts | 8 +- .../event-list/event-list.page.ts | 2 +- .../expediente/expediente.page.ts | 2 +- .../gabinete-digital.module.ts | 9 +- .../gabinete-digital.page.html | 160 ++++++++---------- .../gabinete-digital.page.scss | 93 +++++----- .../gabinete-digital/gabinete-digital.page.ts | 56 +++--- .../approve-event/approve-event.component.ts | 2 +- .../event-list/event-list.component.html | 3 + .../event-list/event-list.component.scss | 0 .../event-list/event-list.component.spec.ts | 24 +++ .../event-list/event-list.component.ts | 14 ++ .../expediente/expediente.component.html | 3 + .../expediente/expediente.component.scss | 0 .../expediente/expediente.component.spec.ts | 24 +++ .../expediente/expediente.component.ts | 14 ++ src/global.scss | 6 + src/style/main.scss | 7 +- 19 files changed, 253 insertions(+), 175 deletions(-) create mode 100644 src/app/shared/gabinete-digital/event-list/event-list.component.html create mode 100644 src/app/shared/gabinete-digital/event-list/event-list.component.scss create mode 100644 src/app/shared/gabinete-digital/event-list/event-list.component.spec.ts create mode 100644 src/app/shared/gabinete-digital/event-list/event-list.component.ts create mode 100644 src/app/shared/gabinete-digital/expediente/expediente.component.html create mode 100644 src/app/shared/gabinete-digital/expediente/expediente.component.scss create mode 100644 src/app/shared/gabinete-digital/expediente/expediente.component.spec.ts create mode 100644 src/app/shared/gabinete-digital/expediente/expediente.component.ts diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 9e55f2946..e71c616e2 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -538,6 +538,7 @@ td.monthview-primary-with-event { flex-wrap: wrap; border-top-right-radius: 0px; width: calc(100% - 40%); + border-right: 1px solid #d8d8d8; } } .event-details{ diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 0d3ea798e..73f143d4a 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -247,7 +247,7 @@ export class AgendaPage implements OnInit { profile: this.profile, eventSelectedDate: this.eventSelectedDate, }, - cssClass: 'cal-modal', + cssClass: 'cal-modal modal-desktop', backdropDismiss: false }); @@ -636,7 +636,7 @@ export class AgendaPage implements OnInit { profile: this.profile, eventSelectedDate: this.eventSelectedDate }, - cssClass: 'modal', + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); @@ -679,7 +679,7 @@ export class AgendaPage implements OnInit { componentProps:{ eventId: eventId }, - cssClass: 'modal', + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); @@ -718,7 +718,7 @@ export class AgendaPage implements OnInit { component: EventListPage, componentProps:{ }, - cssClass: 'modal', + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 161b1771e..c2b33546c 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -62,7 +62,7 @@ S componentProps:{ serialNumber: eventSerialNumber, }, - cssClass: 'cal-modal', + cssClass: 'cal-modal modal modal-desktop', backdropDismiss: false }); diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 2ea7f6a3f..67078d349 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -73,7 +73,7 @@ export class ExpedientePage implements OnInit { serialNumber: serialNumber, profile: this.profile, }, - cssClass: 'modal', + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 0a466bead..102fa68dc 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -8,6 +8,9 @@ import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.mod import { GabineteDigitalPage } from './gabinete-digital.page'; import { SharedModule } from 'src/app/shared/shared.module'; + +import { EventListComponent } from 'src/app/shared/gabinete-digital/event-list/event-list.component'; +import { ExpedienteComponent } from 'src/app/shared/gabinete-digital/expediente/expediente.component' /* import { ComponentsModule } from 'src/app/components/components.module'; */ @NgModule({ @@ -18,7 +21,11 @@ import { SharedModule } from 'src/app/shared/shared.module'; SharedModule, GabineteDigitalPageRoutingModule ], - declarations: [GabineteDigitalPage], + declarations: [ + GabineteDigitalPage, + EventListComponent, + ExpedienteComponent + ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class GabineteDigitalPageModule {} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index d4d8b8d8a..1a37d3559 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -1,20 +1,7 @@ - + - - -
-
-
- Gabinete Digital -
- -
-
- - + - + -
-
-
- +
+ +
+ + +
+

Gabinete Digital

+
+
+
+ +
+

Eventos para Aprovação

+

{{count_ev_md+count_ev_pr}} Documentos

+
+
+
+ +
+

Correspondencia

+

{{count_exp_dailywork}} Documentos

+
+
+
+ +
+ +

Pendentes

+

- Documentos

+
+
+
+ +
+

Pedidos de Parecer

+

- Documentos

+
+
+
+ +
+

Pedidos de Deferimento

+

- Documentos

+
+
+
+ +
+

Despachos

+

- Documentos

+
+
+
+ +
+

Diplomas por Validar

+

- Documentos

+
+
-
-

Eventos para Aprovação

-
-
-

{{count_ev_md+count_ev_pr}} Documentos

+ + +
+ 123
-
-
- -
-
-

Correspondencia

-
-
-

{{count_exp_dailywork}} Documentos

-
-
-
-
- -
-
-

Pendentes

-
-
-

- Documentos

-
-
-
-
- -
-
-

Pedidos de Parecer

-
-
-

- Documentos

-
-
-
-
- -
-
-

Pedidos de Deferimento

-
-
-

- Documentos

-
-
-
-
- -
-
-

Despachos

-
-
-

- Documentos

-
-
-
-
- -
-
-

Diplomas por Validar

-
-
-

- Documentos

-
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 5273c3948..c1bd16897 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -65,44 +65,6 @@ ion-content{ } } -.main-header{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background-color: #ecf8ff; - overflow:hidden; - padding: 30px 20px 0px 20px; - color:#000; - transform: translate3d(0, 1px, 0); - - .title-content{ - width: 360px; - margin: 0px auto; - overflow: hidden; - padding: 0 !important; - background: #ecf8ff; - } - .div-title{ - padding: 0!important; - float: left; - } - .title{ - font-size: 25px; - } - .div-icon{ - width: 40px; - float: right; - font-size: 35px; - overflow: auto; - padding: 1px; - } - .div-icon ion-icon{ - float: right; - padding-left: 20px; - } -} /* NEW CSS */ .main-content{ @@ -110,9 +72,14 @@ ion-content{ height: 100%; font-family: Roboto; margin: 0 auto; - background:#ecf8ff;; + background:#ecf8ff; overflow:auto; - padding: 25px 15px 15px 15px; + + border-top-left-radius: 25px; + border-top-right-radius: 25px; + .aside{ + + } } .title-content{ width: 360px; @@ -130,7 +97,6 @@ ion-content{ font-size: 25px; } .div-icon{ - width: 40px; float: right; font-size: 35px; overflow: auto; @@ -148,11 +114,10 @@ ion-content{ float: left; } .exp-card-icon{ - width: 55px; margin: 0 auto; } .exp-card ion-icon{ - font-size: 54px; + font-size: 48px; } .exp-card-title{ font-size: 15px; @@ -181,14 +146,36 @@ ion-content{ letter-spacing: normal; text-align: center; } -.header-title{ - width: 300px; - font-family: Roboto; - font-size: 25px; - margin: 0 5px 0 25px; - padding: 0; - color:#ffffff; - float: left; + + + + +@media only screen and (min-width: 1024px) { + + .main-content{ + .aside{ + width: 340px; + } + .aside-content{ + display: flex !important; + background-color: white; + } + } + + .exp-card{ + margin: 5px auto; + flex-direction: row !important; + width: 300px; + padding-right: 11px; + padding-bottom: 5px; + padding-top: 5px; + height: unset !important; + .exp-card-title{ + flex: 1; + text-align: left; + } + .exp-card-content .title1{ + display: none; + } + } } - - diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index ea64b937a..d0260b8e9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -17,6 +17,11 @@ export class GabineteDigitalPage implements OnInit { showLoader: boolean; public profile:string; + desktopComponent: any = { + showEventList: false, + showExpediente : false + } + constructor( private processesbackend:ProcessesService, private modalController: ModalController, @@ -84,29 +89,40 @@ this.processesbackend.GetActionsList().subscribe(res=>{ } async openEventsToApproveList(segment:any){ - const modal = await this.modalController.create({ - component: EventListPage, - componentProps:{ - segment: segment, - }, - cssClass: 'expedient-task-modal', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); + if( window.innerWidth <= 1024){ + const modal = await this.modalController.create({ + component: EventListPage, + componentProps:{ + segment: segment, + }, + cssClass: 'modal expedient-task-modal modal-desktop', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } else { + + } + } async openExpedientList(){ - const modal = await this.modalController.create({ - component: ExpedientePage, - componentProps:{ - profile: this.profile, - }, - cssClass: 'modal', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); + + if( window.innerWidth <= 1024){ + const modal = await this.modalController.create({ + component: ExpedientePage, + componentProps:{ + profile: this.profile, + }, + cssClass: 'modal modal-desktop', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } else { + + } + } } 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 08874303b..507fd31c9 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -47,7 +47,7 @@ export class ApproveEventComponent implements OnInit { } notImplemented(){ - this.AproveEventEditEvent.emit(this.loadedEvent); + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } close(){ diff --git a/src/app/shared/gabinete-digital/event-list/event-list.component.html b/src/app/shared/gabinete-digital/event-list/event-list.component.html new file mode 100644 index 000000000..66d7b636a --- /dev/null +++ b/src/app/shared/gabinete-digital/event-list/event-list.component.html @@ -0,0 +1,3 @@ +

+ event-list works! +

diff --git a/src/app/shared/gabinete-digital/event-list/event-list.component.scss b/src/app/shared/gabinete-digital/event-list/event-list.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/shared/gabinete-digital/event-list/event-list.component.spec.ts b/src/app/shared/gabinete-digital/event-list/event-list.component.spec.ts new file mode 100644 index 000000000..f0ec73364 --- /dev/null +++ b/src/app/shared/gabinete-digital/event-list/event-list.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EventListComponent } from './event-list.component'; + +describe('EventListComponent', () => { + let component: EventListComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ EventListComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EventListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/gabinete-digital/event-list/event-list.component.ts b/src/app/shared/gabinete-digital/event-list/event-list.component.ts new file mode 100644 index 000000000..240cb96d1 --- /dev/null +++ b/src/app/shared/gabinete-digital/event-list/event-list.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-event-list', + templateUrl: './event-list.component.html', + styleUrls: ['./event-list.component.scss'], +}) +export class EventListComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/shared/gabinete-digital/expediente/expediente.component.html b/src/app/shared/gabinete-digital/expediente/expediente.component.html new file mode 100644 index 000000000..41a829ae2 --- /dev/null +++ b/src/app/shared/gabinete-digital/expediente/expediente.component.html @@ -0,0 +1,3 @@ +

+ expediente works! +

diff --git a/src/app/shared/gabinete-digital/expediente/expediente.component.scss b/src/app/shared/gabinete-digital/expediente/expediente.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/shared/gabinete-digital/expediente/expediente.component.spec.ts b/src/app/shared/gabinete-digital/expediente/expediente.component.spec.ts new file mode 100644 index 000000000..3c03113fc --- /dev/null +++ b/src/app/shared/gabinete-digital/expediente/expediente.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ExpedienteComponent } from './expediente.component'; + +describe('ExpedienteComponent', () => { + let component: ExpedienteComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ExpedienteComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ExpedienteComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/gabinete-digital/expediente/expediente.component.ts b/src/app/shared/gabinete-digital/expediente/expediente.component.ts new file mode 100644 index 000000000..632c47e18 --- /dev/null +++ b/src/app/shared/gabinete-digital/expediente/expediente.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-expediente', + templateUrl: './expediente.component.html', + styleUrls: ['./expediente.component.scss'], +}) +export class ExpedienteComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/global.scss b/src/global.scss index e90076c2e..71761b3f8 100644 --- a/src/global.scss +++ b/src/global.scss @@ -279,6 +279,12 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- } } +.modal-width-100{ + .modal-wrapper{ + width: 100%; + } +} + .profile-modal{ .modal-wrapper{ diff --git a/src/style/main.scss b/src/style/main.scss index c6e3af376..f9b9a422e 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -321,4 +321,9 @@ .font-#{$i} { font-size: #{$i}px ; } - } \ No newline at end of file + } + + +.text-center{ + text-align: center; +} \ No newline at end of file