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

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-05-27 13:23:07 +01:00
parent 7eb69504b5 366b615b5a
commit 83557e2cf4
36 changed files with 1529 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+8 -6
View File
@@ -81,12 +81,14 @@ export class DespachoPrPage implements OnInit {
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"despachospr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "despachospr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back()
}
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+1 -1
View File
@@ -2,9 +2,9 @@
<app-header > </app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<div class="main-header">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="thetitle">
<ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
<ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
+1 -1
View File
@@ -25,7 +25,7 @@ ion-content, .header-2, .main-content{
font-size: 25px;
color:#000;
overflow: auto;
padding: 30px 20px 0 20px !important;
// padding: 30px 20px 0 20px !important;
margin: 0;
.thetitle{
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+2 -1
View File
@@ -74,6 +74,7 @@ export class DespachosPrPage implements OnInit {
}
segmentChanged(ev: any) {
this.LoadList();
}
@@ -297,7 +298,7 @@ export class DespachosPrPage implements OnInit {
this.dicIndex = index;
}
goBack(){
goBack() {
this.router.navigate(['/home/gabinete-digital']);
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+18 -8
View File
@@ -83,13 +83,23 @@ export class DespachoPage implements OnInit {
this.modalController.dismiss();
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"despachos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
goBack() {
// this.activatedRoute.queryParams.subscribe(params => {
// if(params["from"] == 'pendentes') {
// this.router.navigate(['/home/gabinete-digital/pendentes']);
// } else {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "despachos": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
// }
// });
window.history.back()
}
@@ -293,7 +303,7 @@ export class DespachoPage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
src/app/pages/gabinete-digital/despachos/despachos.page.html
-1
View File
@@ -4,7 +4,6 @@
<ion-header class="ion-no-border header-2">
<div class="title">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+12 -7
View File
@@ -69,16 +69,13 @@ export class DespachosPage implements OnInit {
this.LoadList();
}
goBack(){
this.router.navigate(['/home/gabinete-digital']);
}
notImplemented(){
notImplemented() {
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data){
console.log(data);
openExpedientDetailPage(data) {
this.openExpedientDetail.emit(data);
}
@@ -145,7 +142,7 @@ export class DespachosPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"serialNumber": serialNumber,
}
};
@@ -156,5 +153,13 @@ export class DespachosPage implements OnInit {
docIndex(index: number) {
this.dicIndex = index;
}
goBack() {
this.router.navigate(['/home/gabinete-digital']);
}
goToList() {
this.router.navigate(['/home/gabinete-digital/despachos']);
}
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts
+1
View File
@@ -19,4 +19,5 @@ import { SharedModule } from 'src/app/shared/shared.module';
],
declarations: [DiplomaAssinarPage]
})
export class DiplomaAssinarPageModule {}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+1 -1
View File
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header></app-header>
<app-header > </app-header>
</ion-header>
<ion-content>
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+19
View File
@@ -1,4 +1,23 @@
@import '~src/function.scss';
:host{
margin: 0;
}
.header-2 {
border-top-right-radius: 24px;
border-top-left-radius: 24px;
}
ion-content, .header-2, .main-content{
padding: 30px 20px 0 20px !important;
background-color: white;
}
.main-content {
padding-top: 0px !important;
}
.main-content{
background-color: #fff !important;
border-top-left-radius: 25px;
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+1 -10
View File
@@ -52,16 +52,7 @@ export class DiplomaAssinarPage implements OnInit {
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomasassinar": true,
}
};
if( window.innerWidth < 801){
this.router.navigate(['/home/gabinete-digital/diplomas-assinar']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
window.history.back()
}
async openOptions(taskAction?: any) {
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts
+3 -1
View File
@@ -7,13 +7,15 @@ import { IonicModule } from '@ionic/angular';
import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.module';
import { DiplomasAssinarPage } from './diplomas-assinar.page';
import { SharedModule } from 'src/app/shared/shared.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
DiplomasAssinarPageRoutingModule
DiplomasAssinarPageRoutingModule,
SharedModule
],
declarations: [DiplomasAssinarPage]
})
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+89 -4
View File
@@ -1,9 +1,94 @@
<ion-header>
<ion-toolbar>
<ion-title>diplomas-assinar</ion-title>
</ion-toolbar>
<ion-header class="ion-no-border">
<app-header > </app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<div class="title">
<div class="thetitle"><ion-label >Diplomas</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
<div class="bottom-title d-flex"><h3 class="bottom-text">Diplomas por Assinar</h3></div>
</div>
</ion-header>
<ion-content>
<div class="main-content">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="width-100">
<div *ngIf="diplomasList">
<ion-list >
<!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of diplomasList"
(click)="goToDiploma(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="!diplomasList">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
</ion-content>
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+198
View File
@@ -0,0 +1,198 @@
@import '~src/function.scss';
/* CONTENT */
:host{
margin: 0;
}
.header-2 {
border-top-right-radius: 24px;
border-top-left-radius: 24px;
}
ion-content, .header-2, .main-content{
padding: 30px 20px 0 20px !important;
background-color: white;
}
.main-content {
padding-top: 0px !important;
}
.title{
font-family: Roboto;
font-size: 25px;
color:#000;
overflow: auto;
.thetitle{
width: fit-content;
float: left;
}
.theicon{
width: fit-content;
float: right;
}
}
.bottom-title{
width: calc(100% - 40px);
margin-left: 20px !important;
margin-right: 20px !important;
margin: 0 auto;
align-items: center;
justify-content: center;
border-bottom: 5px solid #42b9fe;
.bottom-text{
font-size: 15px !important;
font-family: Roboto !important;
color: #0d89d1 !important;
}
}
.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 {
background-color: var(--white);
margin: 0 auto;
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{
float: left;
font-size: 12px;
padding-left: 18px;
}
.span-right{
text-align: right;
float: right;
font-size: 12px;
padding-right: 18px;
}
/* New CSS */
.expediente{
padding-top: 10px;
}
.exp-list-item{
overflow: auto;
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{
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;
}
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+95 -5
View File
@@ -1,4 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationExtras, Router } from '@angular/router';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { ModalController, NavParams } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
@Component({
selector: 'app-diplomas-assinar',
@@ -6,10 +13,93 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./diplomas-assinar.page.scss'],
})
export class DiplomasAssinarPage implements OnInit {
constructor() { }
ngOnInit() {
//profile:string;
diplomasList:DailyWorkTask[] = [];
showLoader: boolean;
totalDocs:any;
serialNumber:string;
@Input() profile:string;
@Input() segment:string;
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private router: Router,
) {
}
ngOnInit() {
this.LoadList();
}
goToDiploma(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras);
}
doRefresh() {
this.LoadList();
setTimeout(() => {
//event.target.complete();
}, 2000);
}
async LoadList(){
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = new Array();
console.log(diplomas);
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar diploma");
console.log(diplomasAssinar);
diplomasAssinar.forEach(element => {
let DocId = element.workflowInstanceDataFields.FolderID;
let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
this.totalDocs = res.DocumentsTotal;
console.log(res.DocumentsTotal);
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
},
(error)=>{
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
});
});
this.showLoader = false;
}
goBack() {
this.router.navigate(['/home/gabinete-digital']);
// window.history.back()
}
}
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+8 -6
View File
@@ -53,12 +53,14 @@ export class DiplomaPage implements OnInit {
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomas": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "diplomas": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back()
}
async openOptions(taskAction?: any) {
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+14 -2
View File
@@ -52,7 +52,18 @@ constructor(
}
segmentChanged(ev: any) {
this.LoadList();
let navigationExtras: NavigationExtras;
if (this.segment == 'assinados') {
navigationExtras= { queryParams: {"assinados": true,}};
} else if (this.segment == 'validar') {
navigationExtras = { queryParams: {"validar": true,}};
}
this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
// this.LoadList();
}
goToDiploma(serialNumber:any) {
@@ -160,8 +171,9 @@ constructor(
});
}
goBack(){
goBack() {
this.router.navigate(['/home/gabinete-digital']);
// window.history.back()
}
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+5
View File
@@ -296,6 +296,7 @@ export class BookMeetingModalPage implements OnInit {
setTimeout(()=>{
modal.dismiss()
this.goToGabinete()
},3000)
}
@@ -316,5 +317,9 @@ export class BookMeetingModalPage implements OnInit {
},3000)
}
goToGabinete() {
this.router.navigate(['/home/gabinete-digital']);
}
}
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+10 -7
View File
@@ -84,13 +84,16 @@ export class ExpedientePrPage implements OnInit {
this.modalController.dismiss();
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes-pr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "expedientes-pr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back();
}
sendExpedienteToPending(){
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+10 -2
View File
@@ -149,8 +149,16 @@ export class ExpedientesPrPage implements OnInit {
});
}
goBack(){
this.router.navigate(['/home/gabinete-digital']);
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "expedientes-pr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back();
}
}
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+36 -10
View File
@@ -356,7 +356,15 @@ export class GabineteDigitalPage implements OnInit {
this.closeAllDesktopComponents();
if( window.innerWidth <= 800) {
//this.openPedidoList();
let navigationExtras: NavigationExtras = { queryParams: {"deferimento": true,}};
let navigationExtras: NavigationExtras;
if (segment == 'deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (segment == 'parecer') {
navigationExtras = { queryParams: {"parecer": true,}};
}
this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras);
}
else{
@@ -421,7 +429,9 @@ export class GabineteDigitalPage implements OnInit {
}
openDiplomasPage(segment:string) {
this.closeAllDesktopComponents();
if( window.innerWidth <= 800){
//this.openDeploma();
let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}};
@@ -437,16 +447,32 @@ export class GabineteDigitalPage implements OnInit {
openDiplomasAssinarPage() {
this.closeAllDesktopComponents();
if( window.innerWidth <= 800){
//this.openDeploma();
let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
}
else{
let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showDiplomasAssinar = true;
if (this.loggeduser.Profile == 'MDGPR') {
if( window.innerWidth <= 800){
//this.openDeploma();
let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
}
else{
let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showDiplomasAssinar = true;
}
} else {
if( window.innerWidth <= 800){
//this.openDeploma();
let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
this.router.navigate(['/home/gabinete-digital/diplomas-assinar'], navigationExtras);
}
else{
let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showDiplomasAssinar = true;
}
}
}
openSignedDiploma(segment:string) {
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+6 -9
View File
@@ -63,15 +63,6 @@ export class PedidoPage implements OnInit {
this.LoadTaskDetail(this.serialnumber);
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"pedidos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
close(){
this.modalController.dismiss();
}
@@ -402,4 +393,10 @@ export class PedidoPage implements OnInit {
});
}
goBack() {
window.history.back();
}
}
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+47 -26
View File
@@ -68,17 +68,28 @@ export class PedidosPage implements OnInit {
}
segmentChanged(ev: any) {
this.LoadList();
let navigationExtras: NavigationExtras;
if (this.segment == 'deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.segment == 'parecer') {
navigationExtras = { queryParams: {"parecer": true,}};
}
this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras);
//this.LoadList();
}
goToPedido(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
goToPedido(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
@@ -164,24 +175,34 @@ export class PedidosPage implements OnInit {
}, 2000);
}
async viewPedidoDetail(serialNumber:any) {
console.log(this.profile);
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();
});
}
// 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();
// });
let navigationExtras: NavigationExtras = {
queryParams: {
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
}
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+52 -50
View File
@@ -53,7 +53,8 @@ export class PendentesPage implements OnInit {
}
goBack() {
this.router.navigate(['/home/gabinete-digital']);
window.history.back();
}
notImplemented(){
@@ -66,41 +67,20 @@ export class PendentesPage implements OnInit {
}
async LoadList(){
this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
//ParecerList
this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {
//DeferimentoList
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => {
this.pendentesList = new Array();
//PendentesList
let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
pendentes.forEach(element => {
let DocId = element.workflowInstanceDataFields.FolderID;
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
this.totalDocs = res.DocumentsTotal;
console.log(res.DocumentsTotal);
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
},
(error)=>{
let date = new Date(element.taskStartDate);
this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
//ParecerList
this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {
//DeferimentoList
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => {
this.pendentesList = new Array();
//PendentesList
let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
pendentes.forEach(element => {
let DocId = element.workflowInstanceDataFields.FolderID;
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
this.totalDocs = res.DocumentsTotal;
console.log(res.DocumentsTotal);
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
@@ -116,14 +96,33 @@ export class PendentesPage implements OnInit {
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
});
this.pendentesList.push(task);
},
(error)=>{
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
});
console.log(pendentes);
console.log(this.pendentesList);
});//Fim deferimento
});//Fim parecer
});//Fim despacho
});
console.log(pendentes);
console.log(this.pendentesList);
});//Fim deferimento
});//Fim parecer
});//Fim despacho
}
doRefresh(event) {
@@ -151,17 +150,19 @@ export class PendentesPage implements OnInit {
goToDespacho(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
queryParams: {
"serialNumber": serialNumber,
"from": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
}
goToPedido(serialNumber:any){
goToPedido(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
queryParams: {
"serialNumber": serialNumber,
"from": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
@@ -171,6 +172,7 @@ export class PendentesPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);