diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index eaa6130e2..f8e3ad8cb 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

-
+
@@ -37,7 +37,7 @@
-
+
@@ -46,7 +46,7 @@

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

-
+
@@ -54,7 +54,7 @@

{{count_desp_dailywork}}Documentos

-
+
@@ -62,16 +62,14 @@

{{count_par_dailywork}} Documentos

-
+

Pedidos de Deferimento

{{count_def_dailywork}} Documentos

- - -
+
@@ -79,8 +77,7 @@

- Documentos

- -
+
@@ -88,8 +85,7 @@

- Documentos

-
+
@@ -101,8 +97,7 @@
-
+
@@ -114,7 +109,7 @@
-
+
@@ -122,7 +117,7 @@

- Documentos

-
+
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]; diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index bdda9a548..cab989dc9 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
@@ -72,7 +37,6 @@ class="expediente ion-no-padding" *ngFor = "let task of parecerList" (click)="viewPedidoDetail(task.SerialNumber)" - > @@ -85,9 +49,8 @@ {{task.Remetente}}
- + +
@@ -116,7 +79,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..2fce3ffe9 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -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 { 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 { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; @Component({ selector: 'app-pedidos', @@ -27,6 +24,7 @@ export class PedidosPage implements OnInit { taskslist:DailyWorkTask[]; parecerList:DailyWorkTask[]; + fulltask:any; parecerListResult:tasksList[] = []; deferimentoListResult:tasksList[] = []; @@ -39,9 +37,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, @@ -71,10 +66,9 @@ 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; - + this.parecerList = new Array(); let res = result.reverse(); res.forEach(element => { @@ -98,9 +92,8 @@ 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; this.deferimentoList = new Array(); let res = result.reverse(); @@ -114,6 +107,7 @@ export class PedidosPage implements OnInit { "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": 0, "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "FolderId": element.workflowInstanceDataFields.FolderId, "WorkflowName": element.workflowDisplayName, } this.deferimentoList.push(task); @@ -159,140 +153,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(); */ - } - - }); - } - - docIndex(index: number) { - this.dicIndex = index; - } - } \ No newline at end of file