Minor fixes to data abstract

diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php
index 60d8294..2f1460e 100755 (executable)
--- a/lib/GlmDataAbstract/DataAbstract.php
+++ b/lib/GlmDataAbstract/DataAbstract.php
@@ -1872,9 +1872,16 @@ abstract class GlmDataAbstract
 
         }
 
+        // If a time format is specified, use that. See PHP date() for format specification
+        if (isset($f['time_format'])) {
+            $time = date( $f['time_format'], strtotime($time));
+        }
+
+/* NEED TO LOOK AT THIS
         if (!$this->optionIncludeSelectListData && !$forEdit) {
                $time_list = false;
         }
+*/
 
         $r = array(
             'time'      => $time,
@@ -1960,6 +1967,11 @@ abstract class GlmDataAbstract
         // Build text time output
         $time = sprintf('%02d:%02d %s', $hour, $min, $ampm);
 
+        // If a time format is specified, use that. See PHP date() for format specification
+        if (isset($f['time_format'])) {
+            $time = date( $f['time_format'], strtotime($time));
+        }
+
         // Build time for storing
         $store_hour = $hour;
         if ($hour < 12 && $ampm == 'PM') {

diff --git a/lib/GlmDataAbstract/documentation.odt b/lib/GlmDataAbstract/documentation.odt
index 76dfa88..ff7687f 100644 (file)
Binary files a/lib/GlmDataAbstract/documentation.odt and b/lib/GlmDataAbstract/documentation.odt differ