diff --git a/lms/www/classes/class.html b/lms/www/classes/class.html index b763d742..92462595 100644 --- a/lms/www/classes/class.html +++ b/lms/www/classes/class.html @@ -108,22 +108,40 @@ {{ AddStudents() }} {% if class_students | length %} -
+ + + + + + {% for student in class_students %} -
- - {{ student.student_name }} - - - - -
- {% if not loop.last %}
{% endif %} + {% set last_active = frappe.db.get_value("User", student.student, "last_active") %} + + + + + {% endfor %} - + +
+ {{ _("Student") }} + + {{ _("Last Active") }} +
+ + {{ student.student_name }} + + + {{ frappe.utils.format_datetime(last_active, "medium") }} + + + + +
{% else %}

{{ _("No Students are added to this class.") }}

{% endif %} +
{% endmacro %} diff --git a/lms/www/classes/progress.html b/lms/www/classes/progress.html index 0eb1f5b4..80a0307a 100644 --- a/lms/www/classes/progress.html +++ b/lms/www/classes/progress.html @@ -9,8 +9,13 @@
{{ BreadCrumb(class_info, student) }}
-
- {{ student.full_name }} +
+
+ {{ frappe.utils.format_datetime(student.last_active, "medium") }} +
+
+ {{ student.full_name }} +
{{ Progress(class_courses, student) }}
diff --git a/lms/www/classes/progress.py b/lms/www/classes/progress.py index 88b7397f..34a9e0d5 100644 --- a/lms/www/classes/progress.py +++ b/lms/www/classes/progress.py @@ -17,7 +17,7 @@ def get_context(context): classname = frappe.form_dict["classname"] context.student = frappe.db.get_value( - "User", {"username": student}, ["first_name", "full_name", "name"], as_dict=True + "User", {"username": student}, ["first_name", "full_name", "name", "last_active"], as_dict=True ) context.class_info = frappe.db.get_value( "LMS Class", classname, ["name"], as_dict=True