updated grand totals

opencredo · Aug 18, 2015 · 366878a · 366878a
1 parent e495839
commit 366878a
Showing 1 changed file with 36 additions and 15 deletions.
diff --git a/templates/salesforce.html b/templates/salesforce.html
@@ -106,26 +106,47 @@ <h3 class="box-title"> {{ data["group_billability"]["title"] }}</h3>
                     </thead>
                     <tbody>
                     {% for name, values in data["group_billability"]["body"].items() %}
-                    <tr>
-                        <td>
-                            {{ name }}
-                        </td>
-                        {% for code, aggregates in sorted(values.items()) %}
-                           <td> {% for i, dict in enumerate(aggregates) %}
-                                       {% if dict is not None %}
-                                           <!-- HTML to write -->
-                                           <a href="#" data-toggle="tooltip" title='{{ data["group_billability"]["meta"]["column_info"][i] }}'>{{ dict["label"] }}</a>
-                                           <br>
-                                       {% end %}
+                         {% if name != "Grand Total" %}
+                            <tr>
+                                <td>
+                                    {{ name }}
+                                </td>
+                                {% for code, aggregates in sorted(values.items()) %}
+                                   <td> {% for i, dict in enumerate(aggregates) %}
+                                               {% if dict is not None %}
+                                                   <!-- HTML to write -->
+                                                   <a href="#" data-toggle="tooltip" title='{{ data["group_billability"]["meta"]["column_info"][i] }}'>{{ dict["label"] }}</a>
+                                                   <br>
+                                               {% end %}
 
+                                        {% end %}
+                                   </td>
                                 {% end %}
-                           </td>
+
+                            </tr>
+                        {% end %}
+                    {% end %}
+                    </tbody>
+                    <tfoot>
+                    <tr>
+                        <th>
+                            Grand Total
+                        </th>
+                        {% for code, aggregates in sorted(data["group_billability"]["body"]["Grand Total"].items()) %}
+                        <th> {% for i, dict in enumerate(aggregates) %}
+                            {% if dict is not None %}
+                            <!-- HTML to write -->
+                            <a href="#" data-toggle="tooltip" title='{{ data["group_billability"]["meta"]["column_info"][i] }}'>{{ dict["label"] }}</a>
+                            <br>
+                            {% end %}
+
+                            {% end %}
+                        </th>
                         {% end %}
 
                     </tr>
-                    {% end %}
 
-                    </tbody>
+                    </tfoot>
                 </table>
             </div>
             {% else %}
@@ -231,7 +252,7 @@ <h3 class="box-title">Report not available</h3>
 
     $(function () {
         $('#billability').dataTable({
-            "bPaginate": true,
+            "bPaginate": false,
             "bLengthChange": true,
             "bFilter": true,
             "bSort": true,