Skip to content

Commit

Permalink
Merge branch 'master' into feature/use-enter-for-new-work-item
Browse files Browse the repository at this point in the history
  • Loading branch information
Hawiak authored Jul 26, 2022
2 parents 063c5a1 + f11f47a commit 51f2ed6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Mit dem integrierten Dashboard lässt sich anhand eines Kuchen-/Donut-Diagramms

Diese App wird aktuell noch weiterentwickelt, also: Augen offen halten für neue Features! Und falls Dir irgendwelche Verbesserungsvorschläge, Probleme oder neue Features einfallen, schau mal auf unserem [GitHub Projekt](https://github.com/mtierltd/timetracker) vorbei, vielleicht wird Dein Thema bereits diskutiert! Und falls nicht, starte gerne eine neue Diskussion, wir freuen uns auf Dein Feedback!
</description>
<version>0.0.74</version>
<version>0.0.75</version>
<licence>agpl</licence>
<author mail="[email protected]" >MTier Ltd.</author>
<namespace>TimeTracker</namespace>
Expand Down
2 changes: 2 additions & 0 deletions lib/Controller/AjaxController.php
Original file line number Diff 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
1 change: 1 addition & 0 deletions lib/Db/ProjectMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 ."%"]);

}

/**
Expand Down

0 comments on commit 51f2ed6

Please sign in to comment.