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

User teams in user-list and on dashboard #1150

Merged
merged 25 commits into from
Oct 3, 2019
Merged

User teams in user-list and on dashboard #1150

merged 25 commits into from
Oct 3, 2019

Conversation

kevinpapst
Copy link
Member

@kevinpapst kevinpapst commented Sep 27, 2019

Description

Can be tested at https://demo-branch.kimai.org

Fixes #1153
Fixes #1147

Bildschirmfoto 2019-10-02 um 14 55 38

Bildschirmfoto 2019-10-02 um 14 55 42

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 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 27, 2019
@kevinpapst kevinpapst changed the title User teams User teams in user-list and profile Sep 27, 2019
@codecov
Copy link

codecov bot commented Sep 27, 2019

Codecov Report

Merging #1150 into master will decrease coverage by 0.22%.
The diff coverage is 85.31%.

@@             Coverage Diff              @@
##             master    #1150      +/-   ##
============================================
- Coverage     93.09%   92.87%   -0.23%     
- Complexity     3246     3333      +87     
============================================
  Files           326      332       +6     
  Lines         10094    10327     +233     
============================================
+ Hits           9397     9591     +194     
- Misses          697      736      +39
Impacted Files Coverage Δ Complexity Δ
src/Repository/Loader/ProjectIdLoader.php 100% <ø> (ø) 3 <0> (ø) ⬇️
src/Twig/IconExtension.php 100% <ø> (ø) 2 <0> (ø) ⬇️
src/Repository/Loader/TimesheetIdLoader.php 100% <ø> (ø) 6 <0> (ø) ⬇️
src/Repository/Loader/CustomerIdLoader.php 95.23% <ø> (ø) 3 <0> (ø) ⬇️
src/Repository/Loader/ActivityIdLoader.php 96.15% <ø> (ø) 5 <0> (ø) ⬇️
src/Repository/Loader/TeamIdLoader.php 92.3% <ø> (ø) 3 <0> (ø) ⬇️
src/Repository/TimesheetRepository.php 78.68% <0%> (-0.63%) 108 <0> (+3)
src/Timesheet/Calculator/RateCalculator.php 100% <100%> (ø) 21 <0> (+1) ⬆️
src/Model/ProjectStatistic.php 100% <100%> (ø) 4 <2> (+2) ⬆️
src/Twig/Extensions.php 98.59% <100%> (-0.02%) 27 <0> (ø)
... and 36 more

@kevinpapst kevinpapst changed the title User teams in user-list and profile User teams in user-list and on dashboard Oct 2, 2019
@kevinpapst kevinpapst merged commit e8c25d8 into master Oct 3, 2019
@kevinpapst kevinpapst deleted the user-teams branch October 3, 2019 11:44
@lock
Copy link

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