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

Display meta-fields in datatables #1116

Merged
merged 44 commits into from
Sep 19, 2019
Merged

Display meta-fields in datatables #1116

merged 44 commits into from
Sep 19, 2019

Conversation

kevinpapst
Copy link
Member

@kevinpapst kevinpapst commented Sep 17, 2019

Description

  • Display (visible) meta-fields in the following places:
    • Timesheet
    • Admin Timesheets
    • Customer
    • Project
    • Activity
    • Users
  • Adds a "label" to display a nice heading, instead of the technical identifier
  • Show timesheet fields in timesheet exports (user and admin views)
  • Show customer/project/activity/user fields in export

Fixes #1103
Fixes #1014

Updated documentation, see kimai/www.kimai.org#41

Types of changes

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

Checklist

  • I verified that my code applies to the guidelines (composer kimai: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.4 milestone Sep 17, 2019
# Conflicts:
#	src/Entity/MetaTableTypeInterface.php
# Conflicts:
#	public/build/app.bb9e3b55.js
#	public/build/entrypoints.json
#	public/build/manifest.json
# Conflicts:
#	public/build/app.bb9e3b55.js
#	public/build/entrypoints.json
#	public/build/manifest.json
# Conflicts:
#	src/Entity/MetaTableTypeInterface.php
#	src/Entity/MetaTableTypeTrait.php
#	src/Form/Type/EntityMetaDefinitionType.php
@codecov
Copy link

codecov bot commented Sep 18, 2019

Codecov Report

Merging #1116 into master will increase coverage by 0.16%.
The diff coverage is 95.7%.

@@             Coverage Diff              @@
##             master    #1116      +/-   ##
============================================
+ Coverage     93.06%   93.22%   +0.16%     
- Complexity     3184     3240      +56     
============================================
  Files           319      323       +4     
  Lines          9905    10081     +176     
============================================
+ Hits           9218     9398     +180     
+ Misses          687      683       -4
Impacted Files Coverage Δ Complexity Δ
src/Event/CustomerMetaDefinitionEvent.php 100% <ø> (ø) 2 <0> (ø) ⬇️
src/Event/ActivityMetaDefinitionEvent.php 100% <ø> (ø) 2 <0> (ø) ⬇️
src/Event/ProjectMetaDefinitionEvent.php 100% <ø> (ø) 2 <0> (ø) ⬇️
src/Entity/UserPreference.php 82.6% <ø> (ø) 20 <0> (+1) ⬆️
src/Event/TimesheetMetaDefinitionEvent.php 100% <ø> (ø) 2 <0> (ø) ⬇️
src/Repository/TimesheetRepository.php 79.31% <100%> (-0.06%) 105 <2> (+1)
src/API/ActivityController.php 97.53% <100%> (+3.7%) 21 <0> (ø) ⬇️
src/Controller/ExportController.php 100% <100%> (ø) 11 <0> (ø) ⬇️
src/Form/Type/EntityMetaDefinitionType.php 87.5% <100%> (+0.83%) 4 <0> (ø) ⬇️
src/Event/CustomerMetaQueryEvent.php 100% <100%> (ø) 5 <5> (?)
... and 34 more

@kevinpapst kevinpapst merged commit 5aa422d into master Sep 19, 2019
@kevinpapst kevinpapst deleted the meta-field-columns branch September 19, 2019 18:28
@lock
Copy link

lock bot commented Nov 18, 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 Nov 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Provide full usage of CustomMetaFields Add user preferences fields to export and timesheet views
1 participant