From 0630478404acbde521edfe83d3d04b9712034bca Mon Sep 17 00:00:00 2001
From: Kevin Crider <kevinacrider@gmail.com>
Date: Fri, 27 Sep 2013 18:52:26 -0400
Subject: [PATCH] Cleaned up date and time formatting on events page

---
 web/app/View/Events/index.ctp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/app/View/Events/index.ctp b/web/app/View/Events/index.ctp
index 1600bf1fe..f4933a484 100644
--- a/web/app/View/Events/index.ctp
+++ b/web/app/View/Events/index.ctp
@@ -68,7 +68,7 @@ echo $this->Form->inputs(array(
 
 <table class="table table-condensed table-striped" id="Events">
 <?php
-  echo $this->Html->tableHeaders(array($this->Form->checkbox('', array('hiddenField' => false, 'class' => 'selectAll')), 'Thumbnail', 'Id', 'Name', 'Monitor', 'Cause', 'Time', 'Duration', 'Alarm Frames', 'Total Score', 'Avg. Score', 'Max Score'));
+  echo $this->Html->tableHeaders(array($this->Form->checkbox('', array('hiddenField' => false, 'class' => 'selectAll')), 'Thumbnail', 'Id', 'Name', 'Monitor', 'Cause', 'Date/Time', 'Duration', 'Alarm Frames', 'Total Score', 'Avg. Score', 'Max Score'));
 
 foreach ($events as $key => $value) {
 	echo $this->Html->tableCells(array(
@@ -86,7 +86,8 @@ foreach ($events as $key => $value) {
 		$value['Event']['Name'],
 		$value['Monitor']['Name'],
 		$value['Event']['Cause'],
-		$value['Event']['StartTime'],
+		//$value['Event']['StartTime'],
+		$this->Time->format('n/j/y @ g:i:s A', $value['Event']['StartTime'], null, 'EST'),
 		$value[0]['Duration'],
 		$value['Event']['AlarmFrames'],
 		$value['Event']['TotScore'],