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.

Sign up for GitHub

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

Jump to bottom

[Tools] Enable PHPCS for CouchDB_Import_Demographics.php #6785

Merged
merged 1 commit into from
Aug 19, 2020
Merged

[Tools] Enable PHPCS for CouchDB_Import_Demographics.php #6785

merged 1 commit into from
Aug 19, 2020

Conversation

laemtl
Copy link
Contributor

@laemtl laemtl commented Jun 30, 2020 •
edited
Loading

Replaces #6001

@laemtl laemtl added State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) State: Needs work PR awaiting additional work by the author to proceed Testing PR contains test plan or automated test code (or config files for Travis) labels Jun 30, 2020
@laemtl laemtl mentioned this pull request Jun 30, 2020
Closed
@laemtl laemtl added State: Blocked PR or issue awaiting an external event such as the merge or another PR to proceed and removed State: Needs work PR awaiting additional work by the author to proceed labels Jul 8, 2020
@laemtl laemtl changed the base branch from master to main July 21, 2020 15:43
@laemtl laemtl force-pushed the 2020-01-20_PHPCS-CouchDB_Import_Demographics.php branch from 338d3c2 to 03deda5 Compare August 6, 2020 16:21
@laemtl laemtl removed State: Blocked PR or issue awaiting an external event such as the merge or another PR to proceed State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) labels Aug 6, 2020
@pierre-p-s
Copy link
Contributor

@laemtl
Travis failed

@laemtl laemtl force-pushed the 2020-01-20_PHPCS-CouchDB_Import_Demographics.php branch from 03deda5 to 22f1ea5 Compare August 7, 2020 19:33
@laemtl
Copy link
Contributor Author

laemtl commented Aug 7, 2020 •
edited
Loading

@pierre-p-s Solved!

pierre-p-s
pierre-p-s reviewed Aug 10, 2020
View reviewed changes
tools/CouchDB_Import_Demographics.php Outdated
@@ -158,7 +209,8 @@ function _generateQuery() {
LEFT JOIN participant_status_options pso ON (pso.ID=ps.participant_status)
LEFT JOIN feedback_bvl_thread fbt ON (fbt.CandID=c.CandID)
LEFT JOIN feedback_bvl_entry fbe ON (fbe.FeedbackID=fbt.FeedbackID)";
$groupBy=" GROUP BY s.ID,
//phpcs:enable
$groupBy =" GROUP BY s.ID,
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe a space after the equal sign to match the syntax

tools/CouchDB_Import_Demographics.php Outdated
}
$whereClause=" WHERE s.Active='Y' AND c.Active='Y' AND c.Entity_type != 'Scanner'";
$whereClause =" WHERE s.Active='Y' AND c.Active='Y' "
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

tools/CouchDB_Import_Demographics.php Outdated Show resolved Hide resolved
@pierre-p-s
Copy link
Contributor

I ran phpcs and did not get an error. Just 3 minor comments on the code

driusan
driusan requested changes Aug 10, 2020
View reviewed changes
Copy link
Collaborator

@driusan driusan left a comment

Choose a reason for hiding this comment

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

Don't disable phpcs

@laemtl laemtl force-pushed the 2020-01-20_PHPCS-CouchDB_Import_Demographics.php branch from 22f1ea5 to b1344fb Compare August 17, 2020 17:48
@laemtl laemtl force-pushed the 2020-01-20_PHPCS-CouchDB_Import_Demographics.php branch from b1344fb to 490c82a Compare August 17, 2020 18:05
@laemtl
Copy link
Contributor Author

laemtl commented Aug 17, 2020 •
edited
Loading

@pierre-p-s, @driusan Ready for review.

@laemtl laemtl requested a review from driusan August 17, 2020 18:07
@pierre-p-s
Copy link
Contributor

phpcs worked and comments were addressed

@driusan driusan merged commit 9896c8e into aces:main Aug 19, 2020
@ridz1208 ridz1208 added this to the 24.0.0 milestone Aug 20, 2020
zaliqarosli pushed a commit to zaliqarosli/Loris that referenced this pull request Sep 3, 2020
@laemtl @zaliqarosli
[Tools] Enable PHPCS for CouchDB_Import_Demographics.php (aces#6785)
558dbec 
Replaces aces#6001
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 29, 2021
@laemtl @AlexandraLivadas
[Tools] Enable PHPCS for CouchDB_Import_Demographics.php (aces#6785)
b9bf814 
Replaces aces#6001
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pierre-p-s pierre-p-s pierre-p-s approved these changes

@driusan driusan Awaiting requested review from driusan

Assignees
No one assigned
Labels
Testing PR contains test plan or automated test code (or config files for Travis)
Projects
None yet
Milestone
24.0.0
Development

Successfully merging this pull request may close these issues.
5 participants
@laemtl @pierre-p-s @driusan @ridz1208 @johnsaigle