20.6 fb wnprc183 192 merge #16

dnicolalde · 2020-06-30T17:44:08Z

Rationale

Moving changes done by WNPRC staff to wnprc-modules on our repo. This is reference to Ticket 40688.

Related Pull Requests

Changes

Bring updates of LabKey Core to wnprc-modules to work on 20.6

Adding link to EHR panels and modifying startup for compliance

…enerating. Don't store today's date if pmt received date is not provided, instead validate if pmt amt received is provided then pmt received date is expected.

…e chargeId, since its a rowid and could vary.

… is loaded

…-modules into develop

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.13. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.10...4.17.13) Signed-off-by: dependabot[bot] <support@github.com>

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.11...4.17.15) Signed-off-by: dependabot[bot] <support@github.com>

Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](jonschlinkert/mixin-deep@1.3.1...1.3.2) Signed-off-by: dependabot[bot] <support@github.com>

Housing Change fix

…n/lodash-4.17.13 Bump lodash from 4.17.10 to 4.17.13

…rn/AnimalRequests/lodash-4.17.15 Bump lodash from 4.17.11 to 4.17.15 in /AnimalRequests

…rn/AnimalRequests/mixin-deep-1.3.2 Bump mixin-deep from 1.3.1 to 1.3.2 in /AnimalRequests

Bumps [underscore.string](https://github.com/epeli/underscore.string) from 3.3.4 to 3.3.5. - [Release notes](https://github.com/epeli/underscore.string/releases) - [Changelog](https://github.com/epeli/underscore.string/blob/master/CHANGELOG.markdown) - [Commits](esamattis/underscore.string@3.3.4...3.3.5) Signed-off-by: dependabot[bot] <support@github.com>

Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.11...4.17.15) Signed-off-by: dependabot[bot] <support@github.com>

…rn/AnimalRequests/lodash-es-4.17.15 Bump lodash-es from 4.17.11 to 4.17.15 in /AnimalRequests

…rn/underscore.string-3.3.5 Bump underscore.string from 3.3.4 to 3.3.5

Convert to use only raw QueryWebPart for read-only task details views, without ExtJS3 wrapper panels.

Adding hermaphrodites to kinship calculations and pedigree plots

…s are correctly queried. also removed unnecessary comma after treatmentCode

fix for bcreports treatments

…0.6-SNAPSHOT

labkey-jeckels

Thanks for taking on the monster merge. I skimmed almost all of the files (I skipped some generated files and the wnprc_billing changes since those had already been code reviewed by our dev process). Some of these are just FYI/suggestions, not required changes.

ETLChemistryAnalyzer/build.gradle

labkey-jeckels · 2020-07-08T00:40:05Z

ETLChemistryAnalyzer/src/org/labkey/ETLChemistryAnalyzer/ETLChemistryAnalyzerModule.java

+    @Override
+    public double getVersion()
+    {
+        return 16.21;


We should switch this and other newly introduced modules to override getSchemaVersion() instead, per our new approach described at https://www.labkey.org/Documentation/wiki-page.view?name=sqlScripts#ver

What version number should you recommend to use for this module that we have develop and maintain in our own. We could start with 20.001, or stay with 16.021?

For modules that aren't shared with anyone else, it doesn't matter too much. If you want to be consistent with the core modules, that's great. Otherwise, you can choose whatever numbering approach you want, subject to the SQL upgrade script running rules.

https://www.labkey.org/Documentation/wiki-page.view?name=sqlScripts#ver

Gringotts/resources/schemas/dbscripts/sqlserver/gringotts-15.10-15.11.sql

WNPRC_Compliance/src/org/labkey/wnprc_compliance/WNPRC_ComplianceController.java

labkey-jeckels · 2020-07-08T01:08:14Z

WNPRC_EHR/resources/queries/study/_UltrasoundsByPregnancyId.sql

+                       FROM pregnancies p
+                       WHERE p.objectid = PARENT_RECORD_ID
+                       LIMIT 1)
+ORDER BY u.date DESC


Note: ORDER BY in custom SQL queries often gets lost when grids are rendered. Not a required change for merging, but use a sort in a custom view like .qview.xml for more reliable behavior

