fixed reporting

Author: puthre

appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>Time Tracker</name>
     <summary>Time Tracker App</summary>
     <description><![CDATA[Time Tracker App]]></description>
-    <version>0.0.19</version>
+    <version>0.0.20</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >MTier Ltd.</author>
     <namespace>TimeTracker</namespace>

lib/Controller/AjaxController.php

@@ -111,10 +111,14 @@ public function workIntervals() {
 	}
 
 
-	public function isAdminUser(){
+	public function isThisAdminUser(){
 		return \OC_User::isAdminUser(\OC_User::getUser());
 	}
 
+	public function isUserAdmin($user){
+		return \OC_User::isAdminUser($user);
+	}
+
 	/**
 	 *
 	 * @NoAdminRequired
@@ -370,7 +374,7 @@ public function addProject($name) {
 			$p->setClientId($clientId);
 			$this->projectMapper->insert($p);
 		} else {
-			if($p->locked && !$this->isAdminUser()){
+			if($p->locked && !$this->isThisAdminUser()){
 				return new JSONResponse(["Error" => "This project is locked"]);
 			}
 		}
@@ -478,7 +482,7 @@ public function getProjects(){
 	 * @NoCSRFRequired
 	 */
 	public function getProjectsTable(){
-		if ($this->isAdminUser()){
+		if ($this->isThisAdminUser()){
 			$projects = $this->projectMapper->findAllAdmin();
 		} else {
 			$projects = $this->projectMapper->findAll($this->userId);
@@ -616,18 +620,20 @@ public function getReport(){
 		}
 
 
-		if($this->isAdminUser()){
+		if(!$this->isThisAdminUser()){
 			$allowedClients =  $this->clientMapper->findAll($this->userId);
 			$allowedClientsId = array_map(function($client){ return $client->id;}, $allowedClients );
 			if(empty($filterClientId)){
 				$filterClientId = $allowedClientsId;
+				$filterClientId[] = null; // allow null clientid
 			} else {
 				$filterClientId = array_intersect($filterClientId, $allowedClientsId);
 			}
 			$allowedProjects =  $this->projectMapper->findAll($this->userId);
 			$allowedProjectsId = array_map(function($project){ return $project->id;}, $allowedProjects );
 			if(empty($filterProjectId)){
 				$filterProjectId = $allowedProjectsId;
+				$filterProjectId[] = null; // allow null projectId
 			} else {
 				$filterProjectId = array_intersect($filterProjectId, $allowedProjectsId);
 			}
@@ -637,7 +643,7 @@ public function getReport(){
 		$filterTagId = [];
 		$groupOn1 = $this->request->group1;
 		$groupOn2 = $this->request->group2;
-		$items = $this->reportItemMapper->report($name, $from, $to, $filterProjectId, $filterClientId, $filterTagId, $timegroup, $groupOn1, $groupOn2, 0, 1000);
+		$items = $this->reportItemMapper->report($name, $from, $to, $filterProjectId, $filterClientId, $filterTagId, $timegroup, $groupOn1, $groupOn2, $this->isThisAdminUser(), 0, 1000);
 		return new JSONResponse(["items" => json_decode(json_encode($items), true), 'total' => count($items)]);
 	}
 

lib/Db/ReportItemMapper.php

@@ -23,7 +23,8 @@ public function __construct(IDBConnection $db) {
     public $clientId;
     public $client;
 */
-    public function report($user, $from, $to, $filterProjectId, $filterClientId, $filterTagId, $timegroup, $groupOn1, $groupOn2, $start, $limit ){
+
+    public function report($user, $from, $to, $filterProjectId, $filterClientId, $filterTagId, $timegroup, $groupOn1, $groupOn2, $admin, $start, $limit ){
 
         $selectFields = ['min(wi.id) as id', 'sum(duration) as totalDuration'];
         if(empty($timegroup)){
@@ -72,33 +73,42 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
         $filters = [];
         $params = [];
         if (!empty($from)){
-            $filters[] = "start > ?";
+            $filters[] = "(start > ?)";
             $params[] = $from;
 
         }
         if (!empty($to)){
-            $filters[] = "start < ?";
+            $filters[] = "(start < ?)";
             $params[] = $to;
 
         }
         if (!empty($filterProjectId)){
             $qm = [];
+            $append = '';
             foreach($filterProjectId as $f){
                 $qm[] = '?';
                 $params[] = $f;
+                
+                if($f == null) {
+                    $append = ' or wi.project_id is null ';
+                }
             }
-            $filters[] = 'wi.project_id in ('.implode(",",$qm).')';
+            $filters[] = '(wi.project_id in ('.implode(",",$qm).')'.$append.')';
         }
         if (!empty($filterClientId)){
             $qm = [];
+            $append = '';
             foreach($filterClientId as $f){
                 $qm[] = '?';
                 $params[] = $f;
+                if ($f == null) {
+                    $append = ' or p.client_id is null ';
+                }
             }
-            $filters[] = 'p.client_id in ('.implode(",",$qm).')';
+            $filters[] = '(p.client_id in ('.implode(",",$qm).')'.$append.')';
         }
-        if ( (!empty($user)) && ($user !='admin') ){
-            $filters[] = "user_uid = ?";
+        if ( (!empty($user)) && (!$admin) ){
+            $filters[] = "(user_uid = ?)";
             $params[] = $user;
 
         }