peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +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-07-13 16:02:29 +01:00
parent 594c2c6b5b 3bbab397be
commit 085587e9c8
6 changed files with 77 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+2 -18
View File
@@ -1,13 +1,8 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { Component, Input, OnInit } from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';
import { DailyWorkTask } 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 } 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';
@Component({
@@ -21,21 +16,15 @@ export class ExpedientePage implements OnInit {
showLoader: boolean;
//profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
serialNumber:string;
@Input() profile:string;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private router: Router,
) {
this.profile = 'mdgpr';
}
ngOnInit() {
@@ -47,11 +36,6 @@ export class ExpedientePage implements OnInit {
});
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
}
LoadList(){
this.showLoader = true;
this.processes.GetTasksList("Expediente", false).subscribe(result => {
src/app/pages/gabinete-digital/gabinete-digital.page.html
+7 -7
View File
@@ -8,7 +8,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content d-flex height-100">
<!-- Aside left -->
@@ -19,7 +19,7 @@
<ion-icon class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
<div class="aside overflow-y-auto d-flex flex-wrap width-100">
<div (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'" class="exp-card d-flex flex-column" *ngIf="loggeduser.Profile == 'MDGPR'" >
<div class="d-flex justify-center">
@@ -85,8 +85,8 @@
<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 " *ngIf="loggeduser.Profile == 'MDGPR'">Despacho do Presidente da República</p>
<p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Despachos criados por mim</p>
<p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Despacho do Presidente da República</p>
<p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Despachos criados por mim</p>
<p class="text-center exp-card-content">{{ count_de_pr }} <span class="title1">Documentos</span> </p>
</div>
@@ -109,7 +109,7 @@
<ion-icon src="assets/images/icons-despachos-presidente.svg"></ion-icon>
</div>
<div class="exp-card-text">
<p class="text-center exp-card-title">Despacho do Presidente da República</p>
<p class="exp-card-title">Despacho do Presidente da República</p>
<p class="text-center exp-card-content">{{ count_de_pr }} <span class="title1">Documentos</span> </p>
</div>
</div>
@@ -146,10 +146,10 @@
<!-- Aside right -->
<div class="aside-content d-none flex-column height-100">
<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 [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
<app-pedidos [profile]="profile" [segment]="segment" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showPedidos"></app-pedidos>
<app-despachos [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachos"></app-despachos>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+19 -27
View File
@@ -20,17 +20,17 @@ import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-a
})
export class GabineteDigitalPage implements OnInit {
segment:string;
showLoader: boolean;
public profile:string;
count_exp_dailywork=0;
count_exp_dailywork=0;
count_exp_pr =0
count_desp_dailywork=0;
count_desp_pending=0;
count_desp_pending=0;
count_par_dailywork=0;
count_par_pending=0;
count_par_pending=0;
count_def_dailywork=0;
count_def_pending=0;
count_exp_pp : string;
@@ -49,7 +49,7 @@ export class GabineteDigitalPage implements OnInit {
desktopComponent: any = {
showEventList: false,
showExpediente : false
showExpediente : false,
}
showEventsToApprove = false;
@@ -63,7 +63,7 @@ export class GabineteDigitalPage implements OnInit {
showDiplomas = false;
showDiplomasAssinar = false;
showExpedientDetail = false;
showSignedDiploma = false
showSignedDiploma = false;
emptyTextDescription = 'Sem opção selecionada';
serialNumber:string;
@@ -96,7 +96,7 @@ export class GabineteDigitalPage implements OnInit {
}
};
this.checkRoutes();
}
closeAllDesktopComponent(){
@@ -111,7 +111,7 @@ export class GabineteDigitalPage implements OnInit {
ngOnInit() {
const pathname = window.location.pathname
this.router.events.forEach((event) => {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) {
this.checkRoutes();
this.LoadCounts();
@@ -120,11 +120,12 @@ export class GabineteDigitalPage implements OnInit {
// console.log('not')
}
});
this.hideRefreshButton();
this.hideRefreshButton();
}
checkUser(){
this.selectedElement='Correspondence';
switch(this.loggeduser.Profile){
case 'MDGPR':
this.showExpedients = true;
@@ -150,6 +151,7 @@ export class GabineteDigitalPage implements OnInit {
}
checkRoutes(){
this.closeAllDesktopComponents();
if(this.router.url == '/home/gabinete-digital?eventos=true'){
this.openEventsToApprovePage();
this.selectedElement='approval';
@@ -196,12 +198,6 @@ export class GabineteDigitalPage implements OnInit {
}
}
refreshExpedientes(){
this.expedientesPage.doRefresh();
//this.pendentesListPage.doRefresh();
//this.eventsToApprove.doRefresh();
}
closeAllDesktopComponents() {
this.showEmptyContainer = false;
this.showEventsToApprove = false;
@@ -252,7 +248,7 @@ export class GabineteDigitalPage implements OnInit {
this.count_de_pr = Object.keys(despachosPr).length;
break;
}
let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma");
this.count_dip_pv = Object.keys(diplomasValidar).length;
@@ -263,14 +259,14 @@ export class GabineteDigitalPage implements OnInit {
this.count_dip_as_pr = Object.keys(diplomasAssinados).length;
this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
this.count_ev_pr = res;
this.count_ev_pr = res;
});
this.processesbackend.GetToApprovedEvents('MDGPR','true').subscribe(res=>{
this.count_ev_md = res;
});
this.showLoader = false;
this.count_exp_pp = "-";
this.count_exp_pd = "-";
this.count_dip_apr = "-";
@@ -279,7 +275,7 @@ export class GabineteDigitalPage implements OnInit {
doRefresh(event) {
console.log(event);
this.closeAllDesktopComponents();
/* switch(this.loggeduser.Profile){
case 'MDGPR':
@@ -302,12 +298,8 @@ export class GabineteDigitalPage implements OnInit {
}
else{
console.log('null');
}
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
}
selectedElementF(element:string) {
@@ -358,7 +350,7 @@ export class GabineteDigitalPage implements OnInit {
}
break;
}
}
openPedidosPage(segment:string) {
@@ -394,7 +386,7 @@ export class GabineteDigitalPage implements OnInit {
this.showDespachos = true;
}
}
openDespachosPrPage(segment?:string) {
this.closeAllDesktopComponents();
if( window.innerWidth <= 801){
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
-5
View File
@@ -24,7 +24,6 @@ export class PendentesPage implements OnInit {
@Input() profile:string;
segment:string;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
constructor(
private processes:ProcessesService,
@@ -60,10 +59,6 @@ export class PendentesPage implements OnInit {
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data){
this.openExpedientDetail.emit(data);
}
async LoadList(){
this.showLoader = true;
this.pendentesList = new Array();