Merge branch 'feature/gabinete' into developer

This commit is contained in:
tiago.kayaya
2021-04-30 14:26:57 +01:00
49 changed files with 2727 additions and 61 deletions
@@ -6,11 +6,11 @@
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0',fulltask)">
<ion-item (click)="openExpedientActionsModal('0','')">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('1',fulltask)">
<ion-item (click)="openExpedientActionsModal('1','')">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
@@ -68,8 +68,8 @@
<ion-list *ngSwitchCase="'parecer'">
<ion-item
class="expediente ion-no-padding"
*ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)"
*ngFor = "let task of parecerList"
(click)="viewPedidoDetail(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
@@ -100,6 +100,7 @@
<ion-item
class="expediente ion-no-padding"
*ngFor = "let task of deferimentoList"
(click)="viewPedidoDetail(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
@@ -112,7 +113,7 @@
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-icon">
<ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
</ion-menu-button>
</div>
@@ -9,8 +9,9 @@ import { LoadingService } from 'src/app/services/loading.service';
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 { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
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';
@Component({
@@ -70,6 +71,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;
@@ -77,7 +79,7 @@ export class PedidosPage implements OnInit {
this.parecerList = new Array();
let res = result.reverse();
res.forEach(element => {
let task: DailyWorkTask = {
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
@@ -85,6 +87,8 @@ export class PedidosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
}
this.parecerList.push(task);
});
@@ -102,7 +106,7 @@ export class PedidosPage implements OnInit {
this.deferimentoList = new Array();
let res = result.reverse();
res.forEach(element => {
let task: DailyWorkTask = {
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
@@ -110,6 +114,8 @@ export class PedidosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
}
this.deferimentoList.push(task);
});
@@ -127,7 +133,7 @@ export class PedidosPage implements OnInit {
}, 2000);
}
async viewExpedientDetail(serialNumber:any) {
async viewPedidoDetail(serialNumber:any) {
console.log(this.profile);
let classs;
@@ -138,7 +144,7 @@ export class PedidosPage implements OnInit {
}
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
component: PedidoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,