Skip to content
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.

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

Use tags for every timesheet entry #604

Merged
merged 109 commits into from
May 11, 2019
Merged

Use tags for every timesheet entry #604

merged 109 commits into from
May 11, 2019

Conversation

infastra
Copy link
Contributor

@infastra infastra commented Feb 26, 2019

Description

I added the possibility to allocate tags for every timesheet entry. The timesheet edit form works with an autocomplete function which uses jquery-ui-autocomplete widget. Furthermore I created a database table for this tags.
The filter function in the timesheet table was extended with a form for tag entries.
The using of tags could deactivate in the settings when the option use_tags is pointing on false.
In addition I extended the Rest-API

Fixes #768

TODO

  • check enter in toolbar after selecting an entry from the autocomplete (doesn't work when ending with a ",")
  • shall we have an admin screen to change tags with typo or delete (deprecated) tags?

Types of changes

  • New feature (non-breaking change which adds functionality)

Checklist

  • I have executed bin/console kimai:phpcs --fix to make sure my changes adopt the correct code style
  • I have added tests to cover my changes
  • I agree that this code is used in Kimai and will be published under the MIT license

Extend find query for index-pages of invoice and timesheet
@kevinpapst
Copy link
Member

FYI: I have some more PRs in the pipeline which I will merge first. Your PR might have to wait for the next milestone before being integrated.
I will solve the merge conflicts as soon as I merge the other PRs, as I moved some files around and I don't want you to have the "trouble".

# Conflicts:
#	assets/js/kimai.js
#	assets/sass/app.scss
#	config/packages/admin_lte.yaml
#	config/serializer/App/Entity.Timesheet.yml
#	public/build/app.css
#	public/build/app.js
#	public/build/manifest.json
#	src/API/TimesheetController.php
#	src/Controller/TimesheetController.php
#	src/Controller/TimesheetTeamController.php
#	src/Entity/Timesheet.php
#	src/Repository/TimesheetRepository.php
#	templates/timesheet-team/index.html.twig
#	templates/timesheet/index.html.twig
#	tests/API/TimesheetControllerTest.php
#	tests/DataFixtures/TimesheetFixtures.php
#	translations/messages.de.xliff
#	translations/messages.en.xliff
#	var/data/kimai_test.sqlite
@kevinpapst
Copy link
Member

Sorry @infastra this is taking so long. I just merged it with the latest master and will do further testing now and work on integrating it ASAP.

@rarvin as you also requested this feature, can you jump in and do some testing on this branch?

I deployed it to https://demo-branch.kimai.org/en/timesheet/

kevinpapst
kevinpapst previously approved these changes May 11, 2019
# Conflicts:
#	public/build/app.js
#	public/build/manifest.json
@kevinpapst kevinpapst merged commit e29e183 into kimai:master May 11, 2019
@kevinpapst
Copy link
Member

That was by far the biggest contribution to Kimai so far, thanks again for introducing the initial tags feature @infastra

@infastra
Copy link
Contributor Author

@kevinpapst Thanks a lot for compliment! I really appreciate that I am part of the project!

@lock
Copy link

lock bot commented Jul 12, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. If you use Kimai on a daily basis, please consider donating to support further development of Kimai.

@lock lock bot locked and limited conversation to collaborators Jul 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Include option of tags field to link various timesheet entries together and use them for filtering data
2 participants