+
@@ -118,7 +118,7 @@
- Documentos
-
+
@@ -136,15 +136,15 @@
-
-
-
+
+
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 7289026d3..cda6c6ff9 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/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){
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 2da84eafb..41ce22c49 100644
--- a/src/app/pages/login/login.page.ts
+++ b/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);
- } */
}
}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas-routing.module.ts b/src/app/shared/gabinete-digital/diplomas/diplomas-routing.module.ts
new file mode 100644
index 000000000..1081fb235
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasPage } from './diplomas.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: DiplomasPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class DiplomasPageRoutingModule {}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts
new file mode 100644
index 000000000..d056e0b92
--- /dev/null
+++ b/src/app/shared/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 {}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
new file mode 100644
index 000000000..02260facc
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -0,0 +1,119 @@
+
+
+
+
+
+ Diplomas por validar
+
+
+ Diplomas assinados PR
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
+
+
+ {{task.Remetente}}
+
+
+
+
+
+
+
+ {{ task.Folio }}
+
+
+
+
+
+
+
+
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
+
+
+ {{task.Remetente}}
+
+
+
+
+
+
+
+
+ {{ task.Folio }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
new file mode 100644
index 000000000..e624d0744
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
@@ -0,0 +1,177 @@
+@import '~src/function.scss';
+/* CONTENT */
+:host{
+ padding: 30px 20px 0 20px !important;
+ margin: 0;
+}
+.title{
+ font-family: Roboto;
+ font-size: 25px;
+ color:#000;
+ overflow: auto;
+
+ .thetitle{
+ width: fit-content;
+ float: left;
+ }
+ .theicon{
+ width: fit-content;
+ float: right;
+ }
+ }
+.item-list-small{
+ font-size: 11px;
+ overflow: hidden;
+ }
+ .ion-item-class{
+ padding: 0;
+
+ }
+ .label-text{
+ width: 100%;
+ padding: 0;
+ margin: 0;
+ }
+//DIV
+ion-item{
+ --background: none;
+}
+.item {
+ //border-radius: 15px;
+ //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+ //Sborder: solid 1px #e9e9e9;
+ background-color: var(--white);
+ margin: 0 auto;
+ //padding: 10px;
+ margin-bottom: 10px;
+ overflow: hidden;
+ }
+.div-content-expediente{
+ width: 100%;
+ float: left;
+ border-left: 3px solid #dae3f3;
+ padding:5px 5px 15px 5px;
+ margin: 10px 0 10px 0;
+ background: #dae3f3;
+ border-radius: 20px;
+}
+.div-content-pendentes{
+ width: 100%;
+ float: left;
+ border-left: 3px solid #d9d9d9;
+ padding: 5px;
+}
+ .div-content-expediente h3, .div-content-pendentes h3{
+ margin: 0;
+ padding: 0;
+ font-size: 14pt;
+ 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: 12px;
+ padding-left: 18px;
+ }
+ .span-right{
+ /* border: 1px solid blue; */
+ text-align: right;
+ float: right;
+ font-size: 12px;
+ padding-right: 18px;
+}
+
+/* New CSS */
+.expediente{
+ padding-top: 10px;
+}
+.exp-list-item{
+ //width: 368px;
+ overflow: auto;
+ /* border-bottom: 1px solid gray; */
+ margin: 10px auto;
+}
+.exp-top-detail{
+ width: 100%;
+ overflow: auto;
+}
+.exp-date{
+ width: auto;
+ font-family: Roboto;
+ font-size: 13px;
+ font-weight: normal;
+ font-stretch: normal;
+ font-style: normal;
+ line-height: normal;
+ letter-spacing: normal;
+ color: #797979;
+ float: left;
+}
+.exp-remetente{
+ //width: 200px;
+ font-family: Roboto;
+ font-size: 13px;
+ font-weight: normal;
+ color: #000000;
+ float: left;
+ margin-left: 16px;
+
+}
+.exp-icon{
+ width: 45px;
+ float: right;
+ font-size: 13px;
+}
+.exp-icon ion-icon{
+ font-size: 25px;
+ color: #42b9fe;
+}
+.exp-bottom-detail{
+ float: left;
+ font-family: Roboto;
+ font-size: 16px;
+ font-weight: 700;
+ color: #0d89d1;
+}
+.div-top-header{
+ width: 400px;
+ margin: 6px auto;
+ background-color: #0782c9;
+ overflow: auto;
+}
+.div-search{
+ font-size: 45px;
+ float: left;
+ margin: 0 0 0 10px
+}
+.div-logo{
+ background: transparent;
+ width: 150px;
+ margin: 2.5px 0 2.5px 71px;
+ float: left;
+}
+.div-logo img{
+ width: 100%;
+}
+.div-profile{
+ font-size: 45px;
+ float: right;
+ margin-right: 10px;
+}
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.spec.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.spec.ts
new file mode 100644
index 000000000..c643e943c
--- /dev/null
+++ b/src/app/shared/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
;
+
+ 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();
+ });
+});
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
new file mode 100644
index 000000000..718484a6a
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -0,0 +1,102 @@
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { CalendarComponent } from 'ionic2-calendar';
+
+import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { formatDate } from '@angular/common';
+import { LoadingService } from 'src/app/services/loading.service';
+import { ModalController, NavParams } from '@ionic/angular';
+import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
+import { AlertService } from 'src/app/services/alert.service';
+import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
+
+@Component({
+ selector: 'app-diplomas',
+ templateUrl: './diplomas.page.html',
+ styleUrls: ['./diplomas.page.scss'],
+})
+export class DiplomasPage implements OnInit {
+//profile:string;
+
+@ViewChild(CalendarComponent) myCal: CalendarComponent;
+
+taskslist:DailyWorkTask[];
+parecerList:DailyWorkTask[];
+fulltask:any;
+
+parecerListResult:tasksList[] = [];
+deferimentoListResult:tasksList[] = [];
+
+deferimentoList:DailyWorkTask[];
+taskType: string;
+serialNumber:string;
+
+@Input() profile:string;
+@Input() segment:string;
+@Output() openExpedientDetail:EventEmitter = new EventEmitter();
+
+constructor(
+ private processes:ProcessesService,
+ private modalController: ModalController,
+ private alertService: AlertService,
+ ) {
+ this.profile = 'mdgpr';
+ }
+
+ngOnInit() {
+ //Inicializar segment
+ this.segment = 'validar';
+ this.LoadList();
+}
+segmentChanged(ev: any) {
+ this.LoadList();
+}
+
+notImplemented(){
+ this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+}
+
+openExpedientDetailPage(data){
+ console.log(data);
+ this.openExpedientDetail.emit(data);
+}
+
+LoadList(){
+ if(this.segment == 'validar'){
+
+ }
+ else if(this.segment == 'assinados'){
+
+ }
+ console.log(this.taskType);
+}
+
+doRefresh(event) {
+ this.LoadList();
+ setTimeout(() => {
+ event.target.complete();
+ }, 2000);
+}
+
+async viewPedidoDetail(serialNumber:any) {
+ console.log(this.profile);
+
+ const modal = await this.modalController.create({
+ component: PedidoPage,
+ componentProps:{
+ enterAnimation: "",
+ serialNumber: serialNumber,
+ profile: this.profile,
+ },
+ cssClass: 'modal modal-desktop',
+ });
+ await modal.present();
+ modal.onDidDismiss().then((res)=>{
+ console.log('refresh list');
+ this.LoadList();
+ });
+}
+
+
+}
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr-routing.module.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr-routing.module.ts
new file mode 100644
index 000000000..0316251d4
--- /dev/null
+++ b/src/app/shared/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 {}
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts
new file mode 100644
index 000000000..e06195279
--- /dev/null
+++ b/src/app/shared/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 {}
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
new file mode 100644
index 000000000..4b7190d65
--- /dev/null
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -0,0 +1,111 @@
+
+
+
+
+
+ Expediente
+
+
+ Pendente
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
+
+
+ {{task.Remetente}}
+
+
+
+
+
+
+
+ {{ task.Folio }}
+
+
+
+
+
+
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
+
+
+ {{task.Remetente}}
+
+
+
+
+
+
+
+ {{ task.Folio }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+