From ee2e4c79db91a1aeb6362ff8d0fe44853d92e62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Jyrkk=C3=A4?= <ville.jyrkka@samposoftware.com>
Date: Mon, 1 Feb 2016 17:36:03 +0200
Subject: [PATCH 1/5] Call JS functions in template event

---
 client/views/dashboard/charts/charts.js          | 6 +++++-
 client/views/dashboard/charts/filter/filter.html | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/views/dashboard/charts/charts.js b/client/views/dashboard/charts/charts.js
index 68c166b6b1..9a3fb7673f 100644
--- a/client/views/dashboard/charts/charts.js
+++ b/client/views/dashboard/charts/charts.js
@@ -176,7 +176,6 @@ Template.chartsLayout.created = function () {
     var overviewChart = dc.barChart("#overview-chart");
     var moveChart = dc.barChart("#move-chart");
 
-
     overviewChart
       .height(80)
       .dimension(timeStampDimension)
@@ -391,5 +390,10 @@ Template.chartsLayout.events({
     // Forces "save As" function allow user download file
     saveAs(file, moment().format("MMM-YYYY") + "-logs.csv");
 
+  },
+  "click #reset": function(event, template){
+    console.log(dc);
+    dc.filterAll();
+    dc.redrawAll();
   }
 });
diff --git a/client/views/dashboard/charts/filter/filter.html b/client/views/dashboard/charts/filter/filter.html
index ede1af83dd..59bfff4556 100644
--- a/client/views/dashboard/charts/filter/filter.html
+++ b/client/views/dashboard/charts/filter/filter.html
@@ -34,7 +34,7 @@ <h3 class="box-title">{{_ "filterData_Title"}}</h3>
         <span class="dc-data-count dc-chart" id="row-selection" style="margin:0">
           <span class="filter-count">_</span> {{_ "filterData_SelectedOf"}} <span class="total-count">_</span> {{_ "filterData_Records"}}
           <span>
-            <a href='javascript:dc.filterAll();dc.redrawAll();'>{{_ "filterData_Reset"}}</a>
+            <a id="reset" href="#">{{_ "filterData_Reset"}}</a>
           </span>
         </span>
         <span id="loadingState">

From 1678444ae2aa3917863f4c51d9370c86995ef1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Jyrkk=C3=A4?= <ville.jyrkka@samposoftware.com>
Date: Tue, 2 Feb 2016 12:09:21 +0200
Subject: [PATCH 2/5] Remove not working functions.

---
 client/views/dashboard/charts/charts.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/client/views/dashboard/charts/charts.js b/client/views/dashboard/charts/charts.js
index 9a3fb7673f..2d190aca7e 100644
--- a/client/views/dashboard/charts/charts.js
+++ b/client/views/dashboard/charts/charts.js
@@ -390,10 +390,5 @@ Template.chartsLayout.events({
     // Forces "save As" function allow user download file
     saveAs(file, moment().format("MMM-YYYY") + "-logs.csv");
 
-  },
-  "click #reset": function(event, template){
-    console.log(dc);
-    dc.filterAll();
-    dc.redrawAll();
   }
 });

From e0becc2b8a82f09409ebbd54740aef5955343f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Jyrkk=C3=A4?= <ville.jyrkka@samposoftware.com>
Date: Tue, 2 Feb 2016 12:09:51 +0200
Subject: [PATCH 3/5] Add IDs to filter fields

---
 client/views/dashboard/charts/filter/filter.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/views/dashboard/charts/filter/filter.html b/client/views/dashboard/charts/filter/filter.html
index 59bfff4556..53b3ed8580 100644
--- a/client/views/dashboard/charts/filter/filter.html
+++ b/client/views/dashboard/charts/filter/filter.html
@@ -7,7 +7,7 @@ <h3 class="box-title">{{_ "filterData_Title"}}</h3>
     <div class="box-body">
       <form id="filteringForm">
         {{_ "filterData_Month"}}
-        <select name="month" >
+        <select id="month" name="month" >
           <option value="00">-</option>
           <option value="01">{{_ "filterData_January"}}</option>
           <option value="02">{{_ "filterData_February"}}</option>
@@ -23,13 +23,13 @@ <h3 class="box-title">{{_ "filterData_Title"}}</h3>
           <option value="12">{{_ "filterData_December"}}</option>
         </select>
         {{_ "filterData_Year"}}
-        <select name="year">
+        <select id="year" name="year">
           <option value="0000">-</option>
           <option value="2014">2014</option>
           <option value="2015">2015</option>
         </select>
         {{_ "filterData_Limit"}}
-        <input name="limit" type="text" value="10000" />
+        <input id="limit" name="limit" type="text" value="10000" />
 
         <span class="dc-data-count dc-chart" id="row-selection" style="margin:0">
           <span class="filter-count">_</span> {{_ "filterData_SelectedOf"}} <span class="total-count">_</span> {{_ "filterData_Records"}}

