Merge branch 'master' into feature/use-enter-for-new-work-item

mtierltd · mtierltd · Oct 26, 2022 · Jun 1, 2022 · Jun 1, 2022 · Jun 14, 2022
commit 51f2ed6cb3fb72ca694fd54938da7260a1155aec
diff --git a/lib/Controller/AjaxController.php b/lib/Controller/AjaxController.php
@@ -484,6 +484,8 @@ public function addWorkInterval() {
 
 		$this->workIntervalMapper->insert($wi);
 
+		$running = $this->workIntervalMapper->findAllRunning($this->userId);
+
 		return new JSONResponse(["WorkIntervals" => json_decode(json_encode($running), true)]);
 	}
 

diff --git a/lib/Db/ProjectMapper.php b/lib/Db/ProjectMapper.php
@@ -31,6 +31,7 @@ public function searchByName($user, string $name) {
         $sql = 'SELECT tp.* FROM `*PREFIX*timetracker_project` tp LEFT JOIN `*PREFIX*timetracker_user_to_project` up ON up.project_id = tp.id WHERE up.`user_uid` = ? AND upper(tp.`name`) LIKE ? ORDER BY tp.`name`';
 
         return $this->findEntities($sql, [$user,"%" . $name ."%"]);
+
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -484,6 +484,8 @@ public function addWorkInterval() { @@
     		$this->workIntervalMapper->insert($wi);
+    		$running = $this->workIntervalMapper->findAllRunning($this->userId);
     		return new JSONResponse(["WorkIntervals" => json_decode(json_encode($running), true)]);
     	}
@@ Expand Down @@