wip

sequentech · Apr 4, 2024 · 73c819c · 73c819c
1 parent df21951
commit 73c819c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/avAdmin/admin-directives/dashboard/turnout-graph.html b/avAdmin/admin-directives/dashboard/turnout-graph.html
@@ -12,14 +12,21 @@
             </label>
         </div>
         <div class="time-selector-container">
-            <label for="time-basis">Choose a time basis:</label>
+            <label for="time-basis">Choose a time resolution:</label>
             <select name="time-basis" id="time-basis" ng-model="timeBasis.value">
               <option value="auto">Auto</option>
               <option value="hour">Hour</option>
               <option value="day">Day</option>
               <option value="week">Week</option>
               <option value="month">Month</option>
         </div>
-        <div moment-picker="selectedDates.minDate" max-view="hour"> {{ selectedDates.minDate }} </div>
+        <div class="start-date-container">
+            <span>Start date: </span>
+            <div moment-picker="selectedDates.minDate" max-view="hour"> {{ selectedDates.minDate }} </div>
+        </div>
+        <div class="end-date-container">
+            <span>End date: </span>
+            <div moment-picker="selectedDates.maxDate" max-view="hour"> {{ selectedDates.maxDate }} </div>
+        </div>
     </div>
 </div>
diff --git a/avAdmin/admin-directives/dashboard/turnout-graph.js b/avAdmin/admin-directives/dashboard/turnout-graph.js
@@ -293,6 +293,17 @@ angular.module('avAdmin')
               }]
           }
       };
+
+      function updateDates() {
+        if (scope.selectedDates.minDate instanceof Date) {
+          scope.minDate = scope.selectedDates.minDate;
+        }
+        if (scope.selectedDates.maxDate instanceof Date) {
+          scope.maxDate = scope.selectedDates.maxDate;
+        }
+        calculateValues();
+      }
+
         var onClick = function (points, evt) {
           console.log(points, evt);
         };
@@ -305,7 +316,8 @@ angular.module('avAdmin')
           minDate: undefined,
           maxDate: undefined,
           selectedDates: {
-            minDate: new Date()
+            minDate: undefined,
+            maxDate: undefined
           },
           seriesBase: series,
           dataBase: data,
@@ -325,6 +337,7 @@ angular.module('avAdmin')
         scope.$watch('id', updateTurnoutData);
         scope.$watch('selectedSeries', refreshGraph, true);
         scope.$watch('timeBasis.value', calculateValues, true);
+        scope.$watch('selectedDates', updateDates, true)
       }
 
       return {