-
-
Notifications
You must be signed in to change notification settings - Fork 585
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
added hourly and money budgets to activity, project and customer #843
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/Entity/Project.php
kevinpapst
changed the title
adding budgets
added hourly and money budgets to activity, project and customer
Jun 10, 2019
Codecov Report
@@ Coverage Diff @@
## master #843 +/- ##
============================================
+ Coverage 93.68% 94.01% +0.32%
- Complexity 2332 2340 +8
============================================
Files 239 243 +4
Lines 7345 7346 +1
============================================
+ Hits 6881 6906 +25
+ Misses 464 440 -24
|
This was referenced Jun 14, 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. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Can be tested at https://demo-branch.kimai.org/
Login as admin, go to Customer/Projects/Activities and select "Reports" from the drop-down
You may find, that there is only one or no progress bar shown, in this case you found an entity that has no budget defined. The test data is generated randomly, so you need to configure your test data manually!
Both money and duration budgets are not validated in any way, so you could add a budget of 100 € to your customer and 1000 € on a project for that customer. You could also set the time budget to 0 while having a budget of 10000€.
The budgets are not used for validation when creating / stopping time entries, for now they are an optional feature and exceeding a budget has no consequences (see screenshot, there is more time logged on the customer than the budget "allows").
These fields exist for statistical purpose only (for now).
Changes
budget
andtimeBudget
column to customerstimeBudget
column to projects (budget
column was already existing) (Fixes maximale Anzahl Projektstunden als Vorgabe #467)budget
andtimeBudget
column to activitiesbudget_activity
- view and edit budgets for activitiesbudget_project
- view and edit budgets for projectsbudget_customer
- view and edit budgets for customersFixes #416
Types of changes
Checklist
composer code-check
)