From acb2d6658e65434444a44d7da0e08e8b4bf91e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Jyrkk=C3=A4?= <ville.jyrkka@samposoftware.com>
Date: Tue, 2 Feb 2016 12:11:04 +0200
Subject: [PATCH 4/5] Reset filters and charts data

---
 .../views/dashboard/charts/filter/filter.js   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/client/views/dashboard/charts/filter/filter.js b/client/views/dashboard/charts/filter/filter.js
index a70ed08694..1118c92b38 100644
--- a/client/views/dashboard/charts/filter/filter.js
+++ b/client/views/dashboard/charts/filter/filter.js
@@ -36,5 +36,41 @@ Template.chartsLayout.events({
 
     instance.getDashboardData(input)
 
+  },
+  "click #reset": function(event, template){
+    // appending loading state
+    $('#loadingState').html("Loading...");
+
+
+
+    // gets current month and year -> providing them for initial query
+    var currentYearAndMonth = moment().format("YYYY-MM");
+
+    // sets default items amount to be returned
+    var initialLimit = 10000;
+
+    // Initialize filter values
+    $('#month option[value="00"]').prop('selected', true);
+    $('#year option[value="0000"]').prop('selected', true);
+    $('#limit').val( initialLimit.toString() );
+
+    // sets query for elastic search
+    var input = {
+      index : "api-umbrella-logs-v1-"+currentYearAndMonth,
+      type  : "log",
+      limit : initialLimit,
+      fields: [
+        'request_at',
+        'request_ip_country',
+        'request_ip',
+        'response_time',
+        'request_path',
+        'request_ip_location.lon',
+        'request_ip_location.lat'
+      ]
+    };
+
+    // get data
+    template.getDashboardData(input);
   }
 });

From 6dffb994451ba1e38a82f05c22b893f62516a294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Jyrkk=C3=A4?= <ville.jyrkka@samposoftware.com>
Date: Wed, 3 Feb 2016 11:47:46 +0200
Subject: [PATCH 5/5] Requested code improvements

---
 client/views/dashboard/charts/filter/filter.html |  8 ++++----
 client/views/dashboard/charts/filter/filter.js   | 10 ++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/client/views/dashboard/charts/filter/filter.html b/client/views/dashboard/charts/filter/filter.html
index 53b3ed8580..3d46b6ff7f 100644
--- a/client/views/dashboard/charts/filter/filter.html
+++ b/client/views/dashboard/charts/filter/filter.html
@@ -7,7 +7,7 @@ <h3 class="box-title">{{_ "filterData_Title"}}</h3>
     <div class="box-body">
       <form id="filteringForm">
         {{_ "filterData_Month"}}
-        <select id="month" name="month" >
+        <select id="filter-month" name="month" >
           <option value="00">-</option>
           <option value="01">{{_ "filterData_January"}}</option>
           <option value="02">{{_ "filterData_February"}}</option>
@@ -23,18 +23,18 @@ <h3 class="box-title">{{_ "filterData_Title"}}</h3>
           <option value="12">{{_ "filterData_December"}}</option>
         </select>
         {{_ "filterData_Year"}}
-        <select id="year" name="year">
+        <select id="filter-year" name="year">
           <option value="0000">-</option>
           <option value="2014">2014</option>
           <option value="2015">2015</option>
         </select>
         {{_ "filterData_Limit"}}
-        <input id="limit" name="limit" type="text" value="10000" />
+        <input id="filter-limit" name="limit" type="text" value="10000" />
 
         <span class="dc-data-count dc-chart" id="row-selection" style="margin:0">
           <span class="filter-count">_</span> {{_ "filterData_SelectedOf"}} <span class="total-count">_</span> {{_ "filterData_Records"}}
           <span>
-            <a id="reset" href="#">{{_ "filterData_Reset"}}</a>
+            <a id="filter-reset" href="#">{{_ "filterData_Reset"}}</a>
           </span>
         </span>
         <span id="loadingState">
diff --git a/client/views/dashboard/charts/filter/filter.js b/client/views/dashboard/charts/filter/filter.js
index 1118c92b38..8ec9238083 100644
--- a/client/views/dashboard/charts/filter/filter.js
+++ b/client/views/dashboard/charts/filter/filter.js
@@ -37,12 +37,10 @@ Template.chartsLayout.events({
     instance.getDashboardData(input)
 
   },
-  "click #reset": function(event, template){
+  "click #filter-reset": function(event, template){
     // appending loading state
     $('#loadingState').html("Loading...");
 
-
-
     // gets current month and year -> providing them for initial query
     var currentYearAndMonth = moment().format("YYYY-MM");
 
@@ -50,9 +48,9 @@ Template.chartsLayout.events({
     var initialLimit = 10000;
 
     // Initialize filter values
-    $('#month option[value="00"]').prop('selected', true);
-    $('#year option[value="0000"]').prop('selected', true);
-    $('#limit').val( initialLimit.toString() );
+    $('#filter-month').val(undefined);
+    $('#filter-year').val(undefined);
+    $('#filter-limit').val( initialLimit.toString() );
 
     // sets query for elastic search
     var input = {