add support for changing the timeline in the Timer main view

closes mtierltd#51

Author: mtierltd

js/timer.js

@@ -4,6 +4,39 @@
 
 
     $( function() {
+        var days='31';
+        var start = moment().subtract(29, 'days');
+        var end = moment();
+
+        function cb(start, end) {
+            $('#report-range span').html(start.format('DD/MM/YY') + ' - ' + end.format('DD/MM/YY'));
+        }
+        $("#report-range").daterangepicker({
+            timePicker: false,
+            startDate: start,
+            endDate: end,
+            ranges: {
+                'Today': [moment(), moment()],
+                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                'Last 90 Days': [moment().subtract(89, 'days'), moment()],
+                'Last 365 Days': [moment().subtract(364, 'days'), moment()],
+                'This Month': [moment().startOf('month'), moment().endOf('month')],
+                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
+                'The Month Before Last': [moment().subtract(2, 'month').startOf('month'), moment().subtract(2, 'month').endOf('month')],
+                'This Year': [moment().startOf('year'), moment().endOf('year')],
+                'Last Year': [moment().subtract(1, 'year').startOf('year'), moment().subtract(1, 'year').endOf('year')],
+            },
+            locale: {
+                format: 'DD/MM/YY'
+            }
+          },cb);
+          $("#report-range").on('apply.daterangepicker', function(ev, picker) {
+            days = (picker.endDate.unix()-picker.startDate.unix()) / 86400;
+            getWorkItems();
+          });
+      cb(start, end);
 
       var entityMap = {
         '&': '&',
@@ -180,7 +213,7 @@
             return formattedTime;
         }
         function getWorkItems(){
-            var baseUrl = OC.generateUrl('/apps/timetracker/ajax/work-intervals');
+            var baseUrl = OC.generateUrl('/apps/timetracker/ajax/work-intervals?days='+days);
             $.ajaxSetup({
               scriptCharset: "utf-8",
               //contentType: "application/json; charset=utf-8"
@@ -527,4 +560,4 @@
           });
       } );
 
-}());
+}());

lib/Controller/AjaxController.php

@@ -73,9 +73,9 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
 	 *
 	 * @NoAdminRequired
 	 */
-	public function workIntervals() {
+	public function workIntervals($days) {
 		$i = 0;
-		$tryIntervals=[90,180,365,365*5];
+		$tryIntervals=[$days,90,180,365,365*5];
 		do {
 			$l = $this->workIntervalMapper->findLatestDays($this->userId,$tryIntervals[$i],0);
 			$i++;

lib/Db/WorkIntervalMapper.php

@@ -105,4 +105,4 @@ public function deleteAllForProject($project_id) {
 
     }
 
-}
+}

templates/content/index.php

@@ -56,7 +56,16 @@
 </div>
 
 <div class="clearfix"> </div>
+<br/>
+<div class="time-controls">
+  <div id="report-range" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+      <i class="fa fa-calendar"></i>&nbsp;
+      <span></span> <i class="fa fa-caret-down"></i>
+  </div>
+</div>
+<br/>
+
 <div class="clearfix"> </div>
 <div id="work-intervals">
 </div>
-</div>
+</div>