This commit is contained in:
Peter Maquiran
2021-07-16 16:29:27 +01:00
parent 72bfa06d63
commit a9dac9679d
5 changed files with 27 additions and 29 deletions
@@ -44,7 +44,7 @@ export class ExpedientesPrPage implements OnInit {
const pathname = location.pathname + location.search const pathname = location.pathname + location.search
this.router.events.forEach((event) => { this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { if (event instanceof NavigationEnd && event.url.startsWith('/home/gabinete-digital?expedientes-pr=true')) {
this.LoadList(); this.LoadList();
} }
}); });
@@ -3,9 +3,7 @@ import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { ModalController } 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'; import { AlertService } from 'src/app/services/alert.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
@@ -13,7 +11,6 @@ import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
import { DespachoPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page'; import { DespachoPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router'; import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
@@ -16,37 +16,39 @@
refreshingSpinner="circles" refreshingSpinner="circles"
refreshingText="A actualizar..."> refreshingText="A actualizar...">
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="width-100 overflow-y-auto height-100" *ngIf="taskslist"> <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <div class="height-100">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<ion-list> <ion-list>
<ion-item <ion-item
class="expediente ion-no-padding cursor-pointer" class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of taskslist" *ngFor = "let task of taskslist"
(click)="goToExpediente(task.SerialNumber)" (click)="goToExpediente(task.SerialNumber)"
> >
<div class="item width-100"> <div class="item width-100">
<div class="exp-top-detail"> <div class="exp-top-detail">
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label> <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>
<div class="exp-bottom-detail"> <div class="exp-remetente">
<ion-label>{{ task.Folio }}</ion-label> <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> </div>
</ion-item> <div class="exp-bottom-detail">
</ion-list> <ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-list>
</div>
</div> </div>
<div *ngIf="skeletonLoader && taskslist.length == 0"> <div *ngIf="skeletonLoader && taskslist.length == 0">
<ion-list> <ion-list>
@@ -49,7 +49,6 @@ export class ExpedientsPage implements OnInit {
} }
}); });
} }
segmentChanged(){ segmentChanged(){
@@ -99,7 +99,7 @@
</ion-list> </ion-list>
</div> </div>
</div> </div>
<div *ngIf="skeletonLoader && parecerList.length == 0 || skeletonLoader && deferimentoList.length == 0 "> <div *ngIf="skeletonLoader && parecerList.length == 0 && skeletonLoader && deferimentoList.length == 0 ">
<ion-list> <ion-list>
<ion-item> <ion-item>