adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-17 04:32:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve hours-minutes-colon-seperated format

Browse Source
This commit is contained in:
Gregor Vostrak
2025-05-20 14:42:02 +02:00
parent 0bd32dee39
commit 09f7fbccf6
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
resources/js/packages/ui/src/utils/time.ts
View File

@@ -13,7 +13,6 @@ import updateLocale from 'dayjs/plugin/updateLocale';
import { computed } from 'vue'; import { computed } from 'vue';
import { formatNumber } from './number'; import { formatNumber } from './number';
export type DateFormat = export type DateFormat =
| 'point-separated-d-m-yyyy' | 'point-separated-d-m-yyyy'
| 'slash-separated-mm-dd-yyyy' | 'slash-separated-mm-dd-yyyy'
@@ -28,7 +27,7 @@ const dateFormatMap: Record<DateFormat, string> = {
'slash-separated-dd-mm-yyyy': 'DD/MM/YYYY', 'slash-separated-dd-mm-yyyy': 'DD/MM/YYYY',
'hyphen-separated-dd-mm-yyyy': 'DD-MM-YYYY', 'hyphen-separated-dd-mm-yyyy': 'DD-MM-YYYY',
'hyphen-separated-mm-dd-yyyy': 'MM-DD-YYYY', 'hyphen-separated-mm-dd-yyyy': 'MM-DD-YYYY',
'hyphen-separated-yyyy-mm-dd': 'YYYY-MM-DD' 'hyphen-separated-yyyy-mm-dd': 'YYYY-MM-DD',
}; };
export type TimeFormat = '12-hours' | '24-hours'; export type TimeFormat = '12-hours' | '24-hours';
@@ -84,7 +83,7 @@ export function formatHumanReadableDuration(
case 'hours-minutes': case 'hours-minutes':
return `${hours}h ${minutes.toString().padStart(2, '0')}min`; return `${hours}h ${minutes.toString().padStart(2, '0')}min`;
case 'hours-minutes-colon-separated': case 'hours-minutes-colon-separated':
return `${hours}:${minutes.toString().padStart(2, '0')}`; return `${hours}:${minutes.toString().padStart(2, '0')} h`;
case 'hours-minutes-seconds-colon-separated': case 'hours-minutes-seconds-colon-separated':
return `${hours}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`; return `${hours}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
default: default:
@@ -129,7 +128,10 @@ export function getLocalizedDateFromTimestamp(timestamp: string) {
* Returns a formatted date. * Returns a formatted date.
* @param date - date in the format of 'YYYY-MM-DD' * @param date - date in the format of 'YYYY-MM-DD'
*/ */
export function formatDate(date: string, format: DateFormat = 'point-separated-d-m-yyyy'): string { export function formatDate(
date: string,
format: DateFormat = 'point-separated-d-m-yyyy'
): string {
if (date?.includes('+')) { if (date?.includes('+')) {
console.warn( console.warn(
'Date contains timezone information, use formatDateLocalized instead' 'Date contains timezone information, use formatDateLocalized instead'
@@ -142,11 +144,18 @@ export function formatDate(date: string, format: DateFormat = 'point-separated-d
* Returns a formatted date. * Returns a formatted date.
* @param date - date in the format of 'YYYY-MM-DD' * @param date - date in the format of 'YYYY-MM-DD'
*/ */
export function formatDateLocalized(date: string, format: DateFormat = 'point-separated-d-m-yyyy'): string { export function formatDateLocalized(
date: string,
format: DateFormat = 'point-separated-d-m-yyyy'
): string {
return getLocalizedDayJs(date).format(dateFormatMap[format]); return getLocalizedDayJs(date).format(dateFormatMap[format]);
} }
export function formatDateTimeLocalized(date: string, dateFormat?: DateFormat, timeFormat?: TimeFormat): string { export function formatDateTimeLocalized(
date: string,
dateFormat?: DateFormat,
timeFormat?: TimeFormat
): string {
const format = `${dateFormatMap[dateFormat ?? 'point-separated-d-m-yyyy']} ${timeFormat === '12-hours' ? 'hh:mm A' : 'HH:mm'}`; const format = `${dateFormatMap[dateFormat ?? 'point-separated-d-m-yyyy']} ${timeFormat === '12-hours' ? 'hh:mm A' : 'HH:mm'}`;
return getLocalizedDayJs(date).format(format); return getLocalizedDayJs(date).format(format);
} }
@@ -172,7 +181,11 @@ export function formatWeekday(date: string) {
return dayjs(date).format('dddd'); return dayjs(date).format('dddd');
} }
export function formatStartEnd(start: string, end: string | null, timeFormat: TimeFormat = '24-hours') { export function formatStartEnd(
start: string,
end: string | null,
timeFormat: TimeFormat = '24-hours'
) {
if (end) { if (end) {
return `${formatTime(start, timeFormat)} - ${formatTime(end, timeFormat)}`; return `${formatTime(start, timeFormat)} - ${formatTime(end, timeFormat)}`;
} else { } else {