added colours to table

opencredo · Aug 6, 2015 · 62d2b36 · 62d2b36
1 parent c584a5d
commit 62d2b36
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/templates/salesforce.html b/templates/salesforce.html
@@ -48,7 +48,8 @@ <h3 class="box-title"> {{ title }}</h3>
                             {{ name }}
                         </td>
                         {% for code, value in sorted(values.items()) %}
-                           <td>{{ value }}</td>
+                           <td {% if value < 50 %} bgcolor="#E60000"
+                               {% elif value < 80 %} bgcolor="#FF9900" {% end %} >{{ value }}%</td>
                         {% end %}
 
                     </tr>

diff --git a/utilities/sfclient.py b/utilities/sfclient.py
@@ -151,10 +151,12 @@ def create_final_report(raw_report, time_dict, employee_dict):
         # get full name from value {'group_key': '1', 'group_name': 'Employee', 'name': 'Karolis Rusenas'}
         employee_full_name = employee_dict[empl_key]['name']
         # getting utilisation
-        utilisation = value['aggregates'][0]['label']
+        utilisation = value['aggregates'][0]['value']
         # check for Nones
-        if utilisation == "-":
-            utilisation = '0.00%'
+        if utilisation == "None" or utilisation is None:
+            utilisation = '0.00'
+
+        utilisation = float("{0:.2f}".format(float(utilisation)))
 
         # check if employee is not in dictionary
         if employee_full_name not in body_employee_records.keys():