- - +
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index cb5608577..9d3208a45 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -41,7 +41,6 @@ constructor( ngOnInit() { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - console.log('Atualiza'); this.refreshing(); } }); @@ -172,7 +171,8 @@ constructor( "activityInstanceName": element.activityInstanceName, } this.diplomasList.push(task); - this.diplomasList = removeDuplicate( this.diplomasList) + this.diplomasList = removeDuplicate(this.diplomasList); + this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse(); }); this.showLoader = false; @@ -202,13 +202,20 @@ constructor( "activityInstanceName": element.activityInstanceName, } this.diplomasList.push(task); - this.diplomasList = removeDuplicate( this.diplomasList) - + this.diplomasList = removeDuplicate(this.diplomasList); + this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse(); + }); this.showLoader = false; break; } - } + } + + sortArrayISODate(myArray: any) { + return myArray.sort(function(a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } async refreshing() { setTimeout(() => { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 28f1bfa46..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/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(); From b6e7cc4ea96f8f974b384525ee09d1d2384591bc Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Jul 2021 15:58:09 +0100 Subject: [PATCH 09/23] save --- .../opts-expediente/opts-expediente.page.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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; } - }); + }); */ } } From d433543b5c3fe860951430d965ad770c33869c3a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Jul 2021 16:10:03 +0100 Subject: [PATCH 10/23] save --- .../despachos-options/despachos-options.page.ts | 2 -- .../popover/request-options/request-options.page.ts | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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/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(){ From 1ecf7d386be91de1ae9a6023c552fea3b594777b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 6 Jul 2021 16:18:00 +0100 Subject: [PATCH 11/23] Improve validation for publication --- .../pages/agenda/new-event/new-event.page.ts | 2 - .../expedient-task-modal.page.ts | 8 +- .../new-action/new-action.module.ts | 30 +++++- .../new-action/new-action.page.html | 44 ++++++++- .../new-action/new-action.page.ts | 95 ++++++++++++++++-- .../new-publication/new-publication.page.ts | 98 +++++++++++++------ .../pages/publications/publications.module.ts | 6 -- .../agenda/edit-event/edit-event.page.html | 6 +- .../agenda/edit-event/edit-event.page.ts | 6 +- .../edit-action/edit-action.page.ts | 2 +- .../publication/new-action/new-action.page.ts | 13 ++- 11 files changed, 249 insertions(+), 61 deletions(-) diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index e02c6e206..b3afed654 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -188,8 +188,6 @@ export class NewEventPage implements OnInit { this.runValidation() if(this.Form.invalid) return false - - console.log('passed') if(this.documents.length >= 0) { this.postEvent.HasAttachments = true; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 77d486654..d2fb6c86f 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -224,16 +224,16 @@ export class ExpedientTaskModalPage implements OnInit { - if(this.postData.Priority=='99999861'){ + if(this.postData.Priority=='99999861') { this.dispatchFolder.DeadlineType = 'Normal'; } - else if(this.postData.Priority=='99999862'){ + else if(this.postData.Priority=='99999862') { this.dispatchFolder.DeadlineType = 'Urgente'; } - else if(this.postData.Priority=='99999863'){ + else if(this.postData.Priority=='99999863') { this.dispatchFolder.DeadlineType = 'Muito Urgente'; } - else if(this.postData.Priority=='99999864'){ + else if(this.postData.Priority=='99999864') { this.dispatchFolder.DeadlineType = 'Urgentíssimo'; } let attendees = this.taskParticipants.concat(this.taskParticipantsCc); diff --git a/src/app/pages/publications/new-action/new-action.module.ts b/src/app/pages/publications/new-action/new-action.module.ts index d5d868f49..3924eab40 100644 --- a/src/app/pages/publications/new-action/new-action.module.ts +++ b/src/app/pages/publications/new-action/new-action.module.ts @@ -8,12 +8,40 @@ import { NewActionPageRoutingModule } from './new-action-routing.module'; import { NewActionPage } from './new-action.page'; +import { MatNativeDateModule } from '@angular/material/core'; +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; +import { MatDialogModule } from '@angular/material/dialog'; + + @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - NewActionPageRoutingModule + NewActionPageRoutingModule, + // Angular material + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule, + MatDialogModule, ], exports: [NewActionPage], declarations: [NewActionPage] diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index c0c33141f..135958933 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -18,7 +18,7 @@
-
+
@@ -30,6 +30,7 @@
+ + + + + + + +