improve gabinete digital

This commit is contained in:
Peter Maquiran
2021-03-04 15:14:09 +01:00
parent 769a7941ce
commit bd2bcc4831
21 changed files with 576 additions and 124 deletions
@@ -66,6 +66,15 @@ export class ExpedientePage implements OnInit {
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
let classs;
if( window.innerWidth <= 1024){
classs = 'modal modal-desktop'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
}
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
@@ -73,7 +82,7 @@ export class ExpedientePage implements OnInit {
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
cssClass: classs,
backdropDismiss: false
});
await modal.present();
@@ -9,8 +9,9 @@ import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.mod
import { GabineteDigitalPage } from './gabinete-digital.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { EventListComponent } from 'src/app/shared/gabinete-digital/event-list/event-list.component';
import { ExpedienteComponent } from 'src/app/shared/gabinete-digital/expediente/expediente.component'
import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component';
import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page'
/* import { ComponentsModule } from 'src/app/components/components.module'; */
@NgModule({
@@ -24,7 +25,7 @@ import { ExpedienteComponent } from 'src/app/shared/gabinete-digital/expediente/
declarations: [
GabineteDigitalPage,
EventListComponent,
ExpedienteComponent
ExpedientePage
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
@@ -2,22 +2,6 @@
<app-header></app-header>
</ion-header>
<!-- <ion-header class="ion-no-border">
<ion-toolbar class="ion-no-border" class="bg-blue">
<div class="div-top-header">
<div class="div-search">
<ion-icon src='assets/images/icons-search.svg'></ion-icon>
</div>
<div class="div-logo">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="div-profile">
<ion-icon src='assets/images/icons-profile.svg'></ion-icon>
</div>
</div>
</ion-toolbar>
</ion-header> -->
<ion-content class="height-100">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -29,8 +13,8 @@
<div class="d-flex height-100">
<!-- -->
<div class="d-flex flex-column pt-25 justify-center">
<p class="text-center mt-0">Gabinete Digital</p>
<div class="d-flex aside-wrapper flex-column pt-25 justify-center">
<p class="text-center mt-0 aside-title px-20">Gabinete Digital</p>
<div class="aside overflow-y-auto d-flex flex-wrap justify-center">
<div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApproveList('MDGPR')">
<div class="d-flex justify-center">
@@ -87,7 +71,8 @@
<!-- -->
<div class="d-none flex-1 aside-content height-100 overflow-y-auto pt-25">
123
<app-event-list class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showEventList"></app-event-list>
<app-expediente class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showExpediente"></app-expediente>
</div>
</div>
@@ -153,6 +153,14 @@ ion-content{
@media only screen and (min-width: 1024px) {
.main-content{
.aside-wrapper{
justify-content: flex-start !important;
.aside-title{
font-family: Roboto;
font-size: 25px;
text-align: left;
}
}
.aside{
width: 340px;
}
@@ -17,6 +17,16 @@ export class GabineteDigitalPage implements OnInit {
showLoader: boolean;
public profile:string;
count_exp_dailywork=0;
count_exp_pp : string;
count_exp_pd : string;
count_dip_apr : string;
count_dip_pv : string;
count_de_pr : string;
count_ev_pr=0;
count_ev_md=0;
desktopComponent: any = {
showEventList: false,
showExpediente : false
@@ -30,15 +40,12 @@ export class GabineteDigitalPage implements OnInit {
}
count_exp_dailywork=0;
count_exp_pp : string;
count_exp_pd : string;
count_dip_apr : string;
count_dip_pv : string;
count_de_pr : string;
count_ev_pr=0;
count_ev_md=0;
closeAllDesktopComponent(){
this.desktopComponent = {
showEventList: false,
showExpediente: false
}
}
ngOnInit() {
//Initialize profile as mdgpr
this.profile = "mdgpr";
@@ -89,39 +96,59 @@ this.processesbackend.GetActionsList().subscribe(res=>{
}
async openEventsToApproveList(segment:any){
this.closeAllDesktopComponent();
let classs;
if( window.innerWidth <= 1024){
classs = 'modal'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
}
//if( window.innerWidth <= 1024){
const modal = await this.modalController.create({
component: EventListPage,
componentProps:{
segment: segment,
},
cssClass: 'modal expedient-task-modal modal-desktop',
cssClass: classs,
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
} else {
}
//} else {
//this.desktopComponent.showEventList = true;
//}
}
async openExpedientList(){
this.closeAllDesktopComponent();
let classs;
if( window.innerWidth <= 1024){
classs = 'modal'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
}
//if( window.innerWidth <= 1024){
const modal = await this.modalController.create({
component: ExpedientePage,
componentProps:{
profile: this.profile,
},
cssClass: 'modal modal-desktop',
cssClass: classs,
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
} else {
}
//} else {
console.log('show desktop modal')
//this.desktopComponent.showExpediente = true;
//}
}
+2 -2
View File
@@ -403,7 +403,7 @@ export class SearchPage implements OnInit {
componentProps:{
eventId: id
},
cssClass: 'modal',
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
@@ -422,7 +422,7 @@ export class SearchPage implements OnInit {
componentProps:{
publicationId: publicationId,
},
cssClass: 'publication-detail',
cssClass: 'publication-detail modal modal-desktop',
backdropDismiss: false
});
@@ -1,3 +0,0 @@
<p>
event-list works!
</p>
@@ -1,24 +0,0 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { EventListComponent } from './event-list.component';
describe('EventListComponent', () => {
let component: EventListComponent;
let fixture: ComponentFixture<EventListComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ EventListComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(EventListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -1,14 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-event-list',
templateUrl: './event-list.component.html',
styleUrls: ['./event-list.component.scss'],
})
export class EventListComponent implements OnInit {
constructor() { }
ngOnInit() {}
}
@@ -0,0 +1,12 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
const routes: Routes = [
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class ExpedientePageRoutingModule {}
@@ -1,3 +0,0 @@
<p>
expediente works!
</p>
@@ -1,24 +0,0 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { ExpedienteComponent } from './expediente.component';
describe('ExpedienteComponent', () => {
let component: ExpedienteComponent;
let fixture: ComponentFixture<ExpedienteComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ ExpedienteComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(ExpedienteComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -1,14 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-expediente',
templateUrl: './expediente.component.html',
styleUrls: ['./expediente.component.scss'],
})
export class ExpedienteComponent implements OnInit {
constructor() { }
ngOnInit() {}
}
@@ -0,0 +1,23 @@
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { ExpedientePageRoutingModule } from './expediente-routing.module';
import { ExpedientePage } from './expediente.page';
import { SharedModule } from 'src/app/shared/shared.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
SharedModule,
ExpedientePageRoutingModule
],
declarations: [ExpedientePage],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class ExpedientePageModule {}
@@ -0,0 +1,112 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">Gabinete Digital</ion-label>
</div>
</div>
</div>
</ion-toolbar>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment-button value="expediente">
Expediente
</ion-segment-button>
<ion-segment-button value="pendentes">
Pendentes
</ion-segment-button>
</ion-segment>
</ion-toolbar>
</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>
<div [ngSwitch]="segment" *ngIf="taskslist">
<ion-list *ngSwitchCase="'expediente'">
<ion-item-group>
<ion-item-sliding>
<!-- <ion-item lines="none" *ngFor = "let task of taskslist" >
<div class="div-content-expediente">
<ion-item lines="none" [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]">
<ion-icon slot="end" name="calendar"></ion-icon>
<h3>{{ task.Folio }}</h3>
</ion-item>
<p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
<p><span class="span-left">{{ task.Senders }}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
</div>
</ion-item> -->
<ion-item
class="expediente"
lines="none"
*ngFor = "let task of taskslist"
(click)="viewExpedientDetail(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="Rectangle">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-item-sliding>
</ion-item-group>
</ion-list>
<ion-list *ngSwitchCase="'pendentes'">
<ion-item-group>
<ion-item-sliding>
</ion-item-sliding>
</ion-item-group>
</ion-list>
</div>
<div *ngIf="!taskslist">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</ion-content>
@@ -0,0 +1,227 @@
@import '~src/function.scss';
.header-toolbar{
--background:transparent;
--opacity: 1;
.main-header{
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:hidden;
padding: 30px 20px 0px 20px;
color:#000;
transform: translate3d(0, 1px, 0);
.header-top{
width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
background: #fff;
.middle{
padding: 0!important;
float: left;
width: 280px;
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
}
.right{
padding: 0!important;
float: right;
font-size: 25px;
color: #0782c9;
margin: 5px 0 0 0;
}
}
.header-bottom{
width: 310px;
overflow: auto;
margin: 0 auto;
.header-bottom-icon{
width: 30px;
font-size: 25px;
float: left;
padding: 2px;
}
.header-bottom-contacts{
width: 275px;
font-size: 15px;
color: #797979;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
float: left;
padding: 5px;
margin: 1px;
}
}
.title{
font-size: 25px;
overflow: auto;
float: left;
}
.div-icon{
width: 40px;
float: right;
font-size: 35px;
overflow: auto;
padding: 1px;
}
}
}
/* CONTENT */
.item-list-small{
font-size: 11px;
overflow: auto;
}
.ion-item-class{
padding: 0;
}
.label-text{
width: 100%;
padding: 0;
margin: 0;
}
//DIV
ion-item{
--background: none;
}
.div-content-expediente{
width: 100%;
float: left;
border-left: 3px solid #dae3f3;
padding:5px 5px 15px 5px;
margin: 10px 0 10px 0;
background: #dae3f3;
border-radius: 20px;
}
.div-content-pendentes{
width: 100%;
float: left;
border-left: 3px solid #d9d9d9;
padding: 5px;
}
.div-content-expediente h3, .div-content-pendentes h3{
margin: 0;
padding: 0;
font-size: 14pt;
width: 100%;
}
.div-icon{
width: 10%;
font-size: 20px;
float: left;
color: #808080;
}
.div-icon ion-icon{
display: block;
margin: 0 auto;
}
.div-content-expediente p, .div-content-pendentes p{
font-size: 14pt;
color: rgb(94, 92, 92);
padding: 0;
margin: 0;
}
.span-left{
/* border: 1px solid red; */
float: left;
font-size: 12px;
padding-left: 18px;
}
.span-right{
/* border: 1px solid blue; */
text-align: right;
float: right;
font-size: 12px;
padding-right: 18px;
}
/* New CSS */
.expediente{
padding-top: 10px;
}
.exp-list-item{
width: 368px;
overflow: auto;
/* border-bottom: 1px solid gray; */
margin: 10px auto;
}
.exp-top-detail{
width: 100%;
overflow: auto;
}
.exp-date{
width: auto;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: #797979;
float: left;
}
.exp-remetente{
width: 200px;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
color: #000000;
float: left;
margin-left: 16px;
}
.exp-icon{
width: 45px;
float: right;
font-size: 13px;
}
.exp-icon ion-icon{
font-size: 25px;
color: #42b9fe;
}
.exp-bottom-detail{
width: 100px;
float: left;
font-family: Roboto;
font-size: 16px;
font-weight: 700;
color: #0d89d1;
}
.div-top-header{
width: 400px;
margin: 6px auto;
background-color: #0782c9;
overflow: auto;
}
.div-search{
font-size: 45px;
float: left;
margin: 0 0 0 10px
}
.div-logo{
background: transparent;
width: 150px;
margin: 2.5px 0 2.5px 71px;
float: left;
}
.div-logo img{
width: 100%;
}
.div-profile{
font-size: 45px;
float: right;
margin-right: 10px;
}
@@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { ExpedientePage } from './expediente.page';
describe('ExpedientePage', () => {
let component: ExpedientePage;
let fixture: ComponentFixture<ExpedientePage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ExpedientePage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(ExpedientePage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,92 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
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 { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
@Component({
selector: 'app-expediente',
templateUrl: './expediente.page.html',
styleUrls: ['./expediente.page.scss'],
})
export class ExpedientePage implements OnInit {
segment:string;
profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
serialNumber:string;
constructor(
private processes:ProcessesService,
private modalController: ModalController,
) {
this.profile = 'mdgpr';
}
ngOnInit() {
//Inicializar segment
this.segment = "expediente";
this.LoadList();
}
LoadList()
{
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = new Array();
result.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceFolio,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
}
this.taskslist.push(task);
});
});
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
let classs;
if( window.innerWidth <= 1024){
classs = 'modal'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
}
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: classs,
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((res)=>{
});
}
}
+14
View File
@@ -300,3 +300,17 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.footer-container{
padding: 10px 20px;
}
.gabinete-digital-mobile-modal-to-Desktop{
top: 74px;
left: 340px;
ion-backdrop{
display: none;
}
.modal-wrapper{
width: 100%;
box-shadow: none !important;
}
}