Skip to content

Instrument list ordering #1500

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
Merged
samirdas merged 23 commits into from
Feb 26, 2016
Merged

Instrument list ordering #1500

samirdas merged 23 commits into from
Feb 26, 2016

Conversation

@ted-strauss-K1
Copy link
Contributor

@ted-strauss-K1 ted-strauss-K1 commented Jan 20, 2016

This allows explicit ordering of subgroups and instruments on the test battery page (instrument_list module).

screenshot from 2016-01-21 10 16 24

@ted-strauss-K1 ted-strauss-K1 added Category: Feature PR or issue that aims to introduce a new feature Language: SQL PR or issue that update SQL code labels Jan 20, 2016
@ted-strauss-K1 ted-strauss-K1 added this to the 16.04 milestone Jan 20, 2016
@jstirling91 jstirling91 added the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label Jan 22, 2016
@driusan
Copy link
Collaborator

driusan commented Jan 22, 2016

I don't understand this ordering.

@ted-strauss-K1 ted-strauss-K1 force-pushed the instrument_list_ordering branch 2 times, most recently from 2baa6c4 to 341d8a6 Compare January 26, 2016 19:32
@ted-strauss-K1 ted-strauss-K1 removed the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label Jan 26, 2016
@ted-strauss-K1
Copy link
Contributor Author

ted-strauss-K1 commented Jan 28, 2016

phpcs is passing locally, but not in travis.
this is an outrage.
who is to blame?

@driusan
Copy link
Collaborator

driusan commented Jan 28, 2016

Did you include --standard=docs/LorisCS.xml when running it locally? Are you running the same version of phpcs (the one in vendor/bin/ after doing a composer install)?

@codecov-io
Copy link

codecov-io commented Jan 28, 2016

Current coverage is 15.01%

Merging #1500 into 16.04-dev will increase coverage by +0.02% as of 5b95b16

@@            16.04-dev   #1500   diff @@
=========================================
  Files             108     108       
  Stmts           18264   18306    +42
  Branches            0       0       
  Methods          1025    1027     +2
=========================================
+ Hit              2739    2748     +9
  Partial             0       0       
- Missed          15525   15558    +33

Review entire Coverage Diff as of 5b95b16

Powered by Codecov. Updated on successful CI builds.

gluneau
gluneau reviewed Feb 12, 2016
View reviewed changes
modules/instrument_list/templates/menu_instrument_list.tpl Outdated
<td>
<a href="{$instruments[group][instrument].testName}/?commentID={$instruments[group][instrument].commentID}">
{$instruments[group][instrument].fullName}</a></td>
<a href="main.php?test_name={$instruments[group][instrument].testName}&candID={$candID}&sessionID={$sessionID}&commentID={$instruments[group][instrument].commentID}">
Copy link
Contributor

@gluneau gluneau Feb 12, 2016

Choose a reason for hiding this comment

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

Let's remove references to main.php

@ted-strauss-K1 ted-strauss-K1 force-pushed the instrument_list_ordering branch 6 times, most recently from 82f76f2 to 76b5af7 Compare February 18, 2016 17:36
@ted-strauss-K1 ted-strauss-K1 force-pushed the instrument_list_ordering branch from 74f588b to 04c267d Compare February 19, 2016 17:20
samirdas added a commit that referenced this pull request Feb 26, 2016
@samirdas
Merge pull request #1500 from tedstrauss/instrument_list_ordering
83f1793 
Instrument list ordering
@samirdas samirdas merged commit 83f1793 into aces:16.04-dev Feb 26, 2016
xlecours
xlecours reviewed Mar 21, 2016
View reviewed changes
SQL/Archive/16.04/2016-01-20-InstrumentListOrdering.sql
# add ordering column (tinyint) to battery
ALTER TABLE test_battery ADD instr_order tinyint after firstVisit;
# add ordering column (tinyint) to test_subgroups
ALTER TABLE test_subgroups ADD group_order tinyint after Subgroup_name; No newline at end of file
Copy link
Contributor

@xlecours xlecours Mar 21, 2016

Choose a reason for hiding this comment

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

This should be reflected in the schema. And a patch should be available somewhere else than in the archives.

@xlecours xlecours mentioned this pull request Mar 21, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@gluneau gluneau

Labels

Category: Feature PR or issue that aims to introduce a new feature Language: SQL PR or issue that update SQL code

Projects

None yet

Milestone

16.0

Development

Successfully merging this pull request may close these issues.

7 participants

@ted-strauss-K1 @driusan @codecov-io @gluneau @xlecours @samirdas @jstirling91