cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-07-26 10:38:55 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

feat: improve smart time entry (#2029)

Browse Source 
Co-authored-by: alex-Arc <omnivox@LAPTOP-RC5SNBVV.localdomain>
This commit is contained in:
Alex Christoffer Rasmussen
2026-03-23 21:23:36 +01:00
committed by GitHub
parent 8c52556cc0
commit 4662cc8a26
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/utils/src/date-utils/parseUserTime.test.ts
+16
View File
@@ -30,6 +30,22 @@ describe('test parseUserTime()', () => {
}
});
describe('infer unit from bigger unit', () => {
const testData = [
{ value: '1h2', expect: MILLIS_PER_HOUR + 2 * MILLIS_PER_MINUTE },
{ value: '1h2s', expect: MILLIS_PER_HOUR + 2 * MILLIS_PER_SECOND },
{ value: '1m2', expect: MILLIS_PER_MINUTE + 2 * MILLIS_PER_SECOND },
{ value: '1m2s', expect: MILLIS_PER_MINUTE + 2 * MILLIS_PER_SECOND },
];
for (const s of testData) {
it(`handles ${s.value}`, () => {
expect(typeof parseUserTime(s.value)).toBe('number');
expect(parseUserTime(s.value)).toBe(s.expect);
});
}
});
describe('parses strings correctly', () => {
const ts = [
{ value: '1.1.1', expect: MILLIS_PER_HOUR + MILLIS_PER_MINUTE + MILLIS_PER_SECOND },
packages/utils/src/date-utils/parseUserTime.ts
+4 -2
View File
@@ -116,12 +116,14 @@ function checkMatchers(value: string): number | null {
// if there's a number after 'h' without a unit and it's not followed by 's', treat it as minutes
const implicitMinutesValue = hoursMatch?.[2] ? parse(hoursMatch[2]) : 0;
const minutesMatch = /(\d+)m/i.exec(value);
const minutesMatch = /(\d+)m(?:(\d+)?)/i.exec(value);
// only use implicit minutes if there's no explicit minutes match
const minutesMatchValue = minutesMatch ? parse(minutesMatch[1]) : implicitMinutesValue;
// if there's a number after 'm' without a unit treat it as seconds
const implicitSecondsValue = minutesMatch?.[2] ? parse(minutesMatch[2]) : 0;
const secondsMatch = /(\d+)s/i.exec(value);
const secondsMatchValue = secondsMatch ? parse(secondsMatch[1]) : 0;
const secondsMatchValue = secondsMatch ? parse(secondsMatch[1]) : implicitSecondsValue;
if (hoursMatch || minutesMatch || secondsMatch) {
return (