STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

fix incorrect parsing of some dates

Browse Source
This commit is contained in:
James Collins
2023-03-14 18:44:29 +10:00
parent b45dd84f0f
commit 4b9867bd16
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
resources/js/helpers/datetime.ts
View File

@@ -167,7 +167,24 @@ export class SMDate {
parsedHours = parseInt(match[1]);
parsedMinutes = match[2] ? parseInt(match[2]) : 0;
parsedSeconds = match[3] ? parseInt(match[3]) : 0;
if (match[4] && /pm/i.test(match[4])) {
if (
parsedHours < 0 ||
parsedHours > 23 ||
(match[4] &&
(/(am|pm)/i.test(match[4]) == false ||
parsedHours > 12)) ||
parsedMinutes < 0 ||
parsedMinutes > 59 ||
parsedSeconds < 0 ||
parsedSeconds > 59
) {
// not valid
this.date = null;
return this;
}
if (match[4] && /pm/i.test(match[4]) && parsedHours < 12) {
parsedHours += 12;
}
if (