Skip to content

Use the shared LDK helper for lookup normalization #1885

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
labkey-martyp merged 2 commits into from
Sep 10, 2026
Merged

Use the shared LDK helper for lookup normalization #1885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7701b
Use the shared LDK helper for lookup normalization
labkey-martyp Sep 8, 2026
046e5f6
Pin the employeeperUnit employeeId lookup to the compliance folder
labkey-martyp Sep 8, 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
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']);
}
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']);
}