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

change modal to page

Browse Source
This commit is contained in:
tiago.kayaya
2021-05-10 22:09:05 +01:00
parent b500ded7a6
commit 1711e57150
7 changed files with 44 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/gabinete-digital.page.html
+3 -3
View File
@@ -83,7 +83,7 @@
<ion-icon src="assets/images/icons-despachos-presidente.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Despacho do Presidente da República</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"><span class="number">{{ count_de_pr }}</span> <span class="title1">Documentos</span> </p>
</div>
<div (click)="openExpedientesPrPage(); selectedElement='ExpedientesPr'" [class.active]="selectedElement == 'ExpedientesPr'" class="exp-card-long justify-center width-100">
@@ -105,7 +105,7 @@
</div>
<div class="exp-card-text">
<p class="text-center exp-card-title">Despacho do Presidente da República</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"><span class="number">{{ count_de_pr }}</span> <span class="title1">Documentos</span> </p>
</div>
</div>
</div>
@@ -138,7 +138,7 @@
<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-pedidos (openPedido)="openExpedientPage($event)" [profile]="profile" [segment]="segment" [serialNumber]="serialNumber" 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>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+7 -3
View File
@@ -32,7 +32,7 @@ export class GabineteDigitalPage implements OnInit {
count_exp_pd : string;
count_dip_apr : string;
count_dip_pv : string;
count_de_pr : string;
count_de_pr = 0;
count_ev_pr=0;
count_ev_md=0;
@@ -161,6 +161,10 @@ export class GabineteDigitalPage implements OnInit {
let pendingList = res.filter(data => data.workflowInstanceDataFields.Status == "Pending");
this.count_def_pending = Object.keys(pendingList).length;
});
this.processesbackend.GetTasksList("Despacho do PR", false).subscribe(res =>{
this.showLoader = false;
this.count_de_pr = Object.keys(res).length;
});
this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
this.count_ev_pr = res;
});
@@ -172,12 +176,12 @@ export class GabineteDigitalPage implements OnInit {
this.count_exp_pd = "-";
this.count_dip_apr = "-";
this.count_dip_pv = "-";
this.count_de_pr ='-';
}
doRefresh(event) {
this.closeAllDesktopComponents();
this.selectedElement='Correspondence';
this.showExpedients = true;
this.LoadCounts();
@@ -240,7 +244,7 @@ export class GabineteDigitalPage implements OnInit {
}
openExpedientPage(data){
/* console.log(data); */
console.log(data);
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+3 -38
View File
@@ -1,41 +1,6 @@
<ion-menu autoHide="false" side="end" content-id="main-content">
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0',fulltask)">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('1',fulltask)">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('2',fulltask)">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item (click)="openBookMeetingModal(task)">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item (click)="discartExpedient()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-menu>
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content>
<div class="main-content d-flex height-100">
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+6 -2
View File
@@ -1,4 +1,10 @@
@import '~src/function.scss';
.main-content{
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
}
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
@@ -13,8 +19,6 @@
}
.main-header{
font-family: Roboto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:auto;
color:#000;
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+9 -14
View File
@@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, NavParams } from '@ionic/angular';
import { MenuController, ModalController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
@@ -38,7 +38,7 @@ export class PedidoPage implements OnInit {
intervenientes: any;
cc: any;
constructor(private activateRoute: ActivatedRoute,
constructor(private activatedRoute: ActivatedRoute,
private processes: ProcessesService,
private iab: InAppBrowser,
private attachmentsService: AttachmentsService,
@@ -46,24 +46,19 @@ export class PedidoPage implements OnInit {
private menu: MenuController,
private router: Router,
private modalController: ModalController,
private navParams: NavParams,
private alertService: AlertService) {
this.serialnumber = this.navParams.get('serialNumber');
this.profile = this.navParams.get('profile');
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
});
}
ngOnInit() {
this.profile = "mdgpr";
console.log(this.serialnumber);
this.activateRoute.paramMap.subscribe(paramMap => {
if (!paramMap.has('SerialNumber')) {
return;
}
/* this.serialnumber = paramMap.get('SerialNumber'); */
this.LoadTaskDetail(this.serialnumber);
this.LoadRelatedEvents(this.serialnumber);
});
this.LoadTaskDetail(this.serialnumber);
this.LoadRelatedEvents(this.serialnumber);
}
@@ -77,7 +72,7 @@ export class PedidoPage implements OnInit {
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
this.processes.GetTask(this.serialnumber).subscribe(res => {
if(res.workflowDisplayName == 'Pedido de Parecer'){
this.task = {