Add comment section for students

pasapp/static/pasapp/css/applications.css

+#student-priority-list {
+    padding-inline-start: 1em;
+}
+
+#student-applications-list {
+    padding-inline-start: 0;
+}
+
+#student-applications-list li {
+    margin-left: 2em;
+}
+
 .application-status {
     text-align: center;
     background: rgba(207, 255, 180, 0.6);
@@ -45,6 +57,25 @@
     font-size: small;
 }
 
+.application>div:last-child {
+    margin-right: 1em;
+}
+
+button, input[type=submit] {
+    padding-bottom: 2px;
+}
+
+button {
+    margin-top: 4px;
+}
+
+#new-comment-form textarea {
+    width: 60em;
+    height: 1.5em;
+    resize: vertical;
+    margin-top: 2px;
+    margin-bottom: 4px;
+}
 .priority-number {
     font-size: x-large;
     color: darkcyan;

pasapp/templates/pasapp/components/application_student.html

 {% load custom_filters %}
+{% load html_components %}
 <li class="dashed-box application {{application|student_status|minify|lower}} {{application|professor_status|minify|lower}}">
     <div class="application-meta-container">
         {% if application.priority %}
@@ -53,5 +54,7 @@
         <hr>
         {% comment %}<em>Description: </em>{{application.project.description}}<br/>{% endcomment %}
         {{application.message}}
+        <br>
+        {% application_comment_section application.id comments comment_box=True %}
     </div>
 </li>
\ No newline at end of file

pasapp/templates/pasapp/pages/student_applications.html

@@ -4,15 +4,16 @@
 {% block imports %}
     {% load static %}
     <script src={% static 'pasapp/js/app_student_edit.js' %}></script>
+    <script src={% static 'pasapp/js/form_redirect.js' %}></script>
 {% endblock %}
-{% block onload %} {% endblock %}
+{% block onload %} addNextRoutes() {% endblock %}
 {% block content %}
     {% load html_components %}
     {% load custom_filters %}
     {% if applications %}
     <form action="/applications/update_priorities/" method="post">
         {% csrf_token %}
-        <ol>
+        <ol id="student-priority-list">
         {% for i in 5|times %}
             <li>
                 <select class="prioritySelect" name="priority{{i}}" oninput="checkForConflicts(this)">
@@ -34,27 +35,27 @@
         {% csrf_token %}
         <input type="hidden" name="application" id="status_id">
         <input type="hidden" name="state" id="status_state">
-        <ol>
+    </form>
+        <ol id="student-applications-list">
         {% if offeredApplications %}
             <h2>Extended Offers</h2>
             {% for application in offeredApplications %}
-                {% application_student application True %}
+                {% application_student application comments|for_application:application True %}
             {% endfor %}
         {% endif %}
         {% if openApplications %}
             <h2>Pending Applications</h2>
             {% for application in openApplications %}
-                {% application_student application True %}
+                {% application_student application comments|for_application:application True %}
             {% endfor %}
         {% endif %}
         {% if closedApplications %}
             <h2>Declined Applications</h2>
             {% for application in closedApplications %}
-                {% application_student application False %}
+                {% application_student application comments|for_application:application False %}
             {% endfor %}
         {% endif %}
         </ol>
-    </form>
     {% else %}
     <p>You have no applications to display yet!</p>
     {% endif %} 

pasapp/templates/pasapp/pages/student_project_details.html

 {% extends 'pasapp/templates/base_template.html' %} 
 
 {% block title %} {{project.title}} {% endblock %} 
+{% block imports %}
+    {% load static %}
+    <script src={% static 'pasapp/js/form_redirect.js' %}></script>
+{% endblock %}
+{% block onload %} addNextRoutes() {% endblock %}
 {% block content %} 
     {% load html_components %}
     <h1>{{project.title}}</h1>
@@ -25,6 +30,6 @@
     {% endif %}
     {% if student_application %}
         <h2>Your application:</h2>
-        {% application_student student_application %}
+        {% application_student student_application comments|for_application:student_application True %}
     {% endif %}
 {% endblock %}

pasapp/templatetags/html_components.py

@@ -37,7 +37,7 @@ def tags_dropdown(tags):
     return { 'tags': tags }
 
 @register.inclusion_tag('pasapp/components/application_student.html')
-def application_student(application, interactive=False):
+def application_student(application, comments=[], interactive=False, comment_box=False):
     if interactive:
         checkbox = application.student_status in ('APPL', 'PRE') and application.professor_status in ('NONE')
         responses = application.professor_status in ('OFFR') and application.student_status in ('APPL', 'PRE') # 'PRE' not necessary after automation
@@ -45,7 +45,10 @@ def application_student(application, interactive=False):
         checkbox = responses = False
     student_status = application.student_status
     professor_status = application.professor_status
-    return { 'application': application, 'studentStatus': student_status, 'professorStatus': professor_status, 'checkbox': checkbox, 'responses': responses }
+    return { 'application': application, 
+        'studentStatus': student_status, 'professorStatus': professor_status, 
+        'checkbox': checkbox, 'responses': responses,
+        'comments': comments, 'commentBox': comment_box }
 
 @register.inclusion_tag('pasapp/components/application_professor.html')
 def application_professor(application, comments=[], buttons=False, comment_box=False):

pasapp/views.py

@@ -70,7 +70,8 @@ def student_project_details(request, project_id):
     num_applicants = Application.objects.filter(project=project_id).count()
     student_application = Application.objects.filter(project=project_id, student=request.user).first() if is_student(request.user) else None
     project_tags = ProjectTag.objects.filter(project=project)
-    context = {'project': project, 'numApplicants': num_applicants, 'projectTags': project_tags, 'student_application': student_application}
+    comments = Comment.objects.filter(application=student_application)
+    context = {'project': project, 'numApplicants': num_applicants, 'projectTags': project_tags, 'student_application': student_application, 'comments': comments}
     return render(request, 'pasapp/pages/student_project_details.html', contextWithHeader(context, request))
 
 def professor_project_details(request, project_id):
@@ -239,8 +240,10 @@ def student_applications_view(request):
     offered_applications = applications.filter(professor_status=Application.ProfessorStatus.OFFERED)
     open_applications = applications.filter(professor_status=Application.ProfessorStatus.NONE)
     closed_applications = applications.filter(professor_status=Application.ProfessorStatus.DECLINED)
+    comments = Comment.objects.filter(application__in=applications)
     context = {'applications': applications, 'offeredApplications': offered_applications, 
-        'openApplications': open_applications, 'closedApplications': closed_applications}
+        'openApplications': open_applications, 'closedApplications': closed_applications,
+        'comments': comments}
     return render(request, 'pasapp/pages/student_applications.html', contextWithHeader(context, request))