use intervals for the timer display instead of days in the past

fixes mtierltd#98

Author: mtierltd

js/src/timer.js

@@ -35,7 +35,6 @@ function() {
             timePicker: false,
             startDate: start,
             endDate: end,
-            showCustomRangeLabel: false,
             ranges: {
                 'Today': [moment().startOf('day'), moment().endOf('day')],
                 'Last 7 Days': [moment().startOf('day').subtract(6, 'days'), moment().endOf('day')],
@@ -53,7 +52,8 @@ function() {
             }
           },cb);
           $("#report-range").on('apply.daterangepicker', function(ev, picker) {
-            days = Math.round((picker.endDate.unix()-picker.startDate.unix()) / 86400);
+            start = picker.startDate;
+            end = picker.endDate;
             getWorkItems();
           });
       cb(start, end);
@@ -243,7 +243,7 @@ function() {
             return formattedTime;
         }
         function getWorkItems() {
-            var baseUrl = OC.generateUrl('/apps/timetracker/ajax/work-intervals?days='+days);
+            var baseUrl = OC.generateUrl('/apps/timetracker/ajax/work-intervals?from='+start.unix()+'&to='+end.unix());
             $.ajaxSetup({
               scriptCharset: "utf-8",
               //contentType: "application/json; charset=utf-8"

lib/Controller/AjaxController.php

@@ -78,12 +78,9 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
 	 * @NoAdminRequired
 	 */
 	public function workIntervals() {
-		$ndays = 30;
-		if (isset($this->request->days)){
-			$ndays = $this->request->days;
-		}
-
-		$l = $this->workIntervalMapper->findLatestDays($this->userId, $ndays, 0);
+		$from = $this->request->from;
+		$to = $this->request->to;
+		$l = $this->workIntervalMapper->findLatestInterval($this->userId, $from, $to);
 		$days = [];
 		foreach ($l as $wi){
 			//$dt = date("d/m/Y", $wi->start);

lib/Db/WorkIntervalMapper.php

@@ -60,6 +60,27 @@ public function findLatestByName($user, $name){
         }
     }
 
+    public function findLatestInterval($user, $from, $to, $limit = 5000, $offset = 0){
+        $filters[] = "(user_uid = ?)";
+        $params[] = $user;
+
+        if (!empty($from)){
+            $filters[] = "(start > ?)";
+            $params[] = $from;
+
+        }
+        if (!empty($to)){
+            $filters[] = "(start < ?)";
+            $params[] = $to;
+
+        }
+
+        if ($this->dbengine == 'MYSQL'){
+            $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where '.implode(" and ",$filters).' order by start desc';
+            return $this->findEntities($sql, $params, $limit, $offset);
+        }
+    }
+
     public function findLatestDays($user, $limitDays = 10, $startDay = 0, $limit = 5000, $offset = 0){
         if ($this->dbengine == 'MYSQL'){
         $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? and 
@@ -74,7 +95,6 @@ public function findLatestDays($user, $limitDays = 10, $startDay = 0, $limit = 5
             order by start desc';
             return $this->findEntities($sql, [$user],$limit, $offset);
         }
-        
     }
 
     public function findAllRunning($user, $limit = 100, $offset = 0){