From 132e5d10da05da0a11b77b3e008d5af0dd99c2a5 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 8 Oct 2022 11:02:34 -0500 Subject: [PATCH] fix date and display errors --- frontend/components/Item/CreateModal.vue | 2 +- frontend/components/global/DateTime.vue | 6 +----- frontend/pages/item/[id]/index.vue | 16 +++++++++------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/frontend/components/Item/CreateModal.vue b/frontend/components/Item/CreateModal.vue index c065f63..e5b115d 100644 --- a/frontend/components/Item/CreateModal.vue +++ b/frontend/components/Item/CreateModal.vue @@ -52,7 +52,7 @@ const loading = ref(false); const focused = ref(false); const form = reactive({ - location: locations.value.length > 0 ? locations.value[0] : ({} as LocationOut), + location: locations.value && locations.value.length > 0 ? locations.value[0] : ({} as LocationOut), name: "", description: "", color: "", // Future! diff --git a/frontend/components/global/DateTime.vue b/frontend/components/global/DateTime.vue index 52defcf..bc57acc 100644 --- a/frontend/components/global/DateTime.vue +++ b/frontend/components/global/DateTime.vue @@ -19,7 +19,7 @@ return ""; } - if (nullDate(dt)) { + if (!validDate(dt)) { return ""; } @@ -35,10 +35,6 @@ } }); - function nullDate(dt: Date) { - return dt.getFullYear() === 1; - } - const props = defineProps({ date: { type: [Date, String], diff --git a/frontend/pages/item/[id]/index.vue b/frontend/pages/item/[id]/index.vue index ccbc943..5028cf0 100644 --- a/frontend/pages/item/[id]/index.vue +++ b/frontend/pages/item/[id]/index.vue @@ -177,14 +177,14 @@ if (preferences.value.showEmpty) { return true; } - return item.value?.purchaseFrom || item.value?.purchasePrice; + return item.value?.purchaseFrom || item.value?.purchasePrice !== "0"; }); - const purchaseDetails = computed<(Detail | DateDetail)[]>(() => { + const purchaseDetails = computed>(() => { return [ { name: "Purchase From", - label: item.value?.purchaseFrom || "", + text: item.value?.purchaseFrom || "", }, { name: "Purchase Price", @@ -193,18 +193,19 @@ { name: "Purchase Date", text: item.value.purchaseTime, + type: "date", }, - ] as (Detail | DateDetail)[]; + ]; }); const showSold = computed(() => { if (preferences.value.showEmpty) { return true; } - return item.value?.soldTo || item.value?.soldPrice; + return item.value?.soldTo || item.value?.soldPrice !== "0"; }); - const soldDetails = computed>(() => { + const soldDetails = computed>(() => { return [ { name: "Sold To", @@ -217,8 +218,9 @@ { name: "Sold At", text: item.value?.soldTime || "", + type: "date", }, - ] as Detail[]; + ]; }); const confirm = useConfirm();