From 4b87bf216ce1f34a5e9cf2bce5aebee9b64dcd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Thu, 23 Jan 2020 21:37:39 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20data=20rozpocz=C4=99cia=20testu=20w=20gru?= =?UTF-8?q?pie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group-details/group-details.component.ts | 14 +++++++++++--- .../sharing-resources-in-groups.component.ts | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/FrontEnd/src/app/groups/group-details/group-details.component.ts b/FrontEnd/src/app/groups/group-details/group-details.component.ts index d60485d..ae056a7 100644 --- a/FrontEnd/src/app/groups/group-details/group-details.component.ts +++ b/FrontEnd/src/app/groups/group-details/group-details.component.ts @@ -86,7 +86,7 @@ export class GroupDetailsComponent implements OnInit, OnDestroy { let dateFrom = null; let dateTo = null; if (this.dateFrom) { - dateFrom = this.dateFrom.getTime(); + dateFrom = this.dateFrom.getTime() - this.dateFrom.getSeconds() * 1000 - this.dateFrom.getMilliseconds(); dateTo = dateFrom + this.howLong * 60 * 1000; } this.groupService.putTestsToGroup(this.id, [this.testId.toString()], dateFrom, dateTo).subscribe( @@ -339,7 +339,11 @@ export class GroupDetailsComponent implements OnInit, OnDestroy { const tempstop = new Date(x['dateTo']); x['startDate'] = ''; const hours = temp.getHours(); - const minutes = temp.getMinutes(); + const minutesTemp = temp.getMinutes(); + let minutes = minutesTemp.toString(); + if (minutesTemp < 10) { + minutes = `0${minutesTemp}`; + } // const months = ['STY', 'LUT', 'MAR', 'KWI', 'MAJ', 'CZE', 'LIP', 'SIE', 'WRZ', 'PAŹ', 'LIS', 'GRU']; const year = temp.getFullYear().toString().substring(2); const monthTemp = (temp.getMonth() + 1); @@ -347,7 +351,11 @@ export class GroupDetailsComponent implements OnInit, OnDestroy { if (monthTemp < 10) { month = `0${monthTemp}`; } - const date = temp.getDate(); + const dateTemp = temp.getDate(); + let date = dateTemp.toString(); + if (dateTemp < 10) { + date = `0${dateTemp}`; + } const time = date + '.' + month + '.' + year + ' ' + hours + ':' + minutes; x['startDate'] += time; }); diff --git a/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.ts b/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.ts index 1f37682..6cab565 100644 --- a/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.ts +++ b/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.ts @@ -165,7 +165,7 @@ export class SharingResourcesInGroupsComponent implements OnInit, OnDestroy { let dateFrom = null; let dateTo = null; if (this.dateFrom) { - dateFrom = this.dateFrom.getTime(); + dateFrom = this.dateFrom.getTime() - this.dateFrom.getSeconds() * 1000 - this.dateFrom.getMilliseconds(); dateTo = dateFrom + this.howLong * 60 * 1000; } this.addTestsToGroupSub = this.groupService.addTestsToGroup(this.id, this.selected, dateFrom, dateTo).subscribe(