fix: several bugs and improvement ideas for education module #18599 (#18600)

* Update student_report_generation_tool.py

bug fix

* Update student_applicant.json

* Update program_course.json

* Update course_activity.json
This commit is contained in:
Fisher Yu 2019-09-11 21:40:39 +08:00 committed by Nabin Hait
parent 1d1858a8b0
commit cd38ba4833
4 changed files with 15 additions and 7 deletions

View File

@ -30,7 +30,7 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Enrollment", "label": "Course Enrollment",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Course Enrollment", "options": "Course Enrollment",

View File

@ -5,6 +5,7 @@
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"course", "course",
"course_name",
"required" "required"
], ],
"fields": [ "fields": [
@ -16,6 +17,14 @@
"label": "Course", "label": "Course",
"options": "Course", "options": "Course",
"reqd": 1 "reqd": 1
},
{
"fieldname": "course_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Course Name",
"fetch_from": "course.course_name",
"read_only":1
}, },
{ {
"default": "0", "default": "0",

View File

@ -705,7 +705,6 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"default": "INDIAN",
"fieldname": "nationality", "fieldname": "nationality",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,

View File

@ -55,7 +55,7 @@ def preview_report_card(doc):
"courses": courses, "courses": courses,
"assessment_groups": assessment_groups, "assessment_groups": assessment_groups,
"course_criteria": course_criteria, "course_criteria": course_criteria,
"letterhead": letterhead.content, "letterhead": letterhead and letterhead.get('content', None),
"add_letterhead": doc.add_letterhead if doc.add_letterhead else 0 "add_letterhead": doc.add_letterhead if doc.add_letterhead else 0
}) })
final_template = frappe.render_template(base_template_path, {"body": html, "title": "Report Card"}) final_template = frappe.render_template(base_template_path, {"body": html, "title": "Report Card"})