Merge pull request #777 from frappe/fix-batch-date-range

fix: batch date range

frontend/src/components/BatchCard.vue

@@ -31,13 +31,11 @@
 				<BookOpen class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
 				<span> {{ batch.courses.length }} {{ __('Courses') }} </span>
 			</div>
-			<div class="flex items-center mb-3">
-				<Calendar class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
-				<span>
-					{{ dayjs(batch.start_date).format('DD MMM YYYY') }} -
-					{{ dayjs(batch.end_date).format('DD MMM YYYY') }}
-				</span>
-			</div>
+			<DateRange
+				:startDate="batch.start_date"
+				:endDate="batch.end_date"
+				class="mb-3"
+			/>
 			<div class="flex items-center">
 				<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
 				<span>
@@ -48,12 +46,11 @@
 	</div>
 </template>
 <script setup>
-import { Calendar, Clock, BookOpen } from 'lucide-vue-next'
-import { inject } from 'vue'
 import { Badge } from 'frappe-ui'
 import { formatTime } from '../utils'
+import { Clock, BookOpen } from 'lucide-vue-next'
+import DateRange from '@/components/Common/DateRange.vue'
 
-const dayjs = inject('$dayjs')
 const props = defineProps({
 	batch: {
 		type: Object,

frontend/src/components/BatchOverlay.vue

@@ -21,13 +21,11 @@
 			<BookOpen class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
 			<span> {{ batch.data.courses.length }} {{ __('Courses') }} </span>
 		</div>
-		<div class="flex items-center mb-3">
-			<Calendar class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
-			<span>
-				{{ dayjs(batch.data.start_date).format('DD MMM YYYY') }} -
-				{{ dayjs(batch.data.end_date).format('DD MMM YYYY') }}
-			</span>
-		</div>
+		<DateRange
+			:startDate="batch.data.start_date"
+			:endDate="batch.data.end_date"
+			class="mb-3"
+		/>
 		<div class="flex items-center">
 			<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
 			<span>
@@ -91,12 +89,12 @@
 	</div>
 </template>
 <script setup>
-import { formatNumberIntoCurrency, formatTime } from '@/utils'
-import { BookOpen, Calendar, Clock } from 'lucide-vue-next'
 import { inject, computed } from 'vue'
 import { Badge, Button } from 'frappe-ui'
+import { BookOpen, Clock } from 'lucide-vue-next'
+import { formatNumberIntoCurrency, formatTime } from '@/utils'
+import DateRange from '@/components/Common/DateRange.vue'
 
-const dayjs = inject('$dayjs')
 const user = inject('$user')
 
 const props = defineProps({

frontend/src/components/Common/DateRange.vue

@@ -0,0 +1,22 @@
+<template>
+	<div class="flex items-center">
+		<Calendar class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
+		<span>
+			{{ getFormattedDateRange(props.startDate, props.endDate) }}
+		</span>
+	</div>
+</template>
+
+<script setup>
+import { Calendar } from 'lucide-vue-next'
+import { getFormattedDateRange } from '@/utils'
+
+const props = defineProps({
+	startDate: {
+		type: String,
+	},
+	endDate: {
+		type: String,
+	},
+})
+</script>

frontend/src/pages/Batch.vue

@@ -80,13 +80,12 @@
 					{{ batch.data.title }}
 				</div>
 				<div v-html="batch.data.description" class="leading-5 mb-4"></div>
-				<div class="flex items-center mb-3">
-					<Calendar class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
-					<span>
-						{{ dayjs(batch.data.start_date).format('DD MMMM YYYY') }} -
-						{{ dayjs(batch.data.end_date).format('DD MMMM YYYY') }}
-					</span>
-				</div>
+
+				<DateRange
+					:startDate="batch.data.start_date"
+					:endDate="batch.data.end_date"
+					class="mb-3"
+				/>
 				<div class="flex items-center mb-6">
 					<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
 					<span>
@@ -150,7 +149,6 @@
 import { Breadcrumbs, Button, createResource, Tabs, Badge } from 'frappe-ui'
 import { computed, inject, ref } from 'vue'
 import {
-	Calendar,
 	Clock,
 	LayoutDashboard,
 	BookOpen,
@@ -170,8 +168,8 @@ import Assessments from '@/components/Assessments.vue'
 import Announcements from '@/components/Annoucements.vue'
 import AnnouncementModal from '@/components/Modals/AnnouncementModal.vue'
 import Discussions from '@/components/Discussions.vue'
+import DateRange from '@/components/Common/DateRange.vue'
 
-const dayjs = inject('$dayjs')
 const user = inject('$user')
 const showAnnouncementModal = ref(false)
 

frontend/src/pages/BatchDetail.vue

@@ -17,13 +17,10 @@
 						<span> {{ batch.data?.courses?.length }} {{ __('Courses') }} </span>
 					</div>
 					<span v-if="batch.data.courses">&middot;</span>
-					<div class="flex items-center">
-						<Calendar class="h-4 w-4 text-gray-700 mr-2" />
-						<span>
-							{{ dayjs(batch.data.start_date).format('DD MMM YYYY') }} -
-							{{ dayjs(batch.data.end_date).format('DD MMM YYYY') }}
-						</span>
-					</div>
+					<DateRange
+						:startDate="batch.data.start_date"
+						:endDate="batch.data.end_date"
+					/>
 					<span v-if="batch.data.start_date">&middot;</span>
 					<div class="flex items-center">
 						<Clock class="h-4 w-4 text-gray-700 mr-2" />
@@ -80,15 +77,15 @@
 	</div>
 </template>
 <script setup>
-import { Breadcrumbs, createResource, Button } from 'frappe-ui'
-import { BookOpen, Calendar, Clock } from 'lucide-vue-next'
-import { formatTime } from '../utils'
-import { computed, inject, ref } from 'vue'
-import BatchOverlay from '@/components/BatchOverlay.vue'
-import CourseCard from '@/components/CourseCard.vue'
+import { computed, inject } from 'vue'
 import { useRouter } from 'vue-router'
+import { BookOpen, Calendar, Clock } from 'lucide-vue-next'
+import { formatTime } from '@/utils'
+import { Breadcrumbs, createResource } from 'frappe-ui'
+import CourseCard from '@/components/CourseCard.vue'
+import BatchOverlay from '@/components/BatchOverlay.vue'
+import DateRange from '../components/Common/DateRange.vue'
 
-const dayjs = inject('$dayjs')
 const user = inject('$user')
 const router = useRouter()
 

frontend/src/utils/index.js

@@ -8,6 +8,7 @@ import Paragraph from '@editorjs/paragraph'
 import Embed from '@editorjs/embed'
 import NestedList from '@editorjs/nested-list'
 import { watch } from 'vue'
+import dayjs from '@/utils/dayjs'
 
 export function createToast(options) {
 	toast({
@@ -322,3 +323,16 @@ export function getSidebarLinks() {
 		},
 	]
 }
+
+export function getFormattedDateRange(
+	startDate,
+	endDate,
+	format = 'DD MMM YYYY'
+) {
+	if (startDate === endDate) {
+		return dayjs(startDate).format(format)
+	}
+	return `${dayjs(startDate).format(format)} - ${dayjs(endDate).format(
+		format
+	)}`
+}