[statistics_reporting] added time cutoff ui

4 files changed, 64 insertions, 11 deletions

diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index db3e9f11..521b0607 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -18,5 +18,11 @@
     "lang_hostname": "Client Name",
     "lang_location": "Raum",
     "lang_avgSessionLength": "Durchschnittliche Sitzungsdauer",
-    "lang_totalTime": "Gesamte Zeit"
+    "lang_totalTime": "Gesamte Zeit",
+    "lang_last1": "Letzten 24 Stunden",
+    "lang_last2": "Letzten 48 Stunden",
+    "lang_last7": "Letzten 7 Tage",
+    "lang_last14": "Letzten 14 Tage",
+    "lang_last30": "Letzten 30 Tage",
+    "lang_last90": "Letzten 90 Tage"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 7a7ff13a..c3900e31 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -18,5 +18,11 @@
     "lang_hostname": "Client Name",
     "lang_location": "Location",
     "lang_avgSessionLength": "Average Session Length",
-    "lang_totalTime": "Total Time"
+    "lang_totalTime": "Gesamte Zeit",
+    "lang_last1": "Last 24 hours",
+    "lang_last2": "Last 48 hours",
+    "lang_last7": "Last 7 days",
+    "lang_last14": "Last 14 days",
+    "lang_last30": "Last 30 days",
+    "lang_last90": "Last 90 days"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/style.css b/modules-available/statistics_reporting/style.css
index 6cb6de51..b0875a7d 100644
--- a/modules-available/statistics_reporting/style.css
+++ b/modules-available/statistics_reporting/style.css
@@ -1,7 +1,16 @@
 .top-row {
-    margin-bottom: 20px;
+    margin-bottom: 10px;
+}
+
+.top-row select, .top-row .btn-group {
+    margin-right: 10px;
+    margin-bottom: 10px;
 }
 
 .buttonbar button {
     margin-bottom: 4px;
+}
+
+.buttonbar {
+    margin-bottom: 20px;
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index ccc82a50..9e6f51d2 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -1,15 +1,23 @@
 <div class="container-fluid">
-	<div class="row top-row form-inline">
-		<div class="col-md-2">
+	<div class="row form-inline">
+		<div class="col-md-12  top-row">
 			<select id="select-table" onchange="chooseTable(this.value)" class="form-control">
-				<option value="total" selected="selected">{{lang_total}}</option>
+				<option value="total">{{lang_total}}</option>
 				<option value="perlocation">{{lang_perlocation}}</option>
 				<option value="perclient">{{lang_perclient}}</option>
 				<option value="peruser">{{lang_peruser}}</option>
 				<option value="pervm">{{lang_pervm}}</option>
 			</select>
+			<select id="select-cutoff" onchange="chooseCutoff(this.value)" class="form-control">
+				<option value="1">{{lang_last1}}</option>
+				<option value="2">{{lang_last2}}</option>
+				<option value="7">{{lang_last7}}</option>
+				<option value="14">{{lang_last14}}</option>
+				<option value="30">{{lang_last30}}</option>
+				<option value="90">{{lang_last90}}</option>
+			</select>
 		</div>
-		<div class="col-md-10 buttonbar">
+		<div class="col-md-12 buttonbar">
 			<button id="button-totaltime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('totaltime')">{{lang_totalTime}}</button>
 			<button id="button-avgtime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('avgtime')">{{lang_avgSessionLength}}</button>
 			<button id="button-logincount" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('logincount')">{{lang_totalLogins}}</button>
@@ -20,12 +28,9 @@
 	</div>
 </div>
 
-
 <script type="application/javascript">
 	document.addEventListener("DOMContentLoaded", function () {
-		chooseTable($('#select-table').val());
-		toggleButton('lastlogout');
-		toggleButton('laststart');
+		loadForm();
 		var table = $("table").stupidtable();
 		table.on("aftertablesort", function (event, data) {
 			var th = $(this).find("th");
@@ -47,6 +52,11 @@
 		}
 	}
 
+	function chooseCutoff(v) {
+		saveForm();
+		window.location.replace("?do=statistics_reporting&cutoff="+v);
+	}
+
 	function toggleButton(v) {
 		var button = $('#button-'+v);
 		if(button.hasClass('btn-default')) {
@@ -59,4 +69,26 @@
 			$('.column-'+v).hide()
 		}
 	}
+
+	function saveForm() {
+		sessionStorage.setItem("select-table", $("#select-table").val());
+		sessionStorage.setItem("buttons", $('.buttonbar').find(".btn-default").map(function() { return this.id; }).get().join(" "));
+	}
+
+	function loadForm() {
+		var selectTable = sessionStorage.getItem("select-table");
+		if (selectTable) {
+			$("#select-table").val(selectTable);
+			chooseTable(selectTable);
+		} else {
+			$("#select-table").val("total");
+			chooseTable("total");
+		}
+
+		$('#select-cutoff').val("{{cutoff}}");
+
+		sessionStorage.getItem("buttons").split(" ").forEach(function(button) {
+			toggleButton(button.substr(7));
+		});
+	}
 </script>
\ No newline at end of file