From 6e273e6eb888c4fd5da4c6628ba8661be7f247db Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Mon, 17 Aug 2020 18:11:26 +0100 Subject: [PATCH] built the gabinete-digital-menu page --- src/app/app-routing.module.ts | 8 ++- src/app/home/home-routing.module.ts | 4 ++ src/app/home/home.page.html | 8 +-- src/app/pages/feed/feed.page.html | 4 +- .../gabinete-digital-menu-routing.module.ts | 17 ++++++ .../gabinete-digital-menu.module.ts | 20 +++++++ .../gabinete-digital-menu.page.html | 53 +++++++++++++++++++ .../gabinete-digital-menu.page.scss | 29 ++++++++++ .../gabinete-digital-menu.page.spec.ts | 24 +++++++++ .../gabinete-digital-menu.page.ts | 19 +++++++ .../gabinete-digital.page.html | 4 +- .../gabinete-digital.page.scss | 26 +++++---- src/theme/variables.scss | 8 +++ 13 files changed, 202 insertions(+), 22 deletions(-) create mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu-routing.module.ts create mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.module.ts create mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.html create mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.scss create mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.spec.ts create mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c6eb6f97c..469afe7a4 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -14,8 +14,14 @@ const routes: Routes = [ path: 'cal-modal', loadChildren: () => import('./pages/cal-modal/cal-modal.module').then( m => m.CalModalPageModule) }, + /* + { + path: 'gabinete-digital-menu', + loadChildren: () => import('./pages/gabinete-digital-menu/gabinete-digital-menu.module').then( m => m.GabineteDigitalMenuPageModule) + }, -/* { + + { path: 'view-event', loadChildren: () => import('./pages/view-event/view-event.module').then( m => m.ViewEventPageModule) }, */ diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 34981549d..da1b48233 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -28,6 +28,10 @@ const routes: Routes = [ path: 'gabinete-digital', loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule) }, + { + path: 'gabinete-digital-menu', + loadChildren: ()=> import('../pages/gabinete-digital-menu/gabinete-digital-menu.module').then(m => m.GabineteDigitalMenuPageModule) + }, /* PROVISORIO */ { path: 'view-event', diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 022be290b..9583caf8e 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -1,5 +1,4 @@ - @@ -10,7 +9,7 @@ Agenda - + Gabinete Digital @@ -18,11 +17,6 @@ Pesquisa - - diff --git a/src/app/pages/feed/feed.page.html b/src/app/pages/feed/feed.page.html index 976ea6341..3d26ba9e7 100644 --- a/src/app/pages/feed/feed.page.html +++ b/src/app/pages/feed/feed.page.html @@ -151,7 +151,7 @@
- +

Reunião de Conselho de Ministros

@@ -200,7 +200,7 @@
- +

Conference call Particular

diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu-routing.module.ts b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu-routing.module.ts new file mode 100644 index 000000000..daaf35d95 --- /dev/null +++ b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { GabineteDigitalMenuPage } from './gabinete-digital-menu.page'; + +const routes: Routes = [ + { + path: '', + component: GabineteDigitalMenuPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class GabineteDigitalMenuPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.module.ts b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.module.ts new file mode 100644 index 000000000..f905980ac --- /dev/null +++ b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { GabineteDigitalMenuPageRoutingModule } from './gabinete-digital-menu-routing.module'; + +import { GabineteDigitalMenuPage } from './gabinete-digital-menu.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + GabineteDigitalMenuPageRoutingModule + ], + declarations: [GabineteDigitalMenuPage] +}) +export class GabineteDigitalMenuPageModule {} diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.html b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.html new file mode 100644 index 000000000..26d46c0a2 --- /dev/null +++ b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.html @@ -0,0 +1,53 @@ + + + Gbinete Digital + + + + + + + Expediente + + + Correspondência + 1 + + + Pedidos de parecer + 1 + + + Pedidos de deferimento + 1 + + + + + + + Diplomas + + + Assinados pelo PR + 1 + + + Por validar (MDGPR) + 1 + + + + + + + Despachos Efectuados + + + Presidente da República + 1 + + + + + diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.scss b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.scss new file mode 100644 index 000000000..32e2c25eb --- /dev/null +++ b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.scss @@ -0,0 +1,29 @@ +:host{ + ion-card-title{ + text-align: center; + } + + +ion-card{ + background-color: #d4d5ca; +} +ion-item{ + --ion-background-color:#dae3f3; + margin-bottom: 10px; + border-radius: 5px; + } + ion-button{ + color: #000; + --background:none; + --border-color: none; + --box-shadow:none; + } + ion-label{ + padding: 10px; + } +} +.ion-item-change-color{ + --ion-background-color:#fff2cc !important; + margin-bottom: 10px; + border-radius: 5px; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.spec.ts b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.spec.ts new file mode 100644 index 000000000..269c144fb --- /dev/null +++ b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { GabineteDigitalMenuPage } from './gabinete-digital-menu.page'; + +describe('GabineteDigitalMenuPage', () => { + let component: GabineteDigitalMenuPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ GabineteDigitalMenuPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(GabineteDigitalMenuPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.ts b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.ts new file mode 100644 index 000000000..ab2a2ed1d --- /dev/null +++ b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-gabinete-digital-menu', + templateUrl: './gabinete-digital-menu.page.html', + styleUrls: ['./gabinete-digital-menu.page.scss'], +}) +export class GabineteDigitalMenuPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + + load(){ + + } + +} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 2048e70a8..ae971fc0b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -20,7 +20,7 @@ -
+

Reunião de Conselho de Ministros

@@ -35,7 +35,7 @@ -
+

Avaliação de execução dos projectos públicos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 4004879cb..166336d17 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -13,10 +13,22 @@ margin: 0; } //DIV - .div-content h3{ +.div-content-expediente{ + width: 100%; + float: left; + border-left: 3px solid #dae3f3; + padding: 0 0 0 5px; +} +.div-content-pendentes{ + width: 100%; + float: left; + border-left: 3px solid #d9d9d9; + padding: 0 0 0 5px; +} + .div-content-expediente h3, .div-content-pendentes h3{ margin: 0; padding: 0; - font-size: 15px; + font-size: 16pt; width: 100%; } .div-icon{ @@ -30,14 +42,8 @@ margin: 0 auto; } -.div-content{ - width: 100%; - float: left; - border-left: 2px solid orange; - padding: 0 0 0 5px; - } - .div-content p{ - font-size: 10.5pt; + .div-content-expediente p, .div-content-pendentes p{ + font-size: 14pt; color: rgb(94, 92, 92); padding: 0; margin: 0; diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 3b14e9319..5154c732c 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -74,6 +74,8 @@ --ion-color-light-contrast-rgb: 0, 0, 0; --ion-color-light-shade: #d7d8da; --ion-color-light-tint: #f5f6f9; + + --ion-color-expediente: #dae3f3; } @media (prefers-color-scheme: dark) { @@ -145,6 +147,8 @@ --ion-color-light-contrast-rgb: 255,255,255; --ion-color-light-shade: #1e2023; --ion-color-light-tint: #383a3e; + + --ion-color-expediente: #dae3f3; } /* @@ -184,6 +188,8 @@ --ion-item-background: #000000; --ion-card-background: #1c1c1d; + + --ion-color-expediente: #dae3f3; } @@ -228,6 +234,8 @@ --ion-tab-bar-background: #1f1f1f; --ion-card-background: #1e1e1e; +/* My colors */ + --ion-color-expediente: #dae3f3; } } .center{