From d2fcc8a4b3c454e4005faa4bf1ecdbb47ad3d081 Mon Sep 17 00:00:00 2001
From: Georgia Shay <georgiashay@gmail.com>
Date: Sat, 7 May 2022 14:33:13 -0400
Subject: [PATCH 1/5] Begin setting up syllabus submission

---
 common/templates/common/base.html           |   2 +
 fireroad/settings.py                        |   3 +-
 fireroad/urls.py                            |   3 +-
 syllabus/__init__.py                        |   0
 syllabus/models.py                          |  44 +++++
 syllabus/static/syllabus/css/nav.css        | 182 ++++++++++++++++++++
 syllabus/static/syllabus/css/syllabus.css   |  13 ++
 syllabus/templates/syllabus/base.html       |  52 ++++++
 syllabus/templates/syllabus/create.html     |  88 ++++++++++
 syllabus/templates/syllabus/index.html      |  10 ++
 syllabus/templates/syllabus/review.html     |   8 +
 syllabus/templates/syllabus/review_all.html |  95 ++++++++++
 syllabus/templates/syllabus/success.html    |   6 +
 syllabus/templates/syllabus/viewer.html     |   8 +
 syllabus/urls.py                            |  17 ++
 syllabus/views.py                           | 157 +++++++++++++++++
 16 files changed, 685 insertions(+), 3 deletions(-)
 create mode 100644 syllabus/__init__.py
 create mode 100644 syllabus/models.py
 create mode 100644 syllabus/static/syllabus/css/nav.css
 create mode 100644 syllabus/static/syllabus/css/syllabus.css
 create mode 100644 syllabus/templates/syllabus/base.html
 create mode 100644 syllabus/templates/syllabus/create.html
 create mode 100644 syllabus/templates/syllabus/index.html
 create mode 100644 syllabus/templates/syllabus/review.html
 create mode 100644 syllabus/templates/syllabus/review_all.html
 create mode 100644 syllabus/templates/syllabus/success.html
 create mode 100644 syllabus/templates/syllabus/viewer.html
 create mode 100644 syllabus/urls.py
 create mode 100644 syllabus/views.py

diff --git a/common/templates/common/base.html b/common/templates/common/base.html
index fcce210..5b3f87d 100644
--- a/common/templates/common/base.html
+++ b/common/templates/common/base.html
@@ -52,6 +52,7 @@
           <a href="/" class="brand-logo"><img class="logo-img hoverable" src="https://fireroad.mit.edu/catalogs/fireroad_logo.png" width="40" height="40"/>FireRoad</a>
           <ul class="right hide-on-med-and-down">
             <li><a href="/requirements">Requirements Editor</a></li>
+            <li><a href="/syllabus">Class Syllabi</a></li>
             <li><a href="/reference">API</a></li>
             <li><a class="dropdown-trigger" href="#!" data-target="dropdown1">GitHub</a></li>
             <li><a href="mailto:base12apps@gmail.com">Contact</a></li>
@@ -87,6 +88,7 @@
 
     <ul class="sidenav" id="mobile-nav">
       <li><a href="/requirements">Requirements Editor</a></li>
+      <li><a href="/syllabus">Class Syllabi</a></li>
       <li><a href="/reference">FireRoad API</a></li>
       <li><a class="dropdown-trigger" href="#!" data-target="dropdown2">GitHub<i class="material-icons right">arrow_drop_down</i></a></li>
       <li><a href="mailto:base12apps@gmail.com">Contact</a></li>
diff --git a/fireroad/settings.py b/fireroad/settings.py
index f041cd0..d6b246a 100644
--- a/fireroad/settings.py
+++ b/fireroad/settings.py
@@ -49,7 +49,8 @@
     'requirements',
     'courseupdater',
     'catalog',
-    'analytics'
+    'analytics',
+    'syllabus'
 ]
 
 MIDDLEWARE_CLASSES = [
diff --git a/fireroad/urls.py b/fireroad/urls.py
index 78fe45a..bca6b3f 100644
--- a/fireroad/urls.py
+++ b/fireroad/urls.py
@@ -31,6 +31,7 @@
     url(r'sync/', include('sync.urls')),
     url(r'analytics/', include('analytics.urls')),
     url(r'requirements/', include('requirements.urls')),
+    url(r'syllabus/', include('syllabus.urls')),
     url(r'', include('common.urls')),
 ]
 
@@ -47,5 +48,3 @@
         urlpatterns.insert(0, url(r'^login/$', RedirectView.as_view(url=settings.LOGIN_URL,
                                                                     permanent=True,
                                                                     query_string=True)))
