Skip to content

Fix time parsing and AM/PM conversion inconsistencies #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
borgar merged 9 commits into from
Apr 2, 2026
+12 −7
Merged

Fix time parsing and AM/PM conversion inconsistencies #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2c48d08
Fix bug in selected condition parts and add tests.
ibrahim-sadiqi Mar 25, 2026
4322cc8
Fix parsing of times around 12:00 AM and 12:00 PM.
ibrahim-sadiqi Mar 26, 2026
134abdc
Removed the ex.js file
ibrahim-sadiqi Mar 26, 2026
c77994b
ran linting
ibrahim-sadiqi Apr 1, 2026
09b77fb
removed console.log
ibrahim-sadiqi Apr 1, 2026
eb96e49
ran linting
ibrahim-sadiqi Apr 1, 2026
7a94947
Merge branch 'fix/conditional-format-section-handling-#68' of https:/…
ibrahim-sadiqi Apr 1, 2026
b3de459
Revert "Merge branch 'fix/conditional-format-section-handling-#68' of…
ibrahim-sadiqi Apr 1, 2026
dca772d
revert package.json
ibrahim-sadiqi Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/parseValue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,8 @@ export function parseTime (value, options = {}) {
ampm = 'p';
}
else if (tail) {
return null;
if (tail === ':') { parts[2] = '00'; }
else { return null; }
}
}
if (parts) {
Expand All @@ -593,13 +594,17 @@ export function parseTime (value, options = {}) {
// console.error(am);
// valid -- Ertu með far eð
// 00:00 AM - 12:00 AM
if (ampm === 'p') {
hrs += 12;
if (ampm === 'a') {
if (hrs === 12) { hrs = 0; } // midnight
}
else if (ampm === 'p') {
if (hrs !== 12) { hrs += 12; } // afternoon
}
}
const min = +(m || 0) * 1;
const sec = +(s || 0) * 1;
const mss = +(f || 0) * 1;

return {
v: ((hrs * 60 * 60) + (min * 60) + sec + mss) / (60 * 60 * 24),
z: (
Expand Down
8 changes: 4 additions & 4 deletions test/parseValue-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,8 @@ const tests = [
[ '09:00 AM', 0.375, 'hh:mm AM/PM' ],
[ '10:00 AM', 0.4166666666666667, 'hh:mm AM/PM' ],
[ '11:00 AM', 0.4583333333333333, 'hh:mm AM/PM' ],
[ '12:00 AM', 0.5, 'hh:mm AM/PM' ],
[ '12:59 AM', 0.5409722222222222, 'hh:mm AM/PM' ],
[ '12:00 AM', 0, 'hh:mm AM/PM' ],
[ '12:59 AM', 0.04097222222222222, 'hh:mm AM/PM' ],
[ '12:60 AM', null, null ],
[ '12:61 AM', null, null ],
[ '12:99 AM', null, null ],
Expand Down Expand Up @@ -502,8 +502,8 @@ const tests = [
[ '09:00 PM', 0.875, 'hh:mm AM/PM' ],
[ '10:00 PM', 0.9166666666666666, 'hh:mm AM/PM' ],
[ '11:00 PM', 0.9583333333333334, 'hh:mm AM/PM' ],
[ '12:00 PM', 1, 'hh:mm AM/PM' ],
[ '12:59 PM', 1.0409722222222222, 'hh:mm AM/PM' ],
[ '12:00 PM', 0.5, 'hh:mm AM/PM' ],
[ '12:59 PM', 0.5409722222222222, 'hh:mm AM/PM' ],
[ '12:60 PM', null, null ],
[ '12:61 PM', null, null ],
[ '12:99 PM', null, null ],
Expand Down