PCHR-4073: Fix SSP Filter on Staff Directory #533
Merged
Conversation
This file contains 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
mickadoo
suggested changes
Aug 7, 2018
| $query->add_where($group, $roleEndField, date('Y-m-d'), '>='); | ||
| $query->add_where($group, $roleEndField, NULL, 'IS'); | ||
| // if department or title is set we must limit to only current roles | ||
| if (!empty($queryParts[$departmentField]) || |
There was a problem hiding this comment.
Doesn't this fit in the 80 character limit on one line?
There was a problem hiding this comment.
Will check and update as appropriate 👓
| if (!empty($queryParts[$departmentField]) || | ||
| !empty($queryParts[$titleField]) | ||
| ) { | ||
| $orGroup = $query->set_where_group('OR'); // add a new WHERE group |
There was a problem hiding this comment.
I think this is $orGroup because it's endDate is in future OR is null, but you have $andGroup that doesn't contain AND conditions. Do you think it would be clearer to rename these roleEndGroup and roleStartGroup or roleEndCondition or something like that?
There was a problem hiding this comment.
The add_where function requires a group which will determine what section the query will be added (AND/OR). It makes sense to rename as suggested 👌
ajesamson
force-pushed
the
PCHR-4073-fix-ssp-filter-on-staff-directory
branch
from
094c189 to
ca7fdcd
Compare
ajesamson
merged commit f189aad
into
PCHR-3963-fix-ssp-filters-to-take-into-account-role-start-end-dates
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Overview
Filtering staff records in SSP have some issue with job roles that are not active. This PR fixes the issue by applying additional filter condition to job role start date. Date filtering is now applied to filter requests containing department and job title.
Before
Staff with job roles starting in the future or past end dates show up when running filter.
After
Staff with job roles starting in the future or past end dates no longer show up in filter result.
Technical Details
In Staff Details View the query was altered to cater for
job titleandrole start datefield in addition todepartmentandrole end datefields.Additional query grouping was added.