Should I also implement this to the following files:
WNPRC_EHR/resources/queries/study/_PregnancyOutcomesByPregnancyId.sql
WNPRC_EHR/resources/queries/study/_BreedingEncounterByBreedingId.sql

Yes, it's relevant for all custom SQL queries like this.

Added all the .qview.xml files to the other corresponding files.

labkey-jeckels · 2020-07-08T01:55:54Z

docker/development/docker-compose.yml

@@ -6,7 +6,7 @@ networks:

 services:
  labkeydev:
-    image: wnprcehr/labkey:17.2
+    image: wnprcehr/labkeydev:18.3


Should this be 20.6?

I got the changes in our repo to address all the changes to docker. I can add to this pull request so that those get added to your fork.

labkey-jeckels · 2020-07-08T01:56:13Z

docker/build.gradle

@@ -14,7 +14,7 @@ task("buildEhrcron", group: "Docker", type: Exec, description: "Generates the eh
 task("buildTomcat", group: "Docker", type: Exec, description: "Generates the Tomcat docker image (with R)") {
    workingDir "$projectDir/tomcat"
    executable "docker"
-    args "build", ".", "-t", "wnprcehr/tomcat:latest"
+    args "build", ".", "-t", "wnprcehr/tomcat:18.3"


Should this be 20.6?

I don't think this got updated, but not required from our perspective for the merge

labkey-jeckels · 2020-07-08T01:56:50Z

docker/docker-compose.yml

@@ -45,7 +45,7 @@ services:
      - network1

  labkey:
-    image: wnprcehr/labkey:17.2
+    image: wnprcehr/labkey:18.3


labkey-jeckels · 2020-07-08T01:58:23Z

docker/labkey/Dockerfile

 && echo -e "Downloading LabKey build from \033[1;33m${Z}\033[0m" \
 && wget -qO- --http-user="${LABKEY_TEAMCITY_USERNAME}" --http-password="${LABKEY_TEAMCITY_PASSWORD}" ${Z} \
  | tar -xz --strip-components=1

 # -----------------------------------------------------------------------------
 # MAIN IMAGE BUILD DEFINITION

-FROM wnprcehr/tomcat:latest
+FROM wnprcehr/tomcat:18.3


labkey-jeckels · 2020-07-08T01:58:37Z

docker/labkey/Dockerfile

@@ -19,18 +17,40 @@ RUN apk update \
    && apk add --no-cache wget tar ca-certificates && update-ca-certificates

 RUN if [ "$WNPRC_BRANCH" = "master" ] ; then B="" ; else B=",branch:"${WNPRC_BRANCH}; fi \
+ && if [ "$LABKEY_VERSION" = 17.2 ] ; then \


Are these old versions still relevant?

I modified the docker file on a separate set of changes on my dev machine, I can work with you to figure out how to push those changes to this branch

…dd to wnprc-modules.

…-modules.

labkey-bpatel · 2020-07-16T22:18:53Z

Changed target branch to 20.6_fb_merge_from_wnprc18.3, which aligns with other ehrModules fb so that it can be tested on teamcity.

dnicolalde · 2020-08-04T19:18:21Z

I am trying to commit the changes but I am getting the following error:
Push failed server/modules/wnprc-modules: remote: Permission to LabKey/wnprc-modules.git denied to dnicolalde. unable to access 'https://github.com/LabKey/wnprc-modules.git/': The requested URL returned error: 403

I think I do not have right to write to this repo.

dnicolalde · 2020-08-04T21:12:33Z

Never mind I committed to our repo and my changes should be added to the pull request.

…EHR-Services/wnprc-modules into 20.6_fb_wnprc183_192Merge

dnicolalde · 2020-08-05T18:04:28Z

I think we are all set here, can you approve the pull request?

labkey-jeckels

See a few comments for possible followup, but we can proceed with the merge.

labkey-jeckels · 2020-08-06T00:06:50Z

WNPRC_EHR/resources/queries/study/_BreedingEncounterByBreedingId/.qview.xml

@@ -0,0 +1,15 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="Pregnancies - Current">
+    <columns>
+        <column name="date"/>


Note that if you don't need to adjust the column list you can omit the element completely and just have the

labkey-jeckels · 2020-08-06T00:09:06Z

WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/IrregularObsBehaviorNotification.java

        } catch (SQLException e) {
-            return new StringBuilder("<strong>There was an error retrieving the data. Please alert the IDS team.</strong>");
+            System.err.println("Error retrieving IrregularObs data: " + e.getMessage());
+            e.printStackTrace(System.err);


Not required for merging, but strongly recommend using a Logger so output goes to labkey.log instead of std err

labkey-jeckels · 2020-08-06T00:11:51Z

docker/build.gradle

@@ -14,7 +14,7 @@ task("buildEhrcron", group: "Docker", type: Exec, description: "Generates the eh
 task("buildTomcat", group: "Docker", type: Exec, description: "Generates the Tomcat docker image (with R)") {
    workingDir "$projectDir/tomcat"
    executable "docker"
-    args "build", ".", "-t", "wnprcehr/tomcat:latest"
+    args "build", ".", "-t", "wnprcehr/tomcat:18.3"


I don't think this got updated, but not required from our perspective for the merge

* 20.6 fb wnprc183 192 merge (#16) * fixed issue where none could be selected in tandem with another reason * removed debugging code * Add wnprc_r24 module * Reset module version (from 15.19 back to 18.31). Automated test fix. * Support Ticket 38497: Invoice A/R report - Payment Received on auto generating. Don't store today's date if pmt received date is not provided, instead validate if pmt amt received is provided then pmt received date is expected. * Moved sortStore() from ehr's utils.js. * Add missing paren. * Update automated test for viewChargesAdjustmentsNotYetBilled -- remove chargeId, since its a rowid and could vary. * Remove unneeded pregnancy view * Add necessary tables and columns to make schemaXMLTestCase happy * Rename directories to table title instead of label, so that the qview is loaded * Adding link to User initials. * Bump lodash from 4.17.10 to 4.17.13 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.13. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.10...4.17.13) Signed-off-by: dependabot[bot] <support@github.com> * Bump lodash from 4.17.11 to 4.17.15 in /AnimalRequests Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.11...4.17.15) Signed-off-by: dependabot[bot] <support@github.com> * Bump mixin-deep from 1.3.1 to 1.3.2 in /AnimalRequests Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](jonschlinkert/mixin-deep@1.3.1...1.3.2) Signed-off-by: dependabot[bot] <support@github.com> * Bump underscore.string from 3.3.4 to 3.3.5 Bumps [underscore.string](https://github.com/epeli/underscore.string) from 3.3.4 to 3.3.5. - [Release notes](https://github.com/epeli/underscore.string/releases) - [Changelog](https://github.com/epeli/underscore.string/blob/master/CHANGELOG.markdown) - [Commits](esamattis/underscore.string@3.3.4...3.3.5) Signed-off-by: dependabot[bot] <support@github.com> * Bump lodash-es from 4.17.11 to 4.17.15 in /AnimalRequests Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.11...4.17.15) Signed-off-by: dependabot[bot] <support@github.com> * removing animals that do not have primateId created. * Ticket 38440: Dropdown menus cut off in taskDetails view Convert to use only raw QueryWebPart for read-only task details views, without ExtJS3 wrapper panels. * Update displayWidth query metadata for some columns * Only show projects with r in animal assignments * Fixing MHC Haplotypes to only show concatenated version. * Remove displayWidth settings for several views and one pivot table view * Removing empty primateIds and empty weights from the weight table. * Add missing bootstrap dependencies for custom pages (necropsy, tb dashboard) * removing objectid that are null in production for R24 grant. * Remove reference to non-existent Paging button. Configure Today at Center->Obs/Treatment view to show Chart button * Adding another pathologist that will review necropsy records from the pathology unit. * Revert "Add missing bootstrap dependencies for custom pages (necropsy, tb dashboard)" This reverts commit a161aed. * requiring behavior remarks in irregular obs, showing and hidding remark section. * Adding all the ETL into one single file, only having one sub ETL * Email notification for new project request * 18.3w fb misc billing fixes (#105) * Re-add front page links (looks like they were removed as part of 17.2 merge). * Support Ticket 38821: "Balance Due" column under the invoice/AR section is not calculating appropriately * Remove isActive column from wnprc_billing.tierRates, and make it a calculated column. Get tierRates via UserSchema during pdf generation to get calculated isActive column. Minor view updates. * Support Ticket 38766: Charge with Animal IDs, Batch, Bulk Edit -- disabling Bulk Edit check, since Bulk Edit is disabled. * updated breeding unit test * Change trigger to ran afterInsert so that we can use the row.key * fixed issue where date would show as Dec 31 1969 due to a null date * Adding VVC email to send when new ones come in. * Always showing other behavior text box independent on the behavior chosen. * Add Observed SIB to required remark. * Revert animal portal change * Fix more column width issues * report added to help check that animal per diems are correct * Add project avail code n to animal billable days report * Patch for menu overlay LK issue 39076 * Use LF instead of CRLF line endings * Test cleanup related to LK ticket 38659 * Pause javascript error checker for clinical history panel test per ticket 38659 * Fixing tool tip for housing and assigments graph. * Fix for necropsy visual issues - ticket 6989 * fix for calendar date picker issue 6897 * Refactor 'Mark Reviewed' button under More Actions for study.clinpathRuns and wnprc.vvc: - Server side registry and configuration of the button. - Refactor existing client side code as a handler. - Refactor Ext3 to Ext4 (dataregion changes done in 18.3 does not support Ext3). * Revert local test code committed by mistake. * Refactor "Schedule Task" button under More Actions for study.clinpathRuns and study.blood: - Server side registry and configuration of the button. - Refactor existing client side code as a handler. - Refactor Ext3 to Ext4 (dataregion changes done in 18.3 does not support Ext3). * Clean up * Use existing create task button for creating weight task in demographics table * Configure Mark Reviewed via metadata for wnprc.vvc. * Add approve vvc request status button * Convert blood request qc more actions button, delete unused per ticket 39139 * Remove action to add qc status * Add change qc status to clinpath - use ehr button * Adding tasks panel to taskdetails views per LK ticket 39076 * Removing dependency on Docker to ran load database script. * Add loading msg to schedule task action * initial commit of email notifications for behavior related irregular observations * small formatting fixes * string concatenation fix * Fix for dropdown issue w tasks and requests tabs LK ticket 39183 * Partial fix w svn r64864 for animal history reports pages LK ticket 39173 * updated to query for correct date/time ranges and added a couple of helpful links * fixed formatting * add another blood alert notification at 14:15 each day * Update tomcat dockerfile to grab java 12 * Set up the edit/update urls before setting up ext4 items LK ticket 39498 * Revert housing and assignments graph tooltip position * Enable & customize bulk edit, updates to Billing Module, and other bug fixes/updates. (#116) Ticket 38766: Charge with Animal IDs, Batch, Bulk Edit - enable & customize bulk edit feature for both data entry forms. Ticket 39285: Changes to the billing module : create group-category associations, update column names and have data under appropriate sounding column names. Ticket 39219: Cleanup & Refactor on columns associated with Chargeable Items Ticket 39134: Problem with adding charges without animal id : remove isActive filtering Ticket 38953: duplicate accounts seen in test server : tierRate column in aliases now FKs to activeTierRates query. Ticket 38909: Filter Projects based on Investigator selection for Billing Data Access - plus related refactoring around investigator last name and first name or display name to be used in appropriate places. Ticket 39107: Billing Period Summary By Project : This report is now upgraded and renamed to 'View Billing Queries' report to allow users/testers to view billing queries that get processed during a billing run. * Show birth date in active assignements, ticket 5563 * Fix for date serialization issue on new user tb dashboard form issue 7270 * Temporarily disabling no active assigns in email alerts per ticket 7267 * Update docker files to use 18.3 images * Fix for active assignments query timing out for email alerts, IDS ticket 7267, LK ticket 39601 * Update perl scripts to use most recent version of LabKey Query perl package * Update perlscripts dockerfile * moved behavior remarks to the bottom to prevent confusion with regular remarks * Revert "Update perl scripts to use most recent version of LabKey Query perl package" This reverts commit 47077ac. * remove isQuickValidation check from species determination function so that it doesn't ever get skipped * Change from LogFile Errors * fix for tb dashboard date off by 6 hours * only underline required fields, do not fill entire background * Fix study container for adminAlert script * Upgrade Labkey perl for CSRF support; suppress LWP warnings see ticket 39659 * Temporary fix for no active assignments query timeout lk ticket 39601 * Update docker file for test server env * More fixes for email alerts * Update demographics stock assignment project numbers, related to ticket 7267 * Do not use query web part fix LK ticket 38440, but use ldk-querycmp xtype instead LK ticket 39660, and fix IDS ticket 7269, 7294 * Remove min-height constraint for some animal history panels * Adding species to supplemental pedigree and including in pedigree query. * ignore directory of files that are generated by typescript * updated scripts to default to turning off bcreports and kinship calculations on test servers * remove old labkey perl module * Including another rhesus patterns to complete species in demographic table. * Add pointer cursor for data points on weight graph, IDS ticket 7294 * disable ldap sync on test servers to avoid an issue with users being removed/added to wnprcusers group in production * Remove warning suppression since its handled in labkey perl 1.07 see ticket 39659 * Fix issue with duplicate task, hiding on null window broken * Remove warning supression from treatment alerts * Adding naming patterns for unknown species * added a port option in case database is running on a non-default port * fix for null pointer when reason for housing change isn't in the lookup table * fixed pregnancy dropdown when updating existing records so that it doesn't go blank * properly close the result set * Changes to naming for rhesus * Bump diff from 3.4.0 to 3.5.0 Bumps [diff](https://github.com/kpdecker/jsdiff) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/kpdecker/jsdiff/releases) - [Changelog](https://github.com/kpdecker/jsdiff/blob/master/release-notes.md) - [Commits](kpdecker/jsdiff@v3.4.0...v3.5.0) Signed-off-by: dependabot[bot] <support@github.com> * Bump mixin-deep from 1.3.0 to 1.3.2 Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.0 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](jonschlinkert/mixin-deep@1.3.0...1.3.2) Signed-off-by: dependabot[bot] <support@github.com> * Bump bower from 1.8.2 to 1.8.8 Bumps [bower](https://github.com/bower/bower) from 1.8.2 to 1.8.8. - [Release notes](https://github.com/bower/bower/releases) - [Changelog](https://github.com/bower/bower/blob/master/CHANGELOG.md) - [Commits](bower/bower@1.8.2...v1.8.8) Signed-off-by: dependabot[bot] <support@github.com> * Removing default time for blood draws request and removing some columns from food deprive forms. * Limit hematology and chemistry page limits (add bloodChemistry to be controlled in wnprcReports > reports.js) IDS ticket 7334 * added gestational day calculator and a link to it on main ehrBegin page * changed location of gestation calculator link to fit in better * added a clear form button and did some minor cleanup * Initial commit for viral load queue email notification * Start to get more params via java api * Use java api instead of javascript api to look up submitter and animalid * Do action after update so we can get qc state * Check qc status of complete before sending email, use try w resources when getting results * Item 6974 : Updates to Data Entry forms (#127) Ticket 39709: Make changes to Data Entry forms & minor changes to Projects table - Enter Charges with Animal Ids form - Add Debit Account column deriving value from selected Project. Make this column non-editable by users. - Enter Charges with/without Animal Ids form - Add Total Cost column, which get calculated and populated once both Quantity and Unit Cost are filled in. Make this column non-editable by users. - Rename label 'Project Coordinator' to 'Investigator Name' or 'Investigator'. - Make 'investigatorId' a required field. * Parse out additional email column to send notification to * Add link to zika portal w animal id as filter * changed so that breeding encounters greater than 6 months old can be selected when entering a pregnancy * Further customize email body and add modified by email * Bump knockout from 3.4.0 to 3.5.0 Bumps [knockout](https://github.com/knockout/knockout) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/knockout/knockout/releases) - [Commits](knockout/knockout@v3.4.0...v3.5.0) Signed-off-by: dependabot[bot] <support@github.com> * make breeding encounter no longer required, but show warning if not filled in * Change qc status label and place signature in email * update to projectQueries view to support new financial module changes. update to alias triggerscript so it only sets isAcceptingCharges to true if the box is checked or if no value is passed to the script * remove links so that users don't start entering charges accidentally * Start to add new dataset button to bulk perform actions * Add sample date to email link, add to notification admin panel * Added rowids to custom action, need to make notification class handle multiple keys and search for emails * Bump jquery from 3.3.1 to 3.5.0 Bumps [jquery](https://github.com/jquery/jquery) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](jquery/jquery@3.3.1...3.5.0) Signed-off-by: dependabot[bot] <support@github.com> * allow for multi-line comments on billing invoice pdfs * added some comments for the previous commit * Use trigger script for bulk complete and only send on complete * added indenting for readability * comment length check fix * Rename stuff * add experiment number field, and required field if complete * created a new calculated column that coalesces the new investigatorId/name column with the original inves column so that older projects will still show an investigator. then updated a bunch of .qview files to use the new calculated column * changes made to support adding the EHR_BillingAdminPermission to the ehr investigators table * add institution/city/state/zip to pdf. fix to make payable line so it only shows on external invoices. fix for charge items that are longer than 60 characters to make them gracefully line wrap * Changing action to download .zip file with Download Summary Invoices * added institution and billing_contact_info columns * support for multiple addresses in a bulk email, currently combines by unique submitter * change invoice pdf to show billing contact email rather than contact email * Do not allow completion without experiment number; more refactoring * Cover edge case where submitter might put themselves in notify column * don't charge a per diem for an animal for any day it's on a project with a 'ph' availability (ehr.project.avail) * added comments for previous commit * change ehr_billing to ehr_billing_public so that certain users can enter charges * Adding page to allow staff outside finance to enter data to misc charges. * Updates to JET CSV query and DataEntry form - Update JET query to filter on accounts that are not genCredit accounts. - Filter debitedAccount dropdown based on date selection in Non-Animal Data entry form, & other minor cleanup. - Fix filtering for invoice External and Internal reports. * Add automated test to verify non-genCredit account in JET CSV preview report. Additional sample data. Minor cleanup. * Make testJETWithNonGenCreditAccount public * Refactor data upload - Insert billing records using InsertRowsCommand * Automated test failures fix attempt. * Fix issues during setup. * New test updates/fixes. * Automated test fix - enter date first. * Automated test fix - Move date before debited account for bulk edit as well. * Revert "change ehr_billing to ehr_billing_public so that certain users can enter charges" This reverts commit f220d97. * Adding link to Finance Data Entry for non finance staff. * Fix testBilling(). * Automated test fix - move toggle date field for bulk edit. * Updating gradle to build 18.3 * add pi name above institution/address on internal invoices. added new fields to aliases.query.xml to show them in the correct spots * Adding hermaphrodites to kinship calculations and pedigree plots * added missing comma after remark so that the remark and volume columns are correctly queried. also removed unnecessary comma after treatmentCode * updating location of wnprc-modules * Merging 18.3 to 20.6 to build wnprc modules in latest version of LabKey * #40688 Changing name of mutable column based on input from Binal * Add self registration module * #40688 Changes to 20.6 to build wnprc-modules * Updating intermidiate tomcat and postgres version. * Remove 'SOPRequirements' metadata from ehr_compliancedb module, and add to wnprc-modules. * Remove 'SOPAdmin' view from ehr_compliancedb module, and add to wnprc-modules. * Update import statements. * PullRequest #16 fixes for merging wnprc20.6 * PullRequest #16 additional fixes for merging wnprc20.6 * Revert update to import statements. Co-authored-by: Gabriel Gottfredsen <ggottfredsen@primate.wisc.edu> Co-authored-by: Gabriel <gabriel.gottfredsen@gmail.com> Co-authored-by: fdnicolalde <fdnicolalde@primate.wisc.edu> Co-authored-by: Binal <binalp@labkey.com> Co-authored-by: Chad Sebranek <csebranek@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: labkey-jeckels <jeckels@labkey.com> * Point at new package for permission class * Fix up schema upgrades, including: Don't modify EHR schema from WNPRC_EHR scripts Update getVersion() to getSchemaVersion() Fix up schema XML files to match expected schema Fix bootstrapping for WNPRC_EHR upgrades * Mark as Postgres only so it doesn't fail on SQL Server where WNPRC_EHR won't be deployed * Bump versions to match test expectations * Various test fixes, including: Customize source_material query directly instead of trying to mutate a locked FK lookup table Update to use new assay designer UI Migrate <javaCustomizer> syntax * Cascade user delete though ehr_billing.dataaccess Move code from LabModuleHelper to only place that uses it, ViralLoadAssayTest Fix rate import codepath in WNPRC_EHRTest * Make WNPRC R24 module Postgres-only * Update navMenu from Ext3 to Ext4 and don't pull it into WNPRC with the rest of the Ext3 code * Support custom displayNames * Remove references to Ext3 version of navMenu * Fully migrate navMenu to ExtJS4 * Add dependencies that failed to merge from 18.3 * Avoid double-loading Utils.js and other core APIs * More test fixes * Flip meaning of argument at controls de-duplication of IDs Fix up handling of drop-downs in WNPRC misc charges entry * Update to new grid formatting (exported CSV is unchanged) * Fix encoding issue for WNPRC_EHRTest.testWeightDataEntry * Attempt to fix WNPRC_EHRTest.testBilling * Generics, and change to wait for page to load after finalizing * Another try at waiting for the reload * Use ExtJS3 class instead of ExtJS4 * Same idea, different click * Split compliance test into ONPRC and WNPRC variants * Update to text that's on this form variant * Make tolerant of supplemental lk-row-over class * Delete unused action that throws ClassNotFoundException * Fix crawler error * Code cleanup, better error reporting when character encoding gets mangled Co-authored-by: F. Daniel Nicolalde <dnicolalde@gmail.com> Co-authored-by: Gabriel Gottfredsen <ggottfredsen@primate.wisc.edu> Co-authored-by: Gabriel <gabriel.gottfredsen@gmail.com> Co-authored-by: fdnicolalde <fdnicolalde@primate.wisc.edu> Co-authored-by: Binal <binalp@labkey.com> Co-authored-by: Chad Sebranek <csebranek@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

gottfred and others added 30 commits September 26, 2019 14:19

Merge pull request #96 from WNPRC-EHR-Services/develop

1e02afd

Adding link to EHR panels and modifying startup for compliance

fixed issue where none could be selected in tandem with another reason

bd07388

removed debugging code

223921e

Add wnprc_r24 module

7c341c1

Reset module version (from 15.19 back to 18.31). Automated test fix.

5151ec4

Support Ticket 38497: Invoice A/R report - Payment Received on auto g…

3cf77b0

…enerating. Don't store today's date if pmt received date is not provided, instead validate if pmt amt received is provided then pmt received date is expected.

Moved sortStore() from ehr's utils.js.

b1bec70

Add missing paren.

7d8733e

Update automated test for viewChargesAdjustmentsNotYetBilled -- remov…

3736741

…e chargeId, since its a rowid and could vary.

Remove unneeded pregnancy view

4585947

Add necessary tables and columns to make schemaXMLTestCase happy

285f157

Rename directories to table title instead of label, so that the qview…

e73d141

… is loaded

Adding link to User initials.

43e7df4

Merge branch 'develop' of https://github.com/WNPRC-EHR-Services/wnprc…

d194376

…-modules into develop

Bump lodash from 4.17.10 to 4.17.13

addfa71

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.13. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.10...4.17.13) Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #98 from WNPRC-EHR-Services/develop

a723719

Housing Change fix

Merge pull request #99 from WNPRC-EHR-Services/dependabot/npm_and_yar…

c09d566

…n/lodash-4.17.13 Bump lodash from 4.17.10 to 4.17.13

Merge pull request #100 from WNPRC-EHR-Services/dependabot/npm_and_ya…

66cb02e

…rn/AnimalRequests/lodash-4.17.15 Bump lodash from 4.17.11 to 4.17.15 in /AnimalRequests

Merge pull request #101 from WNPRC-EHR-Services/dependabot/npm_and_ya…

c11c22f

…rn/AnimalRequests/mixin-deep-1.3.2 Bump mixin-deep from 1.3.1 to 1.3.2 in /AnimalRequests

Merge pull request #102 from WNPRC-EHR-Services/dependabot/npm_and_ya…

06eb8dd

…rn/AnimalRequests/lodash-es-4.17.15 Bump lodash-es from 4.17.11 to 4.17.15 in /AnimalRequests

Merge pull request #103 from WNPRC-EHR-Services/dependabot/npm_and_ya…

874dc3a

…rn/underscore.string-3.3.5 Bump underscore.string from 3.3.4 to 3.3.5

removing animals that do not have primateId created.

f5f0df2

Ticket 38440: Dropdown menus cut off in taskDetails view

9c9ae05

Convert to use only raw QueryWebPart for read-only task details views, without ExtJS3 wrapper panels.

Update displayWidth query metadata for some columns

f43857e

Merge remote-tracking branch 'origin/develop' into develop

1d725b4

Only show projects with r in animal assignments

ee66397

fdnicolalde and others added 12 commits June 3, 2020 14:01

Adding hermaphrodites to kinship calculations and pedigree plots

ee93c85

Merge pull request #141 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT

75d0659

Adding hermaphrodites to kinship calculations and pedigree plots

added missing comma after remark so that the remark and volume column…

f7ad64c

…s are correctly queried. also removed unnecessary comma after treatmentCode

Merge pull request #142 from WNPRC-EHR-Services/wnprc18.3-SNAPSHOT

6a93745

fix for bcreports treatments

Merge remote-tracking branch 'origin/19.2_fb_wnprc_r24' into release2…

800d090

…0.6-SNAPSHOT

updating location of wnprc-modules

32419e6

Merge branch 'release20.6-SNAPSHOT' into wnprc20.6-SNAPSHOT

1cda666

Merging 18.3 to 20.6 to build wnprc modules in latest version of LabKey

bd805c5

#40688 Changing name of mutable column based on input from Binal

786d561

Add self registration module

34f0535

#40688 Changes to 20.6 to build wnprc-modules

e669505

Updating intermidiate tomcat and postgres version.

2312250

labkey-jeckels requested changes Jul 8, 2020

View reviewed changes

labkey-bpatel added 2 commits July 15, 2020 18:19

Remove 'SOPRequirements' metadata from ehr_compliancedb module, and a…

a43427d

…dd to wnprc-modules.

Remove 'SOPAdmin' view from ehr_compliancedb module, and add to wnprc…

fd9a136

…-modules.

labkey-bpatel changed the base branch from release20.6-SNAPSHOT to 20.6_fb_merge_from_wnprc18.3 July 16, 2020 22:17

labkey-bpatel and others added 2 commits July 23, 2020 00:15

Update import statements.

a52193e

PullRequest #16 fixes for merging wnprc20.6

fa6520a

fdnicolalde added 2 commits August 4, 2020 15:15

PullRequest #16 additional fixes for merging wnprc20.6

8d854f7

Merge branch 'wnprc20.6-SNAPSHOT' into 20.6_fb_wnprc183_192Merge

d0b2fab

labkey-bpatel added 2 commits August 4, 2020 15:36

Revert update to import statements.

e6ad018

Merge branch '20.6_fb_wnprc183_192Merge' of https://github.com/WNPRC-…

5d0da0c

…EHR-Services/wnprc-modules into 20.6_fb_wnprc183_192Merge

labkey-jeckels approved these changes Aug 6, 2020

View reviewed changes

labkey-jeckels merged commit 4dae5bc into LabKey:20.6_fb_merge_from_wnprc18.3 Aug 6, 2020

dnicolalde deleted the 20.6_fb_wnprc183_192Merge branch February 15, 2023 21:42

20.6 fb wnprc183 192 merge #16

20.6 fb wnprc183 192 merge #16

Uh oh!

Conversation

dnicolalde commented Jun 30, 2020

Rationale

Related Pull Requests

Changes

Uh oh!

labkey-jeckels left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

labkey-bpatel commented Jul 16, 2020

Uh oh!

dnicolalde commented Aug 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dnicolalde commented Aug 4, 2020

Uh oh!

dnicolalde commented Aug 5, 2020

Uh oh!

labkey-jeckels left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dnicolalde commented Aug 4, 2020 •

edited

Loading