adding models, view method, and template dropdown to project form

Author: Luke Tuite

ingest/models.py

@@ -18,6 +18,14 @@ def __str__(self):
     funded_by = models.CharField(max_length=256)
     is_biccn = models.BooleanField(default=False)
 
+class Consortium(models.Model):
+    short_name = models.CharField(max_length=256)
+    long_name = models.CharField(max_length=1000)
+
+class ProjectConsortium(models.Model):
+    project = models.ForeignKey(Project, on_delete=models.SET_NULL, blank=False, null=True)
+    constorium = models.ForeignKey(Consortium, on_delete=models.SET_NULL, null = True, blank=True)
+
 class People(models.Model):
     def __str__(self):
         return self.name

ingest/templates/ingest/project_form.html

@@ -17,11 +17,13 @@ <h1>Create a new project</h1>
   <label for="name">Project Name:</label>
   <input type="text" id="name" name="name">
 
-  <label for="is_biccn">Is BICCN?:</label>
-  <select  name="is_biccn" id="is_biccn">
-    <option value="True"> True </option>
-    <option value="False"> False </option>
-  </select>
+  <label for="consortia">Consortia Affiliation:</label>
+  <p><strong>Select your project's constorium affiliation. You may control-click (Windows) or command-click (Mac) to select more than one.</strong></p> 
+    <select multiple size={{consortia.count}}>
+      {% for c in consortia %}
+        <option value={{c.id}}>{{c.long_name}} ({{c.short_name}})</option> 
+      {% endfor %}
+    </select>
   <label for="funded_by">Funded By:</label>
   <input type="text" id="funded_by" name="funded_by">
 </form>

ingest/views.py

@@ -27,7 +27,7 @@
 from .field_list import required_metadata
 from .filters import CollectionFilter
 from .forms import CollectionForm, ImageMetadataForm, DescriptiveMetadataForm, UploadForm, collection_send
-from .models import UUID, Collection, ImageMetadata, DescriptiveMetadata, Project, ProjectPeople, People, Project, EventsLog, Contributor, Funder, Publication, Instrument, Dataset, Specimen, Image, Sheet
+from .models import UUID, Collection, ImageMetadata, DescriptiveMetadata, Project, ProjectPeople, People, Project, EventsLog, Contributor, Funder, Publication, Instrument, Dataset, Specimen, Image, Sheet, Consortium
 from .tables import CollectionTable, DescriptiveMetadataTable, CollectionRequestTable
 import uuid
 import datetime
@@ -232,12 +232,13 @@ def project_form(request):
     current_user = request.user
     people = People.objects.get(auth_user_id_id = current_user.id)
     project_person = ProjectPeople.objects.filter(people_id = people.id).all()
+    consortia = Consortium.objects.all
     for attribute in project_person:
         if attribute.is_pi:
             pi = True
         else:
             pi = False
-    return render(request, 'ingest/project_form.html', {'pi':pi})
+    return render(request, 'ingest/project_form.html', {'pi':pi, 'consortia':consortia})
 
 # takes the data from project_form
 @login_required