Submissions working nicely

interface/templates/base.html

@@ -25,13 +25,18 @@
               Projects</span></a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="{% url 'register' %}"><i class="fas fa-users"></i> <span class="">Change
-              Ensemble</span></a>
+          <a class="nav-link" href="{% url 'register' %}"><i class="fas fa-users"></i> <span class="">My
+              Ensembles</span></a>
         </li>
         {% endif %}
         <li class="nav-item">
           <a class="nav-link" href=""><i class="fas fa-question"></i> <span class="">About</span></a>
         </li>
+        {% if request.user.is_authenticated %}
+        <li class="nav-item">
+          <a href="/admin"><i class="fas fa-key"></i></a>
+        </li>
+        {% endif %}
       </ul>
     </nav>
     {% endblock %}

interface/templates/interface/project.html

@@ -1,15 +1,31 @@
 {% extends "base.html" %}
 
 {% block content %}
+
 <h1>{{ project.name }}</h1>
-<div>
     {% block page %}
     <div class="narrow">
     <h3 class="text-center">Due in {{ project.deadline|timeuntil }}!</h3>
     <p>There have been {{ project.submissions.count }} submissions so far...</p>
+    <table>
+        <tbody>
+        {% for submission in project.submissions %}
+            <tr>
+                <td>{{ submission.date|timesince }} ago</td>
+                <td>{{ submission.name }} ({{ submission.instrument }})</td>
+                {% if request.user.is_authenticated %}
+                <td>
+                    <a href="{% url 'submission' project_id=project.pk submission_id=submission.pk %}"><i class="fas fa-info-circle"></i></a>
+                    &nbsp;
+                    <a href="{{ submission.presigned_url }}"><i class="fas fa-download"></i></a>
+                </td>
+                {% endif %}
+            </tr>    
+        {% endfor %}
+        </tbody>
+    </table>
     </div>
     {% endblock %}
-</div>
 <div class="project-links">
     <div class="pills" role="tablist">
         <a role=tab" href="{% url 'project' project_id=project.id %}">Project info</a>
@@ -17,8 +33,8 @@
         <a class="nav-link {% if page.id == wiki_id %}active{% endif %}"
             href="{% url 'wiki' project_id=project.id wiki_id=page.id %}">{{ page.title }}</a>
         {% endfor %}
-        <a role="tab" href="">Record a submission</a>
-        <a role="tab" href="{% url 'submission' project_id=project.id %}">Send a file</a>
+        <!--a role="tab" href="">Record a submission</a-->
+        <a role="tab" href="{% url 'create_submission' project_id=project.id %}">Send a file</a>
     </div>
 </div>
 {% endblock %}

interface/templates/interface/project_list.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-
+<div style="flex-grow: 1">
     <h1>Projects for {{ ensemble.name }}</h1>
     <div class="list-group narrow">
     {% for project in ensemble.active_projects %}
@@ -11,4 +11,5 @@
         </a>
     {% endfor %}
     </div>
+</div>
 {% endblock %}

interface/templates/interface/register.html

@@ -1,7 +1,8 @@
 {% extends "base.html" %}
 
 {% block content %}
-<div class="narrow">
+<div style="display: flex">
+    {% if current %}
     <div>
         <h3>My Ensembles</h3>
         <ul>
@@ -9,8 +10,9 @@
             <li><a href="/?code={{ ensemble.ensemble_code}}">{{ ensemble.name }}</a></li>
             {% endfor %}
         </ul>
-    </div>
-    <div>
+    </div
+    {% endif %}
+    <div style="flex-grow: 4;">
         <form action="" method="POST">
             <h3>Add a new ensemble</h3>
             {% csrf_token %}

interface/templates/interface/submission.html

@@ -1,23 +0,0 @@
-{% extends "interface/project.html" %}
-
-{% block page %}
-<div class="card">
-    <div class="card-header">Make a submission</div>
-    <div class="card-body">
-        <p>
-            Some instructions about how to submit the file
-            {{ url }}
-        </p>
-
-        <div class="">
-            <form action="" method="POST" enctype="multipart/form-data">
-                {% csrf_token %}
-                {{ form }}
-                <div class="form-actions">
-                    <button type="submit" class="btn-primary">Continue</button>
-                </div> 
-            </form>
-        </div>
-    </div>
-</div>
-{% endblock %}

interface/templates/interface/submission_create.html

@@ -0,0 +1,20 @@
+{% extends "interface/project.html" %}
+
+{% block page %}
+<div class="narrow">
+    <h3>Excellent, you are ready to make a submission!</h3>
+    <p>
+        Please enter some basic information so we can identify your submission and
+        note anything that might be relevant.
+    </p>
+</div>
+<div>
+    <form action="" method="POST" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form }}
+        <div class="form-actions">
+            <button type="submit" class="btn-primary">Continue</button>
+        </div> 
+    </form>
+</div>
+{% endblock %}

interface/templates/interface/submission_detail.html

@@ -0,0 +1,17 @@
+{% extends "interface/project.html" %}
+
+{% block page %}
+<div class="narrow">
+    <h3>Thankyou for your submission!</h3>
+    <table class="horizontal">
+        <tbody>
+            <tr><th>From:</th><td>{{ submission.name }}</td></tr>
+            <tr><th>Instrument:</th><td>{{ submission.instrument }}</td></tr>
+            <tr><th>Notes:</th><td>{{ submission.notes }}</td></tr>
+            {% if download %}
+            <tr><th>Download:</th><td><a href="{{ download }}">{{ submission.key }}</a></td></tr>
+            {% endif %}
+        </tbody>
+    </table>    
+</div>
+{% endblock %}

interface/templates/interface/submission_upload.html

@@ -35,7 +35,7 @@
 <script src="http://malsup.github.com/jquery.form.js"></script>
 <script>
 
-function enableUpload(e) {
+function uploadReady(e) {
     $('#upload').attr('disabled', false);
     $('#status').html('Ready to upload');
 }
@@ -47,17 +47,20 @@ function startUpload(e) {
     var status = $('#status');
 
     console.log("STARTING");
+
+    // disable file select and submit
     e.target.disabled = true;
-
     //$('input[name="file"]').attr('disabled', true);
-
-    // patch form
+            
+    // patch form to use our ajax policy
     $('input[name="policy"]').val("{{ ajax_post.fields.policy }}");
     $('input[name="signature"]').val("{{ ajax_post.fields.signature }}");
     $('input[name="success_action_redirect"]').remove();
 
+
     $('form').ajaxForm({
         beforeSend: function() {
+            
             status.html("Starting upload");
             var percentVal = '0%';
             bar.width(percentVal)
@@ -77,8 +80,8 @@ function startUpload(e) {
         complete: function(xhr) {
             if (xhr.status == 204) {
                 status.html("Finished upload");
-                console.log(xhr);
-                //location.href = "{{ upload.fields.success_action_redirect }}";
+                let s3_location = xhr.getResponseHeader("Location");
+                location.href += "/complete?location=" + s3_location;
             } else {
                 status.html("Something went wrong");
                 console.log(xhr.responseText);
@@ -87,7 +90,8 @@ function startUpload(e) {
     }); 
 }
 
-$('input[name="file"]').on('change', enableUpload);
+// enable ajax upload
+$('input[name="file"]').on('change', uploadReady);
 $('#upload').on('click', startUpload).attr('disabled', true);
 
 </script>