chore: resolved conflicts

This commit is contained in:
Jannat Patel
2023-07-26 11:00:27 +05:30
10 changed files with 19 additions and 42 deletions
-5
View File
@@ -486,11 +486,6 @@
frappe.boot.single_types = []
frappe.router = {
slug (name) {
return name.toLowerCase().replace(/ /g, "-");
}
}
let class_info = {{ class_info | json }};
</script>
{% endif %}
-6
View File
@@ -157,12 +157,6 @@
"can_select": ["LMS Category"],
"can_read": ["LMS Category"]
};
frappe.router = {
slug (name) {
return name.toLowerCase().replace(/ /g, "-");
}
}
let class_info = null;
</script>
{% endif %}
+1 -1
View File
@@ -36,7 +36,7 @@ def get_context(context):
context.assessments = get_assessments(class_name, context.student.name)
upcoming_evals = frappe.get_all(
"LMS certificate Request",
"LMS Certificate Request",
{
"member": context.student.name,
"course": ["in", context.courses],