fix: sql query case fix
diff --git a/erpnext/education/utils.py b/erpnext/education/utils.py
index 0e02712..8cd5bbb 100644
--- a/erpnext/education/utils.py
+++ b/erpnext/education/utils.py
@@ -304,11 +304,11 @@
return None
def get_program_completion(program):
- topics = frappe.db.sql("""select `tabcourse topic`.topic, `tabcourse topic`.parent
- from `tabcourse topic`,
- `tabprogram course`
- where `tabcourse topic`.parent = `tabprogram course`.course
- and `tabprogram course`.parent = %s""", program.name)
+ topics = frappe.db.sql("""select `tabCourse Topic`.topic, `tabCourse Topic`.parent
+ from `tabCourse Topic`,
+ `tabProgram Course`
+ where `tabCourse Topic`.parent = `tabProgram Course`.course
+ and `tabProgram Course`.parent = %s""", program.name)
progress = []
for topic in topics:
diff --git a/erpnext/www/lms/content.py b/erpnext/www/lms/content.py
index 3ab7a9f..0c04845 100644
--- a/erpnext/www/lms/content.py
+++ b/erpnext/www/lms/content.py
@@ -34,7 +34,7 @@
context.topic = topic
topic = frappe.get_doc("Topic", topic)
- content_list = [{'content_type':item.doctype, 'content':item.name} for item in topic.get_contents()]
+ content_list = [{'content_type':item.content_type, 'content':item.content} for item in topic.topic_content]
# Set context for progress numbers
context.position = content_list.index({'content': content, 'content_type': content_type})
@@ -57,12 +57,12 @@
return content_list[current_index - 1]
def allowed_content_access(program, content, content_type):
- contents_of_program = frappe.db.sql("""select `tabtopic content`.content, `tabtopic content`.content_type
- from `tabcourse topic`,
- `tabprogram course`,
- `tabtopic content`
- where `tabcourse topic`.parent = `tabprogram course`.course
- and `tabtopic content`.parent = `tabcourse topic`.topic
- and `tabprogram course`.parent = %(program)s""", {'program': program})
+ contents_of_program = frappe.db.sql("""select `tabTopic Content`.content, `tabTopic Content`.content_type
+ from `tabCourse Topic`,
+ `tabProgram Course`,
+ `tabTopic Content`
+ where `tabCourse Topic`.parent = `tabProgram Course`.course
+ and `tabTopic Content`.parent = `tabCourse Topic`.topic
+ and `tabProgram Course`.parent = %(program)s""", {'program': program})
return (content, content_type) in contents_of_program
\ No newline at end of file