From 2b5ed79abf894049cb84d2ca1e1a5ba267e3e190 Mon Sep 17 00:00:00 2001
From: Eurie Oh
 <chocolategold@airbears2-10-142-8-59.airbears2.1918.berkeley.edu>
Date: Wed, 7 Sep 2016 12:16:18 -0700
Subject: [PATCH] redirect to template for new assignment

---
 server/controllers/admin.py                   |  2 +
 .../course/enrollment/students.list.html      |  2 +-
 tests/test_assignment.py                      | 52 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_assignment.py

diff --git a/server/controllers/admin.py b/server/controllers/admin.py
index e8a95a651..a595ae121 100644
--- a/server/controllers/admin.py
+++ b/server/controllers/admin.py
@@ -336,6 +336,8 @@ def new_assignment(cid):
         cache.delete_memoized(Assignment.name_to_assign_info)
 
         flash("Assignment created successfully.", "success")
+        if form.visible.data:
+            return redirect(url_for(".templates", cid=cid, aid=model.id))
         return redirect(url_for(".course_assignments", cid=cid))
 
     return render_template('staff/course/assignment/assignment.new.html', form=form,
diff --git a/server/templates/staff/course/enrollment/students.list.html b/server/templates/staff/course/enrollment/students.list.html
index 481de9778..560a1bfbe 100644
--- a/server/templates/staff/course/enrollment/students.list.html
+++ b/server/templates/staff/course/enrollment/students.list.html
@@ -36,7 +36,7 @@ <h3 class="box-title"><span> {{ title }} </span></h3>
                     <td class="sid">{{ item.sid }}</td>
                     <td class="secondary">{{ item.class_account }}</td>
                     <td class="role"><span class="label label-success">{{item.role | title }}</span></td>
-                    <td class="timestamp" data-timestamp="{{ item.created }}">{{ utils.local_time(item.created, current_course) }}</td>
+                    <td class="timestamp" data-timestamp="{{ item.created }}">{{ utils.local_time_obj(item.created, current_course) }}</td>
                     <td class="section">{{item.section}}</td>
                     <td class="unenroll">
                         {% call forms.render_form_bare(unenroll_form, action_url=url_for('.unenrollment', cid=current_course.id, user_id=item.user.id), class_='form') %}
diff --git a/tests/test_assignment.py b/tests/test_assignment.py
new file mode 100644
index 000000000..4daca6820
--- /dev/null
+++ b/tests/test_assignment.py
@@ -0,0 +1,52 @@
+import datetime
+import json
+from server.models import db, Assignment, Backup, Course, User, Version
+from server.utils import encode_id
+from server.forms import VersionForm
+
+from tests import OkTestCase
+
+class TestAssignment(OkTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.setup_course()
+
+    def test_new_assignment(self):
+
+        self.login(self.admin.email)
+
+        data = {
+            "display_name": "test",
+            "name": "{}/test".format(self.course.offering),
+            "due_date": "2016-09-14 23:59:59",
+            "lock_date": "2016-09-15 23:59:59",
+            "max_group_size": 1,
+            "visible": True
+        }
+
+        response = self.client.post("admin/course/1/assignments/new",
+                        data=data, follow_redirects=True)
+
+        self.assert200(response)
+        self.assert_template_used('staff/course/assignment/assignment.template.html')
+
+
+    def test_new_assignment_not_visible(self):
+
+        self.login(self.admin.email)
+
+        data = {
+            "display_name": "test",
+            "name": "{}/test".format(self.course.offering),
+            "due_date": "2016-09-14 23:59:59",
+            "lock_date": "2016-09-15 23:59:59",
+            "max_group_size": 1
+        }
+
+        response = self.client.post("admin/course/1/assignments/new",
+                        data=data, follow_redirects=True)
+
+        self.assert200(response)
+        self.assertTemplateUsed('staff/course/assignment/assignments.html')
+