Merge branch 'develop' of https://github.com/frappe/lms into lesson-md-parser
This commit is contained in:
2
.github/helper/install_dependencies.sh
vendored
2
.github/helper/install_dependencies.sh
vendored
@@ -5,7 +5,7 @@ echo "Setting Up System Dependencies..."
|
|||||||
|
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt remove mysql-server mysql-client
|
sudo apt remove mysql-server mysql-client
|
||||||
sudo apt install libcups2-dev redis-server mariadb-client-10.6
|
sudo apt-get install libcups2-dev redis-server mariadb-client
|
||||||
|
|
||||||
install_wkhtmltopdf() {
|
install_wkhtmltopdf() {
|
||||||
wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
|
wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
|
||||||
|
|||||||
@@ -133,8 +133,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<FormControl
|
<FormControl
|
||||||
v-model="newTag"
|
v-model="newTag"
|
||||||
:placeholder="__('Keywords for the course')"
|
:placeholder="__('Add a keyword and then press enter')"
|
||||||
class="w-52"
|
class="w-72"
|
||||||
@keyup.enter="updateTags()"
|
@keyup.enter="updateTags()"
|
||||||
id="tags"
|
id="tags"
|
||||||
/>
|
/>
|
||||||
@@ -288,6 +288,7 @@ const course = reactive({
|
|||||||
video_link: '',
|
video_link: '',
|
||||||
course_image: null,
|
course_image: null,
|
||||||
tags: '',
|
tags: '',
|
||||||
|
category: '',
|
||||||
published: false,
|
published: false,
|
||||||
published_on: '',
|
published_on: '',
|
||||||
featured: false,
|
featured: false,
|
||||||
|
|||||||
@@ -841,8 +841,6 @@ def delete_course(course):
|
|||||||
frappe.delete_doc("Lesson Reference", lesson)
|
frappe.delete_doc("Lesson Reference", lesson)
|
||||||
|
|
||||||
for lesson in lessons:
|
for lesson in lessons:
|
||||||
frappe.db.delete("LMS Course Progress", {"lesson": lesson})
|
|
||||||
|
|
||||||
topics = frappe.get_all(
|
topics = frappe.get_all(
|
||||||
"Discussion Topic",
|
"Discussion Topic",
|
||||||
{"reference_doctype": "Course Lesson", "reference_docname": lesson},
|
{"reference_doctype": "Course Lesson", "reference_docname": lesson},
|
||||||
@@ -862,6 +860,9 @@ def delete_course(course):
|
|||||||
for chapter in chapters:
|
for chapter in chapters:
|
||||||
frappe.delete_doc("Course Chapter", chapter)
|
frappe.delete_doc("Course Chapter", chapter)
|
||||||
|
|
||||||
|
frappe.db.delete("LMS Course Progress", {"course": course})
|
||||||
|
frappe.db.delete("LMS Quiz", {"course": course})
|
||||||
|
frappe.db.delete("LMS Quiz Submission", {"course": course})
|
||||||
frappe.db.delete("LMS Enrollment", {"course": course})
|
frappe.db.delete("LMS Enrollment", {"course": course})
|
||||||
frappe.delete_doc("LMS Course", course)
|
frappe.delete_doc("LMS Course", course)
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ class LMSQuizSubmission(Document):
|
|||||||
self.notify_member()
|
self.notify_member()
|
||||||
|
|
||||||
def validate_marks(self):
|
def validate_marks(self):
|
||||||
|
self.score = 0
|
||||||
for row in self.result:
|
for row in self.result:
|
||||||
if cint(row.marks) > cint(row.marks_out_of):
|
if cint(row.marks) > cint(row.marks_out_of):
|
||||||
frappe.throw(
|
frappe.throw(
|
||||||
|
|||||||
Reference in New Issue
Block a user