peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix date comparation

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-17 22:17:50 +01:00
parent 0394f41bc3
commit bd1914e81e
4 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/event-list/event-list.page.html
+4 -4
View File
@@ -38,8 +38,8 @@
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p> <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div> </div>
<div class="approve-event-detail"> <div class="approve-event-detail">
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p> <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p> <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3> <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div> </div>
</div> </div>
@@ -58,8 +58,8 @@
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p> <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div> </div>
<div class="approve-event-detail"> <div class="approve-event-detail">
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p> <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p> <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3> <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div> </div>
</div> </div>
src/app/shared/agenda/event-list/event-list.page.ts
+55 -51
View File
@@ -38,68 +38,72 @@ export class EventListPage implements OnInit {
private userAuth: AuthService, private userAuth: AuthService,
) { ) {
this.loggeduser = userAuth.ValidatedUser; this.loggeduser = userAuth.ValidatedUser;
} }
ngOnInit() { ngOnInit() {
this.segment = this.loggeduser.Profile; this.segment = this.loggeduser.Profile;
//this.LoadToApproveEvents(); //this.LoadToApproveEvents();
const pathname = window.location.pathname const pathname = window.location.pathname
this.router.events.forEach((event) => { this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) { if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadToApproveEvents(); this.LoadToApproveEvents();
}
});
}
segmentChanged(ev: any) {
this.LoadToApproveEvents();
}
async LoadToApproveEvents() {
this.showLoader = true;
console.log(this.segment);
if(this.segment == 'MDGPR'){
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
} }
else if(this.segment == 'PR'){ });
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); }
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
}
this.showLoader = false;
}
async openApproveModal(eventSerialNumber, data) { segmentChanged(ev: any) {
this.LoadToApproveEvents();
}
let a =this.eventsMDGPRList.filter((elem)=>{ toDateString(e) {
console.log(eventSerialNumber," ",elem.serialNumber) return new Date(e).toDateString()
return eventSerialNumber == elem.serialNumber }
});
this.approveEventDismiss.emit({ async LoadToApproveEvents() {
"serialNumber": eventSerialNumber, this.showLoader = true;
"action": "Aprovar", console.log(this.segment);
"saveData": data if(this.segment == 'MDGPR'){
}); let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
} }
else if(this.segment == 'PR'){
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
}
this.showLoader = false;
}
doRefresh(event) { async openApproveModal(eventSerialNumber, data) {
this.LoadToApproveEvents();
console.log('refresh'); let a =this.eventsMDGPRList.filter((elem)=>{
setTimeout(() => { console.log(eventSerialNumber," ",elem.serialNumber)
event.target.complete(); return eventSerialNumber == elem.serialNumber
}, 2000); });
}
close(){ this.approveEventDismiss.emit({
console.log('close') "serialNumber": eventSerialNumber,
this.cloneAllmobileComponent.emit(); "action": "Aprovar",
} "saveData": data
});
}
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');
setTimeout(() => {
event.target.complete();
}, 2000);
}
close(){
console.log('close')
this.cloneAllmobileComponent.emit();
}
} }
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+4 -4
View File
@@ -40,8 +40,8 @@
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p> <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div> </div>
<div class="approve-event-detail"> <div class="approve-event-detail">
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p> <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p> <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3> <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div> </div>
</div> </div>
@@ -60,8 +60,8 @@
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p> <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div> </div>
<div class="approve-event-detail"> <div class="approve-event-detail">
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p> <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p> <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3> <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div> </div>
</div> </div>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+5
View File
@@ -72,6 +72,11 @@ export class EventsToApprovePage implements OnInit {
this.showLoader = false; this.showLoader = false;
} }
toDateString(e) {
return new Date(e).toDateString()
}
goToEventDetail(event){ goToEventDetail(event){
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital']) this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
} }