Childrens filter in personnel screen #3771
Conversation
| @@ -419,7 +419,7 @@ private void filterPersonnel() { | |||
| sorter.setRowFilter(new RowFilter<>() { | |||
| @Override | |||
| public boolean include(Entry<? extends PersonnelTableModel, ? extends Integer> entry) { | |||
| return nGroup.getFilteredInformation(entry.getModel().getPerson(entry.getIdentifier())); | |||
| return nGroup.getFilteredInformation(entry.getModel().getPerson(entry.getIdentifier()),hqView.getCampaign().getLocalDate()); | |||
There was a problem hiding this comment.
Style change request: spaces between parameters in parameter lists for readability.
| @@ -590,7 +590,7 @@ public boolean include(Entry<? extends RetirementTableModel, ? extends Integer> | |||
| && !rdTracker.getRetirees(contract).contains(person.getId())) { | |||
| return false; | |||
| } else { | |||
| return nGroup.getFilteredInformation(person); | |||
| return nGroup.getFilteredInformation(person,hqView.getCampaign().getLocalDate()); | |||
There was a problem hiding this comment.
Style change request: spaces between parameters in parameter lists for readability.
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #3771 +/- ##
=========================================
Coverage 10.63% 10.63%
Complexity 5473 5473
=========================================
Files 834 834
Lines 113770 113772 +2
Branches 17196 17196
=========================================
+ Hits 12099 12100 +1
- Misses 100465 100466 +1
Partials 1206 1206
☔ View full report in Codecov by Sentry. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
CodeQL found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.
|
This should be ready now. |
This is a simple added filter that shows any personnel whose age is lower than 13.
The aim is to have an easier way to sort out children without having to display the dates view, and order by birthdate.
The change for PersonnelFilter is in the filters list (row 80), and in the getFilteredInformation method. I had to pass the current date in the method as I couldn't find a way to retrieve that info from inside the method's switch.
The PersonnelTab only change should be on row 283, but the automated diff shows space changes in the whole file - not sure why as I'm using the suggested IDE settings.
Having changed getFilteredInformation there's two changes in PersonnelMarketDialog and RetirementDefectionDialog since they were calling the method as well. I believe these changes don't impact the functionality of the two classes.