Merge pull request #1806 from 18F/highlight_currentWeek

Emphasize current reporting period and reverse order
18F · Oct 4, 2024 · 6f1d685 · 6f1d685
2 parents 9b80c41 + 85d2251
commit 6f1d685
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tock/hours/views.py b/tock/hours/views.py
@@ -386,7 +386,7 @@ def get_context_data(self, **kwargs):
 
         context['uncompleted_reporting_periods'] = sorted(list(chain(
             unstarted_reporting_periods, unfinished_reporting_periods)),
-            key=attrgetter('start_date'), reverse=True)
+            key=attrgetter('start_date'), reverse=False)
 
         context['today'] = dt.datetime.utcnow().date()
 

diff --git a/tock/tock/templates/hours/reporting_period_list.html b/tock/tock/templates/hours/reporting_period_list.html
@@ -28,7 +28,7 @@ <h2>Due</h2>
         {% for reporting_period in uncompleted_reporting_periods %}
             <li class="reporting-period--item{% if reporting_period.end_date < today %} overdue{% endif %}">
               {% if reporting_period.end_date < today %}<span>Overdue: </span>{% endif %}
-              <a href="{% url 'reportingperiod:UpdateTimesheet' reporting_period %}">{{ reporting_period.end_date | date:"F j, Y" }}</a>
+              <a class="{% if today > reporting_period.start_date and today < reporting_period.end_date %}text-bold{% endif %}" href="{% url 'reportingperiod:UpdateTimesheet' reporting_period %}">{{ reporting_period.end_date | date:"F j, Y" }}</a>
             </li>
         {% endfor %}
         </ul>