Merge pull request #139 from grepthink/master

Small Update to Tsr Edit
grepthink · Oct 16, 2018 · bc6d67d · bc6d67d
2 parents d0d91b8 + 40bfb9c
commit bc6d67d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/teamwork/apps/projects/views/EditTsrView.py b/teamwork/apps/projects/views/EditTsrView.py
@@ -24,7 +24,7 @@ def tsr_edit(request, slug, asg_slug):
     page_name = "TSR Edit"
     page_description = "Edit TSR form"
     title = "TSR Edit"
-    
+
     # Current Project
     cur_proj = get_object_or_404(Project, slug=slug)
 
@@ -34,7 +34,9 @@ def tsr_edit(request, slug, asg_slug):
     # List of Members of the Current Project
     members = cur_proj.members.all()
     emails = [member.email for member in members]
-    tsr_list = Tsr.objects.filter(ass_number=asg.ass_number, evaluator=request.user)
+
+    # grab the TSR objects that will be displayed to edit
+    tsr_list = asg.subs.all().filter(evaluator=request.user)
 
     # Determine if Scrum Master
     scrum_master = is_scrum_master(request)

diff --git a/teamwork/templates/projects/tsr_edit.html b/teamwork/templates/projects/tsr_edit.html
@@ -12,19 +12,34 @@
 onblur="checkTextField(this);" />
 {% block content %}
 
-  <form action="{% url 'tsr_edit' cur_proj.slug ass.slug %}" method="post" role="form">
-    {% csrf_token %}
-    {% for form in forms %}
-      <br>
-      <br>
-      <h3>For {{form.prefix}}</h3>
-      {% for field in form.visible_fields %}
-        <label for="{{ field.label }}" class="control-label">{{ field.label }}</label>
+<div class="col-md-8">
+    <div class="box box-success">
+      <div class="box-header with-border">
+        <h3 class="box-title">Edit TSR Submission</h3>
+      </div>
+      <div class="box-body">
+          <p class="text-center">
+              <strong>Course:</strong> {{ cur_proj.course.first.name }}
+          </p>
+          <p class="text-center">
+              <strong>Assignment:</strong> {{ ass.ass_name }}
+          </p>
+      <form action="{% url 'tsr_edit' cur_proj.slug ass.slug %}" method="post" role="form">
+        {% csrf_token %}
+        {% for form in forms %}
+          <h3>For {{form.prefix}}</h3>
+          {% for field in form.visible_fields %}
+            <label for="{{ field.label }}" class="control-label">{{ field.label }}</label>
 
-        {{ field }}
+            {{ field }}
+            {% endfor %}
+            <br>
+            <br>
         {% endfor %}
-    {% endfor %}
-    <br>
-    <h5> <input type="submit" value="Submit">
-    </form>
+        <br>
+        <h5> <input type="submit" value="Submit">
+        </form>
+    </div>
+</div>
+</div>
 {% endblock content %}