vikunja/frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

fix: review findings

Browse Source
This commit is contained in:
cernst 2023-03-20 21:05:11 +01:00 committed by kolaente
parent fb14eca634
commit 5fb45afb12
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/tasks/partials/reminder-period.vue
View File

@ -14,7 +14,7 @@
v-model="periodInput.duration.days" v-model="periodInput.duration.days"
type="number" type="number"
min="0" min="0"
/> {{ $t('task.reminder.daysShort') }} /> {{ $t('task.reminder.days') }}
<input <input
:disabled="disabled" :disabled="disabled"
class="input" class="input"
@ -166,7 +166,7 @@ function formatDuration(reminderPeriod: number): string {
return '00:00' return '00:00'
} }
const duration = secondsToPeriod(Math.abs(reminderPeriod)) const duration = secondsToPeriod(Math.abs(reminderPeriod))
return (duration.days > 0 ? duration.days + ' d ' : '') + return (duration.days > 0 ? `${duration.days} ${t('task.reminder.days')} `: '') +
('' + duration.hours).padStart(2, '0') + ':' + ('' + duration.hours).padStart(2, '0') + ':' +
('' + duration.minutes).padStart(2, '0') ('' + duration.minutes).padStart(2, '0')
} }

13
src/helpers/time/period.ts
View File

@ -3,12 +3,13 @@ import {SECONDS_A_DAY, SECONDS_A_HOUR, SECONDS_A_MINUTE} from '@/constants/date'
/** /**
* Convert time period given as seconds to days, hour, minutes, seconds * Convert time period given as seconds to days, hour, minutes, seconds
*/ */
export function secondsToPeriod(seconds: number): {days: number, hours: number, minutes: number, seconds: number} { export function secondsToPeriod(seconds: number): {days: number, hours: number, minutes: number, seconds: number} {
const d = Math.floor(seconds / SECONDS_A_DAY) return {
const h = Math.floor(seconds % SECONDS_A_DAY / 3600) days: Math.floor(seconds / SECONDS_A_DAY),
const m = Math.floor(seconds % SECONDS_A_HOUR / 60) hours: Math.floor(seconds % SECONDS_A_DAY / 3600),
const s = Math.floor(seconds % 60) minutes: Math.floor(seconds % SECONDS_A_HOUR / 60),
return {days: d, hours: h, minutes: m, seconds: s} seconds: Math.floor(seconds % 60),
}
} }
/** /**

3
src/i18n/lang/en.json
View File

@ -723,7 +723,8 @@
"reminder": { "reminder": {
"hoursShort": "HH", "hoursShort": "HH",
"minutesShort": "MM", "minutesShort": "MM",
"daysShort": "d" "daysShort": "d",
"days": "days"
}, },
"repeat": { "repeat": {
"everyDay": "Every Day", "everyDay": "Every Day",