Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into call-summary-dialog

Browse Source
This commit is contained in:
Suraj Shetty 2019-06-12 17:13:13 +05:30 committed by GitHub
commit 16fc5189d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/education/doctype/course/test_records.json
View File

@ -1,17 +1,14 @@
[ [
{ {
"course_name": "_Test Course", "course_name": "TC100",
"course_code": "TC100",
"course_abbreviation": "TC" "course_abbreviation": "TC"
}, },
{ {
"course_name": "_Test Course 1", "course_name": "TC101",
"course_code": "TC101",
"course_abbreviation": "TC1" "course_abbreviation": "TC1"
}, },
{ {
"course_name": "_Test Course 2", "course_name": "TC102",
"course_code": "TC102",
"course_abbreviation": "TC2" "course_abbreviation": "TC2"
} }
] ]

6
erpnext/education/doctype/program/test_records.json
View File

@ -1,13 +1,11 @@
[ [
{ {
"program_name": "_Test Program 1", "program_name": "_TP1",
"program_code": "_TP1",
"description": "Test Description", "description": "Test Description",
"program_abbreviation": "TP1" "program_abbreviation": "TP1"
}, },
{ {
"program_name": "_Test Program 2", "program_name": "_TP2",
"program_code": "_TP2",
"description": "Test Description", "description": "Test Description",
"program_abbreviation": "TP2" "program_abbreviation": "TP2"
} }

2
erpnext/education/doctype/program_enrollment/program_enrollment.py
View File

@ -66,7 +66,7 @@ class ProgramEnrollment(Document):
msgprint(_("Fee Records Created - {0}").format(comma_and(fee_list))) msgprint(_("Fee Records Created - {0}").format(comma_and(fee_list)))
def get_courses(self): def get_courses(self):
return frappe.db.sql('''select course, course_name from `tabProgram Course` where parent = %s and required = 1''', (self.program), as_dict=1) return frappe.db.sql('''select course from `tabProgram Course` where parent = %s and required = 1''', (self.program), as_dict=1)
def create_course_enrollments(self): def create_course_enrollments(self):
student = frappe.get_doc("Student", self.student) student = frappe.get_doc("Student", self.student)

11
erpnext/www/lms/course.py
View File

@ -5,9 +5,16 @@ import frappe
no_cache = 1 no_cache = 1
def get_context(context): def get_context(context):
try:
program = frappe.form_dict['program']
course_name = frappe.form_dict['name']
except KeyError:
frappe.local.flags.redirect_location = '/lms'
raise frappe.Redirect
context.education_settings = frappe.get_single("Education Settings") context.education_settings = frappe.get_single("Education Settings")
course = frappe.get_doc('Course', frappe.form_dict['name']) course = frappe.get_doc('Course', course_name)
context.program = frappe.form_dict['program'] context.program = program
context.course = course context.course = course
context.topics = course.get_topics() context.topics = course.get_topics()

10
erpnext/www/lms/program.py
View File

@ -6,10 +6,16 @@ from frappe import _
no_cache = 1 no_cache = 1
def get_context(context): def get_context(context):
try:
program = frappe.form_dict['program']
except KeyError:
frappe.local.flags.redirect_location = '/lms'
raise frappe.Redirect
context.education_settings = frappe.get_single("Education Settings") context.education_settings = frappe.get_single("Education Settings")
context.program = get_program(frappe.form_dict['program']) context.program = get_program(program)
context.courses = [frappe.get_doc("Course", course.course) for course in context.program.courses] context.courses = [frappe.get_doc("Course", course.course) for course in context.program.courses]
context.has_access = utils.allowed_program_access(frappe.form_dict['program']) context.has_access = utils.allowed_program_access(program)
context.progress = get_course_progress(context.courses, context.program) context.progress = get_course_progress(context.courses, context.program)
def get_program(program_name): def get_program(program_name):

10
erpnext/www/lms/topic.py
View File

@ -5,9 +5,13 @@ import frappe
no_cache = 1 no_cache = 1
def get_context(context): def get_context(context):
course = frappe.form_dict['course'] try:
program = frappe.form_dict['program'] course = frappe.form_dict['course']
topic = frappe.form_dict['topic'] program = frappe.form_dict['program']
topic = frappe.form_dict['topic']
except KeyError:
frappe.local.flags.redirect_location = '/lms'
raise frappe.Redirect
context.program = program context.program = program
context.course = course context.course = course