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

Preparations for coming features #1818

Merged
merged 9 commits into from Jul 13, 2020
Merged

Preparations for coming features #1818

merged 9 commits into from Jul 13, 2020

Conversation

kevinpapst
Copy link
Member

@kevinpapst kevinpapst commented Jul 13, 2020

Description

Changes:

  • Cleanup: removed unused convert_tz code
  • new modified_at field for timesheets to allow queries for records changed after a certain date (used as modified_after in timesheet GET collection API)
  • increased invoice filename to 150 chars (for very long customer and project names)

This PR adds new ground work for features that will be added in the future:

  • added a new billable field to mark timesheets as billable, so we can distinguish between paid work and internal tasks
  • added a new category field to timesheets to distinguish between multiple types of records (like work, holidays, sickness...). This is NOT yet used and all records map to the "work" category.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • I verified that my code applies to the guidelines (composer code-check)
  • I updated the documentation (see here)
  • I agree that this code is used in Kimai and will be published under the MIT license

@kevinpapst kevinpapst added this to the 1.10 milestone Jul 13, 2020
@codecov
Copy link

codecov bot commented Jul 13, 2020

Codecov Report

Merging #1818 into master will increase coverage by 0.09%.
The diff coverage is 98.48%.

@@             Coverage Diff              @@
##             master    #1818      +/-   ##
============================================
+ Coverage     92.26%   92.36%   +0.09%     
- Complexity     5043     5064      +21     
============================================
  Files           472      471       -1     
  Lines         15636    15670      +34     
============================================
+ Hits          14427    14474      +47     
+ Misses         1209     1196      -13     
Impacted Files Coverage Δ Complexity Δ
src/Entity/Invoice.php 100.00% <ø> (ø) 34.00 <0.00> (ø)
src/Twig/LocaleExtensions.php 100.00% <ø> (ø) 22.00 <0.00> (ø)
src/Repository/TimesheetRepository.php 84.73% <90.90%> (+0.01%) 127.00 <0.00> (+3.00)
src/API/TimesheetController.php 96.41% <100.00%> (+0.02%) 82.00 <0.00> (+1.00)
src/Entity/Timesheet.php 96.10% <100.00%> (+0.35%) 80.00 <6.00> (+6.00)
src/EventSubscriber/UserEnvironmentSubscriber.php 93.33% <100.00%> (ø) 6.00 <0.00> (ø)
src/Repository/Query/InvoiceQuery.php 100.00% <100.00%> (ø) 6.00 <1.00> (+1.00)
src/Repository/Query/TimesheetQuery.php 99.02% <100.00%> (+0.27%) 48.00 <30.00> (+12.00)

@kevinpapst kevinpapst marked this pull request as ready for review July 13, 2020 18:46
@kevinpapst kevinpapst merged commit f57b314 into master Jul 13, 2020
@kevinpapst kevinpapst deleted the more-fields branch July 13, 2020 21:35
pinedev pushed a commit to pinedevstudio/kimai2 that referenced this pull request Mar 23, 2021
* removed unused convert_tz code
* added timestampable listener to support automatic updates of change columns
* added modified_at, billable and category timesheet fields
* new timesheet API query parameter modified_after
@github-actions github-actions bot locked and limited conversation to collaborators Oct 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Development

Successfully merging this pull request may close these issues.

None yet

1 participant