further improvements on events to approve and expedientes view for mobile

This commit is contained in:
tiago.kayaya
2021-05-25 10:32:15 +01:00
parent 9600a050dd
commit a7aa68d83c
21 changed files with 311 additions and 144 deletions
@@ -1,32 +1,40 @@
<ion-header class="ion-no-border">
<div class="title">
<div class="thetitle"><ion-label >Expediente</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
</div>
<app-header></app-header>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content d-flex height-100" [ngSwitch]="segment">
<div class="content d-flex flex-column width-100">
<div class="header-content">
<div class="header-icon-left">
<button class="btn-no-color cursor-pointer" (click)="goBack()">
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</button>
</div>
<div class="header-title">
<label>Expediente</label>
</div>
<div class="btn-refresh">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
</div>
<div class="width-100" *ngIf="taskslist">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
<div
class="expediente cursor-pointer"
*ngFor = "let task of taskslist"
(click)="goToExpediente(task.SerialNumber)"
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-top-detail width-100">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
@@ -42,7 +50,7 @@
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</div>
</ion-list>
</div>
<div *ngIf="!taskslist">
@@ -70,5 +78,7 @@
</ion-item>
</ion-list>
</div>
</div>
</div>
</ion-content>
@@ -1,30 +1,42 @@
@import '~src/function.scss';
/* CONTENT */
:host{
padding: 30px 20px 0 20px !important;
margin: 0;
.main-content{
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
}
.title{
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
float: left;
}
.header-content{
margin: 0 !important;
overflow: auto;
.header-icon-left{
width: 36px;
font-size: 33px;
color: #42b9fe;
float: left;
}
.header-title{
padding-top: 2.5px;
font-family: Roboto;
font-size: 25px;
color:#000;
overflow: auto;
float: left;
}
.item-list-small{
font-size: 11px;
overflow: auto;
}
.ion-item-class{
padding: 0;
}
.label-text{
width: 100%;
padding: 0;
margin: 0;
.btn-refresh {
width: fit-content;
float: right;
}
}
//DIV
ion-item{
border: 1px solid blue;
margin: 0 !important;
padding: 0 !important;
--background: none;
}
.item {
@@ -92,6 +104,7 @@ ion-item{
/* New CSS */
.expediente{
padding-top: 10px;
border-bottom: 1px solid #ebebeb;
}
.exp-list-item{
//width: 368px;
@@ -100,7 +113,6 @@ ion-item{
margin: 10px auto;
}
.exp-top-detail{
width: 100%;
overflow: auto;
}
.exp-date{
@@ -126,7 +138,7 @@ ion-item{
}
.exp-icon{
width: 45px;
width: fit-content;
float: right;
font-size: 13px;
}
@@ -6,7 +6,7 @@ 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';
import { ModalController, NavParams } from '@ionic/angular';
import { ModalController } 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';
@@ -18,6 +18,7 @@ import { AlertService } from 'src/app/services/alert.service';
export class ExpedientePage implements OnInit {
segment:string;
showLoader: boolean;
//profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
@@ -38,14 +39,6 @@ export class ExpedientePage implements OnInit {
}
ngOnInit() {
//Inicializar segment
this.segment = "expedientes";
this.LoadList();
}
segmentChanged(){
console.log(this.segment);
this.LoadList();
}
@@ -59,16 +52,20 @@ export class ExpedientePage implements OnInit {
}
LoadList(){
this.showLoader = true;
this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
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: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
@@ -78,6 +75,7 @@ export class ExpedientePage implements OnInit {
this.taskslist.push(task);
});
console.log(this.taskslist);
this.showLoader = false;
});
}
@@ -89,6 +87,10 @@ export class ExpedientePage implements OnInit {
}, 2000);
}
goBack(){
this.router.navigate(['/home/gabinete-digital']);
}
goToExpediente(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {