From f3136eefe9105deb1d97123629dae80c2de66304 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Thu, 2 Jul 2015 10:33:26 -0400
Subject: updated libraries, squashed the problem of not getting bar handles on
 click, optimized montage view

---
 www/templates/events-graphs.html | 29 +++++++++++++++++++++--------
 www/templates/events.html        |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-graphs.html b/www/templates/events-graphs.html
index b3d19832..84aea168 100644
--- a/www/templates/events-graphs.html
+++ b/www/templates/events-graphs.html
@@ -8,12 +8,19 @@
             you switch between tabs -->
 
     <!-- All Events view -->
+
+    <!-- Oddly, unless I add a "div ng-controller" before each canvas
+    onClick handler does not work
+    -->
+
     <ion-tabs class="tabs-icon-top tabs-stable">
         <ion-tab title="All" icon="ion-stats-bars" on-select="generateTCChart(0,'All Events',0)">
             <ion-nav-view>
                 <ion-content class="has-header">
-                    <canvas tc-chartjs-bar chart-data="data" chart-options="options" ng-click="handleChartClick($event)" chart="chart1">
+                    <div ng-controller="zmApp.EventsGraphsCtrl">
+                    <canvas tc-chartjs-bar chart-data="chart.data" chart-options="chart.options" ng-click="handleChartClick($event)" chart="chartwithbars">
                     </canvas>
+                    </div>
                 </ion-content>
             </ion-nav-view>
         </ion-tab>
@@ -23,26 +30,30 @@
                  on-select="generateTCChart(1,'Events in the last hour',1)">
             <ion-nav-view>
                 <ion-content>
+                    <div ng-controller="zmApp.EventsGraphsCtrl">
                     <div style="overflow:scroll;">
-                        <canvas tc-chartjs-bar chart-data="data" chart-options="options"
-                                ng-click="handleChartClick($event)" chart="chart2">
+                        <canvas tc-chartjs-bar chart-data="chart.data" chart-options="chart.options"
+                                ng-click="handleChartClick($event)" chart="chartwithbars">
                         </canvas>
+                        </div>
                     </div>
                 </ion-content>
             </ion-nav-view>
         </ion-tab>
 
-        <!-- All Events in last 24 hrs -->
+        <!-- All Events in last 24 hrs-->
         <ion-tab title="Day" icon="ion-stats-bars"
                  on-select="generateTCChart(2,'Events in the last day',24)">
             <ion-nav-view>
                 <ion-content>
+                    <div ng-controller="zmApp.EventsGraphsCtrl">
                     <div style="overflow:scroll;">
-                        <canvas tc-chartjs-bar chart-data="data"
-                                chart-options="options" chart="chart3"
+                        <canvas tc-chartjs-bar chart-data="chart.data"
+                                chart-options="chart.options" chart="chartwithbars"
                                 ng-click="handleChartClick($event)">
                         </canvas>
                     </div>
+                    </div>
                 </ion-content>
             </ion-nav-view>
         </ion-tab>
@@ -52,12 +63,14 @@
                  on-select="generateTCChart(3,'Events in the last week',168)">
             <ion-nav-view>
                 <ion-content>
+                    <div ng-controller="zmApp.EventsGraphsCtrl">
                     <div style="overflow:scroll;">
-                        <canvas tc-chartjs-bar chart-data="data"
-                                chart-options="options" chart="chart4"
+                        <canvas tc-chartjs-bar chart-data="chart.data"
+                                chart-options="chart.options" chart="chartwithbars"
                                 ng-click="handleChartClick($event)">
                         </canvas>
                     </div>
+                    </div>
                 </ion-content>
             </ion-nav-view>
         </ion-tab>
diff --git a/www/templates/events.html b/www/templates/events.html
index 12a2afc7..c70f0527 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -73,7 +73,7 @@
             <!--row-->
 
             <div class="row" style="font-size:80%; color:rgb(110,110,110)">
-                <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp;{{event.Event.StartTime}}
+                <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp;{{prettify(event.Event.StartTime)}}
                     <br/>
                     <i class="ion-clipboard"></i>&nbsp; {{event.Event.Notes}}
                     <br/>
-- 
cgit v1.2.3