Fixed date formatting

City-of-Bloomington · Mar 31, 2016 · 4be1f37 · 4be1f37
1 parent a4bb4d5
commit 4be1f37
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/blocks/html/committees/past.inc b/blocks/html/committees/past.inc
@@ -24,11 +24,11 @@ use Blossom\Classes\Url;
         foreach ($this->data as $c) {
             $uri     = BASE_URI.'/committees/info?committee_id='.$c['id'];
             $name    = self::escape($c['name']);
-            $endDate = $c['endDate'];
+            $endDate = new \DateTime($c['endDate']);
 
             echo "
             <tr><td><a href=\"$uri\">$name</a></td>
-                <td>$endDate</td>
+                <td>{$endDate->format(DATE_FORMAT)}</td>
             </tr>
             ";
         }

diff --git a/blocks/html/seats/data.inc b/blocks/html/seats/data.inc
@@ -52,7 +52,30 @@ $title = $this->title
             $userCanEdit = Person::isAllowed('seats', 'edit');
 
             foreach ($this->data['results'] as $row) {
-                foreach ($row as $f=>$v) { $$f = self::escape($v); }
+                foreach ($row as $f=>$v)
+                {
+                    switch ($f) {
+                        case 'seatStart':
+                        case 'seatEnd':
+                        case 'memberStart':
+                        case 'memberEnd':
+                        case 'memberTermStart':
+                        case 'memberTermEnd':
+                        case 'termStart':
+                        case 'termEnd':
+                            if ($v) {
+                                $d = new \DateTime($v);
+                                $$f = $d->format(DATE_FORMAT);
+                            }
+                            else {
+                                $$f = null;
+                            }
+                        break;
+
+                        default:
+                            $$f = self::escape($v);
+                    }
+                }
 
                 $actions    = [];
                 $classes    = [];