-
-
diff --git a/syllabus/__init__.py b/syllabus/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/syllabus/models.py b/syllabus/models.py
new file mode 100644
index 0000000..4f96412
--- /dev/null
+++ b/syllabus/models.py
@@ -0,0 +1,44 @@
+from django.db import models
+from django import forms
+
+SEMESTER_CHOICES = [
+    ('Fall', 'fall'),
+    ('IAP', 'iap'),
+    ('Spring', 'spring'),
+    ('Summer', 'summer')
+]
+
+class DeploySyllabusForm(forms.Form):
+    email_address = forms.CharField(label='Editor Email', max_length=100, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Email address'}))
+    summary = forms.CharField(label='Summary of Uploads', max_length=2000, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Summary of uploads...'}))
+
+class SyllabusDeployment(models.Model):
+    author = models.CharField(max_length=100)
+    timestamp = models.DateTimeField(auto_now_add=True)
+    summary = models.CharField(max_length=2000)
+    date_executed = models.DateTimeField(null=True)
+
+    def __unicode__(self):
+        return u"{}Deployment by {} at {} ({} edits): {}".format("(Pending) " if self.date_executed is None else "", self.author, self.timestamp, self.edit_requests.count(), self.summary)
+
+class SyllabusForm(forms.Form):
+    is_committing = forms.BooleanField(label='commit')
+    email_address = forms.CharField(label='Email address', max_length=100, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Email address'}))
+    semester = forms.ChoiceField(label='Semester', choices=SEMESTER_CHOICES, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Semester (e.g. Fall)'}))
+    year = forms.CharField(label='Year', max_length=4, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Year (e.g. 2022)'}))
+    subject_id = forms.CharField(label='Course Number', max_length=20, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Course number (e.g. 18.01)'}))
+    file = forms.FileField(label='Syllabus File', widget=forms.FileInput(attrs={'class': 'input-field'}))
+
+class SyllabusSubmission(models.Model):
+    email_address = models.CharField(max_length=100)
+    semester = models.CharField(max_length=6, choices=SEMESTER_CHOICES)
+    year = models.CharField(max_length=4)
+    subject = models.ForeignKey('catalog.Course', on_delete=models.CASCADE, related_name='+')
+    file = models.FileField(upload_to='syllabus/')
+    timestamp = models.DateTimeField(auto_now_add=True)
+    resolved = models.BooleanField(default=False)
+    committed = models.BooleanField(default=False)
+    deployment = models.ForeignKey(SyllabusDeployment, null=True, on_delete=models.SET_NULL, related_name='syllabus_submissions')
+
+    def __unicode__(self):
+        return u"{}{}{} request for '{}' by {}: {}".format("(Resolved) " if self.resolved else "", "(Committed) " if self.committed else "", self.type, self.subject_id, self.email_address, self.reason)
diff --git a/syllabus/static/syllabus/css/nav.css b/syllabus/static/syllabus/css/nav.css
new file mode 100644
index 0000000..62d2223
--- /dev/null
+++ b/syllabus/static/syllabus/css/nav.css
@@ -0,0 +1,182 @@
+.nav-side-menu {
+  overflow: auto;
+  font-size: 14px;
+  font-weight: 300;
+  background-color: white;
+  position: fixed;
+  top: 0;
+  width: 300px;
+  color: #bb2222;
+  border-right: 1px solid #dddddd;
+}
+.nav-side-menu .brand {
+  background-color: white;
+  line-height: 50px;
+  display: block;
+  text-align: center;
+  font-size: 16px;
+  font-weight: 500;
+}
+.nav-side-menu .toggle-btn {
+  display: none;
+}
+.nav-side-menu ul,
+.nav-side-menu li {
+  list-style: none;
+  margin: 0px;
+  /*line-height: 44px;*/
+  cursor: pointer;
+}
+.nav-side-menu ul {
+  padding: 0;
+}
+.nav-side-menu li {
+  padding: 8px 0 8px 0;
+}
+.nav-side-menu ul :not(collapsed) .arrow:before,
+.nav-side-menu li :not(collapsed) .arrow:before {
+  font-family: FontAwesome;
+  content: "\f078";
+  display: inline-block;
+  padding-left: 10px;
+  padding-right: 10px;
+  vertical-align: middle;
+  float: right;
+}
+.nav-side-menu ul .active,
+.nav-side-menu li .active {
+  border-left: 3px solid #f54c3b;
+  background-color: white;
+}
+.nav-side-menu ul .sub-menu li.active,
+.nav-side-menu li .sub-menu li.active {
+  color: #f54c3b;
+}
+.nav-side-menu ul .sub-menu li.active a,
+.nav-side-menu li .sub-menu li.active a {
+  color: #f54c3b;
+}
+.nav-side-menu ul .sub-menu li,
+.nav-side-menu li .sub-menu li {
+  background-color: white;
+  border: none;
+  /*line-height: 32px;*/
+  border-bottom: 1px solid #dddddd;
+  margin-left: 0px;
+}
+.nav-side-menu ul .sub-menu li:hover,
+.nav-side-menu li .sub-menu li:hover {
+  background-color: #ffddd9;
+}
+/*.nav-side-menu ul .sub-menu li:before,
+.nav-side-menu li .sub-menu li:before {
+  font-family: FontAwesome;
+  content: "\f105";
+  display: inline-block;
+  padding-left: 10px;
+  padding-right: 10px;
+  vertical-align: middle;
+}*/
+.nav-side-menu li {
+  padding-left: 0px;
+  display: block;
+  border-left: 3px solid #dddddd;
+  border-bottom: 1px solid #dddddd;
+}
+.nav-side-menu li a {
+  text-decoration: none;
+  padding-left: 30px;
+  display: block;
+  color: #bb2222;
+  -webkit-box-decoration-break: clone;
+  box-decoration-break: clone;
+}
+.nav-side-menu li a i {
+  padding-left: 10px;
+  width: 20px;
+  padding-right: 20px;
+}
+.nav-side-menu li:hover {
+  border-left: 3px solid #f45a48;
+  background-color: #ffddd9;
+  -webkit-transition: all 1s ease;
+  -moz-transition: all 1s ease;
+  -o-transition: all 1s ease;
+  -ms-transition: all 1s ease;
+  transition: all 1s ease;
+}
+@media (max-width: 767px) {
+  .nav-side-menu {
+    position: relative;
+    width: 100%;
+    margin-bottom: 10px;
+  }
+  .nav-side-menu .toggle-btn {
+    display: block;
+    cursor: pointer;
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    z-index: 10 !important;
+    padding: 3px;
+    background-color: #ffffff;
+    color: #ddd;
+    width: 40px;
+    text-align: center;
+  }
+  .brand {
+    text-align: left !important;
+    font-size: 24px;
+    padding-left: 20px;
+    line-height: 50px !important;
+  }
+  .content {
+    margin-left: 0;
+    padding: 0 16px 0 16px;
+    width: 100%;
+  }
+}
+@media (min-width: 767px) {
+  .nav-side-menu {
+    height: 100%;
+    padding-top: 64px;
+  }
+  .nav-side-menu .menu-list .menu-content {
+    display: block;
+  }
+  .content {
+    padding-left: 300px;
+  }
+}
+body {
+  margin: 0px;
+  padding: 0px;
+}
+.row {
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+}
+.collapse {
+    display: none
+}
+
+.collapse.in {
+    display: block
+}
+
+tr.collapse.in {
+    display: table-row
+}
+
+tbody.collapse.in {
+    display: table-row-group
+}
+
+.collapsing {
+    position: relative;
+    height: 0;
+    overflow: hidden;
+    -webkit-transition: height .35s ease;
+    -o-transition: height .35s ease;
+    transition: height .35s ease
+}
diff --git a/syllabus/static/syllabus/css/syllabus.css b/syllabus/static/syllabus/css/syllabus.css
new file mode 100644
index 0000000..5fb4cd5
--- /dev/null
+++ b/syllabus/static/syllabus/css/syllabus.css
@@ -0,0 +1,13 @@
+@media (min-width: 767px) {
+  .syllabus-head {
+    margin-top: 12px;
+  }
+  .content {
+    margin-top: -64px;
+    padding-top: 64px;
+  }
+  .content-full-screen {
+    margin-top: -64px;
+    padding-top: 64px;
+  }
+}
diff --git a/syllabus/templates/syllabus/base.html b/syllabus/templates/syllabus/base.html
new file mode 100644
index 0000000..14410df
--- /dev/null
+++ b/syllabus/templates/syllabus/base.html
@@ -0,0 +1,52 @@
+{% extends "common/base.html" %}
+{% load static %}
+{% block title %}
+<title>Syllabus</title>
+{% endblock %}
+
+{% block pagebody %}
+<div class="nav-side-menu">
+  {% block nav %}
+  <div class="brand">Class Syllabi</div>
+  <i class="fa fa-angle-double-down fa-2x toggle-btn" data-toggle="collapse" data-target="#menu-content"></i>
+
+  <div class="menu-list">
+
+    <ul id="menu-content" class="menu-content collapse out">
+      <li class="{% if active_id == "index" %}active{% endif %}">
+        <a href="{% url 'syllabus_index' %}">Overview</a>
+      </li>
+
+      <li class="{% if active_id == "viewer" %}active{% endif %}">
+        <a href="{% url 'syllabus_viewer' %}">Syllabi Viewer</a>
+      </li>
+
+      <li class="{% if active_id == "new_doc" %}active{% endif %}">
+        <a href="{% url 'syllabus_create' %}">Add syllabus...</a>
+      </li>
+
+      {% if is_staff %}
+      <li class="{% if active_id == "review_all" %}active{% endif %}">
+        <a href="{% url 'syllabus_review_all' %}">Review Syllabi Submissions</a>
+      </li>
+      {% endif %}
+    </ul>
+  </div>
+</div>
+{% endblock %}
+<div class="content">
+{% block content %} {% endblock %}
+</div>
+{% endblock %}
+
+{% block pagescripts %}
+  <script type="text/javascript">
+  $(document).ready(function () {
+  // Handler for .ready() called.
+  $('.nav-side-menu').animate({
+      scrollTop: $('.scroll-to-me').offset().top - 64
+  }, 'fast');
+  });
+  </script>
+  {% block scripts %}{% endblock %}
+{% endblock %}
diff --git a/syllabus/templates/syllabus/create.html b/syllabus/templates/syllabus/create.html
new file mode 100644
index 0000000..9d9b340
--- /dev/null
+++ b/syllabus/templates/syllabus/create.html
@@ -0,0 +1,88 @@
+{% extends "syllabus/base.html" %}
+{% block title %}
+<title>Submit a syllabus</title>
+{% endblock %}
+{% block content %}
+<div class="row syllabus-head">
+  <div class="col s12">
+    <h4 class="red-text text-darken-4">Submit a Syllabus</h4>
+  </div>
+</div>
+<div class="row">
+  {% if not is_staff %}
+  <div class="col s12"><p>To submit a class syllabus, please upload the syllabus below and provide the class number and semester the syllabus is from. Then provide your email address (in case of any clarifications), and press Submit.</p></div>
+  <form enctype="multipart/form-data" class="col s12" id="form" method="post">
+    {% csrf_token %}
+      <div class="col s12 m3">
+        {{ form.is_committing.as_hidden }}
+        {{ form.email_address }}
+        {{ form.email_address.errors }}
+      </div>
+      <div class="col s12 m3">
+        {{ form.semester }}
+        {{ form.semester.errors }}
+      </div>
+      <div class="col s12 m3">
+        {{ form.year }}
+        {{ form.year.errors }}
+      </div>
+      <div class="col s12 m3">
+        {{ form.subject_id }}
+        {{ form.subject_id.errors }}
+      </div>
+      <div class="col s12 m3">
+        {{ form.file.label_tag }}
+        {{ form.file }}
+        {{ form.file.errors }}
+      </div>
+      <div class="col s12 m6">
+        <button class="btn mbtn red waves-effect waves-light" style="float: right;" type="submit" name="action">Submit
+          <i class="material-icons right">send</i>
+        </button>
+    </div>
+    {{ form.non_field_errors }}
+  </form>
+  {% else %}
+  <div class="col s12">
+  <p>Click the Commit button below to save your changes. Once you have committed all necessary syllabi, visit the <a href="{% url 'review_all' %}">Review page</a> and click Deploy to apply the changes at the next database refresh.</p>
+  </div>
+    <form enctype="multipart/form-data" id="form" method="post">
+    <div class="col s12 m4">
+      {{ form.semester }}
+      {{ form.semester.errors }}
+    </div>
+    <div class="col s12 m4">
+      {{ form.year }}
+      {{ form.year.errors }}
+    </div>
+    <div class="col s12 m4">
+      {{ form.subject_id }}
+      {{ form.subject_id.errors }}
+    </div>
+    <div class="col s12 m4">
+      {{ form.file.label_tag }}
+      {{ form.file }}
+      {{ form.file.errors }}
+    </div>
+    <div class="col s12 m4">
+      {% csrf_token %}
+      {{ form.is_committing.as_hidden }}
+      {{ form.email_address.as_hidden }}
+      <button class="btn mbtn red waves-effect waves-light" style="float: right;" type="submit" name="action">Commit</button>
+      <a id="reset-button" class="waves-effect waves-light mbtn grey right" onclick="$('#contents').val('{{ req.contents|escapejs }}');" style="float: right;">Reset</a>
+    </div>
+    {{ form.non_field_errors }}
+  </form>
+  {% endif %}
+</div>
+{% endblock %}
+{% block scripts %}
+<script>
+{% if is_staff %}
+  $("#id_is_committing").val(1);
+  $("#id_email_address").val("{{ request.user.username }}");
+{% else %}
+  $("#id_is_committing").val(0);
+{% endif %}
+</script>
+{% endblock %}
diff --git a/syllabus/templates/syllabus/index.html b/syllabus/templates/syllabus/index.html
new file mode 100644
index 0000000..baa27c3
--- /dev/null
+++ b/syllabus/templates/syllabus/index.html
@@ -0,0 +1,10 @@
+{% extends "syllabus/base.html" %}
+{% block content %}
+<div class="row syllabus-head">
+  <div class="col s12">
+    <h2 class="red-text text-darken-4">FireRoad Syllabus System</h2>
+    <p>The Fireroad Syllabus System allows you to view and submit syllabi for the classes, used in FireRoad and CourseRoad. You can view current and past syllabi for courses and submit a syllabus for any class you are taking or have taken.<p>
+    <p class="red-text text-darken-4"><strong>Use the navigation menu to view syllabi or submit a new syllabus.</strong></p>
+  </div>
+</div>
+{% endblock %}
diff --git a/syllabus/templates/syllabus/review.html b/syllabus/templates/syllabus/review.html
new file mode 100644
index 0000000..3f54a63
--- /dev/null
+++ b/syllabus/templates/syllabus/review.html
@@ -0,0 +1,8 @@
+{% extends "syllabus/base.html" %}
+{% block content %}
+<div class="row syllabus-head">
+  <div class="col s12">
+    <h2 class="red-text text-darken-4">Review</h2>
+  </div>
+</div>
+{% endblock %}
diff --git a/syllabus/templates/syllabus/review_all.html b/syllabus/templates/syllabus/review_all.html
new file mode 100644
index 0000000..2716bb5
--- /dev/null
+++ b/syllabus/templates/syllabus/review_all.html
@@ -0,0 +1,95 @@
+{% extends "syllabus/base.html" %}
+{% block title %}
+<title>Review Syllabus Submissions</title>
+{% endblock %}
+{% block content %}
+<div class="row edit-head">
+  <div class="col s8 red-text text-darken-4">
+    <h4>Review Syllabus Submissions</h4>
+    {% if deployments > 0 %}
+    <p class="red-text text-darken-4">{{ deployments }} deployment{% if deployments != 1 %}s{% endif %} pending execution at the next database refresh.</p>
+    {% endif %}
+  </div>
+</div>
+<div class="edit-req-list-card">
+  <div class="edit-req-list-row">
+    <div class="edit-req-list-left">
+      <h5>Pending Review</h5>
+      {% if pending %}
+      <div class="collection edit-req-list">
+        {% for syllabus_submission in pending %}
+          <li class="collection-item" style="list-style: none;">
+            <a class="btn red-text text-darken-4 secondary-content dropdown-trigger" href="#" data-target='dropdown{{ edit_req.pk }}'><i class="material-icons">more_horiz</i></a>
+            <a class="red-text text-darken-4" href="{% url 'syllabus_review' syllabus_submission.pk %}">
+              <strong>{{ syllabus_submission.subject.subject_id }} {{syllabus_submission.semester}} {{syllabus_submission.year}}</strong><br/>
+            <em>{{ syllabus_submission.email_address }}</em>
+            </a>
+
+            <ul id='dropdown{{ syllabus_submission.pk }}' class='dropdown-content'>
+              <li><a href="{% url 'syllabus_review' syllabus_submission.pk %}" class="red-text text-darken-4">Review...</a></li>
+              <li><a href="{% url 'syllabus_commit' syllabus_submission.pk %}" class="red-text text-darken-4">Commit</a></li>
+              <li><a href="{% url 'syllabus_resolve' syllabus_submission.pk %}" class="red-text text-darken-4">Resolve without Committing</a></li>
+            </ul>
+          </li>
+        {% endfor %}
+      </div>
+      {% else %}
+      <p>No pending syllabus submissions!</p>
+      {% endif %}
+    </div>
+    <div class="edit-req-list-right">
+      <h5>Committed</h5>
+      {% if committed %}
+      <div class="collection edit-req-list">
+        {% for syllabus_submission in committed %}
+        <li class="collection-item" style="list-style: none;">
+          <a class="btn mbtn red waves-effect waves-light secondary-content" href="{% url 'syllabus_uncommit' syllabus_submission.pk %}">Uncommit</a>
+          <a class="red-text text-darken-4" href="{% url 'syllabus_review' syllabus_submission.pk %}">
+            <strong>{{ syllabus_submission.subject.subject_id }} {{syllabus_submission.semester}} {{syllabus_submission.year}}</strong><br/>
+            <em>{{ syllabus_submission.email_address }}</em>
+          </a>
+
+          <ul id='dropdown{{ syllabus_submission.pk }}' class='dropdown-content'>
+            <li><a href="{% url 'syllabus_review' syllabus_submission.pk %}" class="red-text text-darken-4">Review...</a></li>
+            <li><a href="{% url 'syllabus_uncommit' syllabus_submission.pk %}" class="red-text text-darken-4">Uncommit</a></li>
+          </ul>
+          </li>
+        {% endfor %}
+      </div>
+      {% else %}
+      <p>No changes committed yet.</p>
+      {% endif %}
+    </div>
+  </div>
+</div>
+<div class="row">
+  <div class="col s12"><p>Be sure all syllabus submissions are correct, and add a descriptive change summary before deploying.
+  </p></div>
+  <form class="col s12" id="form" method="post">
+    {% csrf_token %}
+      <div class="col s12 m4">
+        {{ form.email_address }}
+        {{ form.email_address.errors }}
+      </div>
+      <div class="col s12 m8">
+        {% if num_to_deploy > 0 %}
+        <button class="btn mbtn red waves-effect waves-light" style="float: right;" type="submit" name="action">Deploy {{ num_to_deploy }} {% if num_to_deploy == 1 %}Syllabus{% else %}Syllabi{% endif %}
+          <i class="material-icons right">cloud_upload</i>
+        </button>
+        {% else %}
+        <button class="btn mbtn grey waves-effect waves-light" style="float: right;" type="submit" name="action" disabled>Nothing to Deploy</button>
+        {% endif %}
+        <div style="overflow: hidden; padding-right: 16px;">
+          {{ form.summary }}
+          {{ form.summary.errors }}
+        </div>
+    </div>
+    {{ form.non_field_errors }}
+  </form>
+</div>
+{% endblock %}
+{% block scripts %}
+<script type="text/javascript">
+  $('.dropdown-trigger').dropdown();
+</script>
+{% endblock %}
diff --git a/syllabus/templates/syllabus/success.html b/syllabus/templates/syllabus/success.html
new file mode 100644
index 0000000..d97bc87
--- /dev/null
+++ b/syllabus/templates/syllabus/success.html
@@ -0,0 +1,6 @@
+{% extends "syllabus/base.html" %}
+{% block content %}
+<div class="row" style="padding-top: 24px;">
+Your submission has been sent. Thanks for your contribution!
+</div>
+{% endblock %}
diff --git a/syllabus/templates/syllabus/viewer.html b/syllabus/templates/syllabus/viewer.html
new file mode 100644
index 0000000..97cc5cd
--- /dev/null
+++ b/syllabus/templates/syllabus/viewer.html
@@ -0,0 +1,8 @@
+{% extends "syllabus/base.html" %}
+{% block content %}
+<div class="row syllabus-head">
+  <div class="col s12">
+    <h2 class="red-text text-darken-4">FireRoad Syllabus Viewer</h2>
+  </div>
+</div>
+{% endblock %}
diff --git a/syllabus/urls.py b/syllabus/urls.py
new file mode 100644
index 0000000..005e614
--- /dev/null
+++ b/syllabus/urls.py
@@ -0,0 +1,17 @@
+from django.conf.urls import url
+
+from . import views
+
+from django.views.generic import TemplateView
+
+urlpatterns = [
+    url(r'^$', views.index, name='syllabus_index'),
+    url(r'^success/', views.success, name='syllabus_success'),
+    url(r'^viewer/', views.viewer, name='syllabus_viewer'),
+    url(r'^create/', views.create, name='syllabus_create'),
+    url(r'^review/(?P<syllabus_sub>\d+)', views.review, name='syllabus_review'),
+    url(r'^review/', views.review_all, name='syllabus_review_all'),
+    url(r'^resolve/(?P<syllabus_sub>\d+)', views.resolve, name='syllabus_resolve'),
+    url(r'^uncommit/(?P<syllabus_sub>\d+)', views.uncommit, name='syllabus_uncommit'),
+    url(r'^commit/(?P<syllabus_sub>\d+)', views.commit, name='syllabus_commit'),
+]
diff --git a/syllabus/views.py b/syllabus/views.py
new file mode 100644
index 0000000..3adcf03
--- /dev/null
+++ b/syllabus/views.py
@@ -0,0 +1,157 @@
+from django.shortcuts import render, redirect, reverse
+from django.contrib.admin.views.decorators import staff_member_required
+from django.core.exceptions import ObjectDoesNotExist
+
+from .models import *
+from catalog.models import Course
+
+
+def is_staff(request):
+    """Returns whether or not the request's user is an authenticated staff member."""
+    return request.user is not None and request.user.is_staff and request.user.is_authenticated()
+
+def save_syllabus_submission(form, committed):
+    data = form.cleaned_data
+
+    try:
+        course = Course.objects.get(subject_id=data["subject_id"])
+    except ObjectDoesNotExist:
+        course = Course.objects.get(old_id=data["subject_id"])
+
+    syllabus_submission = SyllabusSubmission.objects.create(email_address=data["email_address"],
+                                                            semester=data["semester"],
+                                                            year=data["year"],
+                                                            subject=course,
+                                                            file=data["file"],
+                                                            committed=committed)
+    syllabus_submission.save()
+
+# Create your views here.
+def index(request):
+    params = {'active_id': 'index', 'is_staff': is_staff(request)}
+    return render(request, 'syllabus/index.html', params)
+
+def success(request):
+    return render(request, 'syllabus/success.html')
+
+def viewer(request):
+    params = {'active_id': 'viewer', 'is_staff': is_staff(request)}
+    return render(request, 'syllabus/viewer.html', params)
+
+def create(request):
+    if request.method == 'POST':
+        form = SyllabusForm(request.POST, request.FILES)
+        print(form.errors)
+
+        if form.is_valid():
+            should_commit = is_staff(request)
+            save_syllabus_submission(form, committed=should_commit)
+            if should_commit:
+                return redirect('syllabus_review_all')
+            return redirect('submit_success')
+    else:
+        form = SyllabusForm()
+
+    params = {'active_id': 'new_doc', 'is_staff': is_staff(request), 'form': form}
+    return render(request, 'syllabus/create.html', params)
+
+
+@staff_member_required
+def review(request, syllabus_sub):
+    """
+    Allow admin users to review a particular syllabus submission, commit it to the list
+    of changes to be added or revise and resubmit.
+    """
+    try:
+        syllabus_submission = SyllabusSubmission.objects.get(pk=int(syllabus_sub))
+    except ObjectDoesNotExist:
+        raise Http404
+    except ValueError:
+        return redirect(reverse('syllabus_index'))
+
+    params = {
+        'syllabus_submission': syllabus_submission,
+        'is_staff': is_staff(request),
+        'active_id': 'review'
+    }
+
+    return render(request, 'syllabus/review.html', params)
+
+@staff_member_required
+def review_all(request):
+    """Displays all available syllabus submissions and allows the user to commit them."""
+    params = {'active_id': 'review_all', 'is_staff': is_staff(request)}
+
+    if request.method == 'POST':
+        form = DeploySyllabusForm(request.POST)
+        if form.is_valid():
+            pass
+            # deployment = Deployment.objects.create(author=form.cleaned_data['email_address'], summary=form.cleaned_data['summary'])
+            # for edit_req in EditRequest.objects.filter(committed=True, resolved=False):
+            #     # Resolve this edit request, and show when it was deployed
+            #     edit_req.deployment = deployment
+            #     edit_req.committed = True
+            #     edit_req.resolved = True
+            #     edit_req.save()
+            # deployment.save()
+            # Go back and re-render the same page
+    else:
+        form = DeploySyllabusForm()
+
+    params['form'] = form
+    params['active_id'] = 'review_all'
+    params['num_to_deploy'] = SyllabusSubmission.objects.filter(committed=True, resolved=False).count()
+    params['committed'] = SyllabusSubmission.objects.filter(committed=True, resolved=False).order_by('pk')
+    params['pending'] = SyllabusSubmission.objects.filter(committed=False, resolved=False).order_by('pk')
+    params['deployments'] = SyllabusDeployment.objects.filter(date_executed=None).count()
+
+    return render(request, 'syllabus/review_all.html', params)
+
+@staff_member_required
+def commit(request, syllabus_sub):
+    """
+    "Commits" the given syllabus submission by setting its 'committed' flag to True.
+    """
+    try:
+        syllabus_submission = SyllabusSubmission.objects.get(pk=int(syllabus_sub))
+    except ObjectDoesNotExist:
+        raise Http404
+    except ValueError:
+        return redirect(reverse('syllabus_review_all'))
+
+    syllabus_submission.committed = True
+    syllabus_submission.save()
+    return redirect(reverse('syllabus_review_all'))
+
+@staff_member_required
+def uncommit(request, syllabus_sub):
+    """
+    Removes the committed flag from the given edit request.
+    """
+    try:
+        syllabus_submission = SyllabusSubmission.objects.get(pk=int(syllabus_sub))
+    except ObjectDoesNotExist:
+        raise Http404
+    except ValueError:
+        return redirect(reverse('syllabus_review_all'))
+
+    syllabus_submission.committed = False
+    syllabus_submission.save()
+    return redirect(reverse('syllabus_review_all'))
+
+@staff_member_required
+def resolve(request, syllabus_sub):
+    """
+    Marks the given syllabus submission as resolved.
+    """
+    try:
+        syllabus_submission = SyllabusSubmission.objects.get(pk=int(syllabus_sub))
+    except ObjectDoesNotExist:
+        raise Http404
+    except ValueError:
+        return redirect(reverse('syllabus_review_all'))
+
+    syllabus_submission.committed = False
+    syllabus_submission.resolved = True
+    syllabus_submission.save()
+    return redirect(reverse('syllabus_review_all'))

From 3a9944bcf839dd1c1e75855e766108b80d9ab7b3 Mon Sep 17 00:00:00 2001
From: Georgia Shay <georgiashay@gmail.com>
Date: Sat, 7 May 2022 23:59:28 -0400
Subject: [PATCH 2/5] Upload syllabi

---
 .gitignore                                    |   3 +-
 .../static/common}/css/nav.css                |   0
 common/templates/common/base.html             |   3 +-
 fireroad/settings.py                          |   4 +
 fireroad/urls.py                              |   5 +-
 setup.sh                                      |   4 +-
 syllabus/models.py                            | 115 ++++++++++-
 syllabus/static/syllabus/css/nav.css          | 182 ------------------
 syllabus/static/syllabus/css/syllabus.css     |  30 +++
 syllabus/templates/syllabus/create.html       |  28 ++-
 syllabus/templates/syllabus/review.html       |  30 ++-
 syllabus/templates/syllabus/review_all.html   |  18 +-
 syllabus/urls.py                              |   1 +
 syllabus/views.py                             |  69 +++++--
 update_db.py                                  |  34 +++-
 15 files changed, 299 insertions(+), 227 deletions(-)
 rename {requirements/static/requirements => common/static/common}/css/nav.css (100%)
 delete mode 100644 syllabus/static/syllabus/css/nav.css

diff --git a/.gitignore b/.gitignore
index 2f61f43..4620003 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,4 +92,5 @@ db.sqlite3
 */migrations/*
 static/**/*
 
-data/catalogs/**
\ No newline at end of file
+data/catalogs/**
+media/**
diff --git a/requirements/static/requirements/css/nav.css b/common/static/common/css/nav.css
similarity index 100%
rename from requirements/static/requirements/css/nav.css
rename to common/static/common/css/nav.css
diff --git a/common/templates/common/base.html b/common/templates/common/base.html
index 5b3f87d..59cd5b9 100644
--- a/common/templates/common/base.html
+++ b/common/templates/common/base.html
@@ -4,9 +4,10 @@
   <head>
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet">
-    <link href="{% static "requirements/css/nav.css" %}" rel="stylesheet" />
+    <link href="{% static "common/css/nav.css" %}" rel="stylesheet" />
     <link href="{% static "requirements/css/req_preview.css" %}" rel="stylesheet" />
     <link href="{% static "requirements/css/editor.css" %}" rel="stylesheet" />
+    <link href="{% static "syllabus/css/syllabus.css" %}" rel="stylesheet" />
     <link type="text/css" rel="stylesheet" href="{% static "common/css/materialize.min.css" %}" media="screen,projection"/>
     <link type="text/css" rel="stylesheet" href="{% static "common/css/shared.css" %}" media="screen,projection"/>
     <!--Import Google Icon Font-->
diff --git a/fireroad/settings.py b/fireroad/settings.py
index d6b246a..c5b4cb1 100644
--- a/fireroad/settings.py
+++ b/fireroad/settings.py
@@ -176,3 +176,7 @@
         }
     },
 }
+
+MEDIA_URL = '/media/'
+
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
diff --git a/fireroad/urls.py b/fireroad/urls.py
index bca6b3f..f5c5124 100644
--- a/fireroad/urls.py
+++ b/fireroad/urls.py
@@ -14,6 +14,7 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.conf.urls import url, include
+from django.conf.urls.static import static
 from django.contrib.admin.views.decorators import staff_member_required
 from django.views.generic.base import RedirectView
 from django.contrib import admin
@@ -32,8 +33,8 @@
     url(r'analytics/', include('analytics.urls')),
     url(r'requirements/', include('requirements.urls')),
     url(r'syllabus/', include('syllabus.urls')),
-    url(r'', include('common.urls')),
-]
+    url(r'', include('common.urls'))
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # Redirect to the appropriate login page if one is specified in the settings module
 if settings.LOGIN_URL:
diff --git a/setup.sh b/setup.sh
index 8d248d3..c6bdba1 100755
--- a/setup.sh
+++ b/setup.sh
@@ -8,7 +8,7 @@ YELLOW='\033[1;33m'
 NC='\033[0m' # No Color
 
 # Installing dependencies
-pip install django==1.11.15 pandas nltk==3.4 lxml scipy scikit-learn requests pyjwt==1.6.4
+pip install django==1.11.15 pandas nltk==3.4 lxml scipy scikit-learn requests pyjwt==1.6.4 python-magic==0.4.25
 echo
 echo
 
@@ -46,5 +46,3 @@ else
   echo -e "${RED}Unrecognized symbol $keepbackend; quitting ${NC}"
   exit 1
 fi
-
-
diff --git a/syllabus/models.py b/syllabus/models.py
index 4f96412..8b24a1b 100644
--- a/syllabus/models.py
+++ b/syllabus/models.py
@@ -1,5 +1,15 @@
 from django.db import models
 from django import forms
+from django.core.files.storage import FileSystemStorage
+from django.conf import settings
+from django.core.exceptions import ValidationError
+from django.utils.deconstruct import deconstructible
+from django.template.defaultfilters import filesizeformat
+
+import os
+import magic
+import shutil
+from uuid import uuid4
 
 SEMESTER_CHOICES = [
     ('Fall', 'fall'),
@@ -19,7 +29,57 @@ class SyllabusDeployment(models.Model):
     date_executed = models.DateTimeField(null=True)
 
     def __unicode__(self):
-        return u"{}Deployment by {} at {} ({} edits): {}".format("(Pending) " if self.date_executed is None else "", self.author, self.timestamp, self.edit_requests.count(), self.summary)
+        return u"{}Deployment by {} at {} ({} edits): {}".format("(Pending) " if self.date_executed is None else "", self.author, self.timestamp, self.syllabus_submissions.count(), self.summary)
+
+# Source: https://stackoverflow.com/a/27916582
+@deconstructible
+class FileValidator(object):
+    error_messages = {
+     'max_size': ("File size must not be greater than %(max_size)s."
+                  " Your file size is %(size)s."),
+     'min_size': ("File size must not be less than %(min_size)s. "
+                  "Your file size is %(size)s."),
+     'content_type': "Files of type %(content_type)s are not supported.",
+    }
+
+    def __init__(self, max_size=None, min_size=None, content_types=()):
+        self.max_size = max_size
+        self.min_size = min_size
+        self.content_types = content_types
+
+    def __call__(self, data):
+        if self.max_size is not None and data.size > self.max_size:
+            params = {
+                'max_size': filesizeformat(self.max_size),
+                'size': filesizeformat(data.size),
+            }
+            raise ValidationError(self.error_messages['max_size'],
+                                   'max_size', params)
+
+        if self.min_size is not None and data.size < self.min_size:
+            params = {
+                'min_size': filesizeformat(self.min_size),
+                'size': filesizeformat(data.size)
+            }
+            raise ValidationError(self.error_messages['min_size'],
+                                   'min_size', params)
+
+        if self.content_types:
+            content_type = magic.from_buffer(data.read(), mime=True)
+            data.seek(0)
+
+            if content_type not in self.content_types:
+                params = { 'content_type': content_type }
+                raise ValidationError(self.error_messages['content_type'],
+                                   'content_type', params)
+
+    def __eq__(self, other):
+        return (
+            isinstance(other, FileValidator) and
+            self.max_size == other.max_size and
+            self.min_size == other.min_size and
+            self.content_types == other.content_types
+        )
 
 class SyllabusForm(forms.Form):
     is_committing = forms.BooleanField(label='commit')
@@ -27,14 +87,23 @@ class SyllabusForm(forms.Form):
     semester = forms.ChoiceField(label='Semester', choices=SEMESTER_CHOICES, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Semester (e.g. Fall)'}))
     year = forms.CharField(label='Year', max_length=4, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Year (e.g. 2022)'}))
     subject_id = forms.CharField(label='Course Number', max_length=20, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Course number (e.g. 18.01)'}))
-    file = forms.FileField(label='Syllabus File', widget=forms.FileInput(attrs={'class': 'input-field'}))
+    file = forms.FileField(label='Syllabus File', widget=forms.ClearableFileInput(attrs={'class': 'input-field', 'accept': 'application/pdf'}), validators=[FileValidator(max_size=1024*1024, content_types=('application/pdf',))])
+
+def rename_file(inst, filename):
+    upload_to = 'syllabus/'
+    _, ext = os.path.splitext(filename)
+    new_name = 'syllabus_' + inst.subject.subject_id.replace('.', '_') + '_' + inst.semester + '_' + inst.year + ext
+
+    fss = FileSystemStorage()
+    filepath = fss.get_available_name(os.path.join(upload_to, new_name))
+    return filepath
 
 class SyllabusSubmission(models.Model):
     email_address = models.CharField(max_length=100)
     semester = models.CharField(max_length=6, choices=SEMESTER_CHOICES)
     year = models.CharField(max_length=4)
     subject = models.ForeignKey('catalog.Course', on_delete=models.CASCADE, related_name='+')
-    file = models.FileField(upload_to='syllabus/')
+    file = models.FileField(upload_to=rename_file)
     timestamp = models.DateTimeField(auto_now_add=True)
     resolved = models.BooleanField(default=False)
     committed = models.BooleanField(default=False)
@@ -42,3 +111,43 @@ class SyllabusSubmission(models.Model):
 
     def __unicode__(self):
         return u"{}{}{} request for '{}' by {}: {}".format("(Resolved) " if self.resolved else "", "(Committed) " if self.committed else "", self.type, self.subject_id, self.email_address, self.reason)
+
+    def update_file_name(self, copy=True):
+        current_filepath = self.file.path
+        current_filename = os.path.basename(current_filepath)
+        _, ext = os.path.splitext(current_filepath)
+        upload_to = 'syllabus/'
+
+        proper_file_prefix = 'syllabus_' + self.subject.subject_id.replace('.', '_') + '_' + self.semester + '_' + self.year
+
+        fss = FileSystemStorage()
+        filepath = fss.get_available_name(os.path.join(upload_to, proper_file_prefix + ext))
+        filepath = os.path.join(settings.MEDIA_ROOT, filepath)
+
+        if current_filename.startswith(proper_file_prefix):
+            if copy:
+                shutil.copyfile(current_filepath, filepath)
+                self.file = fss.open(filepath)
+                self.save()
+        else:
+            if copy:
+                shutil.copyfile(current_filepath, filepath)
+                self.file = fss.open(filepath)
+                self.save()
+            else:
+                shutil.move(current_filepath, filepath)
+                self.file = fss.open(filepath)
+                self.save()
+
+    def remove_file(self):
+        os.remove(self.file.path)
+
+class Syllabus(models.Model):
+    semester = models.CharField(max_length=6, choices=SEMESTER_CHOICES)
+    year = models.CharField(max_length=4)
+    subject = models.ForeignKey('catalog.Course', on_delete=models.CASCADE, related_name='syllabi')
+    file = models.FileField()
+    timestamp = models.DateTimeField(null=False)
+
+    def __unicode__(self):
+        return u"{} {} {} syllabus".format(self.subject, self.semester, self.year)
diff --git a/syllabus/static/syllabus/css/nav.css b/syllabus/static/syllabus/css/nav.css
deleted file mode 100644
index 62d2223..0000000
--- a/syllabus/static/syllabus/css/nav.css
+++ /dev/null
@@ -1,182 +0,0 @@
-.nav-side-menu {
-  overflow: auto;
-  font-size: 14px;
-  font-weight: 300;
-  background-color: white;
-  position: fixed;
-  top: 0;
-  width: 300px;
-  color: #bb2222;
-  border-right: 1px solid #dddddd;
-}
-.nav-side-menu .brand {
-  background-color: white;
-  line-height: 50px;
-  display: block;
-  text-align: center;
-  font-size: 16px;
-  font-weight: 500;
-}
-.nav-side-menu .toggle-btn {
-  display: none;
-}
-.nav-side-menu ul,
-.nav-side-menu li {
-  list-style: none;
-  margin: 0px;
-  /*line-height: 44px;*/
-  cursor: pointer;
-}
-.nav-side-menu ul {
-  padding: 0;
-}
-.nav-side-menu li {
-  padding: 8px 0 8px 0;
-}
-.nav-side-menu ul :not(collapsed) .arrow:before,
-.nav-side-menu li :not(collapsed) .arrow:before {
-  font-family: FontAwesome;
-  content: "\f078";
-  display: inline-block;
-  padding-left: 10px;
-  padding-right: 10px;
-  vertical-align: middle;
-  float: right;
-}
-.nav-side-menu ul .active,
-.nav-side-menu li .active {
-  border-left: 3px solid #f54c3b;
-  background-color: white;
-}
-.nav-side-menu ul .sub-menu li.active,
-.nav-side-menu li .sub-menu li.active {
-  color: #f54c3b;
-}
-.nav-side-menu ul .sub-menu li.active a,
-.nav-side-menu li .sub-menu li.active a {
-  color: #f54c3b;
-}
-.nav-side-menu ul .sub-menu li,
-.nav-side-menu li .sub-menu li {
-  background-color: white;
-  border: none;
-  /*line-height: 32px;*/
-  border-bottom: 1px solid #dddddd;
-  margin-left: 0px;
-}
-.nav-side-menu ul .sub-menu li:hover,
-.nav-side-menu li .sub-menu li:hover {
-  background-color: #ffddd9;
-}
-/*.nav-side-menu ul .sub-menu li:before,
-.nav-side-menu li .sub-menu li:before {
-  font-family: FontAwesome;
-  content: "\f105";
-  display: inline-block;
-  padding-left: 10px;
-  padding-right: 10px;
-  vertical-align: middle;
-}*/
-.nav-side-menu li {
-  padding-left: 0px;
-  display: block;
-  border-left: 3px solid #dddddd;
-  border-bottom: 1px solid #dddddd;
-}
-.nav-side-menu li a {
-  text-decoration: none;
-  padding-left: 30px;
-  display: block;
-  color: #bb2222;
-  -webkit-box-decoration-break: clone;
-  box-decoration-break: clone;
-}
-.nav-side-menu li a i {
-  padding-left: 10px;
-  width: 20px;
-  padding-right: 20px;
-}
-.nav-side-menu li:hover {
-  border-left: 3px solid #f45a48;
-  background-color: #ffddd9;
-  -webkit-transition: all 1s ease;
-  -moz-transition: all 1s ease;
-  -o-transition: all 1s ease;
-  -ms-transition: all 1s ease;
-  transition: all 1s ease;
-}
-@media (max-width: 767px) {
-  .nav-side-menu {
-    position: relative;
-    width: 100%;
-    margin-bottom: 10px;
-  }
-  .nav-side-menu .toggle-btn {
-    display: block;
-    cursor: pointer;
-    position: absolute;
-    right: 10px;
-    top: 10px;
-    z-index: 10 !important;
-    padding: 3px;
-    background-color: #ffffff;
-    color: #ddd;
-    width: 40px;
-    text-align: center;
-  }
-  .brand {
-    text-align: left !important;
-    font-size: 24px;
-    padding-left: 20px;
-    line-height: 50px !important;
-  }
-  .content {
-    margin-left: 0;
-    padding: 0 16px 0 16px;
-    width: 100%;
-  }
-}
-@media (min-width: 767px) {
-  .nav-side-menu {
-    height: 100%;
-    padding-top: 64px;
-  }
-  .nav-side-menu .menu-list .menu-content {
-    display: block;
-  }
-  .content {
-    padding-left: 300px;
-  }
-}
-body {
-  margin: 0px;
-  padding: 0px;
-}
-.row {
-  margin-left: 0 !important;
-  margin-right: 0 !important;
-}
-.collapse {
-    display: none
-}
-
-.collapse.in {
-    display: block
-}
-
-tr.collapse.in {
-    display: table-row
-}
-
-tbody.collapse.in {
-    display: table-row-group
-}
-
-.collapsing {
-    position: relative;
-    height: 0;
-    overflow: hidden;
-    -webkit-transition: height .35s ease;
-    -o-transition: height .35s ease;
-    transition: height .35s ease
-}
diff --git a/syllabus/static/syllabus/css/syllabus.css b/syllabus/static/syllabus/css/syllabus.css
index 5fb4cd5..2a26301 100644
--- a/syllabus/static/syllabus/css/syllabus.css
+++ b/syllabus/static/syllabus/css/syllabus.css
@@ -11,3 +11,33 @@
     padding-top: 64px;
   }
 }
+
+.syllabus-sub-list-row {
+  display: flex;
+  flex-direction: row;
+   overflow: hidden;
+}
+
+.syllabus-sub-list-left {
+  display: flex;
+  flex-direction: column;
+  width: 50%;
+  margin-right: 12px;
+}
+
+.syllabus-sub-list-right {
+  display: flex;
+  flex-direction: column;
+  width: 50%;
+}
+
+.syllabus-sub-list {
+  overflow-y: scroll !important;
+}
+
+.syllabus-sub-list > .collection-item:hover {
+    background-color: #eeeeee;
+    -webkit-transition: background-color 250ms linear;
+    -ms-transition: background-color 2500ms linear;
+    transition: background-color 250ms linear;
+}
diff --git a/syllabus/templates/syllabus/create.html b/syllabus/templates/syllabus/create.html
index 9d9b340..73855fe 100644
--- a/syllabus/templates/syllabus/create.html
+++ b/syllabus/templates/syllabus/create.html
@@ -1,6 +1,6 @@
 {% extends "syllabus/base.html" %}
 {% block title %}
-<title>Submit a syllabus</title>
+<title>Submit a Syllabus</title>
 {% endblock %}
 {% block content %}
 <div class="row syllabus-head">
@@ -30,8 +30,8 @@ <h4 class="red-text text-darken-4">Submit a Syllabus</h4>
         {{ form.subject_id }}
         {{ form.subject_id.errors }}
       </div>
-      <div class="col s12 m3">
-        {{ form.file.label_tag }}
+      <div class="col s12 m6 file-input">
+        <!-- {{ form.file.label_tag }} -->
         {{ form.file }}
         {{ form.file.errors }}
       </div>
@@ -59,8 +59,8 @@ <h4 class="red-text text-darken-4">Submit a Syllabus</h4>
       {{ form.subject_id }}
       {{ form.subject_id.errors }}
     </div>
-    <div class="col s12 m4">
-      {{ form.file.label_tag }}
+    <div class="col s12 m6 file-input">
+      <!-- {{ form.file.label_tag }} -->
       {{ form.file }}
       {{ form.file.errors }}
     </div>
@@ -68,8 +68,11 @@ <h4 class="red-text text-darken-4">Submit a Syllabus</h4>
       {% csrf_token %}
       {{ form.is_committing.as_hidden }}
       {{ form.email_address.as_hidden }}
+      {% if syllabus_sub is not None %}
+      <input name="syllabus_sub" value="{{ syllabus_sub }}" style="display: none;">
+      {% endif %}
       <button class="btn mbtn red waves-effect waves-light" style="float: right;" type="submit" name="action">Commit</button>
-      <a id="reset-button" class="waves-effect waves-light mbtn grey right" onclick="$('#contents').val('{{ req.contents|escapejs }}');" style="float: right;">Reset</a>
+      <a id="reset-button" class="waves-effect waves-light mbtn grey right" href="/syllabus/ignore_edit" style="float: right;">Cancel</a>
     </div>
     {{ form.non_field_errors }}
   </form>
@@ -84,5 +87,18 @@ <h4 class="red-text text-darken-4">Submit a Syllabus</h4>
 {% else %}
   $("#id_is_committing").val(0);
 {% endif %}
+$(".file-input").find("a").attr("target", "_blank");
+$(".file-input").find("a").siblings("input").attr("required", false);
+$("#form").submit(function() {
+  if ($(".file-input").find("a").length > 0 && $(".file-input").find("input").get(0).files.length == 0) {
+    const hiddenInput = document.createElement("input");
+    hiddenInput.value = $(".file-input").find("a").attr("href");
+    hiddenInput.name = "file";
+    hiddenInput.style = "display: none;"
+    $(".file-input").append(hiddenInput);
+    $(".file-input").find("input").get(0).remove();
+  }
+  return true;
+});
 </script>
 {% endblock %}
diff --git a/syllabus/templates/syllabus/review.html b/syllabus/templates/syllabus/review.html
index 3f54a63..a37023d 100644
--- a/syllabus/templates/syllabus/review.html
+++ b/syllabus/templates/syllabus/review.html
@@ -1,8 +1,32 @@
 {% extends "syllabus/base.html" %}
+{% block title %}
+<title>Review {{ syllabus_submission.subject.subject_id }} Syllabus</title>
+{% endblock %}
 {% block content %}
-<div class="row syllabus-head">
-  <div class="col s12">
-    <h2 class="red-text text-darken-4">Review</h2>
+<div class="row edit-head">
+  <div class="col s8 red-text text-darken-4">
+    <h4>Review {{ syllabus_submission.subject.subject_id }} Syllabus</h4>
+  </div>
+  <a id="edit-button" class="waves-effect waves-light mbtn grey right" href="{% url 'syllabus_create' %}?like={{ syllabus_submission.pk }}">Edit</a>
+</div>
+<div class="row">
+  <object data = "{{ syllabus_submission.file.url }}" type = "application/pdf" width = "100%" height = "400px">
+    <p>Your browser does not have a PDF plugin</p>
+    <a href = "{{ syllabus_submission.file.url }}" target = "_blank" role = "button" class = "btn btn-primary">Download</a>
+  </object>
+</div>
+<div class="row">
+  <div class="col s12 m6">
+    <p>{{ syllabus_submission.subject.subject_id }} {{ syllabus_submission.semester }} {{ syllabus_submission.year }}</p>
+    <p>Submitted by <strong>{{ syllabus_submission.email_address|urlize }}</strong> on <strong>{{ syllabus_submission.timestamp|date:'M d Y' }}</strong>.</p>
+  </div>
+  <div class="col s12 m6">
+    {% if syllabus_submission.committed %}
+    <a id="commit-button" class="waves-effect waves-light mbtn red right" href="/syllabus/uncommit/{{ syllabus_submission.pk }}" style="float: right;">Uncommit</a>
+    {% else %}
+    <a id="commit-button" class="waves-effect waves-light mbtn red right" href="/syllabus/commit/{{ syllabus_submission.pk }}" style="float: right;">Commit</a>
+    {% endif %}
+    <a id="ignore-button" class="waves-effect waves-light mbtn grey right" href="/syllabus/ignore_edit/{{ syllabus_submission.pk }}" style="float: right;">Cancel</a>
   </div>
 </div>
 {% endblock %}
diff --git a/syllabus/templates/syllabus/review_all.html b/syllabus/templates/syllabus/review_all.html
index 2716bb5..7018ba2 100644
--- a/syllabus/templates/syllabus/review_all.html
+++ b/syllabus/templates/syllabus/review_all.html
@@ -11,21 +11,21 @@ <h4>Review Syllabus Submissions</h4>
     {% endif %}
   </div>
 </div>
-<div class="edit-req-list-card">
-  <div class="edit-req-list-row">
-    <div class="edit-req-list-left">
+<div class="syllabus-sub-list-card">
+  <div class="syllabus-sub-list-row">
+    <div class="syllabus-sub-list-left">
       <h5>Pending Review</h5>
       {% if pending %}
-      <div class="collection edit-req-list">
+      <div class="collection syllabus-sub-list">
         {% for syllabus_submission in pending %}
           <li class="collection-item" style="list-style: none;">
-            <a class="btn red-text text-darken-4 secondary-content dropdown-trigger" href="#" data-target='dropdown{{ edit_req.pk }}'><i class="material-icons">more_horiz</i></a>
+            <a class="btn red-text text-darken-4 secondary-content dropdown-trigger" href="#" data-target='dropdown-syllabus-{{ syllabus_submission.pk }}'><i class="material-icons">more_horiz</i></a>
             <a class="red-text text-darken-4" href="{% url 'syllabus_review' syllabus_submission.pk %}">
               <strong>{{ syllabus_submission.subject.subject_id }} {{syllabus_submission.semester}} {{syllabus_submission.year}}</strong><br/>
             <em>{{ syllabus_submission.email_address }}</em>
             </a>
 
-            <ul id='dropdown{{ syllabus_submission.pk }}' class='dropdown-content'>
+            <ul id='dropdown-syllabus-{{ syllabus_submission.pk }}' class='dropdown-content'>
               <li><a href="{% url 'syllabus_review' syllabus_submission.pk %}" class="red-text text-darken-4">Review...</a></li>
               <li><a href="{% url 'syllabus_commit' syllabus_submission.pk %}" class="red-text text-darken-4">Commit</a></li>
               <li><a href="{% url 'syllabus_resolve' syllabus_submission.pk %}" class="red-text text-darken-4">Resolve without Committing</a></li>
@@ -37,10 +37,10 @@ <h5>Pending Review</h5>
       <p>No pending syllabus submissions!</p>
       {% endif %}
     </div>
-    <div class="edit-req-list-right">
+    <div class="syllabus-sub-list-right">
       <h5>Committed</h5>
       {% if committed %}
-      <div class="collection edit-req-list">
+      <div class="collection syllabus-sub-list">
         {% for syllabus_submission in committed %}
         <li class="collection-item" style="list-style: none;">
           <a class="btn mbtn red waves-effect waves-light secondary-content" href="{% url 'syllabus_uncommit' syllabus_submission.pk %}">Uncommit</a>
@@ -49,7 +49,7 @@ <h5>Committed</h5>
             <em>{{ syllabus_submission.email_address }}</em>
           </a>
 
-          <ul id='dropdown{{ syllabus_submission.pk }}' class='dropdown-content'>
+          <ul id='dropdown-syllabus-{{ syllabus_submission.pk }}' class='dropdown-content'>
             <li><a href="{% url 'syllabus_review' syllabus_submission.pk %}" class="red-text text-darken-4">Review...</a></li>
             <li><a href="{% url 'syllabus_uncommit' syllabus_submission.pk %}" class="red-text text-darken-4">Uncommit</a></li>
           </ul>
diff --git a/syllabus/urls.py b/syllabus/urls.py
index 005e614..104f486 100644
--- a/syllabus/urls.py
+++ b/syllabus/urls.py
@@ -14,4 +14,5 @@
     url(r'^resolve/(?P<syllabus_sub>\d+)', views.resolve, name='syllabus_resolve'),
     url(r'^uncommit/(?P<syllabus_sub>\d+)', views.uncommit, name='syllabus_uncommit'),
     url(r'^commit/(?P<syllabus_sub>\d+)', views.commit, name='syllabus_commit'),
+    url(r'^ignore_edit/', views.ignore_edit, name='syllabus_ignore_edit')
 ]
diff --git a/syllabus/views.py b/syllabus/views.py
index 3adcf03..829f354 100644
--- a/syllabus/views.py
+++ b/syllabus/views.py
@@ -1,6 +1,10 @@
 from django.shortcuts import render, redirect, reverse
 from django.contrib.admin.views.decorators import staff_member_required
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.files.storage import FileSystemStorage
+from django.conf import settings
+
+import os
 
 from .models import *
 from catalog.models import Course
@@ -10,7 +14,7 @@ def is_staff(request):
     """Returns whether or not the request's user is an authenticated staff member."""
     return request.user is not None and request.user.is_staff and request.user.is_authenticated()
 
-def save_syllabus_submission(form, committed):
+def save_syllabus_submission(form, committed, copy_file):
     data = form.cleaned_data
 
     try:
@@ -24,7 +28,9 @@ def save_syllabus_submission(form, committed):
                                                             subject=course,
                                                             file=data["file"],
                                                             committed=committed)
