Use preferred names for templates in Tock

tock/employees/models.py

@@ -76,7 +76,6 @@ def save(self, *args, **kwargs):
  )
  super(EmployeeGrade, self).save(*args, **kwargs)
 
-
 class UserData(models.Model):
  user = models.OneToOneField(User, related_name='user_data', verbose_name='Tock username', on_delete=models.CASCADE)
  start_date = models.DateField(blank=True, null=True, verbose_name='Employee start date')
@@ -180,6 +179,11 @@ def is_late(self):
  else:
  return False
 
+ @cached_property
+ def display_name(self):
+ """If we have First/Last use those, otherwise fallback to username"""
+ return self.user.get_full_name() or self.user.username
+
  def save(self, *args, **kwargs):
  """Aligns User model and UserData model attributes on save."""
  user = User.objects.get(username=self.user)

tock/employees/tests/test_models.py

@@ -235,4 +235,14 @@ def test_is_18f_employee_true_if_18f(self):
  def test_billable_expectation(self):
  self.regular_user_userdata.expected_billable_hours = 30
  expected = 30 / settings.HOURS_IN_A_REGULAR_WORK_WEEK
- self.assertEqual(self.regular_user_userdata.billable_expectation, expected)
+ self.assertEqual(self.regular_user_userdata.billable_expectation, expected)
+
+ def test_display_name_if_no_full_name(self):
+ expected = self.regular_user.username
+ self.assertEqual(self.regular_user_userdata.display_name, expected)
+
+ def test_display_name_if_full_name(self):
+ self.regular_user.first_name = 'Hank'
+ self.regular_user.last_name = 'Venture'
+ expected = self.regular_user.get_full_name()
+ self.assertEqual(self.regular_user_userdata.display_name, expected)

tock/employees/views.py

@@ -53,8 +53,8 @@ class UserFormView(PermissionMixin, FormView):
  permission_classes = (IsSuperUserOrSelf, )
 
  def get_context_data(self, **kwargs):
- kwargs['username'] = self.kwargs['username']
- user = User.objects.get(username=kwargs['username'])
+ user = User.objects.get(username=self.kwargs['username'])
+ kwargs['display_name'] = user.user_data.display_name
  context = super(UserFormView, self).get_context_data(**kwargs)
  context.update(user_billing_context(user))
  return _add_recent_tock_table(user, context)

tock/hours/tests/test_views.py

@@ -183,14 +183,6 @@ def test_admin_bulk_timecards(self):
  for row in rows:
  self.assertEqual(set(row.keys()), expected_fields)
 
-class ProjectTimelineTests(WebTest):
- fixtures = FIXTURES
-
- def test_project_timeline(self):
- res = client().get(reverse('reports:UserTimelineView'))
- self.assertIn(
- 'aaron.snow,,2015-06-01,2015-06-08,False,20.00', str(res.content))
-
 class UtilTests(TestCase):
 
  def test_number_of_hours_util(self):

tock/projects/tests.py

@@ -494,7 +494,7 @@ def test_project_timeline(self):
  self.assertEqual(
  res['groups'],
  {
- self.user: {
+ self.user.user_data.display_name: {
  obj.timecard.reporting_period.start_date: obj.hours_spent
  for obj in self.objs_recent
  }

tock/projects/views.py

@@ -8,7 +8,6 @@
 from hours.models import TimecardObject
 from .models import Project
 
-
 class ProjectListView(LoginRequiredMixin, ListView):
  """ View for listing all of the projects, sort projects by name """
  model = Project
@@ -53,7 +52,7 @@ def project_timeline(project, period_limit=5):
  ).order_by(
  '-timecard__reporting_period__start_date'
  ).select_related(
- 'timecard__user',
+ 'timecard__user__user_data',
  'timecard__reporting_period',
  )
 
@@ -72,7 +71,7 @@ def project_timeline(project, period_limit=5):
  break
  periods.append(report_date)
 
- groups[tc.user][report_date] = float(t.hours_spent)
+ groups[tc.user.user_data.display_name][report_date] = float(t.hours_spent)
 
  return {
  'groups': dict(groups),

tock/tock/templates/employees/user_detail.html

@@ -4,7 +4,7 @@
 {% endblock %}
 
 {% block content %}
- <h1>Let's Tock about {{ object.user.first_name }} {{ object.user.last_name }}!</h1>
+ <h1>Let's Tock about {{ object.display_name }}!</h1>
  <table id="dataTable" class="striped usa-table">
  <tr>
  <td><b>First Name:</b></td>

tock/tock/templates/employees/user_form.html

@@ -4,7 +4,7 @@
 {% endblock %}
 
 {% block content %}
-<h1>Let's Tock about {{ username }}!</h1>
+<h1>Let's Tock about {{ display_name }}!</h1>
 {% include 'employees/user_utilization.html' %}
 {% include 'employees/user_recent_tocks.html' %}
-{% endblock %}
+{% endblock %}

tock/tock/templates/utilization/includes/unit_utilization_table.html

@@ -21,7 +21,7 @@
  {% for employee in unit.utilization.last_week_data %}
  <tr>
  <td>
- <a href="{% url 'employees:UserDetailView' employee.username %}">{{employee.username}}</a>
+ <a href="{% url 'employees:UserDetailView' employee.display_name %}">{{employee.display_name}}</a>
  </td>
  {% with unit.utilization.last_week_data|index:forloop.counter0 as data %}
  {% include 'utilization/includes/unit_utilization_cell.html' %}

tock/utilization/tests/test_views.py

@@ -183,8 +183,8 @@ def test_excludes_user_with_no_recent_hours(self):
 
  utilization_data = response.context['object_list'][0]['utilization']
 
- self.assertEqual(0, len([u for u in utilization_data['last_week_data'] if u['username'] == self.user_with_no_hours.username]))
- self.assertEqual(0, len([u for u in utilization_data['last_month_data'] if u['username'] == self.user_with_no_hours.username]))
+ self.assertEqual(0, len([u for u in utilization_data['last_week_data'] if u['display_name'] == self.user_with_no_hours.user_data.display_name]))
+ self.assertEqual(0, len([u for u in utilization_data['last_month_data'] if u['display_name'] == self.user_with_no_hours.user_data.display_name]))
 
  def test_includes_user_no_longer_with_unit(self):
  response = self.app.get(

tock/utilization/unit.py

@@ -49,11 +49,11 @@ def _get_unit_billing_data(users, unit, recent_periods=None, fiscal_year=False):
  start, end, utilization = utilization_report(users, unit=unit)
 
  if utilization:
- data = utilization.values('username', 'billable', 'target')
+ data = utilization.values('billable', 'first_name', 'last_name', 'target', 'username')
 
  # Build context for each employee
  output_data = [{
- 'username': employee['username'],
+ 'display_name': f"{employee['first_name']} {employee['last_name']}".strip() or employee['username'],
  'denominator': employee['target'],
  'billable': employee['billable'],
  'utilization': calculate_utilization(employee['billable'], employee['target'])