Use short datetime string for lists

babybuddy/formats/en/formats.py

@@ -18,5 +18,7 @@ else:
         '%m/%d/%Y %I:%M %p',     # '10/25/2006 2:30 PM'
     ]
 
+SHORT_MONTH_DAY_FORMAT = 'M j'
+
 # Append all other input formats from the base locale.
 DATETIME_INPUT_FORMATS = CUSTOM_INPUT_FORMATS + formats.DATETIME_INPUT_FORMATS

core/templates/core/feeding_list.html

@@ -1,5 +1,5 @@
 {% extends 'babybuddy/page.html' %}
-{% load duration i18n widget_tweaks %}
+{% load datetime duration i18n widget_tweaks %}
 
 {% block title %}{% trans "Feedings" %}{% endblock %}
 
@@ -35,7 +35,7 @@
                 {% for feeding in object_list %}
                     {% cycle "odd" "even" as row_class silent %}
                     <tr class="{{ row_class }}">
-                        <th scope="row">{{ feeding.start }}</th>
+                        <th scope="row">{{ feeding.start|datetime_short }}</th>
                         <td><a href="{% url 'core:child' feeding.child.slug %}">{{ feeding.child }}</a></td>
                         <td>{{ feeding.get_method_display }}</td>
                         <td>{{ feeding.get_type_display }}</td>

core/templates/core/note_list.html

@@ -1,5 +1,5 @@
 {% extends 'babybuddy/page.html' %}
-{% load i18n widget_tweaks %}
+{% load datetime i18n widget_tweaks %}
 
 {% block title %}{% trans "Notes" %}{% endblock %}
 
@@ -30,7 +30,7 @@
             <tbody>
                 {% for note in object_list %}
                     <tr>
-                        <th scope="row">{{ note.time }}</th>
+                        <th scope="row">{{ note.time|datetime_short }}</th>
                         <td><a href="{% url 'core:child' note.child.slug %}">{{ note.child }}</a></td>
                         <td>{{ note.note }}</td>
                         <td class="text-center">

core/templates/core/sleep_list.html

@@ -1,5 +1,5 @@
 {% extends 'babybuddy/page.html' %}
-{% load bootstrap duration i18n widget_tweaks %}
+{% load bootstrap datetime duration i18n widget_tweaks %}
 
 {% block title %}{% trans "Sleep" %}{% endblock %}
 
@@ -33,8 +33,8 @@
                 {% for sleep in object_list %}
                     {% cycle "odd" "even" as row_class silent %}
                     <tr class="{{ row_class }}">
-                        <th scope="row">{{ sleep.start }}</th>
+                        <th scope="row">{{ sleep.start|datetime_short }}</th>
-                        <td>{{ sleep.end }}</td>
+                        <td>{{ sleep.end|datetime_short }}</td>
                         <td><a href="{% url 'core:child' sleep.child.slug %}">{{ sleep.child }}</a></td>
                         <td>{{ sleep.duration|duration_string }}</td>
                         <td class="text-center">{{ sleep.nap|bool_icon }}</td>

core/templates/core/temperature_list.html

@@ -1,5 +1,5 @@
 {% extends 'babybuddy/page.html' %}
-{% load i18n widget_tweaks %}
+{% load datetime i18n widget_tweaks %}
 
 {% block title %}{% trans "Temperature" %}{% endblock %}
 
@@ -31,7 +31,7 @@
                 {% for temperature in object_list %}
                     {% cycle "odd" "even" as row_class silent %}
                     <tr class="{{ row_class }}">
-                        <th scope="row">{{ temperature.time }}</th>
+                        <th scope="row">{{ temperature.time|datetime_short }}</th>
                         <td><a href="{% url 'core:child' temperature.child.slug %}">{{ temperature.child }}</a></td>
                         <td>{{ temperature.temperature }}</td>
                         <td class="text-center">

core/templates/core/timer_list.html

@@ -1,5 +1,5 @@
 {% extends 'babybuddy/page.html' %}
-{% load bootstrap duration i18n widget_tweaks %}
+{% load bootstrap datetime duration i18n widget_tweaks %}
 
 {% block title %}{% trans "Timers" %}{% endblock %}
 
@@ -33,17 +33,19 @@
             <tbody>
             {% for timer in object_list %}
                 <tr>
-                    <th scope="row">{{ timer.start }}</th>
+                    <th scope="row">{{ timer.start|datetime_short }}</th>
                     <td><a href="{% url 'core:timer-detail' timer.id %}">{{ timer }}</a></td>
                     <td>
                         {% if timer.child %}
                             <a href="{% url 'core:child' timer.child.slug %}">{{ timer.child }}</a>
-                        {% else %}
-                            &nbsp;
                         {% endif %}
                     </td>
                     <td>{{ timer.duration|duration_string }}</td>
-                    <td>{{ timer.end }}</td>
+                    <td>
+                        {% if timer.end %}
+                            {{ timer.end|datetime_short }}
+                        {% endif %}
+                    </td>
                     <td>{{ timer.active|bool_icon }}</td>
                     <td>{{ timer.user_username }}</td>
                 </tr>

core/templates/core/tummytime_list.html

@@ -1,5 +1,5 @@
 {% extends 'babybuddy/page.html' %}
-{% load duration i18n widget_tweaks %}
+{% load datetime duration i18n widget_tweaks %}
 
 {% block title %}{% trans "Tummy Time" %}{% endblock %}
 
@@ -31,8 +31,8 @@
             <tbody>
                 {% for tummytime in object_list %}
                     <tr>
-                        <th scope="row">{{ tummytime.start }}</th>
+                        <th scope="row">{{ tummytime.start|datetime_short }}</th>
-                        <td>{{ tummytime.end }}</td>
+                        <td>{{ tummytime.end|datetime_short }}</td>
                         <td><a href="{% url 'core:child' tummytime.child.slug %}">{{ tummytime.child }}</a></td>
                         <td>{{ tummytime.duration|duration_string }}</td>
                         <td>{{ tummytime.milestone }}</td>

core/templatetags/datetime.py

@@ -36,7 +36,7 @@ def datetime_short(date):
         date_string = _('Today')
         time_string = formats.date_format(date, format='TIME_FORMAT')
     elif now.year == date.year:
-        date_string = formats.date_format(date, format='MONTH_DAY_FORMAT')
+        date_string = formats.date_format(date, format='SHORT_MONTH_DAY_FORMAT')
         time_string = formats.date_format(date, format='TIME_FORMAT')
     else:
         date_string = formats.date_format(date, format='SHORT_DATETIME_FORMAT')