CAPParser #2
Merged
CAPParser #2
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
…evaluated on the fly)
2-stage parsing technique
jacobpenny
reviewed
Jun 15, 2017
| }) | ||
|
|
||
| describe('Simple equation', () => { | ||
| it('Evaluates the equation, maintaining order of ops', () => { |
There was a problem hiding this comment.
Evaluates the equation is a bit redundant here and in the following two test cases.
I'd say just go with
it('maintains order of operations', () => {
and similarly for the other 2.
| }) | ||
|
|
||
| describe('Complex boolean operation', () => { | ||
| it('evals', () => { |
There was a problem hiding this comment.
Just for readability:
it('evaluates correctly', () => {
| }) | ||
|
|
||
| describe('Date difference operations', () => { | ||
| it('evals', () => { |
There was a problem hiding this comment.
Same as above, maybe just replace with 'evaluates correctly' for now.
| @@ -1,12 +1,79 @@ | |||
| import 'mocha'; | |||
| import { expect } from 'chai'; | |||
| import InstrumentLogicParser from '../../jsx/lib/InstrumentLogicParser'; | |||
| const Evaluator = require('/var/www/LORIS/Loris/jsx/lib/CAPParser/js/Evaluator'); | |||
There was a problem hiding this comment.
Should be relative path. Also should use ES6 import syntax
package.json
Outdated
| @@ -6,7 +6,9 @@ | |||
| "doc": "docs", | |||
| "test": "test" | |||
| }, | |||
| "dependencies": {}, | |||
| "dependencies": { | |||
| "moment": "^2.18.1" | |||
There was a problem hiding this comment.
Since we compile all the JS and include it in the repo I think we can consider this as a devDependency.
| } | ||
| } | ||
|
|
||
| export default InstrumentLogicParser; |
There was a problem hiding this comment.
Can be removed (the entire file)
jacobpenny
approved these changes
Jun 15, 2017
jacobpenny
pushed a commit
that referenced
this pull request
Aug 22, 2017
…#2833 This pull request adding e.examinerID into "group by" clause. Fix the error in Mysql 5.7. [Expression #2 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'loris_test.e.examinerID' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by] https://redmine.cbrain.mcgill.ca/issues/12513
jacobpenny
pushed a commit
that referenced
this pull request
Aug 22, 2017
…#2872 This pull request adding e.examinerID into "group by" clause of the examiner module to fix the following error in MySQL 5.7: "Expression #2 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'dbname.e.examinerID' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by"
Jkat
added a commit
that referenced
this pull request
May 24, 2018
fix candidate issue and transpile
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.
parser