mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-21 13:55:51 +00:00
corrections
This commit is contained in:
@@ -76,6 +76,7 @@
|
|||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura</button>
|
<button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura</button>
|
||||||
<button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
|
<button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
|
||||||
|
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { momentG } from 'src/plugin/momentG';
|
|||||||
|
|
||||||
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
|
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
|
||||||
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
|
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
|
||||||
|
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-diploma',
|
selector: 'app-diploma',
|
||||||
@@ -190,6 +191,25 @@ export class DiplomaPage implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async openBookMeetingModal(task: any) {
|
||||||
|
let classs;
|
||||||
|
if( window.innerWidth <= 800){
|
||||||
|
classs = 'book-meeting-modal modal modal-desktop'
|
||||||
|
} else {
|
||||||
|
classs = 'modal modal-desktop showAsideOptions'
|
||||||
|
}
|
||||||
|
const modal = await this.modalController.create({
|
||||||
|
component: BookMeetingModalPage,
|
||||||
|
componentProps: {
|
||||||
|
task: this.task,
|
||||||
|
},
|
||||||
|
cssClass: classs,
|
||||||
|
backdropDismiss: false
|
||||||
|
});
|
||||||
|
await modal.present();
|
||||||
|
modal.onDidDismiss();
|
||||||
|
}
|
||||||
|
|
||||||
close(){
|
close(){
|
||||||
this.modalController.dismiss();
|
this.modalController.dismiss();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -201,12 +201,12 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
let pendentes = despachos.concat(pareceres, deferimentos, expedientes).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
|
let pendentes = despachos.concat(pareceres, deferimentos, expedientes).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
|
||||||
this.count_total_pending = Object.keys(pendentes).length;
|
this.count_total_pending = Object.keys(pendentes).length;
|
||||||
|
|
||||||
let diplomas = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
|
let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
|
||||||
|
|
||||||
let despachosPr = diplomas.filter(data => data.workflowInstanceDataFields.Status == "Active");
|
let despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho");
|
||||||
this.count_de_pr = Object.keys(despachosPr).length;
|
this.count_de_pr = Object.keys(despachosPr).length;
|
||||||
|
|
||||||
let diplomasValidar = diplomas.filter(data => data.workflowInstanceDataFields.Status == "Revising");
|
let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma");
|
||||||
this.count_dip_pv = Object.keys(diplomasValidar).length;
|
this.count_dip_pv = Object.keys(diplomasValidar).length;
|
||||||
|
|
||||||
this.processesbackend.GetTasksList("Expediente", false).subscribe(result => {
|
this.processesbackend.GetTasksList("Expediente", false).subscribe(result => {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
|
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
|
||||||
import { Router } from '@angular/router';
|
import { NavigationExtras, Router } from '@angular/router';
|
||||||
import { CalendarComponent } from 'ionic2-calendar';
|
import { CalendarComponent } from 'ionic2-calendar';
|
||||||
|
|
||||||
import { DailyWorkTask } from '../../../models/dailyworktask.model';
|
import { DailyWorkTask } from '../../../models/dailyworktask.model';
|
||||||
@@ -36,6 +36,7 @@ export class PendentesPage implements OnInit {
|
|||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
private alertService: AlertService,
|
private alertService: AlertService,
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
|
private router: Router,
|
||||||
) {
|
) {
|
||||||
this.profile = 'mdgpr';
|
this.profile = 'mdgpr';
|
||||||
}
|
}
|
||||||
@@ -121,16 +122,43 @@ export class PendentesPage implements OnInit {
|
|||||||
async viewTaskDetails(serialNumber:string, workflowName:string) {
|
async viewTaskDetails(serialNumber:string, workflowName:string) {
|
||||||
console.log(this.profile);
|
console.log(this.profile);
|
||||||
if(workflowName == 'Despacho'){
|
if(workflowName == 'Despacho'){
|
||||||
this.openDespacho(serialNumber);
|
this.goToDespacho(serialNumber);
|
||||||
}
|
}
|
||||||
else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento'){
|
else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento'){
|
||||||
this.openPedido(serialNumber);
|
this.goToPedido(serialNumber);
|
||||||
}
|
}
|
||||||
else if(workflowName == 'Expediente'){
|
else if(workflowName == 'Expediente'){
|
||||||
this.viewExpedientDetail(serialNumber);
|
this.goToExpediente(serialNumber);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
goToDespacho(serialNumber:any){
|
||||||
|
let navigationExtras: NavigationExtras = {
|
||||||
|
queryParams: {
|
||||||
|
"serialNumber": serialNumber,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
|
||||||
|
}
|
||||||
|
|
||||||
|
goToPedido(serialNumber:any){
|
||||||
|
let navigationExtras: NavigationExtras = {
|
||||||
|
queryParams: {
|
||||||
|
"serialNumber": serialNumber,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
|
||||||
|
}
|
||||||
|
|
||||||
|
goToExpediente(serialNumber:any){
|
||||||
|
let navigationExtras: NavigationExtras = {
|
||||||
|
queryParams: {
|
||||||
|
"serialNumber": serialNumber,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
|
||||||
|
}
|
||||||
|
|
||||||
async openDespacho(serialNumber:string){
|
async openDespacho(serialNumber:string){
|
||||||
|
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
|
|||||||
Reference in New Issue
Block a user