diff --git a/src/app/data/scheduledevent.service.ts b/src/app/data/scheduledevent.service.ts index f41f8264..8f4c6dd8 100644 --- a/src/app/data/scheduledevent.service.ts +++ b/src/app/data/scheduledevent.service.ts @@ -139,6 +139,16 @@ export class ScheduledeventService extends ListableResourceClient { + otac.map((iOTAC: OTAC) => { + if (iOTAC.redeemed_timestamp) { + iOTAC.redeemed_timestamp = new Date(iOTAC.redeemed_timestamp); + } else { + iOTAC.redeemed_timestamp = undefined; + } + }); + return otac; + }), ); } diff --git a/src/app/event/otacmanagement/otacmanagement.component.ts b/src/app/event/otacmanagement/otacmanagement.component.ts index 40c28b61..615f6fd2 100644 --- a/src/app/event/otacmanagement/otacmanagement.component.ts +++ b/src/app/event/otacmanagement/otacmanagement.component.ts @@ -158,8 +158,13 @@ export class OTACManagementComponent implements OnInit, OnDestroy { if (otacUser) { userCSVpart = `${otacUser}, ${this.getUsername(otacUser)}`; } + const redeemedStr = otac.redeemed_timestamp + ? otac.redeemed_timestamp instanceof Date + ? otac.redeemed_timestamp.toISOString() + : otac.redeemed_timestamp + : ''; otacCSV = otacCSV.concat( - `${otac.name}, ${userCSVpart || ''}, ${otac.redeemed_timestamp?.toISOString() || ''}, ${otac.max_duration || ''}, ${otac.status || ''}\n`, + `${otac.name}, ${userCSVpart || ''}, ${redeemedStr}, ${otac.max_duration || ''}, ${otac.status || ''}\n`, ); }); const filename = currentScheduledEvent.event_name + '_OTACs.csv';