From 63a26a02c02144746116c0b30da20d90c59e6787 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Aug 2021 12:31:22 +0100 Subject: [PATCH 1/3] improve --- .../create-process/create-process.page.ts | 4 +-- .../expediente-pr/expediente-pr.page.html | 2 +- .../gabinete-digital/gabinete-digital.page.ts | 31 ++++++++++--------- src/app/services/dom/wait-for-dom.service.ts | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index fe6ec4526..227d8d729 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -121,11 +121,11 @@ export class CreateProcessPage implements OnInit { let SourceType; let SourceSecFsId; - if(this.task.workflowInstanceDataFields.FolderID) { + if(this.task.workflowInstanceDataFields.FolderID || this.task.FolderId) { SourceId = this.task.workflowInstanceDataFields.FolderID SourceType = 'FOLDER' SourceSecFsId = 361 - } else { + } else { SourceId = this.task.workflowInstanceDataFields.SourceID SourceType = 'DOC' SourceSecFsId = 8 diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index c613e0d65..e184bc4b8 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -65,7 +65,7 @@
Documentos Anexados
- +

{{ Document.Assunto }}

{{ Document.Sender}}{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}

 diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 0d18b4f3e..7e31cae4a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -156,27 +156,30 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } const pathname = window.location.pathname - this.LoadCounts(); + this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == pathname) { - this.checkRoutes(); - this.LoadCounts(); - // this.waitForDomService.selector({ - // selector: 'app-gabinete-digital ion-content .aside-wrapper', - // callback: ()=> { - // this.checkRoutes(); - // this.LoadCounts(); - // } - // }) - // console.log('yes', pathname) - } else { - // console.log('not') + + this.waitForDomService.selector({ + selector: 'app-gabinete-digital ion-content .aside-wrapper', + callback: ()=> { + this.checkRoutes(); + this.LoadCounts(); + } + }) } }); this.hideRefreshButton(); - this.loadAllProcesses(); + + this.waitForDomService.selector({ + selector: 'app-gabinete-digital ion-content .aside-wrapper', + callback: ()=> { + this.loadAllProcesses(); + } + }) + } async loadAllProcesses(){ diff --git a/src/app/services/dom/wait-for-dom.service.ts b/src/app/services/dom/wait-for-dom.service.ts index 216c129c9..3ab9c3d12 100644 --- a/src/app/services/dom/wait-for-dom.service.ts +++ b/src/app/services/dom/wait-for-dom.service.ts @@ -9,7 +9,7 @@ export class WaitForDomService { constructor() { } selector({ selector, callback }) { - + function _try() { if (!document.querySelector(selector)) { window.requestAnimationFrame(_try); From 17d90c93c25f5e87e50dce4c4bc27b9fd6d98736 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Aug 2021 13:04:30 +0100 Subject: [PATCH 2/3] Improve --- src/app/modals/create-process/create-process.page.ts | 6 ++++++ .../shared/popover/request-options/request-options.page.ts | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 227d8d729..3bdc7cedb 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -330,6 +330,8 @@ export class CreateProcessPage implements OnInit { try { await this.pedidoService.createDeferimento(this.postData).toPromise(); await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise(); + alert('!!__!!') + this.modalController.dismiss(); this.toastService.successMessage('Pedido de Deferimento criado'); } @@ -465,7 +467,11 @@ export class CreateProcessPage implements OnInit { }, "AttachmentList" :null, } + + } else { + alert('!!!') } + console.log(body); try { 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 35358223f..e403aab6d 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; 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 { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { PermissionService } from 'src/app/OtherService/permission.service'; @@ -117,21 +118,23 @@ export class RequestOptionsPage implements OnInit { classs = 'modal modal-desktop showAsideOptions' } const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, + component: CreateProcessPage, componentProps: { taskAction: taskAction, task: task, profile: this.profile, + fulltask: this.fulltask }, cssClass: classs, }); await modal.present(); - modal.onDidDismiss().then(res=>{ + modal.onDidDismiss().then(res=> { console.log(res['data']); if(res['data']=='openDiscart'){ console.log('open discart'); this.distartExpedientModal(); + this.modalController.dismiss() } From 660ab9cc93820c97c513318791d0aff0b3ca5b87 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Aug 2021 14:15:34 +0100 Subject: [PATCH 3/3] add --- src/app/shared/popover/request-options/request-options.page.ts | 1 - 1 file changed, 1 deletion(-) 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 e403aab6d..8b925bc4c 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -8,7 +8,6 @@ import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { PermissionService } from 'src/app/OtherService/permission.service'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; -import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service';