From e2bf324fb4c803cd87c4292aa62f5df4d9b59d06 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 3 May 2023 23:08:02 +0530 Subject: [PATCH] feat: start and end time in class --- lms/lms/doctype/lms_class/lms_class.json | 16 ++++++++++++++-- lms/lms/doctype/lms_class/lms_class.py | 11 ++++++++++- lms/public/js/common_functions.js | 20 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/lms/lms/doctype/lms_class/lms_class.json b/lms/lms/doctype/lms_class/lms_class.json index ba0bb438..be46771e 100644 --- a/lms/lms/doctype/lms_class/lms_class.json +++ b/lms/lms/doctype/lms_class/lms_class.json @@ -13,8 +13,10 @@ "end_date", "column_break_4", "seat_count", - "description", + "start_time", + "end_time", "section_break_6", + "description", "students", "courses", "custom_component" @@ -77,11 +79,21 @@ "fieldname": "seat_count", "fieldtype": "Int", "label": "Seat Count" + }, + { + "fieldname": "start_time", + "fieldtype": "Time", + "label": "Start Time" + }, + { + "fieldname": "end_time", + "fieldtype": "Time", + "label": "End Time" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2023-05-03 20:57:22.579068", + "modified": "2023-05-03 23:07:06.725720", "modified_by": "Administrator", "module": "LMS", "name": "LMS Class", diff --git a/lms/lms/doctype/lms_class/lms_class.py b/lms/lms/doctype/lms_class/lms_class.py index e6b4b389..e4aae569 100644 --- a/lms/lms/doctype/lms_class/lms_class.py +++ b/lms/lms/doctype/lms_class/lms_class.py @@ -167,7 +167,14 @@ def authenticate(): @frappe.whitelist() def create_class( - title, start_date, end_date, description=None, seat_count=0, name=None + title, + start_date, + end_date, + description=None, + seat_count=0, + start_time=None, + end_time=None, + name=None, ): if name: class_details = frappe.get_doc("LMS Class", name) @@ -181,6 +188,8 @@ def create_class( "end_date": end_date, "description": description, "seat_count": seat_count, + "start_time": start_time, + "end_time": end_time, } ) class_details.save() diff --git a/lms/public/js/common_functions.js b/lms/public/js/common_functions.js index a646621d..2ba394cb 100644 --- a/lms/public/js/common_functions.js +++ b/lms/public/js/common_functions.js @@ -415,12 +415,30 @@ const open_class_dialog = (e) => { reqd: 1, default: class_info && class_info.end_date, }, + { + fieldtype: "Column Break", + }, { fieldtype: "Int", label: __("Seat Count"), fieldname: "seat_count", default: class_info && class_info.seat_count, }, + { + fieldtype: "Time", + label: __("Start Time"), + fieldname: "start_time", + default: class_info && class_info.start_time, + }, + { + fieldtype: "Time", + label: __("End Time"), + fieldname: "end_time", + default: class_info && class_info.end_time, + }, + { + fieldtype: "Section Break", + }, { fieldtype: "Small Text", label: __("Description"), @@ -445,6 +463,8 @@ const create_class = (values) => { end_date: values.end_date, description: values.description, seat_count: values.seat_count, + start_time: values.start_time, + end_time: values.end_time, name: class_info && class_info.name, }, callback: (r) => {