+
     syllabus_submission.save()
+    syllabus_submission.update_file_name(copy=copy_file)
 
 # Create your views here.
 def index(request):
@@ -39,20 +45,50 @@ def viewer(request):
     return render(request, 'syllabus/viewer.html', params)
 
 def create(request):
+    params = {
+        'active_id': 'new_doc',
+        'is_staff': is_staff(request)
+    }
+
     if request.method == 'POST':
-        form = SyllabusForm(request.POST, request.FILES)
+        copy_file = False
+        if "file" in request.FILES:
+            form = SyllabusForm(request.POST, request.FILES)
+        else:
+            syllabus_sub = request.POST["syllabus_sub"]
+            syllabus_submission = SyllabusSubmission.objects.get(pk=syllabus_sub)
+            form = SyllabusForm(request.POST, {"file": syllabus_submission.file})
+            copy_file = True
         print(form.errors)
 
         if form.is_valid():
             should_commit = is_staff(request)
-            save_syllabus_submission(form, committed=should_commit)
+            save_syllabus_submission(form, committed=should_commit, copy_file=copy_file)
             if should_commit:
                 return redirect('syllabus_review_all')
             return redirect('submit_success')
     else:
         form = SyllabusForm()
 
-    params = {'active_id': 'new_doc', 'is_staff': is_staff(request), 'form': form}
+        if 'like' in request.GET:
+            try:
+                syllabus_sub_id = int(request.GET['like'])
+                syllabus_submission = SyllabusSubmission.objects.get(pk=syllabus_sub_id)
+                params['syllabus_sub'] = syllabus_submission.pk
+                form = SyllabusForm({
+                    "is_committing": is_staff(request),
+                    "email_address": syllabus_submission.email_address,
+                    "semester": syllabus_submission.semester,
+                    "year": syllabus_submission.year,
+                    "subject_id": syllabus_submission.subject.subject_id
+                }, {
+                    "file": syllabus_submission.file
+                })
+            except ValueError:
+                pass
+
+    params['form'] = form
+
     return render(request, 'syllabus/create.html', params)
 
 
