add structure diploma and expediemtes-pr desktop

src/app/pages/gabinete-digital/diplomas/diploma/diploma-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomaPage } from './diploma.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomaPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomaPageRoutingModule {}

src/app/pages/gabinete-digital/diplomas/diploma/diploma.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 { DiplomaPageRoutingModule } from './diploma-routing.module';
+
+import { DiplomaPage } from './diploma.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomaPageRoutingModule
+  ],
+  declarations: [DiplomaPage]
+})
+export class DiplomaPageModule {}

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html

@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>diploma</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomaPage } from './diploma.page';
+
+describe('DiplomaPage', () => {
+  let component: DiplomaPage;
+  let fixture: ComponentFixture<DiplomaPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomaPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomaPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-diploma',
+  templateUrl: './diploma.page.html',
+  styleUrls: ['./diploma.page.scss'],
+})
+export class DiplomaPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/pages/gabinete-digital/diplomas/diplomas-routing.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasPage } from './diplomas.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasPage
+  },
+  {
+    path: 'diploma',
+    loadChildren: () => import('./diploma/diploma.module').then( m => m.DiplomaPageModule)
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasPageRoutingModule {}

src/app/pages/gabinete-digital/diplomas/diplomas.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 { DiplomasPageRoutingModule } from './diplomas-routing.module';
+
+import { DiplomasPage } from './diplomas.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasPageRoutingModule
+  ],
+  declarations: [DiplomasPage]
+})
+export class DiplomasPageModule {}

src/app/pages/gabinete-digital/diplomas/diplomas.page.html

@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>diplomas</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>

src/app/pages/gabinete-digital/diplomas/diplomas.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasPage } from './diplomas.page';
+
+describe('DiplomasPage', () => {
+  let component: DiplomasPage;
+  let fixture: ComponentFixture<DiplomasPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/gabinete-digital/diplomas/diplomas.page.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-diplomas',
+  templateUrl: './diplomas.page.html',
+  styleUrls: ['./diplomas.page.scss'],
+})
+export class DiplomasPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ExpedientesPrPage } from './expedientes-pr.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ExpedientesPrPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ExpedientesPrPageRoutingModule {}

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.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 { ExpedientesPrPageRoutingModule } from './expedientes-pr-routing.module';
+
+import { ExpedientesPrPage } from './expedientes-pr.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ExpedientesPrPageRoutingModule
+  ],
+  declarations: [ExpedientesPrPage]
+})
+export class ExpedientesPrPageModule {}

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>expedientes-pr</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ExpedientesPrPage } from './expedientes-pr.page';
+
+describe('ExpedientesPrPage', () => {
+  let component: ExpedientesPrPage;
+  let fixture: ComponentFixture<ExpedientesPrPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ExpedientesPrPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ExpedientesPrPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-expedientes-pr',
+  templateUrl: './expedientes-pr.page.html',
+  styleUrls: ['./expedientes-pr.page.scss'],
+})
+export class ExpedientesPrPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts

@@ -1,21 +1,22 @@
-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)
-  },
-  {
-    path: 'event-list',
-    loadChildren: () => import('./event-list/event-list.module').then( m => m.EventListPageModule)
-  },
+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)
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./event-list/event-list.module').then( m => m.EventListPageModule)
+  },
+  {
     path: 'discart-expedient-modal',
     loadChildren: () => import('./discart-expedient-modal/discart-expedient-modal.module').then( m => m.DiscartExpedientModalPageModule)
   },
