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

Expanded Manual Assignment of Personnel Statuses to Include PoW, On Leave, and AWOL Statuses #4377

Merged
merged 4 commits into from
Jul 14, 2024

Conversation

IllianiCBT
Copy link
Collaborator

@IllianiCBT IllianiCBT commented Jul 11, 2024

The PersonnelFilter for the MIA status now includes friendly Prisoners of War (PoWs). The GUI properties file has been updated to reflect this change in the relevant text and tooltips. This decision was made to avoid creating an additional category and to reduce option clutter.

Additionally, I adjusted the PersonnelStatus.getImplementedStatuses() method to no longer filter out the On_Leave, AWOL, and PoW statuses. These statuses were previously disabled as they were not implemented, but with ongoing expansions to the personnel modules, this is no longer the case. This allows users to manually assign these statuses to personnel.

Although the PoW status will not be fully utilized until the S&E module is released later this year, it is now available for users to incorporate into their role-playing scenarios.

The PersonnelFilter for MIA status has been updated to also include Prisoners of War (PoWs). This change affects the GUI and various enum operations. The relevant tooltips in the GUI properties file have also been updated to reflect this change.
The previous logic was set to filter out the PersonnelStatus enumeration values that were PoW, on Leave, or AWOL in the getImplementedStatuses method. This has been altered to include all status enumerations without any filtering.
The switch-case statement in the 'testGetImplementedStatuses' method of PersonnelStatusTest.java has been condensed into a single assert statement.
@IllianiCBT IllianiCBT added Personnel Personnel-related Issues GUI labels Jul 11, 2024
@IllianiCBT IllianiCBT self-assigned this Jul 11, 2024
@IllianiCBT IllianiCBT changed the title Turnover leave Expanded Manual Assignment of Personnel Statuses to Include PoW, On Leave, and AWOL Statuses Jul 11, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jul 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 10.26%. Comparing base (f7bd31c) to head (c53fd68).
Report is 1 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #4377      +/-   ##
============================================
- Coverage     10.27%   10.26%   -0.01%     
+ Complexity     5811     5807       -4     
============================================
  Files           925      925              
  Lines        126031   126029       -2     
  Branches      18627    18627              
============================================
- Hits          12945    12943       -2     
  Misses       111811   111811              
  Partials       1275     1275              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@HammerGS HammerGS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and seems to work. (Ignore this mis-click on the requested changes)

Copy link
Member

@HammerGS HammerGS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignore the Requested changes.

@IllianiCBT IllianiCBT merged commit 012b063 into MegaMek:master Jul 14, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
GUI Personnel Personnel-related Issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants