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

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,