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

feat: timezone in batches

Browse Source
This commit is contained in:
Jannat Patel
2024-06-21 13:08:58 +05:30
parent 63f4dc0caa
commit 9c2bebb3d9
11 changed files with 104 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/BatchCard.vue
View File

@@ -36,19 +36,25 @@
:endDate="batch.end_date"
class="mb-3"
/>
<div class="flex items-center">
<div class="flex items-center mb-3">
<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ formatTime(batch.start_time) }} - {{ formatTime(batch.end_time) }}
</span>
</div>
<div v-if="batch.timezone" class="flex items-center">
<Globe class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ batch.timezone }}
</span>
</div>
</div>
</div>
</template>
<script setup>
import { Badge } from 'frappe-ui'
import { formatTime } from '../utils'
import { Clock, BookOpen } from 'lucide-vue-next'
import { Clock, BookOpen, Globe } from 'lucide-vue-next'
import DateRange from '@/components/Common/DateRange.vue'
const props = defineProps({

10
frontend/src/components/BatchOverlay.vue
View File

@@ -26,13 +26,19 @@
:endDate="batch.data.end_date"
class="mb-3"
/>
<div class="flex items-center">
<div class="flex items-center mb-3">
<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ formatTime(batch.data.start_time) }} -
{{ formatTime(batch.data.end_time) }}
</span>
</div>
<div v-if="batch.data.timezone" class="flex items-center">
<Globe class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ batch.data.timezone }}
</span>
</div>
<router-link
v-if="user?.data?.is_moderator"
:to="{
@@ -91,7 +97,7 @@
<script setup>
import { inject, computed } from 'vue'
import { Badge, Button } from 'frappe-ui'
import { BookOpen, Clock } from 'lucide-vue-next'
import { BookOpen, Clock, Globe } from 'lucide-vue-next'
import { formatNumberIntoCurrency, formatTime } from '@/utils'
import DateRange from '@/components/Common/DateRange.vue'

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

@@ -87,13 +87,19 @@
:endDate="batch.data.end_date"
class="mb-3"
/>
<div class="flex items-center mb-6">
<div class="flex items-center mb-4">
<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ formatTime(batch.data.start_time) }} -
{{ formatTime(batch.data.end_time) }}
</span>
</div>
<div v-if="batch.data.timezone" class="flex items-center mb-4">
<Globe class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ batch.data.timezone }}
</span>
</div>
</div>
<AnnouncementModal
v-model="showAnnouncementModal"
@@ -159,6 +165,7 @@ import {
Mail,
SendIcon,
MessageCircle,
Globe,
} from 'lucide-vue-next'
import { formatTime } from '@/utils'
import BatchDashboard from '@/components/BatchDashboard.vue'

70
frontend/src/pages/BatchCreation.vue
View File