@@ -85,16 +121,16 @@ def review_all(request):
     if request.method == 'POST':
         form = DeploySyllabusForm(request.POST)
         if form.is_valid():
-            pass
-            # deployment = Deployment.objects.create(author=form.cleaned_data['email_address'], summary=form.cleaned_data['summary'])
-            # for edit_req in EditRequest.objects.filter(committed=True, resolved=False):
-            #     # Resolve this edit request, and show when it was deployed
-            #     edit_req.deployment = deployment
-            #     edit_req.committed = True
-            #     edit_req.resolved = True
-            #     edit_req.save()
-            # deployment.save()
-            # Go back and re-render the same page
+            deployment = SyllabusDeployment.objects.create(author=form.cleaned_data['email_address'], summary=form.cleaned_data['summary'])
+
+            for syllabus_submission in SyllabusSubmission.objects.filter(committed=True, resolved=False):
+                syllabus_submission.deployment = deployment
+                syllabus_submission.committed = True
+                syllabus_submission.resolved = True
+                syllabus_submission.save()
+            deployment.save()
+
+            form = DeploySyllabusForm()
     else:
         form = DeploySyllabusForm()
 
@@ -154,4 +190,9 @@ def resolve(request, syllabus_sub):
     syllabus_submission.committed = False
     syllabus_submission.resolved = True
     syllabus_submission.save()
