-
-
+
@@ -57,7 +52,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 1a70997f6..9d3208a45 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -1,34 +1,31 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router } from '@angular/router';
+import { DailyWorkTask } 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';
+import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
@Component({
selector: 'app-diplomas',
templateUrl: './diplomas.page.html',
styleUrls: ['./diplomas.page.scss'],
})
-export class DiplomasPage implements OnInit {
-diplomasList:DailyWorkTask[] = [];
+export class DiplomasPage implements OnInit, OnDestroy {
+ list:DailyWorkTask[] = [];
+ diplomasList:DailyWorkTask[] = [];
diplomasAssinadoList:DailyWorkTask[] = [];
showLoader: boolean;
totalDocs:any;
serialNumber:string;
-@Input() profile:string;
-@Input() segment:string;
+segment:string;
constructor(
private processes:ProcessesService,
- private modalController: ModalController,
- private alertService: AlertService,
private router: Router,
private activatedRoute: ActivatedRoute,
) {
+ this.diplomasList = [];
+ this.segment = 'validar';
this.activatedRoute.queryParams.subscribe(params => {
console.log('Cria');
@@ -37,34 +34,103 @@ constructor(
} else if (params['segment'] == 'assinados') {
this.segment = 'assinados';
}
-
- this.LoadList();
});
+
}
ngOnInit() {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
- console.log('Atualiza');
-
- this.LoadList();
+ this.refreshing();
}
});
- console.log('Init');
- this.LoadList();
+ }
+
+ /* async loadDiplomas(){
+ console.log('Load');
+
+ this.activatedRoute.data.subscribe(data => {
+ console.log(data['diplomas']);
+
+ switch (this.segment) {
+ case 'validar':
+
+ let diplomasValidar = data['diplomas'].filter(data => data.activityInstanceName == "Revisar Diploma");
+ diplomasValidar.forEach(async element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+
+ let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+
+ 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": res.DocumentsTotal,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ this.diplomasList.push(task);
+ this.diplomasList = removeDuplicate( this.diplomasList)
+
+ });
+ this.showLoader = false;
+ break;
+
+ case 'assinados':
+ //this.diplomasList = new Array();
+ let diplomasAssinados = data.diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+ diplomasAssinados.forEach(async element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+
+ let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+
+ 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.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ this.diplomasList.push(task);
+ this.diplomasList = removeDuplicate( this.diplomasList)
+
+ });
+ this.showLoader = false;
+ break;
+ }
+ });
+ } */
+
+ async getTotalDocs(DocId:any){
+ let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+ console.log(res.DocumentsTotal);
+ return res.DocumentsTotal;
+ }
+
+ ngOnDestroy(): void {
+ console.log('8. on destroy called');
}
segmentChanged(ev: any) {
-
- 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();
}
@@ -73,115 +139,95 @@ constructor(
}
async LoadList(){
+ this.diplomasList = [];
+ console.log(this.diplomasList);
+
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-
+
switch (this.segment) {
case 'validar':
- this.diplomasList = new Array();
- let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma");
- diplomasValidar.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 diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
+ console.log(diplomasValidar);
+
+ diplomasValidar.forEach(async element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+ this.totalDocs = await this.getTotalDocs(DocId);
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.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
+ "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.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
- },
- (error)=> {
+ this.diplomasList = removeDuplicate(this.diplomasList);
+ this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
- 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.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.push(task);
});
- });
- this.showLoader = false;
+ this.showLoader = false;
break;
case 'assinados':
this.diplomasList = new Array();
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
- diplomasAssinados.forEach(element => {
+ diplomasAssinados.forEach(async 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);
+ this.totalDocs = await this.getTotalDocs(DocId);
- 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 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 = {
+ 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,
+ "DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.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.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.push(task);
- });
+ }
+ this.diplomasList.push(task);
+ this.diplomasList = removeDuplicate(this.diplomasList);
+ this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
+
});
this.showLoader = false;
break;
}
}
- doRefresh(event) {
+ sortArrayISODate(myArray: any) {
+ return myArray.sort(function(a, b) {
+ return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+ });
+ }
+
+ async refreshing() {
+ setTimeout(() => {
+ this.LoadList();
+ }, 1500);
+ }
+
+
+ async doRefresh(event) {
+ console.log('refresh');
+
+ //this.loadDiplomas();
this.LoadList();
setTimeout(() => {
event.target.complete();
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 9d96928d5..3e3e06a8c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -431,8 +431,7 @@ export class GabineteDigitalPage implements OnInit {
openDiplomasPage(segment:string) {
if( window.innerWidth <= 801){
- let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}};
- this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
+ this.router.navigate(['/home/gabinete-digital/diplomas']);
}
else{
this.closeAllDesktopComponents();
diff --git a/src/app/resolvers/processes-resolver.service.ts b/src/app/resolvers/processes-resolver.service.ts
index 322839b3c..63de8879d 100644
--- a/src/app/resolvers/processes-resolver.service.ts
+++ b/src/app/resolvers/processes-resolver.service.ts
@@ -1,20 +1,21 @@
import { Injectable } from '@angular/core';
-import { ActivatedRoute, ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
-import { DailyWorkTask } from '../models/dailyworktask.model';
import { ProcessesService } from '../services/processes.service';
@Injectable({
providedIn: 'root'
})
-export class ProcessesResolverService implements Resolve
{
+export class ProcessesResolverService implements Resolve {
constructor(
private processesService: ProcessesService,
) { }
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
- Observable | Promise | any[] {
+ Observable | Promise | any {
+ /* const n: any = [{numero: '1', n2:'3e'}]
+ return n; */
return this.processesService.GetTasksList("Despacho do Presidente da República", false);
}
}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 27ccb6ac5..dddaae1d8 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -2,10 +2,9 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
import { ActivatedRoute, NavigationEnd, 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';
+import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
@Component({
selector: 'app-diplomas',
@@ -33,7 +32,7 @@ constructor(
ngOnInit() {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
- this.LoadList();
+ this.refreshing();
}
});
}
@@ -51,123 +50,93 @@ constructor(
}
async LoadList(){
- this.diplomasList = new Array();
-
- console.log('OOOKAY');
+ this.diplomasList = [];
+ console.log(this.diplomasList);
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-
- console.log(diplomas);
switch (this.segment) {
case 'validar':
- let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma");
+ let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
console.log(diplomasValidar);
- diplomasValidar.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 date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+ diplomasValidar.forEach(async element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+ this.totalDocs = await this.getTotalDocs(DocId);
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.originator.email,
- "CreateDate": taskDate,
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DispatchDocID,
- "FolderID": element.workflowInstanceDataFields.FolderID,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.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.DispatchDocID,
- "FolderID": element.workflowInstanceDataFields.FolderID,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
+ 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.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
this.diplomasList.push(task);
+ this.diplomasList = removeDuplicate(this.diplomasList);
+ this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
+
});
- });
- this.showLoader = false;
+ this.showLoader = false;
break;
case 'assinados':
- console.log(this.segment);
this.diplomasList = new Array();
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
- console.log(diplomasAssinados);
- diplomasAssinados.forEach(element => {
+ diplomasAssinados.forEach(async 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);
+ this.totalDocs = await this.getTotalDocs(DocId);
- 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 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 = {
+ 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.DispatchDocID,
- "FolderID": element.workflowInstanceDataFields.FolderID,
+ "DocumentsQty": this.totalDocs,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.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.DispatchDocID,
- "FolderID": element.workflowInstanceDataFields.FolderID,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.push(task);
- });
+ }
+ this.diplomasList.push(task);
+ this.diplomasList = removeDuplicate(this.diplomasList);
+ this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
+
});
this.showLoader = false;
break;
}
}
+ async getTotalDocs(DocId:any){
+ let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+ console.log(res.DocumentsTotal);
+ return res.DocumentsTotal;
+ }
+ sortArrayISODate(myArray: any) {
+ return myArray.sort(function(a, b) {
+ return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+ });
+ }
+
+ async refreshing() {
+ setTimeout(() => {
+ this.LoadList();
+ }, 1500);
+ }
doRefresh() {
this.LoadList();
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index 2eb280466..bf106b843 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
-import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
+import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { ProcessesService } from 'src/app/services/processes.service';
@@ -26,19 +26,14 @@ export class DeplomaOptionsPage implements OnInit {
private modalController: ModalController,
private activatedRoute: ActivatedRoute,
private processes: ProcessesService,
- private animationController: AnimationController,
+ private navParams: NavParams,
private toastService: ToastService,
private router: Router,) {
- this.activatedRoute.queryParams.subscribe(params => {
- if(params["serialNumber"]) {
- this.serialnumber = params["serialNumber"];
- console.log(params["serialNumber"]);
- }
- });
-
+ this.serialnumber = this.navParams.get('serialNumber');
}
ngOnInit() {
+ console.log(this.serialnumber);
}
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index 861784212..583cca30b 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -63,8 +63,6 @@ export class DespachosOptionsPage implements OnInit {
}
sendExpedienteToPending(){
- console.log(this.task.SerialNumber);
-
this.popoverController.dismiss();
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
console.log(res);
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 2692d2807..53c562db9 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -46,7 +46,7 @@ export class OptsExpedientePage implements OnInit {
}
close(){
- if( window.innerWidth <= 1024){
+ if( window.innerWidth < 801){
this.popoverController.dismiss();
}
else{
@@ -69,13 +69,22 @@ export class OptsExpedientePage implements OnInit {
}
}
else{
- this.activatedRoute.paramMap.subscribe(params => {
+ window.history.back();
+
+ /* this.activatedRoute.paramMap.subscribe(params => {
+ console.log('YES');
+ console.log(params);
+
+
switch (params["params"].caller) {
case 'events':
+ console.log('here-1');
+
this.router.navigate(['/home',params["params"].caller]);
break;
case 'gabinete-digital':
+ console.log('here0');
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
@@ -83,13 +92,15 @@ export class OptsExpedientePage implements OnInit {
}
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/expediente']);
+ console.log('here');
+
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
break;
}
- });
+ }); */
}
}
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index 3964e824a..b215d70da 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
@@ -30,7 +30,8 @@ export class RequestOptionsPage implements OnInit {
private processes: ProcessesService,
private activatedRoute: ActivatedRoute,
private animationController: AnimationController,
- private toastService: ToastService
+ private toastService: ToastService,
+ private router: Router,
) {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
@@ -61,12 +62,13 @@ export class RequestOptionsPage implements OnInit {
}
close(){
- if( window.innerWidth <= 1024){
- this.popoverController.dismiss();
+ if( window.innerWidth < 801){
+ this.popoverController.dismiss();
}
else{
this.modalController.dismiss();
}
+ this.router.navigate(['/home/gabinete-digital/pedidos']);
}
sendExpedienteToPending(){