update branch with dev

Author: ecpantalone

ingest/admin.py

@@ -8,7 +8,9 @@
 from django.utils.translation import ugettext_lazy
 
 from django.db.models import F
-from .models import ImageMetadata, Collection, People, Project, DescriptiveMetadata, Contributor, Instrument, Dataset, Specimen, Image, EventsLog, Sheet, ProjectPeople, Funder, Publication,SWC
+
+from .models import ImageMetadata, Collection, People, Project, DescriptiveMetadata, Contributor, Instrument, Dataset, Specimen, Image, EventsLog, Sheet, ProjectPeople, Funder, Publication, Consortium, SWC
+
 admin.site.site_header = 'Brain Image Library Admin Portal'
 class ContributorsInline(admin.TabularInline):
     model = Contributor
@@ -24,8 +26,13 @@ class SpecimensInline(admin.TabularInline):
     model = Specimen
 class ImagesInline(admin.TabularInline):
     model = Image
+<<<<<<< HEAD
 class SWCSInline(admin.TabularInline):
     model = SWC
+=======
+class ConsortiaInline(admin.TabularInline):
+    model = Consortium
+>>>>>>> dev
 admin.site.disable_action('delete_selected')
 @admin.action(description='Mark selected Collection(s) as Validated and Submitted')
 def mark_as_validated_and_submitted(modeladmin, request, queryset):
@@ -117,6 +124,12 @@ class EventsLogAdmin(admin.ModelAdmin):
 @admin.register(ProjectPeople)
 class ProjectPeople(admin.ModelAdmin):
     list_display = ("id", "project_id", "people_id", "is_po", "is_po", "doi_role")
+<<<<<<< HEAD
 @admin.register(SWC)
 class SWC(admin.ModelAdmin):
-    list_display = ("id", "tracingFile", "sourceData", "sourceDataSample", "sourceDataSubmission", "coordinates", "coordinatesRegistration", "brainRegion", "brainRegionAtlas", "brainRegionAtlasName", "brainRegionAxonalProjection", "brainRegionDendriticProjection", "neuronType","segmentTags","proofreadingLevel", "notes", "sheet")
+    list_display = ("id", "tracingFile", "sourceData", "sourceDataSample", "sourceDataSubmission", "coordinates", "coordinatesRegistration", "brainRegion", "brainRegionAtlas", "brainRegionAtlasName", "brainRegionAxonalProjection", "brainRegionDendriticProjection", "neuronType","segmentTags","proofreadingLevel", "notes", "sheet")
+=======
+@admin.register(Consortium)
+class Consortium(admin.ModelAdmin):
+    list_display = ("id", "short_name", "long_name")
+>>>>>>> dev

ingest/migrations/0015_consortium_projectconsortium.py

@@ -0,0 +1,30 @@
+# Generated by Django 3.2.18 on 2023-06-01 15:23
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ingest', '0014_metadataversion'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Consortium',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('short_name', models.CharField(max_length=256)),
+                ('long_name', models.CharField(max_length=1000)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ProjectConsortium',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('consortium', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ingest.consortium')),
+                ('project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='ingest.project')),
+            ],
+        ),
+    ]

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)
+    consortium = models.ForeignKey(Consortium, on_delete=models.SET_NULL, null = True, blank=True)
+
 class People(models.Model):
     def __str__(self):
         return self.name

ingest/static/ingest/createproject.js