+    syllabus_submission.remove_file()
+    return redirect(reverse('syllabus_review_all'))
+
+@staff_member_required
+def ignore_edit(request):
     return redirect(reverse('syllabus_review_all'))
diff --git a/update_db.py b/update_db.py
index 8da533b..427fd83 100644
--- a/update_db.py
+++ b/update_db.py
@@ -9,6 +9,7 @@
 from courseupdater.models import CatalogUpdate
 import catalog_parse as cp
 from requirements.models import *
+from syllabus.models import *
 from catalog.models import *
 from sync.models import *
 from django.db import DatabaseError, transaction
@@ -130,7 +131,7 @@ def write_delta_file(delta, outpath):
 
     print("Delta file written to {}.".format(delta_file_path))
 
-def perform_deployments():
+def perform_requirement_deployments():
     """Performs any pending deployments of updated requirements files."""
 
     delta = set()
@@ -159,6 +160,27 @@ def perform_deployments():
     if len(delta) > 0:
         write_delta_file(sorted(delta), os.path.join(settings.CATALOG_BASE_DIR, "deltas", requirements_dir))
 
+def perform_syllabus_deployments():
+    """Performs any pending deployments of updated syllabi"""
+
+    for deployment in SyllabusDeployment.objects.filter(date_executed=None).order_by('pk'):
+        print(deployment)
+        try:
+            for syllabus_submission in deployment.syllabus_submissions.all().order_by('pk'):
+                syllabus = Syllabus.objects.create(
+                    semester = syllabus_submission.semester,
+                    year = syllabus_submission.year,
+                    subject = syllabus_submission.subject,
+                    file = syllabus_submission.file,
+                    timestamp = syllabus_submission.timestamp
+                )
+
+                syllabus.save()
+
+            deployment.date_executed = timezone.now()
+            deployment.save()
+        except:
+            print(traceback.format_exc())
 
 def update_requirements():
     """Parses the current set of requirements and adds them to the database."""
