diff --git a/config.xml b/config.xml index 1206355a6..7043c0399 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,6 @@ - MyApp + Gabinete Digital An awesome Ionic/Cordova app. Ionic Framework Team diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 0351ccf1c..1141748ab 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -33,11 +33,15 @@ const routes: Routes = [ ] }, { - path: 'gabinete-digital-menu', + path: 'gabinete-digital', children: [ { path:'', - loadChildren: ()=> import('../pages/gabinete-digital-menu/gabinete-digital-menu.module').then(m => m.GabineteDigitalMenuPageModule) + loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule) + }, + { + path:':expedienteId', + loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule) } ] }, @@ -51,11 +55,11 @@ const routes: Routes = [ ] }, { - path: 'view-event', + path: 'expediente', children: [ { path:'', - loadChildren: ()=> import('../pages/view-event/view-event.module').then(m => m.ViewEventPageModule) + loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule) } ] }, diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 7859d11b1..181d75a1c 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -9,7 +9,7 @@ Agenda - + Gabinete Digital diff --git a/src/app/pages/cal-modal/cal-modal.page.html b/src/app/pages/cal-modal/cal-modal.page.html index a46ea7318..f333d4dc5 100644 --- a/src/app/pages/cal-modal/cal-modal.page.html +++ b/src/app/pages/cal-modal/cal-modal.page.html @@ -1,20 +1,16 @@ - - - - Cancelar - - - - {{ viewTitle }} - - - Enviar - - - - + + + + + + + + Novo Evento + + +
Assunto @@ -65,34 +61,35 @@ displayFormat="D MMM YYYY H:mm" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"> - - Selecione a frequência do evento - - Único - Diário - Semanal - Mensal - - -
- Anexos - - Adicionar +
+ + + Anexos + -
- - Lei do orçamento geral do Estado Eliminar - - + + + Lei do orçamento geral do Estado + +
- - +
+ + + + + Cancelar + + + + {{ viewTitle }} + + + Enviar + + + + + diff --git a/src/app/pages/cal-modal/cal-modal.page.scss b/src/app/pages/cal-modal/cal-modal.page.scss index 16ea07e8b..9d913ed9f 100644 --- a/src/app/pages/cal-modal/cal-modal.page.scss +++ b/src/app/pages/cal-modal/cal-modal.page.scss @@ -1,3 +1,6 @@ +.div-ion-content{ + margin: 15px; +} :host ::ng-deep{ .monthview-container { height: auto !important; @@ -5,4 +8,9 @@ .event-detail-container{ display: none; } +} +.div-attach{ + border: 1px solid #ccc; + margin: 15px 0 0 0; + padding: 15px; } \ No newline at end of file diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index b17be7331..3a9765ef2 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -38,7 +38,6 @@ timeDate = this.today.getHours() + ":" + this.today.getMinutes(); this.segment = "combinada"; this.showGreeting(); /* Call Get events method */ - this.events = this.eventService.getAllEvents(); this.eventsList = this.eventService.allEvents();/* .subscribe(prods=>console.log(prods)); */ } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts new file mode 100644 index 000000000..169b99fb7 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ExpedientePage } from './expediente.page'; + +const routes: Routes = [ + { + path: '', + component: ExpedientePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ExpedientePageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/expediente/expediente.module.ts b/src/app/pages/gabinete-digital/expediente/expediente.module.ts new file mode 100644 index 000000000..8f7f442d7 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente.module.ts @@ -0,0 +1,21 @@ +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ExpedientePageRoutingModule } from './expediente-routing.module'; + +import { ExpedientePage } from './expediente.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ExpedientePageRoutingModule + ], + declarations: [ExpedientePage], + schemas: [CUSTOM_ELEMENTS_SCHEMA] +}) +export class ExpedientePageModule {} diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html new file mode 100644 index 000000000..fa73adb5f --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -0,0 +1,69 @@ + + + + + + Gabinete Digital + + + + + + + + Expediente + + + Pendentes + + + +
+ + + + +
+ + +

Reunião de Conselho de Ministros

+
+

MINEC, MINFIN13 JAN

+
+
+
+
+
+ + + + +
+ + +

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

+
+

MINEC, MINFIN05 JAN

+
+
+
+
+
+
+ + + + + + +
+ diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss new file mode 100644 index 000000000..166336d17 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss @@ -0,0 +1,63 @@ +/* CONTENT */ +.item-list-small{ + font-size: 11px; + overflow: auto; + } + .ion-item-class{ + padding: 0; + + } + .label-text{ + width: 100%; + padding: 0; + margin: 0; + } +//DIV +.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: 16pt; + width: 100%; + } + .div-icon{ + width: 10%; + font-size: 20px; + float: left; + color: #808080; + } + .div-icon ion-icon{ + display: block; + margin: 0 auto; + + } + .div-content-expediente p, .div-content-pendentes p{ + font-size: 14pt; + color: rgb(94, 92, 92); + padding: 0; + margin: 0; + } + .span-left{ + /* border: 1px solid red; */ + float: left; + font-size: 10px; + padding-left: 18px; + } + .span-right{ + /* border: 1px solid blue; */ + text-align: right; + float: right; + font-size: 10px; + padding-right: 18px; +} diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.spec.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.spec.ts new file mode 100644 index 000000000..760d8b73a --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ExpedientePage } from './expediente.page'; + +describe('ExpedientePage', () => { + let component: ExpedientePage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ExpedientePage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ExpedientePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts new file mode 100644 index 000000000..dcbfef3e2 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-expediente', + templateUrl: './expediente.page.html', + styleUrls: ['./expediente.page.scss'], +}) +export class ExpedientePage implements OnInit { + + segment:string; + + constructor() { } + + ngOnInit() { + //Inicializar segment + this.segment = "expediente"; + } + +} diff --git a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts index 2e5568da3..d68940e22 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts @@ -1,17 +1,21 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { GabineteDigitalPage } from './gabinete-digital.page'; - -const routes: Routes = [ - { - path: '', - component: GabineteDigitalPage +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { GabineteDigitalPage } from './gabinete-digital.page'; + +const routes: Routes = [ + { + path: '', + component: GabineteDigitalPage + }, { + path: 'expediente', + loadChildren: () => import('./expediente/expediente.module').then( m => m.ExpedientePageModule) } -]; -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class GabineteDigitalPageRoutingModule {} +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class GabineteDigitalPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index ae971fc0b..bb86d2958 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -1,65 +1,53 @@ - Gabinete Digital + Gbinete Digital - - - - Expediente - - - Pendentes - - - -
- - - - -
- - -

Reunião de Conselho de Ministros

-
-

MINEC, MINFIN13 JAN

-
-
-
-
-
- - - - -
- - -

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

-
-

MINEC, MINFIN05 JAN

-
-
-
-
-
-
- - - - - - + + + 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/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 166336d17..412cf5d8d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -1,63 +1,29 @@ -/* CONTENT */ -.item-list-small{ - font-size: 11px; - overflow: auto; +:host{ + ion-card-title{ + text-align: center; } - .ion-item-class{ - padding: 0; - - } - .label-text{ - width: 100%; - padding: 0; - margin: 0; - } -//DIV -.div-content-expediente{ - width: 100%; - float: left; - border-left: 3px solid #dae3f3; - padding: 0 0 0 5px; + + +ion-card{ + background-color: #d4d5ca; } -.div-content-pendentes{ - width: 100%; - float: left; - border-left: 3px solid #d9d9d9; - padding: 0 0 0 5px; +ion-item{ + --ion-background-color:#dae3f3; + margin-bottom: 10px; + border-radius: 5px; } - .div-content-expediente h3, .div-content-pendentes h3{ - margin: 0; - padding: 0; - font-size: 16pt; - width: 100%; - } - .div-icon{ - width: 10%; - font-size: 20px; - float: left; - color: #808080; - } - .div-icon ion-icon{ - display: block; - margin: 0 auto; - - } - .div-content-expediente p, .div-content-pendentes p{ - font-size: 14pt; - color: rgb(94, 92, 92); - padding: 0; - margin: 0; - } - .span-left{ - /* border: 1px solid red; */ - float: left; - font-size: 10px; - padding-left: 18px; - } - .span-right{ - /* border: 1px solid blue; */ - text-align: right; - float: right; - font-size: 10px; - padding-right: 18px; +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/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index daf7ce482..5b57d28b1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -12,8 +12,10 @@ export class GabineteDigitalPage implements OnInit { constructor() { } ngOnInit() { - //Inicializar segment - this.segment = "expediente"; + } + + load(){ + } } diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 249b54d09..549466a8a 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -12,6 +12,8 @@ import { ToastController } from '@ionic/angular'; }) export class LoginPage implements OnInit { + logstatus: boolean; + /* Declare variables */ public postData = { username: '', @@ -27,6 +29,8 @@ export class LoginPage implements OnInit { ) { } ngOnInit() { + /* console.log(this.authService.validateLogin()); */ + /* this.authService.login(this.postData); */ } /* Function to validade the login inputs */ validateInput(){ @@ -86,6 +90,7 @@ export class LoginPage implements OnInit { if(this.validateInput()){ this.router.navigate(['/home/events']); + /* if (await this.authService.login(this.postData)) { this.router.navigate(['/home/feed']); diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 8e41344eb..2692a9e09 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -5,16 +5,20 @@ import { Router } from '@angular/router'; import { Observable } from 'rxjs'; import { AuthConnstants } from '../config/auth-constants'; import axios from "axios"; +import { HttpClient } from '@angular/common/http'; @Injectable({ providedIn: 'root' }) export class AuthService { + + constructor( private httpService: HttpService, private storageService: StorageService, - private router: Router + private router: Router, + private http: HttpClient ) { } async login(postData: any): Promise { @@ -62,4 +66,19 @@ export class AuthService { }) } */ + validateLogin(){ + const options = { headers: {'Authorization': 'Basic cGF1bG8ucGludG86dGFidGVzdGVAMDA2'}}; + const url = 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/api/calendar/ValidateAuth'; + /* return this.http.get(`${url}`, options); */ + axios.get(url, options) + .then(resp => { + if(resp.data) + console.log(resp.data); + }) + .catch(err => { + // Handle Error Here + console.error(err); + }); + } + } diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 0dfaa0fcf..2a3d0d97d 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -11,8 +11,6 @@ import { Observable } from 'rxjs'; }) export class EventsService { /* Set events */ - private eventos: Event[]; - private events: Event[] = [ { EventId: '1', @@ -71,21 +69,6 @@ export class EventsService { return this.http.get(`${url + ev}`, this.options) } - getAllEvents(){ - //Return a copy of the events in my array - console.log("All eventes loaded"); - const options = { headers: {'Authorization': 'Basic cGF1bG8ucGludG86dGFidGVzdGVAMDA2'}}; - axios.get(this.url, options) - .then((response) => { - console.log(this.eventos); - this.eventos = response.data; - console.log(this.eventos); - return this.events; - }); - return this.eventos; - //return [...this.events]; - } - getStaticEvent(eventId: string){ return { // The find() function looks for an event in a array and return true if found