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

French translation #2

Open
wants to merge 136 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
83374e1
Removed unused 'lang' and 'redmine_dnoise_workload' directories
JostBaron Apr 17, 2013
29b5b92
Update show.html.erb
pydubreucq Mar 19, 2013
4df2eeb
Only show current user by default (performance reasons), fix selectio…
JostBaron Apr 19, 2013
470a2df
Made filter form visible again.
JostBaron Apr 20, 2013
94cee3e
Removed temp files from app/views/work_load folder
JostBaron Apr 20, 2013
e7571fc
Made filters work again, show issues for all selected users if checkb…
JostBaron Apr 20, 2013
8653d0c
Changed permission for plugin. Now every logged in user can see the w…
JostBaron Apr 21, 2013
953be86
Fixed some stylings in the legend.
JostBaron Apr 21, 2013
ed1caf0
Added german localization.
JostBaron Apr 21, 2013
2b2faf6
Made german localization not destroy all other labels...
JostBaron Apr 21, 2013
ba0d3e3
Added a bit distance between filter and workload display, removed unu…
JostBaron Apr 21, 2013
1f7b58a
Let the option 'show_issues' default to true, because of the long loa…
JostBaron Apr 21, 2013
d481e49
Switched default user selection for workload plugin back to none, for…
JostBaron Apr 22, 2013
0d353bb
Renamed @usuarios to @usersToDisplay.
JostBaron May 30, 2013
b02e5f0
Renamed @totalDays.
JostBaron May 30, 2013
e577359
Renamed @dias_hasta_el_lunes.
JostBaron May 30, 2013
fa03d65
Renamed '@lunes' to '@monday'. Not sure if thats correct.
JostBaron May 30, 2013
dd1df1f
Renamed '@num_semanas' to '@numberOfWeeks'.
JostBaron May 30, 2013
c18c35d
Renamed '@fecha_actual' to '@currentDay'.
JostBaron May 30, 2013
3b3d863
Renamed class 'ListingUser' to 'ListUser' to fix random occuring error.
JostBaron May 30, 2013
8ff428e
Renamed some methods and variables in dateTools.
JostBaron May 30, 2013
5a66b93
Made tests work and added first test case for date tools.
JostBaron May 30, 2013
3c5f18b
Added the possibility to configure, which days of the week are workin…
JostBaron May 30, 2013
84fe1b7
Added Tests for getRealDistanceInDays and getWorkingDays. Implemented…
JostBaron May 30, 2013
a7284bb
Made the class 'DateTools' consist solely of static functions; Remove…
JostBaron May 30, 2013
433efa3
Removed trailing whitespaces.
JostBaron May 30, 2013
01b6833
Partly cleaned up the view.
JostBaron May 30, 2013
0986bae
Rewrote parts of the view. Not finished yet.
JostBaron May 31, 2013
68f2ad8
Added function that returns all open issues for a list of users in a …
JostBaron Jun 1, 2013
39df063
Rewrote view to use a table for the tabular data.
JostBaron Jun 1, 2013
ecdff22
Rewrote functions to get workload data.
JostBaron Jun 1, 2013
aab3602
Added computation of total workload for each user
JostBaron Jun 2, 2013
eda61a3
Renamed getMonthsIn to getMonthsInTimespan
JostBaron Jun 2, 2013
92d2f6d
Fixed calculation of remaining time for an issue if it has subtasks.
JostBaron Jun 2, 2013
0c31442
Fixed typo in view
JostBaron Jun 2, 2013
bffa4cd
Added tooltip for the issue subject.
JostBaron Jun 2, 2013
0db7b1a
Added settings and calcuations to decide if a workload is low, normal…
JostBaron Jun 2, 2013
b5b4d6a
Removed some debug code
JostBaron Jun 2, 2013
e5c480f
Styled workload-table
JostBaron Jun 2, 2013
a77eb73
Calculation of workload now considers all open issues.
JostBaron Jun 3, 2013
e3486a2
Highlighted overdue issues.
JostBaron Jun 3, 2013
92bf586
Reworked filter form and removed some unused code.
JostBaron Jun 16, 2013
05c7119
Fixed an access to nil when no parameters are given to the plugin.
JostBaron Jun 20, 2013
3f59000
Removed unused stuff: styles, view parts and code.
JostBaron Jun 20, 2013
af89b6f
Rewrote description in init.rb, increased version number.
JostBaron Jun 20, 2013
2b2ae44
Made styles nicer, fixed a bug.
JostBaron Jun 20, 2013
8f429c6
Removed unused assets.
JostBaron Jun 20, 2013
01cc03c
Inserted logo again.
JostBaron Jun 20, 2013
6fe2cf8
Highlighting overdue issues now respects the date set as "today".
JostBaron Jun 20, 2013
0595554
Fixed some bugs in the filter form.
JostBaron Jun 20, 2013
4ac4eea
Corrected styles if no user is shown.
JostBaron Jun 20, 2013
496db54
View respects "show issues" flag.
JostBaron Jun 20, 2013
3c83264
Styled filter form.
JostBaron Jun 20, 2013
f61c192
Improved display of user names in the filters.
JostBaron Jun 20, 2013
22afef5
Corrected setting of default value for num_months.
JostBaron Jun 20, 2013
061b542
Added permissions for viewing the workload - only stubs, nothing is i…
JostBaron Jun 20, 2013
526b803
Removed obsolete manuals.
JostBaron Jun 20, 2013
064a3b6
Updated readme.
JostBaron Jun 21, 2013
a70796d
Updated readme again.
JostBaron Jun 21, 2013
d7eeeb4
Corrected and changed some labels.
JostBaron Jun 21, 2013
d731099
Added basic access right management: There is a new permission
JostBaron Jun 21, 2013
4264ed5
Replaced home-made query for all projects were given permission is
JostBaron Jun 22, 2013
5726a51
Updated comment for function 'calculateTotalUserWorkloads'.
JostBaron Jun 22, 2013
c6a2a41
Added stub and tests for function that removes all issues that are in…
JostBaron Jun 22, 2013
73a97ee
Implemented function to remove invisible issues.
JostBaron Jun 22, 2013
0ddb344
Added summary of workload for invisible issues to the view.
JostBaron Jun 22, 2013
f70ef8e
Updated Readme.
JostBaron Jun 22, 2013
c4221bc
Some styling details, removed debug output.
JostBaron Jun 22, 2013
6b6a2e5
Made some performance improvements.
JostBaron Jun 22, 2013
88392f0
Fixed Readme.
JostBaron Jun 22, 2013
1032870
Small fixes in README
JostBaron Jul 1, 2013
dc33924
Inserted encoding magic comment.
JostBaron Aug 14, 2013
ebed868
Rewrote parts of calculation code so the workload may be displayed per
JostBaron Aug 14, 2013
599bc57
Removed overdue issues from user and project workload summaries, in o…
JostBaron Aug 14, 2013
fba9cd6
Hide workload specifics for user, make them available by clicking.
JostBaron Aug 14, 2013
4fcec60
Removed possibility to show issues, as it is no longer needed. All is…
JostBaron Aug 14, 2013
864399b
Fixed invalid id reference in filters.
JostBaron Aug 14, 2013
23f83a8
Small fix of trigger-icon.
JostBaron Aug 14, 2013
88a8b90
Removed some debug code, added info about overdue issues to output.
JostBaron Aug 14, 2013
59e343a
Small fix of styles.
JostBaron Aug 14, 2013
90b5805
Bugfix: Hours from overdue issues are no longer accumulated in the in…
JostBaron Aug 14, 2013
4008f11
Added tooltip to table header which inform the user about the possibi…
JostBaron Aug 29, 2013
4faa226
Truncate number of hours from overdue issues to two decimals.
JostBaron Aug 29, 2013
e8ccc58
Initially hide summary of invisible issues.
JostBaron Aug 29, 2013
1ddc19c
Update version to 1.0.0, small fix of description.
JostBaron Aug 29, 2013
83dc9ae
Truncated display of hours from overdue issues for projects.
JostBaron Aug 29, 2013
9b5d410
Added italian localization. Thanks to Carlo Troiano for providing it!
JostBaron Aug 29, 2013
1d33660
Increase version to 1.0.1.
JostBaron Aug 29, 2013
5d507e7
[Bugfix] Styles of the date picker are no longer overwritten by plugi…
JostBaron Aug 29, 2013
b4c5e1a
[Bugfix] Regression: Initially hide info about overdue issues.
JostBaron Aug 29, 2013
53017eb
Updated italian localization.
JostBaron Sep 3, 2013
1467984
[Bugfix] Showing workload now works even if user.name contains spaces.
JostBaron Sep 8, 2013
6b40146
Simplified slides.js
CodeInsider Sep 7, 2013
480456a
[Bugfix] Hours from overdue issues are summed if today is no working …
JostBaron Sep 8, 2013
f25b72a
Update work_load_controller.rb
CodeInsider Sep 8, 2013
ec33b31
Merge pull request #12 from CodeInsider/patch-1
JostBaron Sep 8, 2013
7a60b68
[Bugfix] Regression: Truncate number of hours from overdue issues.
JostBaron Sep 9, 2013
55d504c
[Feature, part 1] Implemented calculation to use any day as first day.
JostBaron Sep 9, 2013
5594128
[Feature, part 2] Implemented display to use any day as first day.
JostBaron Sep 9, 2013
b99c308
Updated italian localization. Thanks again to Carlo Traiano.
JostBaron Sep 9, 2013
2983797
[Bugfix] Increased version number to 1.0.2
JostBaron Sep 27, 2013
7c896d8
[Bugfix] Added default settings for the plugin.
JostBaron Sep 27, 2013
d693a74
Change the way plugin settings are accessed.
JostBaron Sep 27, 2013
aadfaf8
Fixing conflict with redmine_tags
davividal Nov 29, 2013
6adcac9
Merge pull request #16 from davividal/conflict_with_redmine_tags
JostBaron Dec 1, 2013
2a2e74f
little change (simplifying)
braini75 Mar 24, 2015
2ff3891
BugFix 'Use as "today"', Fixes #20
braini75 Mar 24, 2015
271b1c0
Add Groupfilters as multiselect, Fixes #9
braini75 Mar 24, 2015
1b472ce
Sort names by lastname, Fixes #8
braini75 Mar 24, 2015
92b8fc0
change some deprecated functions
braini75 Mar 25, 2015
cb475d7
set default width for select boxes
braini75 Mar 25, 2015
5e5481d
Testing
braini75 Apr 7, 2015
0d24a98
Merge pull request #30 from JostBaron/feature/groupselect
braini75 May 13, 2015
fcd2b4c
Update init.rb
braini75 May 27, 2015
ad9c28f
Layout modification
braini75 Apr 27, 2016
5eceddc
Merge pull request #33 from braini75/master
braini75 May 2, 2016
0b41091
Update README.markdown
braini75 May 2, 2016
fd4c966
Merge pull request #34 from braini75/master
braini75 May 29, 2017
c097a98
Add support for holidays, vacations and user defined load
braini75 May 31, 2017
ad3d7a6
Add vacation and holiday setup info
braini75 May 31, 2017
e4c752c
German locales update
braini75 May 31, 2017
e9b15e6
Merge pull request #35 from braini75/vacation_extension
braini75 May 31, 2017
f77f0c5
BugFix User Vacation: user filter added
braini75 Jun 7, 2017
00d2838
Merge pull request #37 from braini75/vacation_extension
braini75 Jun 7, 2017
71f7b8f
Documentation: db migrate added
braini75 Jun 12, 2017
5264fa8
Merge pull request #38 from braini75/vacation_extension
braini75 Jun 12, 2017
eab3c9f
Solving migation issues
mboremski Aug 18, 2019
8d5642f
replacing attr_accessible by attr_accessor
mboremski Aug 18, 2019
be14711
optimized 1st collum in table view
mboremski Aug 18, 2019
302e92b
1st approach solving #1
mboremski Aug 19, 2019
2c395f9
Fixing error on driting to db. #1
mboremski Dec 8, 2019
be0c451
Own permission module
mboremski Dec 8, 2019
7b1b837
Optimises locales and forms
mboremski Dec 8, 2019
a18c78b
solves #3
mboremski Dec 10, 2019
491399c
resolves #2
mboremski Dec 10, 2019
82afe07
optimising flash-messages
mboremski Dec 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
1st approach solving #1
  • Loading branch information
mboremski authored and JostBaron committed Feb 8, 2020
commit 302e92b75093e46a6a3ebd008f5e68b1c0f78c0f
6 changes: 5 additions & 1 deletion app/controllers/wl_user_vacations_controller.rb
100644 → 100755
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ def update
end

def create
@wl_user_vacation = WlUserVacation.new(params[:wl_user_vacations])
@wl_user_vacation = WlUserVacation.new(wl_user_vacations)
@wl_user_vacation.user_id = User.current.id
if @wl_user_vacation.save
redirect_to action: 'index', notice: 'Vacation was successfully saved.', year: params[:year]
@@ -63,4 +63,8 @@ def check_edit_rights
redirect_to :action => 'index'
end
end

def wl_user_vacations
params.require(:wl_user_vacations).permit(:user_id,:date_from,:date_to,:comments,:vacation_type)
end
end