adds additional fields to full timecard (object) report csv

adds is_weekly_bill, project_allocation, billable_expectation,
, target_hours, and employee unit. This allows for analysis such
as whether a person was FT or PT on a project, aggregation across
chapters (units), and more.

The property unit_name was added to the UserData model in order to
prevent errors if a user has no associated unit.

tock/employees/models.py

@@ -156,6 +156,16 @@ def organization_name(self):
 
         return ''
 
+    @property
+    def unit_name(self):
+        """
+        Returns the unit name associated with the employee or an empty string
+        if no unit is set.
+        """
+        if self.unit is not None:
+            return self.unit.name
+        return ''
+
     @property
     def is_late(self):
         """

tock/hours/tests/test_views.py

@@ -107,7 +107,11 @@ def test_bulk_timecards(self):
             'employee',
             'start_date',
             'end_date',
+            'is_weekly_bill',
             'hours_spent',
+            'project_allocation',
+            'billable_expectation',
+            'target_hours',
             'agency',
             'flat_rate',
             'active',
@@ -118,6 +122,7 @@ def test_bulk_timecards(self):
             'expense_profit_loss_account',
             'expense_profit_loss_account_name',
             'employee_organization',
+            'employee_unit',
             'project_organization',
         ))
         rows_read = 0

tock/hours/views.py

@@ -44,10 +44,20 @@ class BulkTimecardSerializer(serializers.Serializer):
     end_date = serializers.DateField(
         source='timecard.reporting_period.end_date'
     )
-    hours_spent = serializers.DecimalField(max_digits=5, decimal_places=2)
+    is_weekly_bill = serializers.BooleanField(
+        source='project.is_weekly_bill'
+    )
+    hours_spent = serializers.DecimalField(decimal_places=2, max_digits=5)
+    project_allocation = serializers.DecimalField(decimal_places=3, max_digits=6)
     billable = serializers.BooleanField(
         source='project.accounting_code.billable'
     )
+    billable_expectation = serializers.DecimalField(decimal_places=2,
+        max_digits=3,
+        source='timecard.billable_expectation')
+    target_hours = serializers.DecimalField(decimal_places=2,
+        max_digits=5,
+        source='timecard.target_hours')
     agency = serializers.CharField(
         source='project.accounting_code.agency.name'
     )
@@ -76,6 +86,9 @@ class BulkTimecardSerializer(serializers.Serializer):
     employee_organization = serializers.CharField(
         source='timecard.user.user_data.organization_name'
     )
+    employee_unit = serializers.CharField(
+        source='timecard.user.user_data.unit_name'
+    )
     project_organization = serializers.CharField(
         source='project.organization_name'
     )