Skip to content

Feature/use enter for new work item #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hawiak merged 12 commits into from
Aug 20, 2022
Merged

Feature/use enter for new work item #3

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a553cfe
get running status before manually adding an entry
mtierltd Jul 4, 2022
db9eac8
Merge branch 'master' into fix/163_fix-project-search
mtierltd Jul 4, 2022
e7df18d
Merge pull request #176 from Hawiak/fix/163_fix-project-search
mtierltd Jul 4, 2022
f11f47a
bump version
mtierltd Jul 4, 2022
4ca39ba
Use enter to create a new timeline entry
Jul 23, 2022
e2532f2
Merge branch 'master' into feature/use-enter-for-new-work-item
Jul 26, 2022
a0db396
Updated migration
Jul 26, 2022
283fe8d
Merge branch 'master' into feature/use-enter-for-new-work-item
Jul 26, 2022
063c5a1
Fixed client search and enabled fuzzy search
Jul 26, 2022
51f2ed6
Merge branch 'master' into feature/use-enter-for-new-work-item
Hawiak Jul 26, 2022
4f0113f
Enable usage of a comma within cost field
Aug 19, 2022
bce60c2
Merge branch 'feature/use-enter-for-new-work-item' of https://github.…
Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,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
View file
Open in desktop
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