Skip to content

Commit

Permalink
Dev: Change date format HH:MM to HH:mm
Browse files Browse the repository at this point in the history
  • Loading branch information
olleharstedt committed Apr 22, 2016
1 parent ecdfce3 commit 274cae4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion application/controllers/admin/dataentry.php
Expand Up @@ -736,7 +736,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
'id' => 'datestampL',
'value' => $thisdate,
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'drops' => 'up', // TODO: Does not work. Why?
Expand Down
Expand Up @@ -12,9 +12,9 @@
'id' => 'datestampE',
'value' => isset($_POST['datestampE']) ? $_POST['datestampE'] : '',
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'startDate' => date("Y-m-d H:i", time()),
'drops' => 'up', // TODO: Does not work. Why?
'timePicker' => true,
'timePicker12Hour' => false, // NB: timePicker24Hour = true does not work
Expand All @@ -32,9 +32,9 @@
'id' => 'datestampG',
'value' => isset($_POST['datestampG']) ? $_POST['datestampG'] : '',
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'startDate' => date("Y-m-d H:i", time()),
'drops' => 'up', // TODO: Does not work. Why?
'timePicker' => true,
'timePicker12Hour' => false, // NB: timePicker24Hour = true does not work
Expand All @@ -52,9 +52,9 @@
'id' => 'datestampL',
'value' => isset($_POST['datestampL']) ? $_POST['datestampL'] : '',
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'startDate' => date("Y-m-d H:i", time()),
'drops' => 'up', // TODO: Does not work. Why?
'timePicker' => true,
'timePicker12Hour' => false, // NB: timePicker24Hour = true does not work
Expand Down
Expand Up @@ -36,7 +36,7 @@
'id' => 'startdate',
'value' => $startdate,
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d hh:ii", time()),
'drops' => 'up', // TODO: Does not work. Why?
Expand All @@ -58,7 +58,7 @@
'id' => 'expires',
'value' => $expires,
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'drops' => 'up', // TODO: Does not work. Why?
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/token/dummytokenform.php
Expand Up @@ -83,7 +83,7 @@
'name' => "validfrom",
'value' => isset($validfrom) ? $validfrom : '',
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'drops' => 'up', // TODO: Does not work. Why?
Expand All @@ -102,7 +102,7 @@
'name' => "validuntil",
'value' => isset($validuntil) ? $validuntil : '',
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'drops' => 'up',
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/token/tokenform.php
Expand Up @@ -141,7 +141,7 @@
'name' => "validfrom",
'value' => isset($validfrom) ? $validfrom : '',
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'drops' => 'up', // TODO: Does not work. Why?
Expand All @@ -160,7 +160,7 @@
'name' => "validuntil",
'value' => isset($validuntil) ? $validuntil : '',
'pluginOptions' => array(
'format' => $dateformatdetails['jsdate'] . " HH:MM",
'format' => $dateformatdetails['jsdate'] . " HH:mm",
'singleDatePicker' => true,
'startDate' => date("Y-m-d", time()),
'drops' => 'up',
Expand Down

0 comments on commit 274cae4

Please sign in to comment.