Added subproject to cv and project detail templates for front end (#120)

cccs-web · Oct 16, 2014 · 2f02b94 · 2f02b94
1 parent c413c95
commit 2f02b94
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/cvs/templates/cvs/cv_detail.html b/cvs/templates/cvs/cv_detail.html
@@ -45,6 +45,12 @@ <h3 class="panel-title">
                         <div class="panel-inner">
                             <table class="table table-striped table-bordered table-hover table-condensed">
                                 <tbody>
+                                {% if cvproject.subproject %}
+                                    <tr>
+                                        <th>Sub-project:</th>
+                                        <td>{{ cvproject.subproject.name }}</td>
+                                    </tr>
+                                {% endif %}
                                 <tr>
                                     <th>Position:</th>
                                     <td>{{ cvproject.position }}</td>

diff --git a/projects/templates/projects/project_detail.html b/projects/templates/projects/project_detail.html
@@ -44,13 +44,28 @@ <h2>Project Details</h2>
             <th width="30%">Locality</th>
             <td>{{ project.locality }}</td>
         </tr>
+        {% if project.subproject_set.count %}
+        <tr>
+            <th width="30%">Sub-projects / tranches</th>
+            <td>
+                <ul>
+                    {% for sub_project in project.subproject_set.all %}
+                        <li>{{ sub_project.name }}</li>
+                    {% endfor %}
+                </ul>
+            </td>
+        </tr>
+        {% endif %}
         </tbody>
     </table>
     <h2>CCCS Associate Role</h2>
     <table class="table table-striped table-bordered table-hover table-condensed">
         <thead>
         <tr>
             <th width="18%">Consultant</th>
+            {% if project.subproject_set.count %}
+                <th>Sub-project</th>
+            {% endif %}
             <th width="22%" >Position</th>
             <th>Activities</th>
         </tr>
@@ -63,6 +78,9 @@ <h2>CCCS Associate Role</h2>
                         {{ cvproject.cv.user.last_name }}, {{ cvproject.cv.user.first_name }}
                     </a>
                 </td>
+                {% if project.subproject_set.count %}
+                    <td>{{ cvproject.subproject.name }}</td>
+                {% endif %}
                 <td>{{ cvproject.position }}</td>
                 <td>{{ cvproject.activities|mkdown }}</td>
             </tr>