Date formatting to solve issue #16

salsoftware · Apr 9, 2014 · 7f38513 · 7f38513
1 parent 47e7533
commit 7f38513
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/server/templates/server/machine_detail.html b/server/templates/server/machine_detail.html
@@ -115,7 +115,7 @@ <h3>Managed Software Update</h3>
         {% if machine.last_puppet_run %}
         <tr>
           <th>Puppet Run:</th>
-          <td>{{ machine.last_puppet_run }}</td>
+          <td>{{ machine.last_puppet_run|format_date }}</td>
         </tr>
         {% endif %}
       </tbody>

diff --git a/server/templates/server/overview_list_all.html b/server/templates/server/overview_list_all.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-
+{% load dashboard_extras %}
 {% block script %}
 <script type="text/javascript" charset="utf-8">
     $(document).ready(function() {
@@ -45,7 +45,7 @@
             </td>
 
             <td>{{ item.console_user }}</td>
-            <td>{{ item.last_checkin }}</td>
+            <td>{{ item.last_checkin|format_date }}</td>
         </tr>
         {% endfor %}
     </tbody>

diff --git a/server/templatetags/dashboard_extras.py b/server/templatetags/dashboard_extras.py
@@ -38,5 +38,9 @@ def bu_machine_count(bu_id):
 def convert_datetime(string):
     """Converts a string into a formatted date"""
     the_date = datetime.strptime(string, "%Y-%m-%d %H:%M:%S +0000")
-    return date(the_date, "N j, Y, P")
-
+    return date(the_date, "Y-m-d H:i")
+
+@register.filter
+def format_date(string):
+    """Converts a date object into something that can be sorted separately"""
+    return date (string, "Y-m-d H:i")