fix: join batch, removed code revision, redirects for other pages if batch missing
This commit is contained in:
@@ -1,8 +0,0 @@
|
||||
// Copyright (c) 2021, FOSS United and contributors
|
||||
// For license information, please see license.txt
|
||||
|
||||
frappe.ui.form.on('Code Revision', {
|
||||
// refresh: function(frm) {
|
||||
|
||||
// }
|
||||
});
|
||||
@@ -1,58 +0,0 @@
|
||||
{
|
||||
"actions": [],
|
||||
"creation": "2021-04-07 00:26:28.806520",
|
||||
"doctype": "DocType",
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"section",
|
||||
"code",
|
||||
"author"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"fieldname": "section",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"label": "Section",
|
||||
"options": "LMS Section"
|
||||
},
|
||||
{
|
||||
"fieldname": "code",
|
||||
"fieldtype": "Code",
|
||||
"label": "Code"
|
||||
},
|
||||
{
|
||||
"fieldname": "author",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"label": "Author",
|
||||
"options": "User"
|
||||
}
|
||||
],
|
||||
"index_web_pages_for_search": 1,
|
||||
"links": [],
|
||||
"modified": "2021-04-14 11:26:19.628317",
|
||||
"modified_by": "Administrator",
|
||||
"module": "LMS",
|
||||
"name": "Code Revision",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
{
|
||||
"create": 1,
|
||||
"delete": 1,
|
||||
"email": 1,
|
||||
"export": 1,
|
||||
"print": 1,
|
||||
"read": 1,
|
||||
"report": 1,
|
||||
"role": "System Manager",
|
||||
"share": 1,
|
||||
"write": 1
|
||||
}
|
||||
],
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"title_field": "section",
|
||||
"track_changes": 1
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (c) 2021, FOSS United and contributors
|
||||
# For license information, please see license.txt
|
||||
|
||||
from __future__ import unicode_literals
|
||||
# import frappe
|
||||
from frappe.model.document import Document
|
||||
|
||||
class CodeRevision(Document):
|
||||
pass
|
||||
@@ -1,10 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (c) 2021, FOSS United and Contributors
|
||||
# See license.txt
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# import frappe
|
||||
import unittest
|
||||
|
||||
class TestCodeRevision(unittest.TestCase):
|
||||
pass
|
||||
@@ -92,7 +92,7 @@ def update_progress(lesson):
|
||||
course_progress.save(ignore_permissions=True)
|
||||
|
||||
def all_dynamic_content_submitted(lesson, user):
|
||||
exercise_names = frappe.get_list("Exercise", {"lesson": lesson}, pluck="name")
|
||||
exercise_names = frappe.get_list("Exercise", {"lesson": lesson}, pluck="name", ignore_permissions=True)
|
||||
all_exercises_submitted = False
|
||||
query = {
|
||||
"exercise": ["in", exercise_names],
|
||||
|
||||
@@ -194,12 +194,16 @@ class LMSCourse(Document):
|
||||
|
||||
def get_current_batch(self, member=frappe.session.user):
|
||||
current_membership = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name, "is_current": 1}, pluck="batch")
|
||||
print(current_membership, member, self.name)
|
||||
if len(current_membership):
|
||||
return current_membership[0]
|
||||
print(frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch"))
|
||||
return frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch")
|
||||
|
||||
def get_all_memberships(self, member=frappe.session.user):
|
||||
print(member)
|
||||
all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name}, ["batch", "is_current"])
|
||||
print(all_memberships)
|
||||
for membership in all_memberships:
|
||||
membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
|
||||
return all_memberships
|
||||
|
||||
@@ -45,7 +45,9 @@
|
||||
}
|
||||
|
||||
window.checkout_upcoming_batches = () => {
|
||||
$('html,body').animate({scrollTop: $(".upcoming").offset().top}, 300);
|
||||
if ($(".upcoming").length > 0) {
|
||||
$('html,body').animate({ scrollTop: $(".upcoming").offset().top }, 300);
|
||||
}
|
||||
frappe.hide_msgprint();
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user