Private Leaves#27
Open
bigheadsmith wants to merge 634 commits into
Open
Conversation
…lic-holiday-management-page Public holiday management page
…ng-more-default-bank-holidays Bring more default bank holidays
…ocha-6-2-2 fix: upgrade mocha to 6.2.2 to fix potential security issue
…-cleanup fix: clean unused require and variables
…e-fetching-company-feed fix: remove unused fetching of company feed
…-410-carry-over-and-accrual-alloance-issue Fix issue with carry over feature for users with accrual allowance timeoff-management#410
…-194-expose-user-calendar-to-admin Add calendar section to admin view of user details (timeoff-management#194)
…-416-freeze-handlebar-version Freeze handlbar version so its breaking changes do not break the app
Fix Individual Calendar Feed
Under some circumstances, for example when hosted using IIS and a reverse proxy, the existing links get the current base url prepended, rendering them invalid. This forces absolute urls to be used, guaranteeing they work.
- no longer required to update adjustments for each year - if no adjustment exists for the current year, will search back through previous years to find the last adjustment - adjustments can still be made for individual years - year switcher added to absences page
- year variable was updating throughout the loop which later should be used for calculating prorata adjustments - added checkYear variable for use in the loop instead of year
SMTP no auth
fix overlap
Fix Bank Holidays
- Employees should not be able to request certain types of leave (e.g. sick) but a manager should be able to add these leave types for employees when required - Added new manager_only field to leave_types.js - Added Manager Only checkbox for leave types to general_settings.hbs and add_new_leave_type_modal.hbs - Leave type selector on book_leave_modal.hbs is now conditional bas on whether the current user manages other users, and if the leave type is manager_only or not - leaves that have the setting "Manager only" can now only be revoked by a manager
…eports and tables still show only requestor comment (if any)
fix sequelize error when updating admin checkbox
fix sequelize error when updating admin checkbox
correct year for absences and teamview
Allowance adjustments for all years
Manager/supervisor only leave types
Allows to mark a leave_type as private so they do not show on Team View calendar unless viewed by leave owner or manager. Horribly hacky, done by checking if employee should see statistics for other employees or not and using a different calendar_cell partial for Team View
Author
|
I don't expect this to be merged but a starting point to show the concept of this feature and work towards hopefully implementing it |
ashlessscythe
force-pushed
the
dev
branch
2 times, most recently
from
5b3fc5e to
84306a1
Compare
ashlessscythe
force-pushed
the
dev
branch
2 times, most recently
from
21d348d to
9b82311
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
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.
Allows to mark a leave_type as private so they do not show on Team View calendar unless viewed by leave owner or manager.
Horribly hacky, done by checking if employee should see statistics for other employees or not and using a different calendar_cell partial for Team View