diff options
| author | ARC <arjunrc@gmail.com> | 2015-05-04 04:32:51 -0400 |
|---|---|---|
| committer | ARC <arjunrc@gmail.com> | 2015-05-04 04:32:51 -0400 |
| commit | bfe426a83bfcd32bac22bc06cccb15f15a9f9450 (patch) | |
| tree | 996b8848922770b8127ad1abfa7f99dac566d895 /www/templates | |
| parent | a838bdff9750af4ed6be0bad981ceb65341609f1 (diff) | |
Events Graphs now supports time based filters (using the excellent moment library)
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-graphs.html | 8 | ||||
| -rw-r--r-- | www/templates/events.html | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/www/templates/events-graphs.html b/www/templates/events-graphs.html index 2afa18b3..96886588 100644 --- a/www/templates/events-graphs.html +++ b/www/templates/events-graphs.html @@ -7,7 +7,7 @@ <!-- I'm calling the same controller function but with different parameters when you switch between tabs --> <ion-tabs class="tabs-icon-top tabs-stable"> - <ion-tab title="All" icon="ion-stats-bars" on-select="generateChart('All Events')"> + <ion-tab title="All" icon="ion-stats-bars" on-select="generateChart('All Events',0)"> <ion-nav-view> <ion-content class="has-header"> @@ -18,7 +18,7 @@ </ion-nav-view> </ion-tab> - <ion-tab title="Last Hour" icon="ion-stats-bars" on-select="generateChart('Events in the last hour')"> + <ion-tab title="Last Hour" icon="ion-stats-bars" on-select="generateChart('Events in the last hour',1)"> <ion-nav-view> <ion-content> @@ -30,7 +30,7 @@ </ion-nav-view> </ion-tab> - <ion-tab title="Day" icon="ion-stats-bars" on-select="generateChart('Events in the last day')"> + <ion-tab title="Day" icon="ion-stats-bars" on-select="generateChart('Events in the last day',24)"> <ion-nav-view> <ion-content> @@ -41,7 +41,7 @@ </ion-content> </ion-nav-view> </ion-tab> - <ion-tab title="Week" icon="ion-stats-bars" on-select="generateChart('Events in the last week')"> + <ion-tab title="Week" icon="ion-stats-bars" on-select="generateChart('Events in the last week',168)"> <ion-nav-view> <ion-content> diff --git a/www/templates/events.html b/www/templates/events.html index b1853224..a46bf1f1 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -6,9 +6,14 @@ <ion-nav-buttons side="right"> <a style="" class="button button-icon icon ion-stats-bars" ng-href="#events-graphs"> </a> + <!--<a ui-sref="app.events-graphs" class="item" ng-click="toggleMenu()">Tabs</a>--> </ion-nav-buttons> + <ion-nav-buttons side="left"> + <a style="" class="button button-icon icon ion-funnel" ng-href="#events-graphs"> </a> + </ion-nav-buttons> + <ion-content> <ion-refresher pulling-text="Pull to reload Events..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher> |