variable names updated

opencredo · Aug 18, 2015 · 2a361a8 · 2a361a8
1 parent 81d7b5e
commit 2a361a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/handlers/web_handlers.py b/handlers/web_handlers.py
@@ -483,13 +483,13 @@ def get(self):
 
         coroutine_list.append(sf_obj.get_utilisation_report(self.settings["consultantUtilisation"]))
 
-        coroutine_list.append(sf_obj.get_billability_report(self.settings["consultantBillability"]))
+        coroutine_list.append(sf_obj.get_billability_groupings_report(self.settings["consultantBillability"]))
 
-        utilisation_data, consultant_bilability = yield coroutine_list
+        utilisation_data, group_billability = yield coroutine_list
 
         data = {
             "utilisation_data": utilisation_data or None,
-            "consultant_bilability": consultant_bilability or None
+            "group_billability": group_billability or None
         }
         return self.render('salesforce.html', data=data)
 

diff --git a/templates/salesforce.html b/templates/salesforce.html
@@ -79,11 +79,11 @@ <h3 class="box-title">Report not available</h3>
                 <div id="container" style="min-width: 310px; height: 400px; margin: 0 auto"></div>
             </div>
             <div class="row">
-            {% if data["consultant_bilability"] != None %}
+            {% if data["group_billability"] != None %}
             <!-- Small boxes (Stat box) -->
             <div class="box">
                 <div class="box-header">
-                    <h3 class="box-title"> {{ data["consultant_bilability"]["title"] }}</h3>
+                    <h3 class="box-title"> {{ data["group_billability"]["title"] }}</h3>
                 </div>
                 <!-- /.box-header -->
                 <table id="billability" class="table table-condensed table-bordered">
@@ -93,7 +93,7 @@ <h3 class="box-title"> {{ data["consultant_bilability"]["title"] }}</h3>
                             Name
                         </th>
 
-                        {% for header in data["consultant_bilability"]["headers"] %}
+                        {% for header in data["group_billability"]["headers"] %}
                         {% if header != '' %}
                         <th> {% raw header %}</th>
                         {% end %}
@@ -105,7 +105,7 @@ <h3 class="box-title"> {{ data["consultant_bilability"]["title"] }}</h3>
 
                     </thead>
                     <tbody>
-                    {% for name, values in data["consultant_bilability"]["body"].items() %}
+                    {% for name, values in data["group_billability"]["body"].items() %}
                     <tr>
                         <td>
                             {{ name }}
@@ -114,7 +114,7 @@ <h3 class="box-title"> {{ data["consultant_bilability"]["title"] }}</h3>
                            <td> {% for i, dict in enumerate(aggregates) %}
                                        {% if dict is not None %}
                                            <!-- HTML to write -->
-                                           <a href="#" data-toggle="tooltip" title='{{ data["consultant_bilability"]["meta"]["column_info"][i] }}'>{{ dict["label"] }}</a>
+                                           <a href="#" data-toggle="tooltip" title='{{ data["group_billability"]["meta"]["column_info"][i] }}'>{{ dict["label"] }}</a>
                                            <br>
                                        {% end %}
 
@@ -167,7 +167,7 @@ <h3 class="box-title">Report not available</h3>
             },
             xAxis: {
                 categories: [
-                {% for header in data["consultant_bilability"]["headers"] %}
+                {% for header in data["group_billability"]["headers"] %}
                     '{{ header }}',
                 {% end %}
                 ],
@@ -176,13 +176,13 @@ <h3 class="box-title">Report not available</h3>
             yAxis: {
                 min: 0,
                 title: {
-                    text: '{{ data["consultant_bilability"]["meta"]["currency"] }}'
+                    text: '{{ data["group_billability"]["meta"]["currency"] }}'
                 }
             },
             tooltip: {
                 headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
                 pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
-                '<td style="padding:0"><b>{point.y:.1f} {{ data["consultant_bilability"]["meta"]["currency"] }}</b></td></tr>',
+                '<td style="padding:0"><b>{point.y:.1f} {{ data["group_billability"]["meta"]["currency"] }}</b></td></tr>',
                 footerFormat: '</table>',
                 shared: true,
                 useHTML: true
@@ -194,7 +194,7 @@ <h3 class="box-title">Report not available</h3>
                 }
             },
             series: [
-            {% for group, group_data in data["consultant_bilability"]["body"].items() %}
+            {% for group, group_data in data["group_billability"]["body"].items() %}
                 {% if group != 'Grand Total' %}
                     {
                         name: '{{ group }}',