This commit is contained in:
tiago.kayaya
2021-02-10 13:51:39 +01:00
parent 418a0da867
commit df11afd09e
3 changed files with 13 additions and 17 deletions
+10 -14
View File
@@ -35,15 +35,21 @@ export class HomePage implements OnInit {
ngOnInit() { ngOnInit() {
//Initialize profile as mdgpr //Initialize profile as mdgpr
let date = new Date();
date.setMonth(date.getMonth() + 1);
let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59";
this.profile = "mdgpr"; this.profile = "mdgpr";
if (this.profile == "mdgpr") { if (this.profile == "mdgpr") {
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventService.getAllMdEvents(start, end).subscribe(res => {
this.eventsList = res; this.eventsList = res;
this.totalEvent = this.eventsList.length; this.totalEvent = this.eventsList.length;
}); });
} }
else { else {
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventService.getAllPrEvents(start, end).subscribe(res => {
this.eventsList = res; this.eventsList = res;
this.totalEvent = this.eventsList.length; this.totalEvent = this.eventsList.length;
}); });
@@ -203,7 +209,6 @@ export class HomePage implements OnInit {
}); });
await modal.present(); await modal.present();
modal.onDidDismiss(); modal.onDidDismiss();
} }
@@ -219,12 +224,7 @@ export class HomePage implements OnInit {
backdropDismiss: false backdropDismiss: false
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then((res)=>{ modal.onDidDismiss();
if(res){
console.log(res);
//this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
});
} }
async viewExpedientDetail(serialNumber:any) { async viewExpedientDetail(serialNumber:any) {
@@ -240,11 +240,7 @@ export class HomePage implements OnInit {
backdropDismiss: false backdropDismiss: false
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then((res)=>{ modal.onDidDismiss();
if(res){
console.log(res);
}
});
} }
+1 -1
View File
@@ -86,7 +86,7 @@
<ul> <ul>
<li *ngFor = "let task of taskslist" <li *ngFor = "let task of taskslist"
(click)="viewExpedientDetail(task.SerialNumber)"> (click)="viewExpedientDetail(task.SerialNumber)">
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente']" -->
> >
<div class="d-flex"> <div class="d-flex">
<div class="schedule-date"> <div class="schedule-date">
@@ -36,8 +36,8 @@ export class ExpedienteDetailPage implements OnInit {
private modalController: ModalController, private modalController: ModalController,
private navParams: NavParams, private navParams: NavParams,
private alertService: AlertService) { private alertService: AlertService) {
this,this.serialnumber = this.navParams.get('serialNumber'); this.serialnumber = this.navParams.get('serialNumber');
this,this.profile = this.navParams.get('profile'); this.profile = this.navParams.get('profile');
} }
ngOnInit() { ngOnInit() {