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

New instruments loading module #4229

Merged
merged 9 commits into from
Jul 17, 2019
Merged

Conversation

driusan
Copy link
Collaborator

@driusan driusan commented Jan 3, 2019

This adds a new instrument loading module (named "instruments") in order to handle the loading of instrument files which was done by NDB_Caller. This removes the last remaining place that main.php was used, which can now be deleted.

The NDB_Caller is still required for survey.php, until surveys are also converted into a proper module with its own routing.

To test this change...

  • Test all varieties of instruments (PHP, Linst, survey) and that they both load and save correctly.

@driusan driusan force-pushed the InstrumentsModule branch from 99dc5e9 to 14fb825 Compare January 3, 2019 18:04
and put in the `project/instruments`.

Individual instruments may contain their own configurations (such
as requiring tables to be created or lookup tables.)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
as requiring tables to be created or lookup tables.)
as requiring tables to be created or lookup tables).

Copy link
Contributor

Choose a reason for hiding this comment

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

should probably apply this again

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

no.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think @PapillonMcGill is correct in this case based on some Googling. It's not a big deal though.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Google also says that "color" and "neighbor" are correct spelling.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, as the parenthesis was opened inside a phrase, not to at the beginning of a new phrase, it as to be closed inside the phrase, so before the dot.
Not a big deal, as @johnsaigle mentioned, this is why I just commented, not ask for change.

php/libraries/NDB_BVL_Instrument.class.inc Outdated Show resolved Hide resolved
@johnsaigle johnsaigle added Category: Feature PR or issue that aims to introduce a new feature State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) [branch] major labels Jan 8, 2019
@driusan driusan force-pushed the InstrumentsModule branch from 29eccbd to d331f8c Compare March 19, 2019 18:02
@driusan driusan added State: Needs work PR awaiting additional work by the author to proceed and removed State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) labels Mar 19, 2019
@driusan driusan force-pushed the InstrumentsModule branch from d331f8c to 0b65850 Compare April 1, 2019 17:48
@zaliqarosli zaliqarosli self-assigned this May 7, 2019
@zaliqarosli zaliqarosli added State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) and removed State: Needs work PR awaiting additional work by the author to proceed labels May 14, 2019
@driusan driusan force-pushed the InstrumentsModule branch from d5f9245 to 378fcec Compare May 14, 2019 19:51
@driusan driusan removed the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label May 22, 2019
@cmadjar cmadjar assigned xlecours and unassigned zaliqarosli Jul 4, 2019
driusan and others added 8 commits July 11, 2019 10:14
This adds a new "instruments" module which takes the place of
what was previously done by NDB_Caller and main.php to load
instruments. The module does not do anything but delegate to
existing instruments that are in the project directory.

To test this: test a variety of instruments after this change,
in both LINST and PHP format. There should be no noticeable
difference.
It was causing lorisform_parser to break
- Names commentID in ControlPanel to match its parent's
- Replaces REQUESTS with variables
@driusan driusan force-pushed the InstrumentsModule branch from 378fcec to 8866009 Compare July 11, 2019 14:14
@driusan driusan changed the base branch from major to minor July 11, 2019 14:15
@driusan
Copy link
Collaborator Author

driusan commented Jul 11, 2019

@xlecours @zaliqarosli now that this is based on the most recent release and passing Travis can you review/test?

@zaliqarosli
Copy link
Contributor

testing works!

@zaliqarosli zaliqarosli added the Passed manual tests PR has been successfully tested by at least one peer label Jul 15, 2019
@driusan driusan merged commit 397e15b into aces:minor Jul 17, 2019
@ridz1208 ridz1208 added this to the 21.1.0 milestone Jul 22, 2019
zaliqarosli pushed a commit to zaliqarosli/Loris that referenced this pull request Aug 28, 2019
This adds a new "instruments" module which takes the place of
what was previously done by NDB_Caller and main.php to load
instruments. The module does not do anything but delegate to
existing instruments that are in the project directory.
@ridz1208 ridz1208 modified the milestones: 21.1.0, 22.0.0 Nov 1, 2019
driusan pushed a commit that referenced this pull request Mar 9, 2020
Linst instrument subtests are blank and not able to render its fields. This is because of legacy request variable left over from before PR #4229 that introduced a new instruments loading module.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Category: Feature PR or issue that aims to introduce a new feature Passed manual tests PR has been successfully tested by at least one peer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants