Tobias McNulty avatar Tobias McNulty committed 97f827c Merge

merging default into stable

Comments (0)

Files changed (1)

timepiece/templates/timepiece/time-sheet/dashboard.html

             <td>{{ entry.sum }}</td>
         </tr>
       {% endfor %}
-      {% ifnotequal schedule.count 0 %}
+      
       {% for row in activity_entries %}
         <tr>
             <th>Total {% if row.billable %}billable{% else %}non-billable{% endif %} time:</th>
             <td>
                 {% if row.billable %}
-                    {% bar_graph '' row.sum schedule.0.hours_per_week %}
+                    {% ifnotequal schedule.count 0 %}
+                        {% bar_graph '' row.sum schedule.0.hours_per_week %}
+                    {% else %}
+                        {{ row.sum }}
+                    {% endifnotequal %}
                 {% else %}
                     {{ row.sum }}
                 {% endif %}
             </td>
         </tr>
       {% endfor %}
-      {% endifnotequal %}
   </table>
 {% endif %}
 {% if allocations %}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.