From 3a12be505d9c28f987eb81b9436d4bbb9cb3eaaf Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 9 Jan 2022 17:03:08 +0100
Subject: [PATCH] feat: add prop to maybe show selected date

---
 src/components/date/datepickerWithRange.vue | 22 +++++++++++++++++++--
 src/i18n/lang/en.json                       |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/components/date/datepickerWithRange.vue b/src/components/date/datepickerWithRange.vue
index 67aac3257..d06cd2e2a 100644
--- a/src/components/date/datepickerWithRange.vue
+++ b/src/components/date/datepickerWithRange.vue
@@ -3,8 +3,8 @@
 		<popup>
 			<template #trigger="{toggle}">
 				<slot name="trigger" :toggle="toggle">
-					<x-button @click.prevent.stop="toggle()" type="secondary" :shadow="false" class="mb-2">
-						{{ $t('task.show.select') }}
+					<x-button @click.prevent.stop="toggle()" variant="secondary" :shadow="false" class="mb-2">
+						{{ buttonText }}
 					</x-button>
 				</slot>
 			</template>
@@ -187,6 +187,13 @@ const {t} = useI18n()
 
 const emit = defineEmits(['dateChanged'])
 
+const props = defineProps({
+	showSelectedOnButton: {
+		type: Boolean,
+		default: false,
+	}
+})
+
 // FIXME: This seems to always contain the default value - that breaks the picker
 const weekStart = computed<number>(() => store.state.auth.settings.weekStart ?? 0)
 const flatPickerConfig = computed(() => ({
@@ -259,6 +266,17 @@ function setDateRange(range: string[] | null) {
 const customRangeActive = computed<Boolean>(() => {
 	return !Object.values(dateRanges).some(el => from.value === el[0] && to.value === el[1])
 })
+
+const buttonText = computed<string>(() => {
+	if(props.showSelectedOnButton && from.value !== '' && to.value !== '') {
+		return t('input.datepickerRange.fromto', {
+			from: from.value,
+			to: to.value,
+		})
+	}
+	
+	return t('task.show.select')
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 0d0c74295..5e4460940 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -526,6 +526,7 @@
     "datepickerRange": {
       "to": "To",
       "from": "From",
+      "fromto": "{from} to {to}",
       "math": {
         "canuse": "You can use date math to filter for relative dates.",
         "learnhow": "Check out how it works",