fix: file type support

This commit is contained in:
Jannat Patel
2021-12-23 17:58:39 +05:30
parent a6bdbd7cf1
commit 6e3de21f6e
7 changed files with 99 additions and 38 deletions

View File

@@ -9,7 +9,7 @@ frappe.ui.form.on('Course Lesson', {
frm.get_field('help').html(`
<p>You can add some more additional content to the lesson using a special syntax. The table below mentions all types of dynamic content that you can add to the lessons and the syntax for the same.</p>
<div class="row font-weight-bold mb-3">
<div class="col-sm-4">
<div class="col-sm-8">
Content Type
</div>
<div class="col-sm-4">
@@ -18,7 +18,7 @@ frappe.ui.form.on('Course Lesson', {
</div>
<div class="row mb-3">
<div class="col-sm-4">
<div class="col-sm-8">
Video
</div>
<div class="col-sm-4">
@@ -27,7 +27,7 @@ frappe.ui.form.on('Course Lesson', {
</div>
<div class="row mb-3">
<div class="col-sm-4">
<div class="col-sm-8">
YouTube Video
</div>
<div class="col-sm-4">
@@ -36,7 +36,7 @@ frappe.ui.form.on('Course Lesson', {
</div>
<div class="row mb-3">
<div class="col-sm-4">
<div class="col-sm-8">
Exercise
</div>
<div class="col-sm-4">
@@ -45,13 +45,60 @@ frappe.ui.form.on('Course Lesson', {
</div>
<div class="row mb-3">
<div class="col-sm-4">
<div class="col-sm-8">
Quiz
</div>
<div class="col-sm-4">
{{ Quiz("lms_quiz_name") }}
</div>
</div>
<div class="row mb-3">
<div class="col-sm-8">
Assignment
</div>
<div class="col-sm-4">
{{ Assignment("id-filetype") }}
</div>
</div>
<hr>
<div class="row font-weight-bold mb-3">
<div class="col-sm-8">
Supported File Types for Assignment
</div>
<div class="col-sm-4">
Syntax
</div>
</div>
<div class="row mb-3">
<div class="col-sm-8">
.doc,.docx,.xml,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document
</div>
<div class="col-sm-4">
Document
</div>
</div>
<div class="row mb-3">
<div class="col-sm-8">
.pdf
</div>
<div class="col-sm-4">
PDF
</div>
</div>
<div class="row mb-3">
<div class="col-sm-8">
.png, .jpg, .jpeg
</div>
<div class="col-sm-4">
Image
</div>
</div>
`);
}
});

View File

@@ -10,15 +10,19 @@ class LessonAssignment(Document):
@frappe.whitelist()
def upload_assignment(assignment, lesson, identifier):
lesson_work = frappe.get_doc({
args = {
"doctype": "Lesson Assignment",
"lesson": lesson,
"user": frappe.session.user,
"assignment": assignment,
"id": identifier
})
lesson_work.save(ignore_permissions=True)
return lesson_work.name
}
lesson_work = frappe.db.exists(args)
if lesson_work:
frappe.db.set_value("Lesson Assignment", lesson_work[0], "assignment", assignment)
else:
args.update({"assignment": assignment})
lesson_work = frappe.get_doc(args)
lesson_work.save(ignore_permissions=True)
@frappe.whitelist()
def get_assignment(lesson):
@@ -28,6 +32,10 @@ def get_assignment(lesson):
"user": frappe.session.user
},
["lesson", "user", "id", "assignment"])
if len(assignments):
for assignment in assignments:
assignment.file_name = frappe.db.get_value("File", {"file_url": assignment.assignment}, "file_name")
return assignments