@@ -245,7 +267,7 @@ def document_contents_differ(old, new, threshold=20):
             if not isinstance(old_elem, list) or not isinstance(new_elem, list):
                 continue
 
-            # Compare the membership 
+            # Compare the membership
             old_values = set(json.dumps(elem) for elem in old_elem)
             new_values = set(json.dumps(elem) for elem in new_elem)
             if max(len(old_values - new_values), len(new_values - old_values)) >= 2:
@@ -348,7 +370,7 @@ def email_results(message, recipients):
         message += traceback.format_exc()
 
     try:
-        perform_deployments()
+        perform_requirement_deployments()
     except:
         message += "Error performing requirements deployment:\n"
         message += traceback.format_exc()
@@ -359,6 +381,12 @@ def email_results(message, recipients):
         message += "Updating requirements DB failed:\n"
         message += traceback.format_exc()
 
+    try:
+        perform_syllabus_deployments()
+    except:
+        message += "Error performing syllabus deployment:\n"
+        message += traceback.format_exc()
+
     try:
         deploy_catalog_updates()
     except:

From c86daff5aff422651ed09483dc5d41382669295e Mon Sep 17 00:00:00 2001
From: Georgia Shay <georgiashay@gmail.com>
Date: Sun, 8 May 2022 01:53:06 -0400
Subject: [PATCH 3/5] Add syllabus viewer

