Skip to content

[bot] Merge 26.7 to 26.9 #1894

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.

Sign up for GitHub

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

Merged
github-actions merged 5 commits into from
Sep 15, 2026
Merged

[bot] Merge 26.7 to 26.9 #1894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a2adc7
Correct error in SQL (#1888)
bbimber Sep 9, 2026
ca54f39
Use the shared LDK helper for lookup normalization (#1885)
labkey-martyp Sep 10, 2026
a8af443
26.3 fb managed treatment status (#1877)
Ohsudev Sep 10, 2026
112dd95
Merge 26.3 to 26.7
labkey-teamcity Sep 14, 2026
ebd0edb
Merge 26.7 to 26.9
labkey-teamcity Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GeneticsCore/resources/queries/geneticscore/mhc_data_source.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ SELECT
count(*) as totalTests,
cast('POS' as varchar) as result,
cast('SBT' as varchar) as assaytype,
a.analysisId.readset.libraryType as librarytype,
group_concat(DISTINCT a.analysisId.readset.libraryType, ',') as librarytype,
sum(a.result) / (SELECT count(DISTINCT a2.analysisId) as total FROM assay.GenotypeAssay.Genotype.Data a2 WHERE a2.subjectId = a.subjectId AND a2.run.assayType = 'SBT' ) AS score,

FROM assay.GenotypeAssay.Genotype.Data a
Expand Down
1 change: 1 addition & 0 deletions ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/employeeperUnit.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<columns>
<column columnName="employeeId">
<fk>
<fkFolderPath>/ONPRC/Admin/Compliance</fkFolderPath>
<fkDbSchema>ehr_compliancedb</fkDbSchema>
<fkTable>employees</fkTable>
<fkColumnName>employeeId</fkColumnName>
Expand Down
15 changes: 2 additions & 13 deletions ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

var console = require("console");
var LABKEY = require("labkey");
var ldkUtils = require("ldk/Utils").LDK.Server.Utils;

var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'requirements');

Expand All @@ -27,19 +28,7 @@ function beforeUpdate(row, oldRow, errors){
}

function beforeUpsert(row, errors){
var lookupFields = ['type'];
for (var i=0;i<lookupFields.length;i++){
var f = lookupFields[i];
var val = row[f];
if (!LABKEY.ExtAdapter.isEmpty(val)){
var normalizedVal = helper.getLookupValue(val, f);

if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
else
row[f] = normalizedVal; //cache value for purpose of normalizing case
}
}
ldkUtils.normalizeLookupFields(helper, row, errors, ['type']);
}

function afterUpdate(row, oldRow, errors){
Expand Down
15 changes: 2 additions & 13 deletions ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/requirementsperemployee.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

var LABKEY = require("labkey");
var ldkUtils = require("ldk/Utils").LDK.Server.Utils;

var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'onprc_ehr_compliancedb', 'requirementsperemployee');

Expand All @@ -24,17 +25,5 @@ function beforeUpdate(row, oldRow, errors){
}

function beforeUpsert(row, errors){
var lookupFields = ['employeeid', 'requirementname'];
for (var i=0;i<lookupFields.length;i++){
var f = lookupFields[i];
var val = row[f];
if (!LABKEY.ExtAdapter.isEmpty(val)){
var normalizedVal = helper.getLookupValue(val, f);

if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
else
row[f] = normalizedVal; //cache value for purpose of normalizing case
}
}
ldkUtils.normalizeLookupFields(helper, row, errors, ['employeeid', 'requirementname']);
}
3 changes: 2 additions & 1 deletion onprc_ehr/resources/web/onprc_ehr/panel/ManageTreatmentsPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ Ext4.define('onprc_ehr.panel.ManageTreatmentsPanel', {
columns: 'lsid,objectid,Id,date,enddate,project,category,remark,performedby,code,route,frequency,frequency/meaning,amountAndVolume,modifiedby/DisplayName,modified,enddateTimeCoalesced',
filterArray: [
LABKEY.Filter.create('Id', this.animalId, LABKEY.Filter.Types.EQUAL),
LABKEY.Filter.create('enddateTimeCoalesced', xdate, LABKEY.Filter.Types.GTE)//Modified: 6-28-2018 R.Blasa
LABKEY.Filter.create('QCState/Label', 'Completed', LABKEY.Filter.Types.EQUAL),
LABKEY.Filter.create('enddateTimeCoalesced', xdate, LABKEY.Filter.Types.GTE)
],
autoLoad: true,
listeners: {
Expand Down
2 changes: 2 additions & 0 deletions onprc_ehr/src/org/labkey/onprc_ehr/demographics/ActiveTreatmentsXDemographicsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ protected SimpleFilter getFilter(Collection<String> ids)
roundedMax = DateUtils.truncate(roundedMax, Calendar.DATE);

SimpleFilter filter = super.getFilter(ids);
filter.addCondition(FieldKey.fromString("isActive"), true, CompareType.EQUAL);
filter.addCondition(FieldKey.fromString("qcstate/publicData"), true, CompareType.EQUAL);
filter.addCondition(FieldKey.fromString("enddateTimeCoalesced"),roundedMax, CompareType.GTE);
filter.addCondition(FieldKey.fromString("category"), "Husbandry", CompareType.NEQ_OR_NULL);

Expand Down
15 changes: 2 additions & 13 deletions onprc_ssu/resources/queries/onprc_ssu/schedule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

var console = require("console");
var LABKEY = require("labkey");
var ldkUtils = require("ldk/Utils").LDK.Server.Utils;

var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'onprc_ssu', 'schedule');

Expand All @@ -27,17 +28,5 @@ function beforeUpdate(row, oldRow, errors){
}

function beforeUpsert(row, errors){
var lookupFields = ['projectName'];
for (var i=0;i<lookupFields.length;i++){
var f = lookupFields[i];
var val = row[f];
if (!LABKEY.ExtAdapter.isEmpty(val)){
var normalizedVal = helper.getLookupValue(val, f);

if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
else
row[f] = normalizedVal; //cache value for purpose of normalizing case
}
}
ldkUtils.normalizeLookupFields(helper, row, errors, ['projectName']);
}
Loading