@@ -35,12 +36,20 @@ const routes: Routes = [
     path: 'despachos-pr',
     loadChildren: () => import('./despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
   },
+  {
+    path: 'diplomas',
+    loadChildren: () => import('./diplomas/diplomas.module').then( m => m.DiplomasPageModule)
+  },
+  {
+    path: 'expedientes-pr',
+    loadChildren: () => import('./expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
+  },
 
-
-
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class GabineteDigitalPageRoutingModule {}

src/app/pages/gabinete-digital/gabinete-digital.module.ts

@@ -18,6 +18,8 @@ import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendent
 import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.page';
 import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despachos.page';
 import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page';
+import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page';
+import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page';
 
 /* import { ComponentsModule } from 'src/app/components/components.module'; */
 
@@ -40,6 +42,8 @@ import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/de
     DespachosPage,
     PendentesPage,
     DespachosPrPage,
+    DiplomasPage,
+    ExpedientesPrPage,
   ],
   entryComponents: [
     EmptyContainerPage,
@@ -50,6 +54,8 @@ import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/de
     DespachosPage,
     PendentesPage,
     DespachosPrPage,
+    DiplomasPage,
+    ExpedientesPrPage,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -70,7 +70,7 @@
             <p class="text-center exp-card-content">{{count_def_dailywork}} <span class="title1">Documentos</span></p>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-md-flex d-none flex-column justify-center white-background" (click)="notImplemented()">
+          <div (click)="openExpedientesPrPage()" [class.active]="selectedElement == '£££££££'" class="exp-card d-md-flex d-none flex-column justify-center white-background">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
             </div>
@@ -86,7 +86,7 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card-long justify-center width-100" (click)="notImplemented()">
+          <div (click)="openExpedientesPrPage(); selectedElement='ExpedientesPr'" [class.active]="selectedElement == 'ExpedientesPr'" class="exp-card-long justify-center width-100">
             <div class="center-div">
               <div class="exp-card-icon">
                 <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
@@ -98,7 +98,7 @@
             </div>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card-long width-100" (click)="notImplemented()">
+          <div (click)="openDespachosPrPage(); selectedElement='DispatchesPr'" [class.active]="selectedElement == '£££££££'" class="exp-card-long width-100">
             <div class="center-div">
               <div class="exp-card-icon">
                 <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
@@ -110,7 +110,7 @@
             </div>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div (click)="openDiplomasPage(); selectedElement='DiplomasPorAssinar'" [class.active]="selectedElement == 'DiplomasPorAssinar'" class="exp-card d-flex flex-column justify-center">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
             </div>
@@ -118,7 +118,7 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div (click)="openDiplomasPage(); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="exp-card d-flex flex-column justify-center">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
             </div>
@@ -136,15 +136,15 @@
         <app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
         <app-events-to-approve [profile]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
         
-        
         <app-expedients (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
         <app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
         <app-pedidos (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" [segment]="segment" class="d-flex height-100 flex-column" *ngIf="showPedidos"></app-pedidos>
         <app-despachos (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachos"></app-despachos>
         <app-despachos-pr (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachosPr"></app-despachos-pr>
         <app-pendentes (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showPendentes"></app-pendentes>
-      
-
+        <app-diplomas (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" [segment]="segment" class="d-flex height-100 flex-column" *ngIf="showDiplomas"></app-diplomas>
+        <app-expedientes-pr (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedientesPr"></app-expedientes-pr>
+    
       </div>
   </div>
 </ion-content>

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -50,6 +50,8 @@ export class GabineteDigitalPage implements OnInit {
   showDespachos = false;
   showDespachosPr = false;
   showPendentes = false;
+  showDiplomas = false;
+  showExpedientesPr = false;
   showExpedientDetail = false;
   emptyTextDescription = 'Sem opção selecionada';
 
@@ -128,6 +130,8 @@ export class GabineteDigitalPage implements OnInit {
     this.showDespachos = false;
     this.showDespachosPr = false;
     this.showPendentes = false;
+    this.showDiplomas = false;
+    this.showExpedientesPr = false;
     this.showExpedientDetail = false;
   }
 
@@ -289,6 +293,26 @@ export class GabineteDigitalPage implements OnInit {
     }
   }
 
+  openExpedientesPrPage(segment:string){
+    this.closeAllDesktopComponents();
+    if( window.innerWidth <= 1024){
+      //this.openDespachoList();
+    }
+    else{
+      this.showExpedientesPr = true;
+    }
+  }
+
+  openDiplomasPage(segment:string){
+    this.closeAllDesktopComponents();
+    if( window.innerWidth <= 1024){
+      //this.openPendenteList();
+    }
+    else{
+      this.showDiplomas = true;
+    }
+  }
+
   async openExpedientList(){
     this.closeAllDesktopComponent();
     //if( window.innerWidth <= 1024){

src/app/pages/login/login.page.ts

@@ -112,9 +112,5 @@ export class LoginPage implements OnInit {
       //this.toastService.presentToast('Preencha todos campos');
       this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.');
     }
-    /*  } catch (error) {
-       error
-       this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. '+ error);
-     } */
   }
 }