refactor timetracker

philippK-de · Sep 26, 2016 · 1879863 · 1879863
1 parent 06c358e
commit 1879863
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/include/class.timetracker.php b/include/class.timetracker.php
@@ -164,7 +164,7 @@ function getTrack($id)
         }
     }
 
-    function getUserTrack($user, $project = 0, $task = 0, $start = 0, $end = 0 , $lim = 50)
+    function getUserTrack($user, $project = 0, $task = 0, $start = 0, $end = 0 , $lim = 25, $offset = 0)
     {
         global $conn;
         $user = (int) $user;
@@ -207,7 +207,7 @@ function getUserTrack($user, $project = 0, $task = 0, $start = 0, $end = 0 , $li
             $sql = $sql . $order;
 
             $start = 0;
-            $limi = " LIMIT $lim OFFSET $start ";
+            $limi = " LIMIT $lim OFFSET $offset ";
             $sql = $sql . $limi;
         }
 
@@ -266,8 +266,7 @@ function getProjectTrack($project, $user = 0, $task = 0, $start = 0, $end = 0, $
             $task[$index] = (int) $task[$index];
         }
         $task = join(',', $task);
-        // $start = (int) $start; // those are strings, not numbers
-        // $end = (int) $end; // those are strings, not numbers
+
         if ($user > 0) {
             $sql = "SELECT * FROM timetracker WHERE project = $project AND user = $user";
             $num = "SELECT COUNT(*) FROM timetracker WHERE project = $project AND user = $user";

diff --git a/include/js/views/userProfileView.js b/include/js/views/userProfileView.js
@@ -10,9 +10,10 @@ var userProfileProjects = {
 
 
 var userProfileTimetracker = {
-    el: "",
+    el: "userTimetracker",
     itemType: "timetracker",
-    url: "",
+    url: "manageuser.php?action=userTimetracker",
     dependencies: []
-}
-var accord_tracker = new accordion('acc-tracker');
+};
+
+
diff --git a/include/js/views/userProfileView.min.js b/include/js/views/userProfileView.min.js