eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle same start and end dates case for batch

Browse Source 
* also minor refactor
This commit is contained in:
Hussain Nagaria
2024-04-16 21:24:53 +05:30
parent 255990b022
commit f48f437075
5 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/pages/Batch.vue
View File

@@ -83,8 +83,9 @@
<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') }}
{{
getFormattedDateRange(batch.data.start_date, batch.data.end_date)
}}
</span>
</div>
<div class="flex items-center mb-6">
@@ -161,7 +162,7 @@ import {
SendIcon,
MessageCircle,
} from 'lucide-vue-next'
import { formatTime } from '@/utils'
import { formatTime, getFormattedDateRange } from '@/utils'
import BatchDashboard from '@/components/BatchDashboard.vue'
import BatchCourses from '@/components/BatchCourses.vue'
import LiveClass from '@/components/LiveClass.vue'
@@ -171,7 +172,6 @@ import Announcements from '@/components/Annoucements.vue'
import AnnouncementModal from '@/components/Modals/AnnouncementModal.vue'
import Discussions from '@/components/Discussions.vue'
const dayjs = inject('$dayjs')
const user = inject('$user')
const showAnnouncementModal = ref(false)

21
frontend/src/pages/BatchDetail.vue
View File

@@ -20,8 +20,12 @@
<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') }}
{{
getFormattedDateRange(
batch.data.start_date,
batch.data.end_date
)
}}
</span>
</div>
<span v-if="batch.data.start_date">&middot;</span>
@@ -80,15 +84,14 @@
</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, getFormattedDateRange } from '@/utils'
import { Breadcrumbs, createResource } from 'frappe-ui'
import CourseCard from '@/components/CourseCard.vue'
import BatchOverlay from '@/components/BatchOverlay.vue'
const dayjs = inject('$dayjs')
const user = inject('$user')
const router = useRouter()