printing project consortia to mange projects page

Author: ecpantalone

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,9 +28,8 @@ <h1>Manage Projects</h1>
 <tr>
  <td>{{ project.name }}</td>
  <td>{{ project.funded_by }}</td>
- {% for c in consortia %}
-   <td>{{ c.short_name }}</td>
- {% endfor %}
+ <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,27 +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="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}}>
+  <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>
-  <label for="funded_by">Funded By:</label>
-  <input type="text" id="funded_by" name="funded_by">
+  </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

@@ -119,6 +119,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:
@@ -204,7 +205,12 @@ def manageProjects(request):
         project =  Project.objects.get(id=project_id)
         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