Create and process Scholarship form submission

Author: Krystle Salazar

Pipfile

@@ -13,6 +13,7 @@ django_compressor = "*"
 django-countries = "*"
 django-heroku = "*"
 django-libsass = "*"
+django-widget-tweaks = "*"
 gunicorn = "*"
 psycopg2 = "*"
 django-ordered-model = "*"

Pipfile.lock

@@ -44,6 +44,7 @@
     "legal_db.apps.LegalDBConfig",
     "ordered_model",
     "taggit",
+    "widget_tweaks",
 ]
 
 MIDDLEWARE = [

caselaw/settings.py

@@ -0,0 +1,26 @@
+from django import forms
+
+from .models import Link, Scholarship
+
+
+class LinkForm(forms.ModelForm):
+    class Meta:
+        model = Link
+        exclude = ["notes"]
+
+
+class ScholarshipForm(forms.ModelForm):
+    agreement = forms.BooleanField()
+
+    class Meta:
+        model = Scholarship
+        fields = [
+            "contributor_name",
+            "contributor_email",
+            "license",
+            "title",
+            "publication_name",
+            "publication_year",
+            "authors",
+            "summary",
+        ]

legal_db/forms.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2020-06-22 02:59
+# Generated by Django 3.0.8 on 2020-07-14 20:23
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -63,7 +63,7 @@ class Migration(migrations.Migration):
                 ('publication_year', models.PositiveSmallIntegerField(blank=True, null=True)),
                 ('authors', models.CharField(blank=True, max_length=255, null=True)),
                 ('link', models.ForeignKey(help_text='The link to the article.', on_delete=django.db.models.deletion.CASCADE, to='legal_db.Link')),
-                ('tags', taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
+                ('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
             ],
             options={
                 'abstract': False,
@@ -88,7 +88,7 @@ class Migration(migrations.Migration):
                 ('background', models.TextField(blank=True, help_text='Describe the factual information that led to the lawsuit being filed, and explain what claims were filed in the lawsuit.', null=True)),
                 ('decision_year', models.PositiveSmallIntegerField(blank=True, help_text='Year of case resolution.', null=True)),
                 ('links', models.ManyToManyField(help_text='Include any links to pleadings, briefs, and opinions in the lawsuit, as well as blog posts, academic articles, or other relevant materials.', to='legal_db.Link')),
-                ('tags', taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
+                ('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
             ],
             options={
                 'abstract': False,

legal_db/migrations/0001_initial.py

@@ -22,6 +22,8 @@ class Meta:
 
 
 class LegalResource(BaseModel):
+    """Abstract Class to contain the commons attributes of Cases and Scholarship"""
+
     license = models.CharField(
         max_length=50,
         blank=True,
@@ -31,7 +33,7 @@ class LegalResource(BaseModel):
     contributor_name = models.CharField(max_length=120)
     contributor_email = models.EmailField()
     summary = models.TextField(blank=True, null=True)
-    tags = TaggableManager()
+    tags = TaggableManager(blank=True)
 
     class Status(models.IntegerChoices):
         UNREVIEWED = 1, _("Unreviewed")
@@ -110,7 +112,7 @@ class Scholarship(LegalResource):
     )
 
     def __str__(self):
-        return self.title
+        return self.title or self.link.url
 
 
 class FAQ(BaseModel, OrderedModel):

legal_db/models.py

@@ -1,22 +1,25 @@
-const tagsToggle = document.getElementById('tags-filter'),
-    tagsSection = document.getElementById('tags'),
-    tagsShow = document.getElementById('tags-show'),
-    tagsHide = document.getElementById('tags-hide');
+const tagsToggle = document.getElementById('tags-filter');
 
-tagsToggle.addEventListener('click', () => {
-    tagsSection.classList.toggle('is-hidden');
-    tagsShow.classList.toggle('is-hidden');
-    tagsHide.classList.toggle('is-hidden');
-    if (tagsSection.classList.contains('is-hidden')) {
-        tagsSection.setAttribute('aria-expanded', false);
-    } else {
-        tagsSection.setAttribute('aria-expanded', true);
-    }
-});
+if (document.body.contains(tagsToggle)) {
+    const tagsSection = document.getElementById('tags'),
+        tagsShow = document.getElementById('tags-show'),
+        tagsHide = document.getElementById('tags-hide');
 
-const tags = document.querySelectorAll('.tag');
-    tags.forEach(tag => {
-    tag.addEventListener('click', () => {
-        tag.classList.toggle('selected');
-    })
-});
+    tagsToggle.addEventListener('click', () => {
+        tagsSection.classList.toggle('is-hidden');
+        tagsShow.classList.toggle('is-hidden');
+        tagsHide.classList.toggle('is-hidden');
+        if (tagsSection.classList.contains('is-hidden')) {
+            tagsSection.setAttribute('aria-expanded', false);
+        } else {
+            tagsSection.setAttribute('aria-expanded', true);
+        }
+    });
+
+    const tags = document.querySelectorAll('.tag');
+        tags.forEach(tag => {
+        tag.addEventListener('click', () => {
+            tag.classList.toggle('selected');
+        })
+    });
+}

legal_db/static/app.js

@@ -81,6 +81,11 @@ body {
   color: $color-light-gray;
 }
 
+.errorlist {
+  color: $color-tomato;
+  font-size: 0.9rem;
+}
+
 .faq {
   &__content {
     border-bottom: 2px solid $color-light-gray;
@@ -128,6 +133,10 @@ body {
   }
 }
 
+.form {
+  max-width: 768px;
+}
+
 .hero {
   background-color: $color-lighter-gray;
 
@@ -164,6 +173,11 @@ body {
   }
 }
 
+.required {
+  color: darkred;
+  font-weight: bold;
+}
+
 .tags-filter {
   color: $color-dark-slate-blue;
   cursor: pointer;