chore: fixed conflicts

2023-05-15 19:44:50 +05:30
parent b8471dd753 95012072fc
commit 1df6319164
49 changed files with 2345 additions and 1203 deletions
--- a/lms/www/classes/class.py
+++ b/lms/www/classes/class.py
@@ -13,7 +13,17 @@ def get_context(context):
 	context.class_info = frappe.db.get_value(
 		"LMS Class",
 		class_name,
-		["name", "title", "start_date", "end_date", "description", "custom_component"],
+		[
+			"name",
+			"title",
+			"start_date",
+			"end_date",
+			"description",
+			"custom_component",
+			"seat_count",
+			"start_time",
+			"end_time",
+		],
 		as_dict=True,
 	)