Enhance cadmin with link styling, Django admin shortcuts, and project submission editing (#133)

* Initial plan

* Add cadmin link styling and Django admin links

- Changed cadmin link from button to plain link in course.html
- Added Django admin links to course_admin.html for Course, Homework, and Project
- Registered ProjectSubmission in Django admin to allow editing results after evaluation

Co-authored-by: alexeygrigorev <875246+alexeygrigorev@users.noreply.github.com>

* Implement cadmin improvements per new requirements

- Move cadmin link to separate line in course.html
- Remove ProjectSubmission from Django admin
- Add edit functionality for project submissions in cadmin
- Restructure cadmin tests from single file to tests/ folder
- Add project_submission_edit view and template

Co-authored-by: alexeygrigorev <875246+alexeygrigorev@users.noreply.github.com>

* Add cadmin/tests to pytest testpaths

Co-authored-by: alexeygrigorev <875246+alexeygrigorev@users.noreply.github.com>

* Fix repository URL field name in project submissions template

Co-authored-by: alexeygrigorev <875246+alexeygrigorev@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: alexeygrigorev <875246+alexeygrigorev@users.noreply.github.com>

Author: Copilot

cadmin/templates/cadmin/course_admin.html

@@ -16,6 +16,13 @@ <h2>{{ course.title }} - Admin Panel</h2>
   <a href="{% url 'leaderboard' course.slug %}" class="btn btn-primary">Leaderboard</a>
 </div>
 
+<div class="mb-3">
+  <strong>Django Admin:</strong>
+  <a href="/admin/courses/course/{{ course.id }}/change/">
+    <i class="fas fa-edit"></i> Edit Course
+  </a>
+</div>
+
 <div class="alert alert-info" role="alert">
   <strong>Total Enrollments:</strong> {{ total_enrollments }}
 </div>
@@ -43,6 +50,9 @@ <h3>Homework</h3>
           <tr>
             <td>
               <a href="{% url 'homework' course.slug hw.slug %}">{{ hw.title }}</a>
+              | <a href="/admin/courses/homework/{{ hw.id }}/change/" title="Edit in Django Admin">
+                <i class="fas fa-edit"></i>
+              </a>
             </td>
             <td>{{ hw.due_date|date:"Y-m-d H:i" }}</td>
             <td>
@@ -118,6 +128,9 @@ <h3>Projects</h3>
           <tr>
             <td>
               <a href="{% url 'project' course.slug proj.slug %}">{{ proj.title }}</a>
+              | <a href="/admin/courses/project/{{ proj.id }}/change/" title="Edit in Django Admin">
+                <i class="fas fa-edit"></i>
+              </a>
             </td>
             <td>{{ proj.submission_due_date|date:"Y-m-d H:i" }}</td>
             <td>{{ proj.peer_review_due_date|date:"Y-m-d H:i" }}</td>

cadmin/templates/cadmin/project_submission_edit.html

@@ -0,0 +1,100 @@
+{% extends 'base.html' %}
+
+{% load custom_filters %}
+
+{% block breadcrumbs %}
+  <li><a href="{% url 'cadmin_course_list' %}">Course Admin</a></li>
+  <li><a href="{% url 'cadmin_course' course.slug %}">{{ course.title }}</a></li>
+  <li><a href="{% url 'cadmin_project_submissions' course.slug project.slug %}">{{ project.title }} Submissions</a></li>
+  <li><a href="{% url 'cadmin_project_submission_edit' course.slug project.slug submission.id %}">Edit Submission</a></li>
+{% endblock %}
+
+{% block content %}
+<h2>Edit Project Submission</h2>
+
+<div class="mb-3">
+  <a href="{% url 'cadmin_project_submissions' course.slug project.slug %}" class="btn btn-secondary">Back to Submissions</a>
+</div>
+
+<div class="alert alert-info" role="alert">
+  <strong>Student:</strong> {{ submission.student.username }} ({{ submission.student.email }})<br>
+  <strong>Project:</strong> {{ project.title }}<br>
+  <strong>Submitted:</strong> {{ submission.submitted_at|date:"Y-m-d H:i" }}<br>
+  <strong>Repository:</strong> <a href="{{ submission.github_link }}" target="_blank">{{ submission.github_link }}</a>
+</div>
+
+<form method="post">
+  {% csrf_token %}
+  
+  <div class="card mb-3">
+    <div class="card-header">
+      <h4>Project Scores</h4>
+    </div>
+    <div class="card-body">
+      <div class="form-group mb-3">
+        <label for="project_score">Project Score</label>
+        <input type="number" class="form-control" id="project_score" name="project_score" value="{{ submission.project_score }}" required>
+      </div>
+      
+      <div class="form-group mb-3">
+        <label for="project_faq_score">Project FAQ Score</label>
+        <input type="number" class="form-control" id="project_faq_score" name="project_faq_score" value="{{ submission.project_faq_score }}" required>
+      </div>
+      
+      <div class="form-group mb-3">
+        <label for="project_learning_in_public_score">Project Learning in Public Score</label>
+        <input type="number" class="form-control" id="project_learning_in_public_score" name="project_learning_in_public_score" value="{{ submission.project_learning_in_public_score }}" required>
+      </div>
+    </div>
+  </div>
+
+  <div class="card mb-3">
+    <div class="card-header">
+      <h4>Peer Review Scores</h4>
+    </div>
+    <div class="card-body">
+      <div class="form-group mb-3">
+        <label for="peer_review_score">Peer Review Score</label>
+        <input type="number" class="form-control" id="peer_review_score" name="peer_review_score" value="{{ submission.peer_review_score }}" required>
+      </div>
+      
+      <div class="form-group mb-3">
+        <label for="peer_review_learning_in_public_score">Peer Review Learning in Public Score</label>
+        <input type="number" class="form-control" id="peer_review_learning_in_public_score" name="peer_review_learning_in_public_score" value="{{ submission.peer_review_learning_in_public_score }}" required>
+      </div>
+    </div>
+  </div>
+
+  <div class="card mb-3">
+    <div class="card-header">
+      <h4>Overall Results</h4>
+    </div>
+    <div class="card-body">
+      <div class="form-group mb-3">
+        <label for="total_score">Total Score</label>
+        <input type="number" class="form-control" id="total_score" name="total_score" value="{{ submission.total_score }}" required>
+      </div>
+      
+      <div class="form-check mb-3">
+        <input type="checkbox" class="form-check-input" id="reviewed_enough_peers" name="reviewed_enough_peers" {% if submission.reviewed_enough_peers %}checked{% endif %}>
+        <label class="form-check-label" for="reviewed_enough_peers">
+          Reviewed Enough Peers
+        </label>
+      </div>
+      
+      <div class="form-check mb-3">
+        <input type="checkbox" class="form-check-input" id="passed" name="passed" {% if submission.passed %}checked{% endif %}>
+        <label class="form-check-label" for="passed">
+          Passed
+        </label>
+      </div>
+    </div>
+  </div>
+
+  <div class="text-center">
+    <button type="submit" class="btn btn-primary">Save Changes</button>
+    <a href="{% url 'cadmin_project_submissions' course.slug project.slug %}" class="btn btn-secondary">Cancel</a>
+  </div>
+</form>
+
+{% endblock %}

cadmin/templates/cadmin/project_submissions.html

@@ -43,6 +43,7 @@ <h2>{{ project.title }} - Submissions</h2>
         <th>Total Score</th>
         <th>Passed</th>
         <th>Repository URL</th>
+        <th>Actions</th>
       </tr>
     </thead>
     <tbody>
@@ -85,12 +86,17 @@ <h2>{{ project.title }} - Submissions</h2>
           {% endif %}
         </td>
         <td>
-          {% if submission.repository_url %}
-            <a href="{{ submission.repository_url }}" target="_blank">View</a>
+          {% if submission.github_link %}
+            <a href="{{ submission.github_link }}" target="_blank">View</a>
           {% else %}
             -
           {% endif %}
         </td>
+        <td>
+          <a href="{% url 'cadmin_project_submission_edit' course.slug project.slug submission.id %}" class="btn btn-sm btn-primary">
+            <i class="fas fa-edit"></i> Edit
+          </a>
+        </td>
       </tr>
       {% endfor %}
     </tbody>

cadmin/tests/__init__.py

@@ -0,0 +1 @@
+# Tests for cadmin app

cadmin/tests.py cadmin/tests/test_views.pycadmin/tests.py renamed to cadmin/tests/test_views.py

@@ -150,4 +150,3 @@ def test_cadmin_project_submissions_staff_allowed(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, self.project.title)
-

cadmin/urls.py

@@ -35,4 +35,9 @@
         views.project_submissions,
         name="cadmin_project_submissions",
     ),
