Readability cleanup on EventIncome report (towards bringing it under testing) #13963
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
|
(Standard links)
|
eileenmcnaughton
force-pushed
the
event_report
branch
from
14ddb0f to
388f185
Compare
eileenmcnaughton
changed the title
eileenmcnaughton
force-pushed
the
event_report
branch
from
388f185 to
83c2e29
Compare
|
test this please |
1 similar comment
|
test this please |
pradpnayak
reviewed
Apr 18, 2019
CRM/Report/Form/Event/Income.php
Outdated
| $activeParticipantStatuses = []; | ||
| foreach (CRM_Event_PseudoConstant::participantStatus(NULL, "is_counted = 1", "label") as $id => $label) { | ||
| $activeParticipantStatuses[$id] = $label; | ||
| } |
There was a problem hiding this comment.
Why not $activeParticipantStatuses = CRM_Event_PseudoConstant::participantStatus(NULL, "is_counted = 1", "label"); or return CRM_Event_PseudoConstant::participantStatus(NULL, "is_counted = 1", "label");
There was a problem hiding this comment.
Thanks @pradpnayak on looking into it your suggestions make sense & improve readability - I have updated the PR
pradpnayak
reviewed
Apr 18, 2019
CRM/Report/Form/Event/Income.php
Outdated
| @@ -216,6 +208,7 @@ public function buildEventReport($eventIDs) { | |||
|
|
|||
| $statusDAO = $this->executeReportQuery($status); | |||
|
|
|||
| $participantStatus = CRM_Event_PseudoConstant::participantStatus(NULL, "is_counted = 1", "label"); | |||
There was a problem hiding this comment.
How about using $participantStatus = $this->getActiveParticipantStatuses();
There was a problem hiding this comment.
updated per below
eileenmcnaughton
force-pushed
the
event_report
branch
from
83c2e29 to
27f4227
Compare
|
Looks good now. Good to merge! |
|
Merging as per Pradeep's review |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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
Minor readability cleanup, preparatory to extracting buildQuery & bringing it under testing
Before
Less readable
After
More readable
Technical Details
@lcdservices I took a look at this PR #13928 but didn't really feel comfortable making any functional changes to the report before we bring it under unit test - it's one of 3 reports specifically excluded :-(
The main thing we need to do is extract the code that generates $sql to be in a function called buildQuery that takes no arguments
In order to do that I felt some minor cleanup had to happen first - this is just getting the status stuff into a more extractable form.
I also noticed your PR is hard to read due to reformatting - we can fix the formatting in the cleanup PRs. Let me know if this seems good to you...
Comments