Merge pull request #223 from brain-image-library/feature/parent-project-associations

Feature/parent project associations

Author: ecpantalone

ingest/migrations/0018_projectassociation.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.18 on 2023-06-26 11:18
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ingest', '0017_merge_20230608_1210'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProjectAssociation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('parent_project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parent_project', to='ingest.project')),
+                ('project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='project', to='ingest.project')),
+            ],
+        ),
+    ]

ingest/models.py

@@ -26,6 +26,10 @@ 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 ProjectAssociation(models.Model):
+    project = models.ForeignKey(Project, related_name='project', on_delete=models.SET_NULL, blank=False, null=True)
+    parent_project = models.ForeignKey(Project, related_name='parent_project', on_delete=models.SET_NULL, blank=False, null=True)
+
 class People(models.Model):
     def __str__(self):
         return self.name

ingest/static/ingest/createproject.js

@@ -5,6 +5,7 @@ function create_new_project() {
     const name = document.getElementById("name");
     const funded_by = document.getElementById("funded_by");
     const consortia_ids = [];
+    let parent_project;
 
     let options = document.getElementsByTagName('select')[0]
     for (let i=0, length=options.length; i<length; i++) {
@@ -15,10 +16,20 @@ function create_new_project() {
         }
     }
 
+    let parent_project_options = document.getElementsByTagName('select')[1]
+    for (let i=0, length=parent_project_options.length; i<length; i++) {
+        let opt = parent_project_options[i];
+
+        if (opt.selected) {
+            parent_project = opt.value;
+        }
+    }
+
     output_rows.push({
         "name": name.value,
         "funded_by": funded_by.value,
-        "consortia_ids": consortia_ids
+        "consortia_ids": consortia_ids,
+        "parent_project": parent_project
         })     
 
 

ingest/templates/ingest/manage_projects.html

@@ -19,6 +19,8 @@ <h1>Manage Projects</h1>
 <th>Name</th>
 <th>Funded By</th>
 <th>Consortia Affiliation</th>
+<th>Parent Project Affiliation</th>
+<th>Child Project Affiliations</th>
 <th>Personnel</th>
 <th>Submissions</th>
 </tr>
@@ -29,6 +31,8 @@ <h1>Manage Projects</h1>
  <td>{{ project.name }}</td>
  <td>{{ project.funded_by }}</td>
  <td>{{ project.short_names }}</td>
+ <td>{{ project.parent_project_names }}</td>
+ <td>{{ project.child_project_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>

ingest/templates/ingest/project_form.html

@@ -35,6 +35,17 @@ <h1>Create a new project</h1>
       {% endfor %}
     </select>
   </div>
+  <br>
+  <label for="parent_project" style="margin-top:15px;">Project Affiliation:</label>
+  <p>Is this a sub-project of another project? Select your project's parent project.</p>
+  <div style="margin-left: 50px;">
+    <select style="min-width: 540px;">
+      <option></option>
+      {% for a in allprojects %}
+        <option value={{a.id}}>{{a.name}}: ({{a.funded_by}})</option> 
+      {% endfor %}
+    </select>
+  </div>
 </form>
 <div>
 

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, Consortium, ProjectConsortium, SWC
+from .models import UUID, Collection, ImageMetadata, DescriptiveMetadata, Project, ProjectPeople, People, Project, EventsLog, Contributor, Funder, Publication, Instrument, Dataset, Specimen, Image, Sheet, Consortium, ProjectConsortium, SWC, ProjectAssociation
 from .tables import CollectionTable, DescriptiveMetadataTable, CollectionRequestTable
 import uuid
 import datetime
@@ -209,9 +209,25 @@ def manageProjects(request):
         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
+            short_name = Consortium.objects.get(id=c.consortium_id).short_name
             project.short_names.append(short_name)
         project.short_names = ', '.join(project.short_names)
+        
+        proj_assocs = ProjectAssociation.objects.filter(project_id=project.id).all()
+        parent_proj_assocs = ProjectAssociation.objects.filter(parent_project_id=project.id).all()
+
+        project.parent_project_names = []
+        for p in proj_assocs:
+            parent_project_name = Project.objects.get(id=p.parent_project_id).name
+            project.parent_project_names.append(parent_project_name)
+        project.parent_project_names = ', '.join(project.parent_project_names)
+
+        project.child_project_names = []
+        for pa in parent_proj_assocs:
+            child_project_name = Project.objects.get(id=pa.project_id).name
+            project.child_project_names.append(child_project_name)
+        project.child_project_names = ', '.join(project.child_project_names)
+
     return render(request, 'ingest/manage_projects.html', {'allprojects':allprojects, 'pi':pi})
 
 # this functions allows pi to see all the collections
@@ -240,27 +256,36 @@ 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()
+    allprojects=[]
+    for row in project_person:
+        project_id = row.project_id_id
+        project =  Project.objects.get(id=project_id)
+        allprojects.append(project)    
+        
     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, 'consortia':consortia})
+    return render(request, 'ingest/project_form.html', {'pi':pi, 'allprojects':allprojects, '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['name'])
         items.append(item['consortia_ids'])
+        items.append(item['parent_project'])
 
         funded_by = item['funded_by']
         name = item['name']
         consortia_ids = item['consortia_ids']
+        parent_project = item['parent_project']
 
         # write project to the project table   
         project = Project(funded_by=funded_by, name=name)
@@ -272,6 +297,9 @@ def create_project(request):
           project_consortium = ProjectConsortium(project_id=proj_id, consortium_id=c)
           project_consortium.save()
 
+        project_association = ProjectAssociation(project_id=proj_id, parent_project_id=int(parent_project))
+        project_association.save()
+
 
         # create a project_people row for this pi so they can view project on pi dashboard
         project_id_id = project.id