peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-23 10:36:16 +01:00
parent 74bc2a3f2f c02c5ba260
commit f4eafbf9f1
52 changed files with 1769 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+1 -1
View File
@@ -112,7 +112,7 @@ export class BookMeetingModalPage implements OnInit {
this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{
if(res){
this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber);
this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber, this.task.FsId);
}
});
this.distartExpedientModal();
src/app/pages/gabinete-digital/gabinete-digital.module.ts
+6
View File
@@ -14,6 +14,8 @@ import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-contain
import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page';
import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.page';
import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despachos.page';
/* import { ComponentsModule } from 'src/app/components/components.module'; */
@@ -32,12 +34,16 @@ import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/exped
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
PedidosPage,
DespachosPage,
],
entryComponents: [
EmptyContainerPage,
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
PedidosPage,
DespachosPage,
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
src/app/pages/gabinete-digital/gabinete-digital.page.html
+22 -12
View File
@@ -45,28 +45,28 @@
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="openDespachosPage()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-despachos-presidente.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Despachos</p>
<p class="text-center exp-card-content">{{count_desp_dailywork}}<span class="title1">Documentos</span> </p>
</div>
<div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('parecer')">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-parecer.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Pedidos de Parecer</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content">{{count_par_dailywork}} <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('deferimento')">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-deferimento.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Pedidos de Deferimento</p>
<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 class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-diploma.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Diplomas por Validar</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
<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-flex d-none flex-column justify-center" (click)="notImplemented()">
@@ -109,6 +109,14 @@
</div>
</div>
<div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-diploma.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Diplomas por Validar</p>
<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 class="d-flex justify-center">
<ion-icon src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
@@ -130,6 +138,8 @@
<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>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+41 -1
View File
@@ -18,7 +18,10 @@ export class GabineteDigitalPage implements OnInit {
showLoader: boolean;
public profile:string;
count_exp_dailywork=0;
count_exp_dailywork=0;
count_desp_dailywork=0;
count_par_dailywork=0;
count_def_dailywork=0;
count_exp_pp : string;
count_exp_pd : string;
count_dip_apr : string;
@@ -37,6 +40,8 @@ export class GabineteDigitalPage implements OnInit {
showEventsToApprove = false;
showEmptyContainer = false;
showExpedients = true;
showPedidos = false;
showDespachos = false;
showExpedientDetail = false;
emptyTextDescription = 'Sem opção selecionada';
@@ -111,6 +116,8 @@ export class GabineteDigitalPage implements OnInit {
this.showEventsToApprove = false;
this.showExpedients = false;
this.showExpedients = false;
this.showPedidos = false;
this.showDespachos = false;
this.showExpedientDetail = false;
}
@@ -120,6 +127,18 @@ export class GabineteDigitalPage implements OnInit {
this.showLoader = false;
this.count_exp_dailywork = res;
});
this.processesbackend.GetTasksList("Despacho", true).subscribe(res =>{
this.showLoader = false;
this.count_desp_dailywork = res;
});
this.processesbackend.GetTasksList("Pedido de Parecer", true).subscribe(res =>{
this.showLoader = false;
this.count_par_dailywork = res;
});
this.processesbackend.GetTasksList("Pedido de Deferimento", true).subscribe(res =>{
this.showLoader = false;
this.count_def_dailywork = res;
});
this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
this.count_ev_pr = res;
});
@@ -204,6 +223,27 @@ export class GabineteDigitalPage implements OnInit {
}
}
openPedidosPage(segment:string){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openExpedientList();
}
else{
this.segment = segment;
this.showPedidos = true;
}
}
openDespachosPage(segment:string){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openExpedientList();
}
else{
this.showDespachos = true;
}
}
async openExpedientList(){
this.closeAllDesktopComponent();