From cdc984dcfaf428d13e1eb3d1f47a8603baa42a0c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 30 Apr 2021 14:27:13 +0100 Subject: [PATCH 1/7] save --- src/app/shared/gabinete-digital/pedidos/pedidos.page.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 3c364d57f..2ecc63c06 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -10,9 +10,9 @@ import { ModalController, NavParams } from '@ionic/angular'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page'; -import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; -import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; 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'; @Component({ selector: 'app-pedidos', @@ -71,7 +71,6 @@ export class PedidosPage implements OnInit { if(this.segment == 'parecer'){ this.taskType = "Pedido de Parecer"; this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => { - this.taskslist = result; console.log(result); this.parecerListResult =result; @@ -291,9 +290,5 @@ export class PedidosPage implements OnInit { }); } - docIndex(index: number) { - this.dicIndex = index; - } - } \ No newline at end of file From 4c60ab4c8406aff526899ea84fbd58dfe89a242c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 30 Apr 2021 14:28:12 +0100 Subject: [PATCH 2/7] save --- .../gabinete-digital/pedidos/pedidos.page.ts | 150 +----------------- 1 file changed, 2 insertions(+), 148 deletions(-) diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 2ecc63c06..b7f025d04 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu import { Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; -import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; +import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { formatDate } from '@angular/common'; import { LoadingService } from 'src/app/services/loading.service'; @@ -10,9 +10,6 @@ import { ModalController, NavParams } from '@ionic/angular'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page'; -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'; @Component({ selector: 'app-pedidos', @@ -27,10 +24,6 @@ export class PedidosPage implements OnInit { taskslist:DailyWorkTask[]; parecerList:DailyWorkTask[]; - - parecerListResult:tasksList[] = []; - deferimentoListResult:tasksList[] = []; - deferimentoList:DailyWorkTask[]; taskType: string; serialNumber:string; @@ -39,9 +32,6 @@ export class PedidosPage implements OnInit { @Input() segment:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); - loadedAttachments:any; - dicIndex = 0; - constructor( private processes:ProcessesService, private modalController: ModalController, @@ -72,9 +62,7 @@ export class PedidosPage implements OnInit { this.taskType = "Pedido de Parecer"; this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => { console.log(result); - - this.parecerListResult =result; - + this.parecerList = new Array(); let res = result.reverse(); res.forEach(element => { @@ -99,8 +87,6 @@ export class PedidosPage implements OnInit { this.taskType = "Pedido de Deferimento"; this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { console.log(result); - - this.deferimentoListResult =result; this.deferimentoList = new Array(); let res = result.reverse(); @@ -158,137 +144,5 @@ export class PedidosPage implements OnInit { }); } - - - async openExpedientActionsModal(taskAction: any, task: any) { - //this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - let doc: tasksList; - - if (this.segment == 'parecer') { - doc = this.parecerListResult[ this.dicIndex]; - } else if (this.segment == 'deferimento') { - doc = this.deferimentoListResult[ this.dicIndex]; - } - - task = { - serialNumber: doc.serialNumber, - taskStartDate: doc.taskStartDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.workflowInstanceDataFields.SourceSecFsID, - FolderID: null, - DocId: doc.workflowInstanceDataFields.SourceID, - Subject: doc.workflowInstanceFolio - }, - } - - const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, - componentProps: { - taskAction: taskAction, - task: task, - profile: this.profile, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then(res=>{ - console.log(res['data']); - if(res['data']=='openDiscart'){ - console.log('open discart'); - - // this.distartExpedientModal(); - - } - - }); - } - - async openBookMeetingModal(task: any) { - - - let doc: tasksList; - - if (this.segment == 'parecer') { - doc = this.parecerListResult[ this.dicIndex]; - } else if (this.segment == 'deferimento') { - doc = this.deferimentoListResult[ this.dicIndex]; - } - - task = { - serialNumber: doc.serialNumber, - taskStartDate: doc.taskStartDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.workflowInstanceDataFields.SourceSecFsID, - FolderID: null, - DocId: doc.workflowInstanceDataFields.SourceID, - Subject: doc.workflowInstanceFolio - }, - } - - - 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: task, - }, - cssClass: classs, - backdropDismiss: false - }); - - await modal.present(); - modal.onDidDismiss(); - - } - - async distartExpedientModal(){ - - let doc: tasksList; - - if (this.segment == 'parecer') { - doc = this.parecerListResult[ this.dicIndex]; - } else if (this.segment == 'deferimento') { - doc = this.deferimentoListResult[ this.dicIndex]; - } - - - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: doc.serialNumber, - folderId: doc.workflowInstanceDataFields.FolderID, - action: 'complete', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - await modal.present(); - modal.onDidDismiss().then(res=>{ - if(res['data']=='close'){ - //this.close(); - /* console.log('2Expedient Discard closed2'); - this.close(); - this.openMenu(); */ - } - - }); - } - } \ No newline at end of file From b6ea6930e4515c30079e81f5f4d92e16ede142c3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 30 Apr 2021 14:29:02 +0100 Subject: [PATCH 3/7] save --- .../pedidos/pedidos.page.html | 45 ++----------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 85952e6c4..0efe5ef58 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -1,38 +1,3 @@ - - - - Menu PEDIDO - - - - - - - Efectuar Despacho - - - - Pedido de Parecer - - - - - - Descartar - - - - -
- -
-
Pedidos
@@ -82,9 +47,8 @@ {{task.Remetente}}
- + +
@@ -113,9 +77,8 @@ {{task.Remetente}}
- - - + +
From ce5983b48a78fe3c25c032a8edfa99c6b5b0408c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 30 Apr 2021 14:34:50 +0100 Subject: [PATCH 4/7] save --- .../agenda/view-event/view-event.page.ts | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index f3a343a3a..7c3f92aeb 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -11,7 +11,6 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient import { momentG } from 'src/plugin/momentG'; import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page'; -import { OptionsComponent } from './options/options.component'; @Component({ selector: 'app-view-event', @@ -181,27 +180,6 @@ export class ViewEventPage implements OnInit { }); } - async openOptions(ev: any) { - const popover = await this.popoverController.create({ - component: OptionsComponent, - cssClass: 'chat-popover modal-desktop', - event: ev, - componentProps: { - // room: this.room, - }, - translucent: true - }); - await popover.present(); - popover.onDidDismiss().then(res=>{ - console.log(res); - if(res.data){ - // this.getRoomInfo(); - //this.modalController.dismiss(); - }; - - }); - } - async openBookMeetingModal(task: any) { const doc = this.loadedAttachments[ this.dicIndex]; From 98a50eeb74f2c0db6836a636db0fb5cd4a91864c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 30 Apr 2021 14:40:10 +0100 Subject: [PATCH 5/7] save --- .../gabinete-digital.page.html | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index d9556254f..5b6381d4d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -20,7 +20,7 @@
-
+
@@ -28,7 +28,7 @@

{{count_ev_md+count_ev_pr}} Documentos

-
+
@@ -45,7 +45,7 @@

{{this.count_desp_pending + count_def_pending + count_par_pending}} Documentos

-
+
@@ -53,7 +53,7 @@

{{count_desp_dailywork}}Documentos

-
+
@@ -61,16 +61,14 @@

{{count_par_dailywork}} Documentos

-
+

Pedidos de Deferimento

{{count_def_dailywork}} Documentos

- - -
+
@@ -78,8 +76,7 @@

- Documentos

- -
+
@@ -87,8 +84,7 @@

- Documentos

-
+
@@ -100,8 +96,7 @@
-
+
@@ -113,7 +108,7 @@
-
+
@@ -121,7 +116,7 @@

- Documentos

-
+
From bb883600d3c6172bf50d630a9fbc26a7336f9ec3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 30 Apr 2021 16:12:08 +0100 Subject: [PATCH 6/7] save --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index eaa6130e2..058027615 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -37,7 +37,7 @@
-
+
From 162a4205377dcc71ccc598df6a958be0b95ec195 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 30 Apr 2021 16:19:38 +0100 Subject: [PATCH 7/7] save --- src/app/shared/gabinete-digital/pedidos/pedidos.page.html | 6 +++--- src/app/shared/gabinete-digital/pedidos/pedidos.page.ts | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index bdda9a548..8df18f4cf 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -6,11 +6,11 @@ - + Efectuar Despacho - + Pedido de Parecer @@ -116,7 +116,7 @@ {{task.Remetente}}
- +
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 9d935318b..c54d504ae 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -27,6 +27,7 @@ export class PedidosPage implements OnInit { taskslist:DailyWorkTask[]; parecerList:DailyWorkTask[]; + fulltask:any; parecerListResult:tasksList[] = []; deferimentoListResult:tasksList[] = []; @@ -71,6 +72,7 @@ export class PedidosPage implements OnInit { if(this.segment == 'parecer'){ this.taskType = "Pedido de Parecer"; this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => { + this.taskslist = result; console.log(result); this.parecerListResult =result; @@ -98,6 +100,7 @@ export class PedidosPage implements OnInit { else if(this.segment == 'deferimento'){ this.taskType = "Pedido de Deferimento"; this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { + this.taskslist = result; console.log(result); this.deferimentoListResult =result; @@ -290,9 +293,5 @@ export class PedidosPage implements OnInit { }); } - docIndex(index: number) { - this.dicIndex = index; - } - } \ No newline at end of file