eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: renamed reapplication field to duration

Browse Source
This commit is contained in:
Jannat Patel
2022-04-28 16:30:51 +05:30
parent 5db3d14b17
commit 83176a0293
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lms/lms/doctype/lms_course/lms_course.json
View File

@@ -34,13 +34,12 @@
"related_courses", "related_courses",
"certification_section", "certification_section",
"enable_certification", "enable_certification",
"expiry",
"section_break_22",
"grant_certificate_after", "grant_certificate_after",
"evaluator", "evaluator",
"column_break_22", "column_break_22",
"expiry",
"max_attempts", "max_attempts",
"reapplication", "duration",
"pricing_section", "pricing_section",
"paid_certificate", "paid_certificate",
"currency", "currency",
@@ -221,18 +220,14 @@
"depends_on": "eval: doc.grant_certificate_after == \"Evaluation\"", "depends_on": "eval: doc.grant_certificate_after == \"Evaluation\"",
"fieldname": "max_attempts", "fieldname": "max_attempts",
"fieldtype": "Int", "fieldtype": "Int",
"label": "Max Number of Attempts for Evaluations" "label": "Max Attempts for Evaluations"
}, },
{ {
"depends_on": "eval: doc.grant_certificate_after == \"Evaluation\"", "depends_on": "eval: doc.grant_certificate_after == \"Evaluation\"",
"fieldname": "reapplication", "fieldname": "duration",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Re-application After (Months)", "label": "Duration for Attempts",
"options": "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12" "options": "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12"
},
{
"fieldname": "section_break_22",
"fieldtype": "Section Break"
} }
], ],
"is_published_field": "published", "is_published_field": "published",
@@ -258,7 +253,7 @@
"link_fieldname": "course" "link_fieldname": "course"
} }
], ],
"modified": "2022-04-25 17:47:23.648958", "modified": "2022-04-28 16:15:10.047183",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "LMS Course", "name": "LMS Course",

2
lms/lms/test_utils.py
View File

@@ -25,7 +25,7 @@ class TestUtils(unittest.TestCase):
"grant_certificate_after": "Evaluation", "grant_certificate_after": "Evaluation",
"evaluator": "evaluator@example.com", "evaluator": "evaluator@example.com",
"max_attempts": 3, "max_attempts": 3,
"reapplication": 2 "duration": 2
}) })
user = new_user("Eval", "eval@test.com") user = new_user("Eval", "eval@test.com")

4
lms/lms/utils.py
View File

@@ -346,7 +346,7 @@ def get_popular_courses():
return course_membership[:3] return course_membership[:3]
def get_evaluation_details(course, member=None): def get_evaluation_details(course, member=None):
info = frappe.db.get_value("LMS Course", course, ["grant_certificate_after", "max_attempts", "reapplication"], as_dict=True) info = frappe.db.get_value("LMS Course", course, ["grant_certificate_after", "max_attempts", "duration"], as_dict=True)
request = frappe.db.get_value("LMS Certificate Request", { request = frappe.db.get_value("LMS Certificate Request", {
"course": course, "course": course,
"member": member or frappe.session.user, "member": member or frappe.session.user,
@@ -358,7 +358,7 @@ def get_evaluation_details(course, member=None):
"course": course, "course": course,
"member": member or frappe.session.user, "member": member or frappe.session.user,
"status": ["!=", "Pass"], "status": ["!=", "Pass"],
"creation": [">=", add_months(getdate(), -abs(cint(info.reapplication)))] "creation": [">=", add_months(getdate(), -abs(cint(info.duration)))]
}) })
return frappe._dict({ return frappe._dict({

2
lms/www/courses/course.py
View File

@@ -15,7 +15,7 @@ def get_context(context):
course = frappe.db.get_value("LMS Course", course_name, course = frappe.db.get_value("LMS Course", course_name,
["name", "title", "image", "short_introduction", "description", "published", "upcoming", "disable_self_learning", ["name", "title", "image", "short_introduction", "description", "published", "upcoming", "disable_self_learning",
"status", "video_link", "enable_certification", "grant_certificate_after", "paid_certificate", "status", "video_link", "enable_certification", "grant_certificate_after", "paid_certificate",
"price_certificate", "currency", "max_attempts", "reapplication"], "price_certificate", "currency", "max_attempts", "duration"],
as_dict=True) as_dict=True)
if course is None: if course is None: