fix: class issues

lms/www/classes/class.html

@@ -30,15 +30,7 @@
 <!-- Class Details -->
 {% macro ClassDetails(class_info) %}
 <div class="class-details" data-class="{{ class_info.name }}">
-	<div class="course-home-headings">
-		{{ class_info.title }}
-	</div>
-	{% if class_info.description %}
-	<div class="medium">
-		{{ class_info.description }}
-	</div>
-	{% endif %}
-	<div class="medium">
+	<div class="medium pull-right">
 		{% if class_info.start_date %}
 		<span>
 			{{ frappe.utils.format_date(class_info.start_date, "medium") }} -
@@ -50,6 +42,15 @@
 		</span>
 		{% endif %}
 	</div>
+	<div class="course-home-headings">
+		{{ class_info.title }}
+	</div>
+	{% if class_info.description %}
+	<div class="medium">
+		{{ class_info.description }}
+	</div>
+	{% endif %}
+
 	{% if class_info.custom_component %}
 		{{ class_info.custom_component }}
 	{% endif %}
@@ -128,9 +129,10 @@
 		</tr>
 		{% for student in class_students %}
 		{% set last_active = frappe.db.get_value("User", student.student, "last_active") %}
+		{% set allow_progress = is_moderator or student.student == frappe.session.user or frappe.db.get_single_value("LMS Settings", "allow_student_progress") %}
 		<tr>
 			<td>
-				<a class="subheading button-links d-block" href="/classes/{{ class_info.name }}/students/{{ student.username }}">
+				<a class="subheading button-links d-block" {% if allow_progress %} href="/classes/{{ class_info.name }}/students/{{ student.username }}" {% endif %}>
 					{{ student.student_name }}
 				</a>
 			</td>

lms/www/classes/class.py

@@ -6,6 +6,8 @@ from frappe import _
 def get_context(context):
 	context.no_cache = 1
 	class_name = frappe.form_dict["classname"]
+	session_user = []
+	remaining_students = []
 
 	context.class_info = frappe.db.get_value(
 		"LMS Class",
@@ -22,8 +24,19 @@ def get_context(context):
 		"Class Course", {"parent": class_name}, pluck="course"
 	)
 
-	context.class_students = frappe.get_all(
+	class_students = frappe.get_all(
 		"Class Student", {"parent": class_name}, ["student", "student_name", "username"]
 	)
 
+	for student in class_students:
+		if student.student == frappe.session.user:
+			session_user.append(student)
+		else:
+			remaining_students.append(student)
+
+	if len(session_user):
+		context.class_students = session_user + remaining_students
+	else:
+		context.class_students = class_students
+
 	context.is_moderator = has_course_moderator_role()

lms/www/classes/progress.html

@@ -15,14 +15,14 @@
 						{{ frappe.utils.format_datetime(student.last_active, "medium") }}
 					</span>
 					{% if is_moderator %}
-					<a class="btn btn-secondary btn-sm ml-3" href="/evaluation/new?member={{student.name}}&date={{frappe.utils.getdate()}}">
+					<a class="btn btn-secondary btn-sm ml-3" href="/evaluation/new?member={{student.name}}&date={{frappe.utils.getdate()}}&class={{class_info.name}}">
 						{{ _("Evaluate") }}
 					</a>
 					{% endif %}
 				</div>
-				<div class="course-home-headings">
+				<a class="course-home-headings" href="/users/{{student.username}}">
 					{{ student.full_name }}
-				</div>
+				</a>
 			</div>
 			{{ Progress(class_courses, student) }}
 		</div>

lms/www/classes/progress.py

@@ -13,7 +13,7 @@ def get_context(context):
 	context.student = frappe.db.get_value(
 		"User",
 		{"username": student},
-		["first_name", "full_name", "name", "last_active"],
+		["first_name", "full_name", "name", "last_active", "username"],
 		as_dict=True,
 	)
 	context.class_info = frappe.db.get_value(