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
+4
View File
@@ -59,6 +59,10 @@ export class EventListPage implements OnInit {
this.LoadToApproveEvents(); this.LoadToApproveEvents();
} }
toDateString(e) {
return new Date(e).toDateString()
}
async LoadToApproveEvents() { async LoadToApproveEvents() {
this.showLoader = true; this.showLoader = true;
console.log(this.segment); console.log(this.segment);
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'])
} }