Skip to content

A self-hosted media server and file management system

timespan

aminnausin8fabb80aba75
diff --git a/resources/js/components/cards/SubTaskCard.vue b/resources/js/components/cards/SubTaskCard.vue
index 9aca6263..a6702c5e 100644
--- a/resources/js/components/cards/SubTaskCard.vue
+++ b/resources/js/components/cards/SubTaskCard.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { SubTaskResource } from '@/types/resources';
-import { toFormattedDate, toFormattedDuration, within24Hrs } from '@/service/util';
+import { toFormattedDate, toFormattedDuration, toTimeSpan, within24Hrs } from '@/service/util';
import ButtonCorner from '@/components/inputs/ButtonCorner.vue';
import HoverCard from '@/components/cards/HoverCard.vue';
@@ -46,8 +46,9 @@ const emit = defineEmits(['clickAction']);
: `Created: ${toFormattedDate(new Date(data.created_at), true, within24Hrs(data.created_at) ? { hour: '2-digit', minute: '2-digit' } : undefined)}`
}}
</h4>
- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize w-20 hidden sm:block" title="Duration">
- Duration: {{ toFormattedDuration(data.duration, false) }}
+ <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize w-20 lg:w-fit hidden sm:block" title="Duration">
+ {{ data.duration ? 'Duration:' : data.started_at ? 'Started: ' : 'Scheduled: ' }}
+ {{ data.duration ? toFormattedDuration(data.duration, false) : toTimeSpan(data.started_at ?? data.created_at, ' UTC') }}
</h4>
</div>
</div>
diff --git a/resources/js/components/cards/TaskCard.vue b/resources/js/components/cards/TaskCard.vue
index 9f992932..24eb10ca 100644
--- a/resources/js/components/cards/TaskCard.vue
+++ b/resources/js/components/cards/TaskCard.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { type SubTaskResource, type TaskResource } from '@/types/resources';
-import { toFormattedDate, toFormattedDuration, within24Hrs } from '@/service/util';
+import { toFormattedDate, toFormattedDuration, toTimeSpan, within24Hrs } from '@/service/util';
import { computed, ref, useTemplateRef, watch } from 'vue';
import { getSubTasks } from '@/service/siteAPI';
@@ -120,9 +120,11 @@ watch(
: `Created: ${toFormattedDate(new Date(data.created_at), true, within24Hrs(data.created_at) ? { hour: '2-digit', minute: '2-digit' } : undefined)}`
}}
</h4>
- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate capitalize md:ml-auto" title="Time">Duration:</h4>
+ <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate capitalize md:ml-auto" title="Time">
+ {{ data.duration ? 'Duration:' : data.started_at ? 'Started: ' : 'Scheduled: ' }}
+ </h4>
<h4 class="text-xs text-neutral-500 dark:text-neutral-400 capitalize md:me-auto" title="Time">
- {{ toFormattedDuration(data.duration, false) }}
+ {{ data.duration ? toFormattedDuration(data.duration, false) : toTimeSpan(data.started_at ?? data.created_at, ' UTC') }}
</h4>
</span>
diff --git a/resources/js/service/util.ts b/resources/js/service/util.ts
index 6952b05c..d340a92f 100644
--- a/resources/js/service/util.ts
+++ b/resources/js/service/util.ts
@@ -4,10 +4,10 @@ export function toTitleCase(str: string) {
});
}
-export function toTimeSpan(rawDate: Date | string) {
+export function toTimeSpan(rawDate: Date | string, timeZoneName = ' EST') {
if (!rawDate) return '';
if (typeof rawDate === 'string') {
- rawDate = new Date(rawDate + ' EST');
+ rawDate = new Date(rawDate + timeZoneName);
}
const rawAge = Date.now() - rawDate.getTime();