Merge pull request #37 from david-poindexter/dashboard-default-rollin…

…g-year Implement `Rolling Year` for dashboard and user activity list default views
DNNCommunity · Jan 27, 2024 · 2f91b9d · 2f91b9d
2 parents ecbf0af + cf093be
commit 2f91b9d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/app/controllers/dashboard.js b/app/controllers/dashboard.js
@@ -36,6 +36,23 @@
         return deferred.promise;
     };
 
+    $scope.getCurrentDate = function () {
+        return new Date();
+    };
+
+    $scope.getDateOneYearAgo = function () {
+        var date = new Date();
+        date.setDate(date.getDate() - 365);
+        return date;
+    };
+
+    $scope.rollingYear = function () {
+        $scope.period_start = $scope.getDateOneYearAgo();
+        $scope.period_end = $scope.getCurrentDate();
+
+        $scope.getUserActivity();
+    };
+
     $scope.thisYear = function () {
         var now = new Date();
         var year = now.getFullYear();
@@ -149,7 +166,7 @@
     };
 
     init();
-    $scope.thisYear();
+    $scope.rollingYear();
 
 }]);
 
diff --git a/app/controllers/user-activity/user-activity-list.js b/app/controllers/user-activity/user-activity-list.js
@@ -147,13 +147,20 @@
         return deferred.promise;
     };
 
-    $scope.rollingYear = function () {
-        var now = new Date();
-        var yearAgo = now;
-        yearAgo.setDate(now.getDate() - 365);
+    $scope.getCurrentDate = function () {
+        return new Date();
+    };
 
-        $scope.period_end = now;
-        $scope.period_start = yearAgo;
+    $scope.getDateOneYearAgo = function () {
+        var date = new Date();
+        date.setDate(date.getDate() - 365);
+        return date;
+    };
+
+    $scope.rollingYear = function () {
+        $scope.period_start = $scope.getDateOneYearAgo();
+        $scope.period_end = $scope.getCurrentDate();
+        $scope.getUserActivity();
     };
 
     init = function () {

diff --git a/app/views/dashboard.html b/app/views/dashboard.html
@@ -39,6 +39,7 @@
 
     <div class="row">
         <div class="col">
+            <button type="button" class="btn btn-sm btn-light" ng-click="rollingYear()">Rolling Year</button>
             <button type="button" class="btn btn-sm btn-light" ng-click="thisYear()">This Year</button>
             <button type="button" class="btn btn-sm btn-light" ng-click="thisMonth()">This Month</button>
             <button type="button" class="btn btn-sm btn-light" ng-click="lastYear()">Last Year</button>