From f3830bfdd5cd7b44773a037bd9ebfe4a216d289e Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 27 Jun 2023 12:17:00 +0530 Subject: [PATCH] fix: assessment validation --- lms/lms/doctype/lms_class/lms_class.py | 25 ++++++++++++------------- lms/public/css/style.css | 6 ++++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/lms/lms/doctype/lms_class/lms_class.py b/lms/lms/doctype/lms_class/lms_class.py index 9001066f..862bec75 100644 --- a/lms/lms/doctype/lms_class/lms_class.py +++ b/lms/lms/doctype/lms_class/lms_class.py @@ -2,13 +2,12 @@ # For license information, please see license.txt import frappe -from frappe.model.document import Document -from frappe import _ -from frappe.utils import cint, format_date, format_datetime import requests import base64 import json -from lms.lms.utils import has_course_moderator_role +from frappe import _ +from frappe.model.document import Document +from frappe.utils import cint, format_date, format_datetime class LMSClass(Document): @@ -41,16 +40,16 @@ class LMSClass(Document): def validate_duplicate_assessments(self): assessments = [row.assessment_name for row in self.assessment] - duplicates = { - assessment for assessment in assessments if assessments.count(assessment) > 1 - } - if len(duplicates): - title = frappe.db.get_value("LMS Assessment", next(iter(duplicates)), "title") - frappe.throw( - _("Assessment {0} has already been added to this class.").format( - frappe.bold(next(iter(duplicates))) + for assessment in self.assessment: + if assessments.count(assessment.assessment_name) > 1: + title = frappe.db.get_value( + assessment.assessment_type, assessment.assessment_name, "title" + ) + frappe.throw( + _("Assessment {0} has already been added to this class.").format( + frappe.bold(title) + ) ) - ) def validate_membership(self): for course in self.courses: diff --git a/lms/public/css/style.css b/lms/public/css/style.css index 7c6510be..c985aea4 100644 --- a/lms/public/css/style.css +++ b/lms/public/css/style.css @@ -2204,4 +2204,10 @@ select { .btn-remove-course:hover { opacity: 1; +} + +.rows .grid-row .data-row, +.rows .grid-row .grid-footer-toolbar, +.grid-form-heading { + cursor: none; } \ No newline at end of file