From 394f5785482c1edf57362fa3918fc767b9ee3bb3 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Thu, 25 Feb 2016 02:16:03 -0500 Subject: [PATCH] Changed start time to use 24 hour format/ Fixed datetime picker Bug --- stock/templates/registered/operationmanagement.html | 6 +++--- stock/templates/registered/optimerupdate.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stock/templates/registered/operationmanagement.html b/stock/templates/registered/operationmanagement.html index 787d32da..dc6c7d17 100644 --- a/stock/templates/registered/operationmanagement.html +++ b/stock/templates/registered/operationmanagement.html @@ -42,9 +42,9 @@ {{ ops.system }} {{ ops.location }} - {{ ops.start }} - {{ ops.duration }} - {{ ops.fc }} + {{ ops.start | date:"Y-m-d H:i" }} + {{ ops.duration }} + {{ ops.fc }} {{ ops.details }} {{ ops.post_time}} {% if perms.auth.optimer_management %} diff --git a/stock/templates/registered/optimerupdate.html b/stock/templates/registered/optimerupdate.html index a7c22cc9..f10f51da 100755 --- a/stock/templates/registered/optimerupdate.html +++ b/stock/templates/registered/optimerupdate.html @@ -37,7 +37,7 @@ {% block extra_script %} - $('#id_fleet_time').datetimepicker({ + $('#id_start').datetimepicker({ maskInput: true, format: 'Y-m-d H:i',minDate:0 });