-
Notifications
You must be signed in to change notification settings - Fork 189
Add the MRI variables in the imaging_browser's query engine #9545
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
Add the MRI variables in the imaging_browser's query engine #9545
Conversation
|
@nicolasbrossard could you fix the formatting and the tests from this PR? |
|
|
||
| $this->addTable('LEFT JOIN session s ON (s.CandID=c.CandID)'); | ||
| $this->addTable("LEFT JOIN files ON (s.ID=files.SessionID)"); | ||
| /* @phan-suppress-next-line PhanUndeclaredMethod */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't suppress phan errors.
If you're getting "UndeclaredMethod" errors it's likely because you moved the call outside of the instanceof check that ensured it was declared.
CamilleBeau
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
558fecb to
8cfc8c0
Compare
|
@CamilleBeau Bug fixed. Ready to be tested again. |
| 'TotalRejected' => [ | ||
| 'StringType', | ||
| 'processing:total_rejected', | ||
| 'regexp_replace(pf.value, "\\(.*", "")', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's still this regexp_replace!
CamilleBeau
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Passed manual tests
| \"$this->baseURL\", | ||
| \"/api/v0.0.3/candidates/\", | ||
| c.CandID, | ||
| c.ID, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The API URL should still be using CandID. The ID is only for internal joins.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok
| $ScanType . "_Selected", | ||
| "Selected file for $ScanType for session", | ||
| $scope, | ||
| new \LORIS\Data\Types\Enumeration("true", "false"), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason for this to be an enumeration of true/false instead of a BooleanType?
d5f3fab to
ae3e64c
Compare
This puts the infrastructure in place to translate strings in loris on the PHP side using the gettext library. Japanese is added as an example (mostly using machine translation which could probably use proof reading by a native speaker.) Each module has its own textdomain for strings that come from that module, as well as a "loris" textdomain for general LORIS terms (menu categories, common terms, etc). The translations for a module are in $MODULEDIR/locale and the loris textdomain is in $LORISROOT/locale. The module names, menu categories, and breadcrumb text are currently marked up as translateable strings. This is enough to ensure that the menus and breadcrumbs in LORIS get translated.  A new LORIS middleware detects the preferred language by looking for: 1. A lang=? passed in the query parameter (this can be used for testing, but does not currently have any way in the GUI to select) 2. The User's preference under "my_preferences" 3. The HTTP request's Accept-Language header in that order and ensuring that it's a language supported by the project by looking for the language_code in the LORIS "language" table. The pot files at the root of the locale directories are translation templates to give to translators. The locale/$lang/LC_MESSAGES/$textdomain.po contain the translation mapping. The .mo files are the compiled version used by the software and can be generated by "make locales". (We may want to rethink the structure of the Makefile in the future to have `make $modulename` do both the locale and javascript compilation.) Projects may override strings by putting the (compiled) gettext .mo file in the $project/locale/ directory (which would also be a good place to store the .po files). These are generated with `msgfmt -o filename.mo inputfile.po` (msgfmt is included with gettext.) Note that the format of the locale directories must be: locale/$lang/LC_MESSAGES/$textdomain.mo. We do not have any control over that. (Other then the name of the first "locale" directory, but that seems pretty standard.) It's also worth noting that, from what I've read, the *server* must have the locale installed for gettext to support the translation, not just LORIS. I don't know why. It seems silly.
…wser's query engine
7f5e06b to
d521c0a
Compare
|
Was replaced by #9824 |
This adds the MRI variables in the imaging_browser's query engine. The information used to set the variable values sometimes differs from those used in `CouchDB_MRI_Importer` but I put comments in the code for those cases. (This is a re-issue of PR aces#9545 on branch `27.0-release`) Fixes aces#9374
This adds the MRI variables in the imaging_browser's query engine. The information used to set the variable values sometimes differs from those used in `CouchDB_MRI_Importer` but I put comments in the code for those cases. (This is a re-issue of PR aces#9545 on branch `27.0-release`) Fixes aces#9374
First draft for the PR that adds the MRI variables in the imaging_browser's query engine. All vars are added, except those associated to the predefined comments. The information used to set the variable values sometimes differs from those used in
CouchDB_MRI_Importerbut I put comments in the code for those cases.Fixes #9374 (partially)