---
 syllabus/admin.py                           |  8 +++
 syllabus/models.py                          | 20 +++++---
 syllabus/static/syllabus/css/syllabus.css   | 11 +++++
 syllabus/templates/syllabus/review.html     |  8 +--
 syllabus/templates/syllabus/review_all.html |  4 +-
 syllabus/templates/syllabus/viewer.html     | 27 ++++++++++-
 syllabus/views.py                           | 54 ++++++++++++++++++---
 update_db.py                                |  2 +-
 8 files changed, 110 insertions(+), 24 deletions(-)
 create mode 100644 syllabus/admin.py

diff --git a/syllabus/admin.py b/syllabus/admin.py
new file mode 100644
index 0000000..c49a920
--- /dev/null
+++ b/syllabus/admin.py
@@ -0,0 +1,8 @@
+from django.contrib import admin
+
+# Register your models here.
+from .models import *
+
+admin.site.register(SyllabusSubmission)
+admin.site.register(SyllabusDeployment)
+admin.site.register(Syllabus)
diff --git a/syllabus/models.py b/syllabus/models.py
index 8b24a1b..8c06a6e 100644
--- a/syllabus/models.py
+++ b/syllabus/models.py
@@ -11,6 +11,8 @@
 import shutil
 from uuid import uuid4
 
+from catalog.models import *
+
 SEMESTER_CHOICES = [
     ('Fall', 'fall'),
     ('IAP', 'iap'),
@@ -81,18 +83,22 @@ def __eq__(self, other):
             self.content_types == other.content_types
         )
 
