Fixed date time entry for Action Forms.

Updates #248
City-of-Bloomington · Sep 15, 2016 · 5b6908f · 5b6908f
1 parent 9f4c650
commit 5b6908f
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 3 deletions.
diff --git a/crm/Controllers/TicketsController.php b/crm/Controllers/TicketsController.php
@@ -336,6 +336,12 @@ public function recordAction()
 
             if (isset($_POST['ticket_id'])) {
                 try {
+                    $_POST['actionDate'] = \DateTime::createFromFormat(
+                        DATE_FORMAT.' '.TIME_FORMAT,
+                        $_POST['actionDate']['date'].' '.$_POST['actionDate']['time']
+                    );
+                    if (!$_POST['actionDate']) { throw new \Exception('invalidDate'); }
+
                     $history->handleUpdate($_POST);
                     $history->save();
                     $this->redirectToTicketView($ticket);

diff --git a/crm/Models/TicketHistory.php b/crm/Models/TicketHistory.php
@@ -132,7 +132,7 @@ public function setTicket(Ticket $o)  { parent::setForeignKeyObject(__namespace_
 	public function handleUpdate($post)
 	{
 		$this->setAction_id ($post['action_id'] );
-		$this->setActionDate($post['actionDate']);
+		$this->setActionDate($post['actionDate']->format(ActiveRecord::MYSQL_DATETIME_FORMAT));
 		$this->setNotes     ($post['notes']     );
 		$this->setEnteredByPerson($_SESSION['USER']);
 		$this->setActionPerson   ($_SESSION['USER']);

diff --git a/crm/blocks/html/tickets/actionForm.inc b/crm/blocks/html/tickets/actionForm.inc
@@ -16,12 +16,20 @@
 			<?php
                 $helper = $this->template->getHelper('field');
                 echo $helper->field([
-                    'name'  => 'actionDate',
-                    'id'    => 'actionDate',
+                    'name'  => 'actionDate[date]',
+                    'id'    => 'actionDate_date',
                     'label' => $this->_('date'),
                     'type'  => 'date',
                     'value' => $this->ticketHistory->getActionDate(DATE_FORMAT)
                 ]);
+                echo $helper->field([
+                    'name'  => 'actionDate[time]',
+                    'id'    => 'actionDate_time',
+                    'label' =>$this->_('time'),
+                    'type'  =>'time',
+                    'value' =>$this->ticketHistory->getActionDate(TIME_FORMAT)
+                ]);
+
                 echo $helper->field([
                     'name'  => 'notes',
                     'id'    => 'notes',

diff --git a/crm/language/en_CA/LC_MESSAGES/labels.po b/crm/language/en_CA/LC_MESSAGES/labels.po
@@ -248,6 +248,9 @@ msgstr "Fields to display"
 msgid "date"
 msgstr "Date"
 
+msgid "time"
+msgstr "Time"
+
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Day"

diff --git a/crm/language/en_US/LC_MESSAGES/labels.po b/crm/language/en_US/LC_MESSAGES/labels.po
@@ -247,6 +247,9 @@ msgstr "Fields to display"
 msgid "date"
 msgstr "Date"
 
+msgid "time"
+msgstr "Time"
+
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Day"

diff --git a/crm/language/fr_CA/LC_MESSAGES/labels.po b/crm/language/fr_CA/LC_MESSAGES/labels.po
@@ -248,6 +248,9 @@ msgstr "Champs à afficher"
 msgid "date"
 msgstr "Date"
 
+msgid "time"
+msgstr "Temps"
+
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Jour"

diff --git a/crm/language/nl_NL/LC_MESSAGES/labels.po b/crm/language/nl_NL/LC_MESSAGES/labels.po
@@ -247,6 +247,9 @@ msgstr "Zichtbare velden"
 msgid "date"
 msgstr "Datum"
 
+msgid "time"
+msgstr "Tijd"
+
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Dag"

diff --git a/crm/templates/html/helpers/Field.php b/crm/templates/html/helpers/Field.php
@@ -38,6 +38,10 @@ public function field(array $params)
                     $params['attr']['placeholder'] = View::translateDateString(DATE_FORMAT);
                     $renderInput = 'input';
                 break;
+                case 'time':
+                    $params['attr']['placeholder'] = View::translateDateString(TIME_FORMAT);
+                    $renderInput = 'input';
+                break;
 
                 case 'select':
                 case 'textarea':