Merge 21.3.6 to 21.6 #178
Merged
Merge 21.3.6 to 21.6 #178
Conversation
This file contains hidden or 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
* Adding PMIC project files. * Avoid using "IF EXISTS" syntax, unsupported by older SQL Server versions that are still supported and tested on TeamCity * Removed the containerid from the queries * Updated PMIC files and adding housing alert related files. * Added the PMIC section to the Queues * Fixed the file name typo and updated the xml file with PMIC_Reference_Data * Added "Go" statement before the CREATE statements * Added a new alert called PMIC services alert. Updated the ONPRC_EHRModule.java file, added a new sql file and updated ColonyAlertsNotification.java file. * New ETL process added to schedule housing transfer alert process * Added the "GO" statements before and after the stored proc. Co-authored-by: labkey-jeckels <jeckels@labkey.com>
The change is tested on prime20test and ready to be put in uat & production.
* - Added code to hide the "ChargeType" and "CreditTo" fields from all PMIC data entry panels. - Added a new db field "Instance" to extscheduler.Resources to solve the container issue. * Instance field is added to xml. * Added a new query and updated the PMIC daily & weekly sql to get the folder name * Changed the file name to be relevant * Updated the sql name in both files * Changed a field name in all 3 queries to stay in-sync with the notification field names. * resourceid field is case sensitive * Added sql to display the PMIC data on animal history Imaging tab * Added the query filter to the PMIC daily & weekly alert urls to include "All folders"
The alert is tested in test and uat environment and ready to be merged to master branch.
* Color coding the cells in query.xml * Changed the date filter in the query. * Renamed a PMIC file. * Updated the housing color coding for diets
…ngs and have this feature applied to both Surgery input screens. (#146)
* Added the webpart for PMIC wiki * Added groups info to SLA purchase data and changed the billing container in PMIC * URL path updated * Added webpart for SLA landing page and updated PMIC service request form. * SLA allowable data dates validation. * Enhanced the PMIC alerts and housing alerts code. * NHP allowable data dates validation is added. * Fix malformed XML * Fixed the xml * Update onprc_ehr/resources/queries/study/PMIC_ChargeTypes.sql Co-authored-by: Josh Eckels <jeckels@labkey.com> * Changed the aliases table reference code * Added new query that retrieves breeding groups data from eIACUC tables. Co-authored-by: labkey-jeckels <jeckels@labkey.com>
* PMIC service req form flow changes. * Take #2: PMIC service req form flow changes. * Put back the chargeto and creditto fields to the PMIC data entry panels * PMIC CT scan changes. * PMIC PET & CT changes and changed weights days from 45 to 75 in routine preventive care alerts. * Updated CT scan history sql to include new fields. * Updated the routine preventive care alert query * PMIC animal history sql changes * PMIC PET scan examnum width changed * PMIC PET scan history sql updated
* Update of Rate Sheet XML for Year 62 forward * Cleaned up code issue in label * Update onprc_billingpublic/resources/queries/onprc_billing_public/NIHRateConfig.query.xml Co-authored-by: Josh Eckels <jeckels@labkey.com> * Update onprc_billingpublic/resources/queries/onprc_billing_public/NIHRates_ReducedFA.query.xml Co-authored-by: Josh Eckels <jeckels@labkey.com> * Update onprc_billingpublic/resources/queries/onprc_billing_public/NIHIndustryRates.query.xml Co-authored-by: Josh Eckels <jeckels@labkey.com> Co-authored-by: Josh Eckels <jeckels@labkey.com>
#171) * Restored the Weights by Monkey Id from the Printable reports that was inadvertently removed from the web page. * Add new columns to dataset to make tests happy Co-authored-by: labkey-jeckels <Josh Eckels>
Co-authored-by: labkey-jeckels <Josh Eckels>
Conflicts: onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-20.905-20.906.sql onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java
labkey-tchad
force-pushed
the
21.6_fb_merge_21.3.6
branch
from
6ae8945 to
58fd914
Compare
labkey-tchad
approved these changes
Jun 10, 2021
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.
Automatic merge failed! Please merge '21.3.6' into '21.6_fb_merge_21.3.6' and resolve conflicts manually.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.