+def validate_subject_id(subject_id):
+    if Course.objects.filter(subject_id=subject_id).count() == 0:
+        raise ValidationError(u'Must provide a valid subject ID')
+
 class SyllabusForm(forms.Form):
     is_committing = forms.BooleanField(label='commit')
     email_address = forms.CharField(label='Email address', max_length=100, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Email address'}))
     semester = forms.ChoiceField(label='Semester', choices=SEMESTER_CHOICES, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Semester (e.g. Fall)'}))
     year = forms.CharField(label='Year', max_length=4, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Year (e.g. 2022)'}))
-    subject_id = forms.CharField(label='Course Number', max_length=20, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Course number (e.g. 18.01)'}))
+    subject_id = forms.CharField(label='Course Number', max_length=20, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Course number (e.g. 18.01)'}), validators=[validate_subject_id])
     file = forms.FileField(label='Syllabus File', widget=forms.ClearableFileInput(attrs={'class': 'input-field', 'accept': 'application/pdf'}), validators=[FileValidator(max_size=1024*1024, content_types=('application/pdf',))])
 
 def rename_file(inst, filename):
     upload_to = 'syllabus/'
     _, ext = os.path.splitext(filename)
-    new_name = 'syllabus_' + inst.subject.subject_id.replace('.', '_') + '_' + inst.semester + '_' + inst.year + ext
+    new_name = 'syllabus_' + inst.subject_id.replace('.', '_') + '_' + inst.semester + '_' + inst.year + ext
 
     fss = FileSystemStorage()
     filepath = fss.get_available_name(os.path.join(upload_to, new_name))
@@ -102,7 +108,7 @@ class SyllabusSubmission(models.Model):
     email_address = models.CharField(max_length=100)
     semester = models.CharField(max_length=6, choices=SEMESTER_CHOICES)
     year = models.CharField(max_length=4)
-    subject = models.ForeignKey('catalog.Course', on_delete=models.CASCADE, related_name='+')
+    subject_id = models.CharField(max_length=20)
     file = models.FileField(upload_to=rename_file)
     timestamp = models.DateTimeField(auto_now_add=True)
     resolved = models.BooleanField(default=False)
@@ -110,7 +116,7 @@ class SyllabusSubmission(models.Model):
     deployment = models.ForeignKey(SyllabusDeployment, null=True, on_delete=models.SET_NULL, related_name='syllabus_submissions')
 
     def __unicode__(self):
-        return u"{}{}{} request for '{}' by {}: {}".format("(Resolved) " if self.resolved else "", "(Committed) " if self.committed else "", self.type, self.subject_id, self.email_address, self.reason)
+        return u"{}{}{} {} {} syllabus by {}".format("(Resolved) " if self.resolved else "", "(Committed) " if self.committed else "", self.subject_id, self.semester, self.year, self.email_address)
 
     def update_file_name(self, copy=True):
         current_filepath = self.file.path
@@ -118,7 +124,7 @@ def update_file_name(self, copy=True):
         _, ext = os.path.splitext(current_filepath)
         upload_to = 'syllabus/'
 
-        proper_file_prefix = 'syllabus_' + self.subject.subject_id.replace('.', '_') + '_' + self.semester + '_' + self.year
+        proper_file_prefix = 'syllabus_' + self.subject_id.replace('.', '_') + '_' + self.semester + '_' + self.year
 
         fss = FileSystemStorage()
         filepath = fss.get_available_name(os.path.join(upload_to, proper_file_prefix + ext))
@@ -145,9 +151,9 @@ def remove_file(self):
 class Syllabus(models.Model):
     semester = models.CharField(max_length=6, choices=SEMESTER_CHOICES)
     year = models.CharField(max_length=4)
-    subject = models.ForeignKey('catalog.Course', on_delete=models.CASCADE, related_name='syllabi')
+    subject_id = models.CharField(max_length=20)
     file = models.FileField()
     timestamp = models.DateTimeField(null=False)
 
     def __unicode__(self):
-        return u"{} {} {} syllabus".format(self.subject, self.semester, self.year)
+        return u"{} {} {} syllabus".format(self.subject_id, self.semester, self.year)
diff --git a/syllabus/static/syllabus/css/syllabus.css b/syllabus/static/syllabus/css/syllabus.css
index 2a26301..c07b7c7 100644
--- a/syllabus/static/syllabus/css/syllabus.css
+++ b/syllabus/static/syllabus/css/syllabus.css
@@ -41,3 +41,14 @@
     -ms-transition: background-color 2500ms linear;
     transition: background-color 250ms linear;
 }
+
+
+.searchbar.input-field input[type=search] {
+  padding-left: 30px;
+  width: calc(100% - 30px);
+}
+
+.searchbar.input-field input[type=search]:focus:not(.browser-default) {
+  background-color: inherit;
+  border-bottom: 1px solid rgb(224, 20, 20);
+}
diff --git a/syllabus/templates/syllabus/review.html b/syllabus/templates/syllabus/review.html
index a37023d..deba2dd 100644
--- a/syllabus/templates/syllabus/review.html
+++ b/syllabus/templates/syllabus/review.html
@@ -1,11 +1,11 @@
 {% extends "syllabus/base.html" %}
 {% block title %}
-<title>Review {{ syllabus_submission.subject.subject_id }} Syllabus</title>
+<title>Review {{ syllabus_submission.subject_id }} Syllabus</title>
 {% endblock %}
 {% block content %}
-<div class="row edit-head">
+<div class="row syllabus-head">
   <div class="col s8 red-text text-darken-4">
-    <h4>Review {{ syllabus_submission.subject.subject_id }} Syllabus</h4>
+    <h4>Review {{ syllabus_submission.subject_id }} Syllabus</h4>
   </div>
   <a id="edit-button" class="waves-effect waves-light mbtn grey right" href="{% url 'syllabus_create' %}?like={{ syllabus_submission.pk }}">Edit</a>
 </div>
@@ -17,7 +17,7 @@ <h4>Review {{ syllabus_submission.subject.subject_id }} Syllabus</h4>
 </div>
 <div class="row">
   <div class="col s12 m6">
-    <p>{{ syllabus_submission.subject.subject_id }} {{ syllabus_submission.semester }} {{ syllabus_submission.year }}</p>
+    <p>{{ syllabus_submission.subject_id }} {{ syllabus_submission.semester }} {{ syllabus_submission.year }}</p>
     <p>Submitted by <strong>{{ syllabus_submission.email_address|urlize }}</strong> on <strong>{{ syllabus_submission.timestamp|date:'M d Y' }}</strong>.</p>
   </div>
   <div class="col s12 m6">
diff --git a/syllabus/templates/syllabus/review_all.html b/syllabus/templates/syllabus/review_all.html
index 7018ba2..c1d73ac 100644
--- a/syllabus/templates/syllabus/review_all.html
+++ b/syllabus/templates/syllabus/review_all.html
@@ -21,7 +21,7 @@ <h5>Pending Review</h5>
           <li class="collection-item" style="list-style: none;">
             <a class="btn red-text text-darken-4 secondary-content dropdown-trigger" href="#" data-target='dropdown-syllabus-{{ syllabus_submission.pk }}'><i class="material-icons">more_horiz</i></a>
             <a class="red-text text-darken-4" href="{% url 'syllabus_review' syllabus_submission.pk %}">
-              <strong>{{ syllabus_submission.subject.subject_id }} {{syllabus_submission.semester}} {{syllabus_submission.year}}</strong><br/>
+              <strong>{{ syllabus_submission.subject_id }} {{syllabus_submission.semester}} {{syllabus_submission.year}}</strong><br/>
             <em>{{ syllabus_submission.email_address }}</em>
             </a>
 
@@ -45,7 +45,7 @@ <h5>Committed</h5>
         <li class="collection-item" style="list-style: none;">
           <a class="btn mbtn red waves-effect waves-light secondary-content" href="{% url 'syllabus_uncommit' syllabus_submission.pk %}">Uncommit</a>
           <a class="red-text text-darken-4" href="{% url 'syllabus_review' syllabus_submission.pk %}">
-            <strong>{{ syllabus_submission.subject.subject_id }} {{syllabus_submission.semester}} {{syllabus_submission.year}}</strong><br/>
+            <strong>{{ syllabus_submission.subject_id }} {{syllabus_submission.semester}} {{syllabus_submission.year}}</strong><br/>
             <em>{{ syllabus_submission.email_address }}</em>
           </a>
 
diff --git a/syllabus/templates/syllabus/viewer.html b/syllabus/templates/syllabus/viewer.html
index 97cc5cd..b77dd45 100644
--- a/syllabus/templates/syllabus/viewer.html
+++ b/syllabus/templates/syllabus/viewer.html
@@ -1,8 +1,31 @@
 {% extends "syllabus/base.html" %}
+{% block title %}
+<title>Syllabus Viewer</title>
+{% endblock %}
 {% block content %}
 <div class="row syllabus-head">
-  <div class="col s12">
-    <h2 class="red-text text-darken-4">FireRoad Syllabus Viewer</h2>
+  <div class="col s8 red-text text-darken-4">
+    <h4>Syllabus Viewer</h4>
+  </div>
+</div>
+<div class="row">
+    <form action="{% url 'syllabus_viewer' %}">
+      <div class="input-field searchbar">
+        <label class="label-icon" for="search"><i class="material-icons">search</i></label>
+        <input id="search" type="search" name="subject_id" value="{{ search_query }}">
+      </div>
+    </form>
+</div>
+<div class="row">
+  {% for subject_id, syllabi in syllabi_by_subject %}
+  <div class="row">
+    <h6><b>{{ subject_id }}</b></h6>
+    {% for syllabus in syllabi %}
+    <div class="col s12">
+      <a href="{{ syllabus.file.url }}" target="_blank">{{ syllabus.semester }} {{syllabus.year}}</a>
+    </div>
+    {% endfor %}
   </div>
+  {% endfor %}
 </div>
 {% endblock %}
diff --git a/syllabus/views.py b/syllabus/views.py
index 829f354..ab0575d 100644
--- a/syllabus/views.py
+++ b/syllabus/views.py
@@ -3,6 +3,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.storage import FileSystemStorage
 from django.conf import settings
+from django.db.models import Q
 
 import os
 
@@ -17,15 +18,10 @@ def is_staff(request):
 def save_syllabus_submission(form, committed, copy_file):
     data = form.cleaned_data
 
-    try:
-        course = Course.objects.get(subject_id=data["subject_id"])
-    except ObjectDoesNotExist:
-        course = Course.objects.get(old_id=data["subject_id"])
-
     syllabus_submission = SyllabusSubmission.objects.create(email_address=data["email_address"],
                                                             semester=data["semester"],
                                                             year=data["year"],
-                                                            subject=course,
+                                                            subject_id=data["subject_id"],
                                                             file=data["file"],
                                                             committed=committed)
 
@@ -40,8 +36,50 @@ def index(request):
 def success(request):
     return render(request, 'syllabus/success.html')
 
+def syllabus_sortkey(syllabus):
+    year_start = int(syllabus.year)
+    semester_val = 0
+
+    if syllabus.semester != 'Fall':
+        year_start -= 1
+
+    if syllabus.semester == 'IAP':
+        semester_val = 1
+    elif syllabus.semester == 'Spring':
+        semester_val = 2
+    elif syllabus.semester == 'Summer':
+        semester_val = 3
+
+    return (str(syllabus.subject_id), year_start, semester_val, syllabus.pk)
+
 def viewer(request):
-    params = {'active_id': 'viewer', 'is_staff': is_staff(request)}
+    params = {
+        'active_id': 'viewer',
+        'is_staff': is_staff(request)
+    }
+
+    if 'subject_id' in request.GET:
+        subject_id = request.GET['subject_id']
+
+        query = Q(subject_id__istartswith=subject_id)
+        syllabi = Syllabus.objects.filter(query)
+        params['search_query'] = subject_id
+    else:
+        syllabi = Syllabus.objects.all()
+        params['search_query'] = ''
+
+    syllabi_by_subject = {}
+    for syllabus in syllabi:
+        if syllabus.subject_id in syllabi_by_subject:
+            syllabi_by_subject[syllabus.subject_id].append(syllabus)
+        else:
+            syllabi_by_subject[syllabus.subject_id] = [syllabus]
+
+    for subject_id in syllabi_by_subject:
+        syllabi_by_subject[subject_id] = sorted(syllabi_by_subject[subject_id], key=syllabus_sortkey, reverse=True)
+
+    params['syllabi_by_subject'] = sorted(syllabi_by_subject.items())
+
     return render(request, 'syllabus/viewer.html', params)
 
 def create(request):
@@ -80,7 +118,7 @@ def create(request):
                     "email_address": syllabus_submission.email_address,
                     "semester": syllabus_submission.semester,
                     "year": syllabus_submission.year,
-                    "subject_id": syllabus_submission.subject.subject_id
+                    "subject_id": syllabus_submission.subject_id
                 }, {
                     "file": syllabus_submission.file
                 })
diff --git a/update_db.py b/update_db.py
index 427fd83..0731a0f 100644
--- a/update_db.py
+++ b/update_db.py
@@ -170,7 +170,7 @@ def perform_syllabus_deployments():
                 syllabus = Syllabus.objects.create(
                     semester = syllabus_submission.semester,
                     year = syllabus_submission.year,
-                    subject = syllabus_submission.subject,
+                    subject_id = syllabus_submission.subject_id,
                     file = syllabus_submission.file,
                     timestamp = syllabus_submission.timestamp
                 )

From 3de51059b260096760ce4e97304cb3dbacbd2461 Mon Sep 17 00:00:00 2001
From: Georgia Shay <georgiashay@gmail.com>
Date: Sun, 8 May 2022 02:02:19 -0400
Subject: [PATCH 4/5] Add syllabi in course full info

---
 catalog/models.py  |  6 ++++++
 syllabus/models.py | 12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/catalog/models.py b/catalog/models.py
index c8292c1..b081370 100644
--- a/catalog/models.py
+++ b/catalog/models.py
@@ -4,6 +4,7 @@
 from django.db import models
 from common.models import Student
 from catalog_parse.utils.catalog_constants import *
+from syllabus.models import Syllabus
 
 class Attribute:
     """
@@ -120,6 +121,7 @@ class CourseFields:
     parent = "parent"
     children = "children"
     is_half_class = "is_half_class"
+    syllabi = "syllabi"
 
 # Tools to convert from strings to Course field values
 def string_converter(value):
@@ -427,6 +429,10 @@ def to_json_object(self, full=True):
         if self.out_of_class_hours != 0.0:
             data[CourseFields.out_of_class_hours] = self.out_of_class_hours
 
+        syllabi = Syllabus.objects.filter(subject_id=self.subject_id)
+        if syllabi.count() > 0:
+            data[CourseFields.syllabi] = [s.to_json_object() for s in syllabi]
+
         return data
 
 
diff --git a/syllabus/models.py b/syllabus/models.py
index 8c06a6e..5fdd1c4 100644
--- a/syllabus/models.py
+++ b/syllabus/models.py
@@ -11,8 +11,6 @@
 import shutil
 from uuid import uuid4
 
-from catalog.models import *
-
 SEMESTER_CHOICES = [
     ('Fall', 'fall'),
     ('IAP', 'iap'),
@@ -84,6 +82,7 @@ def __eq__(self, other):
         )
 
 def validate_subject_id(subject_id):
+    from catalog.models import Course
     if Course.objects.filter(subject_id=subject_id).count() == 0:
         raise ValidationError(u'Must provide a valid subject ID')
 
@@ -157,3 +156,12 @@ class Syllabus(models.Model):
 
     def __unicode__(self):
         return u"{} {} {} syllabus".format(self.subject_id, self.semester, self.year)
+
+    def to_json_object(self):
+        return {
+            'semester': self.semester,
+            'year': self.year,
+            'subject_id': self.subject_id,
+            'file_url': settings.MY_BASE_URL + self.file.url,
+            'id': self.pk
+        }

From 1a0348dae5fa9788c96d50322a943eeb355af7ce Mon Sep 17 00:00:00 2001
From: Georgia Shay <georgiashay@gmail.com>
Date: Sun, 8 May 2022 15:45:30 -0400
Subject: [PATCH 5/5] Some small fixes

---
 common/templates/common/base.html | 1 +
 syllabus/models.py                | 2 +-
 syllabus/views.py                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/templates/common/base.html b/common/templates/common/base.html
index 59cd5b9..f18a2b3 100644
--- a/common/templates/common/base.html
+++ b/common/templates/common/base.html
@@ -40,6 +40,7 @@
     <ul id="dropdown3" class="dropdown-content">
       <li><a class="red-text text-darken-3" href="/admin">Django Admin</a></li>
       <li><a class="red-text text-darken-3" href="/requirements/review/">Edit Requests</a></li>
+      <li><a class="red-text text-darken-3" href="/syllabus/review/">Syllabus Submissions</a></li>
       <li><a class="red-text text-darken-3" href="/courseupdater/update_catalog/">Catalog Update</a></li>
       <li><a class="red-text text-darken-3" href="/courseupdater/corrections/">Catalog Corrections</a></li>
       <li><a class="red-text text-darken-3" href="/courseupdater/download_data/">Download Catalog Data</a></li>
diff --git a/syllabus/models.py b/syllabus/models.py
index 5fdd1c4..b163131 100644
--- a/syllabus/models.py
+++ b/syllabus/models.py
@@ -92,7 +92,7 @@ class SyllabusForm(forms.Form):
     semester = forms.ChoiceField(label='Semester', choices=SEMESTER_CHOICES, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Semester (e.g. Fall)'}))
     year = forms.CharField(label='Year', max_length=4, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Year (e.g. 2022)'}))
     subject_id = forms.CharField(label='Course Number', max_length=20, widget=forms.TextInput(attrs={'class': 'input-field', 'placeholder': 'Course number (e.g. 18.01)'}), validators=[validate_subject_id])
-    file = forms.FileField(label='Syllabus File', widget=forms.ClearableFileInput(attrs={'class': 'input-field', 'accept': 'application/pdf'}), validators=[FileValidator(max_size=1024*1024, content_types=('application/pdf',))])
+    file = forms.FileField(label='Syllabus File', widget=forms.ClearableFileInput(attrs={'class': 'input-field', 'accept': 'application/pdf'}), validators=[FileValidator(max_size=1024*1024*5, content_types=('application/pdf',))])
 
 def rename_file(inst, filename):
     upload_to = 'syllabus/'
diff --git a/syllabus/views.py b/syllabus/views.py
index ab0575d..01a9ec6 100644
--- a/syllabus/views.py
+++ b/syllabus/views.py
@@ -104,7 +104,7 @@ def create(request):
             save_syllabus_submission(form, committed=should_commit, copy_file=copy_file)
             if should_commit:
                 return redirect('syllabus_review_all')
-            return redirect('submit_success')
+            return redirect('syllabus_success')
     else:
         form = SyllabusForm()