@@ -9,30 +9,24 @@
</Button>
</header>
<div class="py-5">
<div class="container">
<div class="container border-b">
<div class="text-lg font-semibold mb-4">
{{ __('Details') }}
</div>
<div class="grid grid-cols-2 gap-10">
<div class="grid grid-cols-2 gap-10 mb-4">
<div>
<FormControl
v-model="batch.title"
:label="__('Title')"
class="mb-4"
/>
<FormControl
v-model="batch.description"
:label="__('Description')"
type="textarea"
class="mb-4"
/>
</div>
<div>
<FormControl
v-model="batch.published"
type="checkbox"
:label="__('Published')"
/>
</div>
<div class="flex flex-col">
<FileUploader
v-if="!batch.image"
class="mt-4"
@@ -52,7 +46,7 @@
</div>
</template>
</FileUploader>
<div v-else class="mt-4">
<div v-else class="my-4">
<div class="text-xs text-gray-600 mb-1">
{{ __('Meta Image') }}
</div>
@@ -74,10 +68,21 @@
/>
</div>
</div>
<FormControl
v-model="batch.allow_self_enrollment"
type="checkbox"
:label="__('Allow self enrollment')"
/>
</div>
</div>
</div>
<div class="container border-b mb-5">
<div class="container border-b mb-4">
<FormControl
v-model="batch.description"
:label="__('Description')"
type="textarea"
class="my-4"
/>
<div>
<label class="block text-sm text-gray-600 mb-1">
{{ __('Batch Details') }}
@@ -91,9 +96,9 @@
/>
</div>
</div>
<div class="container border-b mb-5">
<div class="container border-b mb-4">
<div class="text-lg font-semibold mb-4">
{{ __('Settings') }}
{{ __('Date and Time') }}
</div>
<div class="grid grid-cols-2 gap-10">
<div>
@@ -109,6 +114,8 @@
type="date"
class="mb-4"
/>
</div>
<div>
<FormControl
v-model="batch.start_time"
:label="__('Start Time')"
@@ -121,7 +128,20 @@
type="time"
class="mb-4"
/>
<FormControl
v-model="batch.timezone"
:label="__('Timezone')"
type="text"
class="mb-4"
/>
</div>
</div>
</div>
<div class="container border-b mb-4">
<div class="text-lg font-semibold mb-4">
{{ __('Settings') }}
</div>
<div class="grid grid-cols-2 gap-10">
<div>
<FormControl
v-model="batch.seat_count"
@@ -135,6 +155,8 @@
type="date"
class="mb-4"
/>
</div>
<div>
<FormControl
v-model="batch.medium"
type="select"
@@ -188,7 +210,7 @@
</div>
</template>
<script setup>
import { computed, onMounted, inject, reactive } from 'vue'
import { computed, onMounted, inject, reactive, onBeforeUnmount } from 'vue'
import {
Breadcrumbs,
FormControl,
@@ -221,10 +243,12 @@ const batch = reactive({
end_date: '',
start_time: '',
end_time: '',
timezone: '',
evaluation_end_date: '',
seat_count: '',
medium: '',
category: '',
allow_self_enrollment: false,
image: null,
paid_batch: false,
currency: '',
@@ -236,6 +260,22 @@ onMounted(() => {
if (props.batchName != 'new') {
batchDetail.reload()
}
window.addEventListener('keydown', keyboardShortcut)
})
const keyboardShortcut = (e) => {
if (
e.key === 's' &&
(e.ctrlKey || e.metaKey) &&
!e.target.classList.contains('ProseMirror')
) {
saveBatch()
e.preventDefault()
}
}
onBeforeUnmount(() => {
window.removeEventListener('keydown', keyboardShortcut)
})
const newBatch = createResource({

13
lms/lms/doctype/lms_batch/lms_batch.json
View File

@@ -9,14 +9,15 @@
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"published",
"title",
"start_date",
"end_date",
"column_break_4",
"allow_self_enrollment",
"start_time",
"end_time",
"published",
"allow_self_enrollment",
"timezone",
"section_break_rgfj",
"medium",
"category",
@@ -301,11 +302,17 @@
"fieldname": "allow_self_enrollment",
"fieldtype": "Check",
"label": "Allow Self Enrollment"
},
{
"fieldname": "timezone",
"fieldtype": "Data",
"label": "Timezone",
"reqd": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2024-05-14 14:47:48.839162",
"modified": "2024-06-21 11:49:32.582832",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Batch",

2
lms/lms/notification/certificate_request_creation/certificate_request_creation.html
View File

@@ -1,5 +1,5 @@
{% set title = frappe.db.get_value("LMS Course", doc.course, "title") %}
<p> {{ _("Hey {0}").format(doc.member_name) }} </p>
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short")) }}</p>
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short")) }}, doc.timezone</p>
<p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>

2
lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html
View File

@@ -1,5 +1,5 @@
{% set title = frappe.db.get_value("LMS Course", doc.course, "title") %}
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short")) }}</p>
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short")) }}, doc.timezone</p>
<p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>

6
lms/lms/notification/certificate_request_reminder/certificate_request_reminder.json
View File

@@ -11,9 +11,9 @@
"event": "Days Before",
"idx": 0,
"is_standard": 1,
"message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\")) }}</p>\n\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
"message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\")) }}, doc.timezone</p>\n\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
"message_type": "HTML",
"modified": "2023-11-29 17:26:53.355501",
"modified": "2024-06-21 12:59:05.980527",
"modified_by": "Administrator",
"module": "LMS",
"name": "Certificate Request Reminder",
@@ -29,4 +29,4 @@
"send_system_notification": 0,
"send_to_all_assignees": 0,
"subject": "Reminder for Certificate Evaluation"
}
}

1
lms/lms/utils.py
View File

@@ -1512,6 +1512,7 @@ def get_batch_details(batch):
"paid_batch",
"evaluation_end_date",
"allow_self_enrollment",
"timezone",
],
as_dict=True,
)

2
lms/public/frontend/index.html
View File

@@ -15,7 +15,7 @@
<meta name="twitter:title" content="{{ meta.title }}" />
<meta name="twitter:image" content="{{ meta.image }}" />
<meta name="twitter:description" content="{{ meta.description }}" />
<script type="module" crossorigin src="/assets/lms/frontend/assets/index-kSywU9PY.js"></script>
<script type="module" crossorigin src="/assets/lms/frontend/assets/index-tTMLLoXs.js"></script>
<link rel="modulepreload" crossorigin href="/assets/lms/frontend/assets/frappe-ui-vM9kBbGH.js">
<link rel="stylesheet" crossorigin href="/assets/lms/frontend/assets/frappe-ui-DzKBfka9.css">
<link rel="stylesheet" crossorigin href="/assets/lms/frontend/assets/index-CxRhs9Fi.css">

8
lms/www/lms.py
View File

@@ -82,6 +82,14 @@ def get_meta(app_path):
if re.match(r"^batches/.*$", app_path):
batch_name = app_path.split("/")[1]
if "new/edit" in app_path:
return {
"title": _("New Batch"),
"image": frappe.db.get_single_value("Website Settings", "banner_image"),
"description": "Create a new batch",
"keywords": "New Batch, Create Batch",
"link": "/lms/batches/new/edit",
}
batch = frappe.db.get_value(
"LMS Batch",
batch_name,