@@ -3,13 +3,25 @@ function create_new_project() {
     const output_rows = [];
 
     const name = document.getElementById("name");
-    const is_biccn = document.getElementById("is_biccn");
-    const funded_my = document.getElementById("is_biccn");
+    const funded_by = document.getElementById("funded_by");
+    const consortia_ids = [];
+
+    let options = document.getElementsByTagName('select')[0]
+    for (let i=0, length=options.length; i<length; i++) {
+        let opt = options[i];
+
+        if (opt.selected) {
+            consortia_ids.push(opt.value);
+            console.log(opt.value);
+        }
+    }
+
+    console.log(consortia_ids)
 
     output_rows.push({
         "name": name.value,
-        "is_biccn": is_biccn.value,
-        "funded_by": funded_by.value
+        "funded_by": funded_by.value,
+        "consortia_ids": consortia_ids
         })
 
     console.log(output_rows)

ingest/templates/ingest/manage_projects.html

@@ -18,7 +18,7 @@ <h1>Manage Projects</h1>
 <tr>
 <th>Name</th>
 <th>Funded By</th>
-<th>Is BICCN?</th>
+<th>Consortia Affiliation</th>
 <th>Personnel</th>
 <th>Submissions</th>
 </tr>
@@ -28,7 +28,8 @@ <h1>Manage Projects</h1>
 <tr>
  <td>{{ project.name }}</td>
  <td>{{ project.funded_by }}</td>
- <td>{{ project.is_biccn }}</td>
+ <td>{{ project.short_names }}</td>
+
  <td><a href="{% url 'ingest:view_project_people' project.id %}">View Personnel</td>
  <td><a href="{% url 'ingest:view_project_collections' project.id %}">View Submissions</td>
 </tr>

ingest/templates/ingest/project_form.html

@@ -1,6 +1,7 @@
-{% extends 'ingest/base.html' %}
-{% block content %}
+{% extends 'ingest/wide.html' %}
 {% load bootstrap4 %}
+{% block wide %}
+
 <script src="/static/ingest/createproject.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/js-cookie@rc/dist/js.cookie.min.js"></script>
 {% if pi %}
@@ -10,25 +11,41 @@
 {% endif %}
 <br>
 <h1>Create a new project</h1>
+<hr>
+
+<br>
+<div style="min-width:600px">
 
 <form id="CreateNewProject">
 {% csrf_token %}
+  <label for="name">Project Name:</label><span style="color:red; margin-right:10px;">*</span>
+  <input type="text" id="name" name="name" placeholder="Name of project">
 
-  <label for="name">Project Name:</label>
-  <input type="text" id="name" name="name">
+  <label for="funded_by" style="margin-top:15px;margin-left:55px;margin-right:10px;">Funded By:</label>
+  <input type="text" id="funded_by" name="funded_by" placeholder="Grant number">
 
-  <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="funded_by">Funded By:</label>
-  <input type="text" id="funded_by" name="funded_by">
+  <br>
+  <label for="consortia" style="margin-top:15px;">Consortia Affiliation:</label>
+  <p>Select your project's affiliation(s). Choose all that apply.</p>
+  <div style="margin-left: 50px;">
+    <p style="font-style:italic; margin-top: 20px;"> To choose multiple: Windows users: control-click | Mac users: command-click</p> 
+    <select multiple size={{consortia.count}} style="min-width: 540px;">
+      {% for c in consortia %}
+        <option value={{c.id}}>{{c.long_name}} ({{c.short_name}})</option> 
+      {% endfor %}
+    </select>
+  </div>
 </form>
-<button class="btn btn-primary" onclick="create_new_project();">Submit New Project</button>
-<hr>
+<div>
 
+<br>
+
+<p style="margin-top:15px;"><b>Required fields are marked with an <span style="color:red;">*</span>.</b></p>
+
+<br>
+<button class="btn btn-primary" onclick="create_new_project();">Submit New Project</button>
 <a href="{% url 'ingest:index' %}">
   <button class="cancel btn btn btn-primary" value="ignore" formnovalidate="">Cancel</button>
 </a>
+
 {% endblock %}

ingest/views.py

@@ -28,7 +28,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, SWC
+from .models import UUID, Collection, ImageMetadata, DescriptiveMetadata, Project, ProjectPeople, People, Project, EventsLog, Contributor, Funder, Publication, Instrument, Dataset, Specimen, Image, Sheet, Consortium, ProjectConsortium, SWC
 from .tables import CollectionTable, DescriptiveMetadataTable, CollectionRequestTable
 import uuid
 import datetime
@@ -120,6 +120,7 @@ def modify_user(request, pk):
         else:
             pi = False
     person = People.objects.get(auth_user_id_id = pk)
+    
     all_project_people = ProjectPeople.objects.filter(people_id_id=person.id).all()   
     for project_person in all_project_people:
         try:
@@ -203,8 +204,14 @@ def manageProjects(request):
     for row in project_person:
         project_id = row.project_id_id
         project =  Project.objects.get(id=project_id)
-        allprojects.append(project)     
-      
+        allprojects.append(project)
+
+        project_consortia = ProjectConsortium.objects.filter(project_id=project.id).all()
+        project.short_names = []
+        for c in project_consortia:
+            short_name = Consortium.objects.get(id=c.id).short_name
+            project.short_names.append(short_name)
+        project.short_names = ', '.join(project.short_names)
     return render(request, 'ingest/manage_projects.html', {'allprojects':allprojects, 'pi':pi})
 
 # this functions allows pi to see all the collections
@@ -233,30 +240,39 @@ 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
 def create_project(request):
     new_project = json.loads(request.body)
+    print(new_project)
     items = []
     for item in new_project:
         items.append(item['funded_by'])
-        items.append(item['is_biccn'])
         items.append(item['name'])
-        
+        items.append(item['consortia_ids'])
+
         funded_by = item['funded_by']
-        is_biccn = item['is_biccn']
         name = item['name']
-        
+        consortia_ids = item['consortia_ids']
+
         # write project to the project table   
-        project = Project(funded_by=funded_by, is_biccn=is_biccn, name=name)
+        project = Project(funded_by=funded_by, name=name)
         project.save()
+
+        proj_id = project.id
+
+        for c in consortia_ids:
+          project_consortium = ProjectConsortium(project_id=proj_id, consortium_id=c)
+          project_consortium.save()
+
 
         # create a project_people row for this pi so they can view project on pi dashboard
         project_id_id = project.id