Add % sign in charge columns

hitier
1 parent 083ac872
Showing 4 changed files with 10 additions and 6 deletions Show diff stats
app/commands/commands.py
app/main/templates/agent.html
app/main/templates/agents.html
app/main/templates/projects.html
@@ -131,6 +131,8 @@ def feed_from_irap(csv_file_name):
         for period_name in range(2011, 2030):
             t = Period.query.filter(Period.name == period_name).one()
             charge = r[f"{period_name}"]
+            # Charge are stored as percent in db, but as fraction of ETP in irap csv
+            # we make the conversion here.
             try:
                 charge = int(100 * float(charge))
             except ValueError:
@@ -17,8 +17,12 @@
   <tbody>
   {% for line in charges[1:] %}
   <tr>
-    {% for cell in line %}
-      <td>{{cell}}</td>
+    {% for i in range(line|length) %}
+      {%if  'Charge' in charges[0][i]  %}
+        <td>{{line[i]}} %</td>
+      {%else%}
+        <td>{{line[i]}}</td>
+      {%endif%}
     {% endfor %}
   </tr>
   {% endfor %}
@@ -15,7 +15,7 @@
       {{ agent.firstname }}
       {{ agent.secondname }}
     </a></td>
-    <td>{{agent.total_charge}}</td>
+    <td>{{agent.total_charge}} %</td>
     <td>{{agent.num_projects}}</td>
   </tr>
   {% endfor %}
@@ -13,9 +13,7 @@
     <td><a href="{{url_for('main.project', project_id=project.id)}}">
       {{ project.name }}</a>
     </td>
-    <td>
-      {{ project.total_charge }}</a>
-    </td>
+    <td>{{ project.total_charge }} % </td>
   </tr>
   {% endfor %}
   </tbody>