+    path(
+        "<slug:course_slug>/project/<slug:project_slug>/submissions/<int:submission_id>/edit",
+        views.project_submission_edit,
+        name="cadmin_project_submission_edit",
+    ),
 ]

cadmin/views.py

@@ -250,3 +250,45 @@ def project_submissions(request, course_slug, project_slug):
 
     return render(request, "cadmin/project_submissions.html", context)
 
+
+@staff_required
+def project_submission_edit(request, course_slug, project_slug, submission_id):
+    """Edit a project submission"""
+    course = get_object_or_404(Course, slug=course_slug)
+    project = get_object_or_404(Project, course=course, slug=project_slug)
+    submission = get_object_or_404(
+        ProjectSubmission, 
+        id=submission_id, 
+        project=project
+    )
+
+    if request.method == "POST":
+        # Update the submission fields
+        try:
+            submission.project_score = int(request.POST.get("project_score", 0))
+            submission.project_faq_score = int(request.POST.get("project_faq_score", 0))
+            submission.project_learning_in_public_score = int(request.POST.get("project_learning_in_public_score", 0))
+            submission.peer_review_score = int(request.POST.get("peer_review_score", 0))
+            submission.peer_review_learning_in_public_score = int(request.POST.get("peer_review_learning_in_public_score", 0))
+            submission.total_score = int(request.POST.get("total_score", 0))
+            submission.reviewed_enough_peers = request.POST.get("reviewed_enough_peers") == "on"
+            submission.passed = request.POST.get("passed") == "on"
+            
+            submission.save()
+            
+            messages.success(
+                request,
+                f"Project submission for {submission.student.username} updated successfully",
+            )
+            return redirect("cadmin_project_submissions", course_slug=course_slug, project_slug=project_slug)
+        except ValueError as e:
+            messages.error(request, f"Error updating submission: {e}")
+
+    context = {
+        "course": course,
+        "project": project,
+        "submission": submission,
+    }
+
+    return render(request, "cadmin/project_submission_edit.html", context)
+

courses/templates/courses/course.html

@@ -23,10 +23,14 @@ <h2>{{ course.title }}</h2>
     {% if is_authenticated %}
       <a class="btn btn-info" href="{% url 'enrollment' course.slug %}" role="button">Edit course profile</a>
     {% endif %}
-    {% if user.is_staff %}
-      <a class="btn btn-warning" href="{% url 'cadmin_course' course.slug %}" role="button">Manage course</a>
-    {% endif %}
-  </p>  
+  </p>
+  {% if user.is_staff %}
+  <p>
+    <a href="{% url 'cadmin_course' course.slug %}">
+      <i class="fas fa-cog"></i> Manage course (Admin only)
+    </a>
+  </p>
+  {% endif %}
 </div>
 
 

pyproject.toml

@@ -40,4 +40,5 @@ python_files = ["test_*.py"]
 testpaths = [
     "courses/tests",
     "data/tests",
+    "cadmin/tests",
 ]