ReportingPeriodUserDetailView cleanup, utilization calculation update (…

…#1072)

* update utilization calculation in ReportingPeriodUserDetailView, clean up table rendering

* remove unused import

tock/hours/tests/test_views.py

@@ -226,27 +226,38 @@ def setUp(self):
         self.billable_project = projects.models.Project.objects.filter(
             accounting_code__billable=True
         )[0]
+        self.excluded_project = projects.models.Project.objects.filter(
+            exclude_from_billability=True
+        )[0]
         self.timecard_obj_0 = hours.models.TimecardObject.objects.create(
             timecard=self.timecard,
             project=self.nonbillable_project,
-            hours_spent=13
+            hours_spent=11
         )
         self.timecard_obj_1 = hours.models.TimecardObject.objects.create(
             timecard=self.timecard,
             project=self.billable_project,
             hours_spent=27
         )
+        self.timecard_obj_2 = hours.models.TimecardObject.objects.create(
+            timecard=self.timecard,
+            project=self.excluded_project,
+            hours_spent=2
+        )
+        self.timecard.save()
 
     def test_user_reporting_period_report(self):
         self.client.force_login(self.user)
         response = self.client.get(reverse(
             'reports:ReportingPeriodUserDetailView',
             kwargs={'reporting_period':'1999-12-31', 'username':'aaron.snow'}
         ))
-        self.assertEqual(response.context['user_utilization'], '67.5%')
-        self.assertEqual(response.context['user_all_hours'], 40.00)
+        self.assertEqual(response.context['user_utilization'], Decimal('0.90'))
+        self.assertEqual(response.context['user_target_hours'], 30.00)
         self.assertEqual(response.context['user_billable_hours'], 27)
-        self.assertContains(response, '67.5%')
+        self.assertEqual(response.context['user_non_billable_hours'], 11)
+        self.assertEqual(response.context['user_excluded_hours'], 2)
+        self.assertContains(response, '90%')
 
 @override_settings(STARTING_FY_FOR_REPORTS_PAGE=2015)
 class ReportTests(WebTest):

tock/hours/views.py

@@ -26,7 +26,6 @@
 from rest_framework.permissions import IsAuthenticated
 from tock.remote_user_auth import email_to_username
 from tock.utils import IsSuperUserOrSelf, PermissionMixin
-from utilization.utils import calculate_utilization
 
 from .forms import (ReportingPeriodForm, ReportingPeriodImportForm,
                     TimecardForm, TimecardFormSet, projects_as_choices,
@@ -783,31 +782,18 @@ def get_object(self):
     def get_context_data(self, **kwargs):
         rp_period = self.kwargs['reporting_period']
         username = self.kwargs['username']
-        user_billable_hours = TimecardObject.objects.filter(
-            timecard__reporting_period__start_date=rp_period,
-            timecard__user__username=username,
-            project__accounting_code__billable=True
-        ).aggregate(
-            (
-                Sum('hours_spent')
-            )
-        )['hours_spent__sum']
-
-        user_all_hours = TimecardObject.objects.filter(
-            timecard__reporting_period__start_date=rp_period,
-            timecard__user__username=username,
-        ).aggregate(
-            (
-                Sum('hours_spent')
-            )
-        )['hours_spent__sum']
+
+        timecard = Timecard.objects.get(
+            reporting_period__start_date=rp_period,
+            user__username=username
+        )
 
         context = super(
             ReportingPeriodUserDetailView, self).get_context_data(**kwargs)
-        context['user_billable_hours'] = user_billable_hours
-        context['user_all_hours'] = user_all_hours
-        context['user_utilization'] = calculate_utilization(
-            context['user_billable_hours'],
-            context['user_all_hours']
-        )
+        context['user_billable_hours'] = timecard.billable_hours
+        context['user_non_billable_hours'] = timecard.non_billable_hours
+        context['user_excluded_hours'] = timecard.excluded_hours
+        context['user_target_hours'] = timecard.target_hours
+        context['user_utilization'] = timecard.utilization
+
         return context

tock/projects/fixtures/projects.json

@@ -238,7 +238,8 @@
       "fields":{
          "name":"Out Of Office",
          "description":"",
-         "accounting_code":1
+         "accounting_code":1,
+         "exclude_from_billability":true
       },
       "pk":1
    },

tock/tock/templates/hours/reporting_period_user_detail.html

@@ -5,7 +5,7 @@
 
 {% block content %}
 
-<table class="table-responsive-reflow">
+<table class="usa-table table-responsive-reflow">
   <caption>
     <h1>{{ object.user }}'s time from {{ object.reporting_period.start_date }} to {{ object.reporting_period.end_date }}</h1>
   </caption>
@@ -14,6 +14,7 @@ <h1>{{ object.user }}'s time from {{ object.reporting_period.start_date }} to {{
       <th>Project</th>
       <th>Billable</th>
       <th>Hours spent</th>
+      <th>Notes</th>
     </tr>
   </thead>
   {% for entry in object.timecardobjects.all %}
@@ -28,39 +29,38 @@ <h1>{{ object.user }}'s time from {{ object.reporting_period.start_date }} to {{
       {% endif %}
       </td>
       <td data-title="Hours spent">{{ entry.hours_spent }}</td>
-    </tr>
-    {% if entry.notes %}
-    <tr>
-      <td colspan="3">
-        <strong>Notes entered for {{ entry.project }}</strong>
+      <td data-title="Notes">
         {% for note in entry.notes_list %}
-        <p>{{ note }}</p>
+          <p>{{ note }}</p>
         {% endfor %}
       </td>
     </tr>
   </tbody>
-  {% endif %}
   {% endfor %}
 </table>
 <div>First Submitted: {{ object.created }}</div>
 Last Changed: {{ object.modified }}
 
-<table class="table-responsive-reflow">
+<table class="usa-table table-responsive-reflow">
   <caption>
     <h3>Reporting Period Summary</h3>
   </caption>
   <thead>
     <tr>
       <th>Billable Hours</th>
-      <th>Total Hours</th>
-      <th>Billable %<br><span class="table-subtext">(billable hrs / total hrs)</span></th>
+      <th>Non-Billable Hours</th>
+      <th>Excluded Hours</th>
+      <th>Target Hours</th>
+      <th>Utilization</th>
     </tr>
   </thead>
   <tbody>
     <tr>
       <td data-title="Billable hours"> {{ user_billable_hours }} </td>
-      <td data-title="Total hours"> {{ user_all_hours }} </td>
-      <td data-title="Billable %"> {{ user_utilization }} </td>
+      <td data-title="Non-Billable hours"> {{ user_non_billable_hours }} </td>
+      <td data-title="Excluded hours"> {{ user_excluded_hours }} </td>
+      <td data-title="Target hours"> {{ user_target_hours }} </td>
+      <td data-title="Utilization"> {% widthratio user_utilization 1 100 %}% </td>
     </tr>
   </tbody>
 </table>