diff --git a/Makefile b/Makefile index e6cfd7f..82928ef 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,12 @@ +DROPZONE=https://github.com/enyo/dropzone/archive/v5.7.0.zip + + dev-setup: pip install -r requirements.txt pip install -r dev-requirements.txt ./manage.py migrate ./manage.py createsuperuser --username admin --email admin@localhost + +interface/static/dropzone/dropzone.js: + wget -O dropzone.zip ${DROPZONE} + unzip -d interface/static dropzone.zip \ No newline at end of file diff --git a/interface/models.py b/interface/models.py index 8ba4580..2ca8b33 100644 --- a/interface/models.py +++ b/interface/models.py @@ -27,6 +27,9 @@ class Project(models.Model): deadline =models.DateField(null=True, blank=True) bucket = models.CharField(max_length=100) + def submissions(self): + return self.all_submissions.filter(complete=True) + def presigned_post(self, object_name, fields={}, conditions=[], expires=3600): key = os.path.join(slugify(self.name), object_name) return s3client.generate_presigned_post(self.bucket, key, Fields=fields, Conditions=conditions, ExpiresIn=expires) @@ -48,7 +51,7 @@ class WikiPage(models.Model): return self.title class Submission(models.Model): - project = models.ForeignKey(Project, related_name='submissions', on_delete=models.CASCADE) + project = models.ForeignKey(Project, related_name='all_submissions', on_delete=models.CASCADE) date = models.DateField(auto_now_add=True) name = models.CharField(max_length=255) instrument = models.CharField(max_length=100) diff --git a/interface/static/interface/css/polyphonic.css b/interface/static/interface/css/polyphonic.css index 448c10d..2d6910b 100644 --- a/interface/static/interface/css/polyphonic.css +++ b/interface/static/interface/css/polyphonic.css @@ -3,6 +3,10 @@ background-color: #69C; } +.form-actions { + margin-top: 20px; +} + #project H1 { text-align: center; } \ No newline at end of file diff --git a/interface/templates/base.html b/interface/templates/base.html index 2fa750a..32530c2 100644 --- a/interface/templates/base.html +++ b/interface/templates/base.html @@ -39,14 +39,15 @@ {% endblock %} - + + + {% block content %}