From 49a24977f96cff1e90e706321505ae43bf7efadf Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 20 Jul 2022 18:35:18 +0200
Subject: [PATCH] feat: allow passing props down to the gantt component

---
 src/components/tasks/gantt-chart.vue | 25 ++++----
 src/i18n/lang/en.json                |  1 +
 src/views/list/ListGantt.vue         | 90 ++++++++++++++--------------
 3 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/src/components/tasks/gantt-chart.vue b/src/components/tasks/gantt-chart.vue
index af88fa378..02bf3a0b8 100644
--- a/src/components/tasks/gantt-chart.vue
+++ b/src/components/tasks/gantt-chart.vue
@@ -1,15 +1,16 @@
 <template>
 	<g-gantt-chart
-		:chart-start="dateFromFormatted"
-		:chart-end="dateToFormatted"
-		precision="day"
+		:chart-start="`${dateFrom} 00:00`"
+		:chart-end="`${dateTo} 23:59`"
+		:precision="precision"
 		bar-start="startDate"
 		bar-end="endDate"
 		:grid="true"
 		@dragend-bar="updateTask"
 	>
 		<g-gantt-row
-			v-for="bar in ganttBars"
+			v-for="(bar, k) in ganttBars"
+			:key="k"
 			label=""
 			:bars="bar"
 		/>
@@ -17,7 +18,7 @@
 </template>
 
 <script setup lang="ts">
-import {computed, ref} from 'vue'
+import {ref} from 'vue'
 import TaskCollectionService from '@/services/taskCollection'
 import {format} from 'date-fns'
 import {colorIsDark} from '@/helpers/color/colorIsDark'
@@ -30,19 +31,21 @@ const props = defineProps({
 		type: Number,
 		required: true,
 	},
+	precision: {
+		type: String,
+		default: 'day',
+	},
 	dateFrom: {
-		default: () => new Date(new Date().setDate(new Date().getDate() - 15)),
+		type: String,
+		required: true,
 	},
 	dateTo: {
-		default: () => new Date(new Date().setDate(new Date().getDate() + 30)),
+		type: String,
+		required: true,
 	},
 })
 
-const dateFromFormatted = computed(() => format(props.dateFrom, dateFormat))
-const dateToFormatted = computed(() => format(props.dateTo, dateFormat))
-
 const tasks = ref([])
-
 const ganttBars = ref([])
 
 // We need a "real" ref object for the gantt bars to instantly update the tasks when they are dragged on the chart.
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 109c422c9..f492013ab 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -286,6 +286,7 @@
       "default": "Default",
       "month": "Month",
       "day": "Day",
+      "hour": "Hour",
       "from": "From",
       "to": "To",
       "noDates": "This task has no dates set."
diff --git a/src/views/list/ListGantt.vue b/src/views/list/ListGantt.vue
index e3bdc9f07..30a7bcb49 100644
--- a/src/views/list/ListGantt.vue
+++ b/src/views/list/ListGantt.vue
@@ -1,47 +1,48 @@
 <template>
 	<ListWrapper class="list-gantt" :list-id="props.listId" viewName="gantt">
 		<template #header>
-			<card class="gantt-options">
-				<fancycheckbox class="is-block" v-model="showTaskswithoutDates">
-					{{ $t('list.gantt.showTasksWithoutDates') }}
-				</fancycheckbox>
-				<div class="range-picker">
-					<div class="field">
-						<label class="label" for="dayWidth">{{ $t('list.gantt.size') }}</label>
-						<div class="control">
-							<div class="select">
-								<select id="dayWidth" v-model.number="dayWidth">
-									<option value="35">{{ $t('list.gantt.default') }}</option>
-									<option value="10">{{ $t('list.gantt.month') }}</option>
-									<option value="80">{{ $t('list.gantt.day') }}</option>
-								</select>
+			<card>
+				<div class="gantt-options">
+					<div class="range-picker">
+						<div class="field">
+							<label class="label" for="precision">{{ $t('list.gantt.size') }}</label>
+							<div class="control">
+								<div class="select">
+									<select id="precision" v-model="precision">
+										<option value="day">{{ $t('list.gantt.day') }}</option>
+										<option value="month">{{ $t('list.gantt.month') }}</option>
+									</select>
+								</div>
+							</div>
+						</div>
+						<div class="field">
+							<label class="label" for="fromDate">{{ $t('list.gantt.from') }}</label>
+							<div class="control">
+								<flat-pickr
+									:config="flatPickerConfig"
+									class="input"
+									id="fromDate"
+									:placeholder="$t('list.gantt.from')"
+									v-model="dateFrom"
+								/>
+							</div>
+						</div>
+						<div class="field">
+							<label class="label" for="toDate">{{ $t('list.gantt.to') }}</label>
+							<div class="control">
+								<flat-pickr
+									:config="flatPickerConfig"
+									class="input"
+									id="toDate"
+									:placeholder="$t('list.gantt.to')"
+									v-model="dateTo"
+								/>
 							</div>
 						</div>
 					</div>
-					<div class="field">
-						<label class="label" for="fromDate">{{ $t('list.gantt.from') }}</label>
-						<div class="control">
-							<flat-pickr
-								:config="flatPickerConfig"
-								class="input"
-								id="fromDate"
-								:placeholder="$t('list.gantt.from')"
-								v-model="dateFrom"
-							/>
-						</div>
-					</div>
-					<div class="field">
-						<label class="label" for="toDate">{{ $t('list.gantt.to') }}</label>
-						<div class="control">
-							<flat-pickr
-								:config="flatPickerConfig"
-								class="input"
-								id="toDate"
-								:placeholder="$t('list.gantt.to')"
-								v-model="dateTo"
-							/>
-						</div>
-					</div>
+					<fancycheckbox class="is-block" v-model="showTaskswithoutDates">
+						{{ $t('list.gantt.showTasksWithoutDates') }}
+					</fancycheckbox>
 				</div>
 			</card>
 		</template>
@@ -49,11 +50,11 @@
 		<template #default>
 			<div class="gantt-chart-container">
 				<card :padding="false" class="has-overflow">
-					
+
 					<gantt-chart
 						:date-from="dateFrom"
 						:date-to="dateTo"
-						:day-width="dayWidth"
+						:precision="precision"
 						:list-id="props.listId"
 						:show-taskswithout-dates="showTaskswithoutDates"
 					/>
@@ -74,6 +75,7 @@ import {useAuthStore} from '@/stores/auth'
 import ListWrapper from './ListWrapper.vue'
 import GanttChart from '@/components/tasks/gantt-chart.vue'
 import Fancycheckbox from '@/components/input/fancycheckbox.vue'
+import {format} from 'date-fns'
 
 const props = defineProps({
 	listId: {
@@ -82,14 +84,12 @@ const props = defineProps({
 	},
 })
 
-const DEFAULT_DAY_COUNT = 35
-
 const showTaskswithoutDates = ref(false)
-const dayWidth = ref(DEFAULT_DAY_COUNT)
+const precision = ref('day')
 
 const now = ref(new Date())
-const dateFrom = ref(new Date((new Date()).setDate(now.value.getDate() - 15)))
-const dateTo = ref(new Date((new Date()).setDate(now.value.getDate() + 30)))
+const dateFrom = ref(format(new Date((new Date()).setDate(now.value.getDate() - 15)), 'yyyy-LL-dd'))
+const dateTo = ref(format(new Date((new Date()).setDate(now.value.getDate() + 30)), 'yyyy-LL-dd'))
 
 const {t} = useI18n({useScope: 'global'})
 const authStore = useAuthStore()