Skip to content

Ticket 53312: Bulk editing "Ordered By" in treatments #546

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 3 commits into from
Jun 25, 2025
Merged

Ticket 53312: Bulk editing "Ordered By" in treatments #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f39ef7
Fix orderedby and endtreatmentorderedby
labkey-martyp Jun 24, 2025
f9831ee
Cleanup performedby
labkey-martyp Jun 24, 2025
ee6e4b3
Test case to bulk edit "ordered by"
labkey-martyp Jun 25, 2025
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
12 changes: 0 additions & 12 deletions nirc_ehr/resources/web/nirc_ehr/model/sources/BehavioralCase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,6 @@ EHR.model.DataModelManager.registerMetadata('BehavioralCase', {
caseCategory: {
hidden: true
},
performedby: {
hidden: false,
defaultValue: LABKEY.Security.currentUser.id.toString(),
editorConfig: {
store: {
type: 'labkey-store',
schemaName: 'core',
sql: 'SELECT CAST (UserId AS VARCHAR) AS UserId,DisplayName,FirstName,LastName FROM core.users',
autoLoad: true
}
}
},
formCasesLink: {
xtype: 'nirc_ehr-editCases'
}
Expand Down
14 changes: 1 addition & 13 deletions nirc_ehr/resources/web/nirc_ehr/model/sources/BulkBehavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,7 @@ EHR.model.DataModelManager.registerMetadata('BulkBehavior', {
},
qcstate: {
hidden: true
},
performedby: {
hidden: false,
defaultValue: LABKEY.Security.currentUser.id.toString(),
editorConfig: {
store: {
type: 'labkey-store',
schemaName: 'core',
sql: 'SELECT CAST (UserId AS VARCHAR) AS UserId,DisplayName,FirstName,LastName FROM core.users',
autoLoad: true
}
}
},
}
},
'study.clinical_observations': {
type: {
Expand Down
14 changes: 1 addition & 13 deletions nirc_ehr/resources/web/nirc_ehr/model/sources/BulkClinical.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,7 @@ EHR.model.DataModelManager.registerMetadata('BulkClinical', {
columnConfig: {
editable: false
}
},
performedby: {
hidden: false,
defaultValue: LABKEY.Security.currentUser.id.toString(),
editorConfig: {
store: {
type: 'labkey-store',
schemaName: 'core',
sql: 'SELECT CAST (UserId AS VARCHAR) AS UserId,DisplayName,FirstName,LastName FROM core.users',
autoLoad: true
}
}
},
}
}
}
});
12 changes: 0 additions & 12 deletions nirc_ehr/resources/web/nirc_ehr/model/sources/ClinicalCase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,6 @@ EHR.model.DataModelManager.registerMetadata('ClinicalCase', {
caseCategory: {
hidden: true
},
performedby: {
hidden: false,
defaultValue: LABKEY.Security.currentUser.id.toString(),
editorConfig: {
store: {
type: 'labkey-store',
schemaName: 'core',
sql: 'SELECT CAST (UserId AS VARCHAR) AS UserId,DisplayName,FirstName,LastName FROM core.users',
autoLoad: true
}
}
},
formCasesLink: {
xtype: 'nirc_ehr-editCases'
}
Expand Down
17 changes: 0 additions & 17 deletions nirc_ehr/resources/web/nirc_ehr/model/sources/ClinicalDefaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,6 @@ EHR.model.DataModelManager.registerMetadata('ClinicalDefaults', {
defaultValue: 'Clinical',
hidden: true
},
performedby: {
hidden: false,
defaultValue: LABKEY.Security.currentUser.id.toString(),
editorConfig: {
store: {
type: 'labkey-store',
schemaName: 'core',

// 'performedby' is a text field in the dataset and its lookup to the userid is an int field - this mismatch causes it to disappear
// from the display when a value is selected from the dropdown even though the 'userid' value gets saved as a text (this behavior was only seen
// in the form panel but not in the grid panel).
// casting it as a varchar when loading the store fixes this issue.
sql: 'SELECT CAST (UserId AS VARCHAR) AS UserId,DisplayName,FirstName,LastName FROM core.users',
autoLoad: true
}
}
},
category: {
defaultValue: 'Clinical',
hidden: true,
Expand Down
24 changes: 23 additions & 1 deletion nirc_ehr/resources/web/nirc_ehr/model/sources/NIRCDefault.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
},
performedby: {
hidden: false,
defaultValue: LABKEY.Security.currentUser.id.toString(),
defaultValue: LABKEY.Security.currentUser.id,
getInitialValue: function (v, rec) {
return LABKEY.Security.currentUser.id;
},
Expand All @@ -35,6 +35,18 @@ EHR.model.DataModelManager.registerMetadata('Default', {
defaultValue: null,
columnConfig: {
width: 160
},
editorConfig: {
store: {
type: 'labkey-store',
schemaName: 'ehr_lookups',

// 'orderedby' is a text field in the dataset and its lookup to the userid is an int field - this mismatch causes it to disappear
// from the display when a value is selected from the dropdown even though the 'userid' value gets saved as a text.
// Casting it as a varchar when loading the store fixes this issue.
sql: 'SELECT CAST (UserId AS VARCHAR) AS UserId,DisplayName FROM ehr_lookups.veterinarians',
autoLoad: true
}
}
},
scheduleddate: {
Expand Down Expand Up @@ -151,6 +163,16 @@ EHR.model.DataModelManager.registerMetadata('Default', {
endTreatmentOrderedBy: {
columnConfig: {
width: 200
},
editorConfig: {
store: {
type: 'labkey-store',
schemaName: 'ehr_lookups',

// see 'orderedby' comment above.
sql: 'SELECT CAST (UserId AS VARCHAR) AS UserId,DisplayName FROM ehr_lookups.veterinarians',
autoLoad: true
}
}
}
},
Expand Down
12 changes: 9 additions & 3 deletions nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,9 +836,16 @@ public void testClinicalCasesWorkflow()
orderGrid.setGridCell(1, "frequency", "QID");
orderGrid.clickDownArrowOnGrid(1, "route");
orderGrid.setGridCell(1, "route", "IVAG");
orderGrid.clickDownArrowOnGrid(1, "orderedby");
orderGrid.setGridCell(1, "orderedby", NIRC_VET_NAME);
orderGrid.completeEdit();

Locator.XPathLocator bulkEditWindow = _helper.openBulkEdit(orderGrid);
_helper.toggleBulkEditExactField("Ordered By");
_ext4Helper.selectComboBoxItem(Ext4Helper.Locators.formItemWithLabelContaining("Ordered By:"), NIRC_VET_NAME);
waitAndClick(bulkEditWindow.append(Ext4Helper.Locators.ext4Button("Submit")));

Window msgWindow = new Window.WindowFinder(this.getDriver()).withTitle("Set Values").waitFor();
msgWindow.clickButton("Yes", 0);

submitForm("Submit Final", "Finalize Form");

log("Completing today's Medication Schedule");
Expand All @@ -857,7 +864,6 @@ public void testClinicalCasesWorkflow()
submitForm("Submit Final", "Finalize");
stopImpersonating();

// TODO: This will be reimplemented in a current PR, this can than be uncommented.
//Go to NIRC/EHR main page
goToEHRFolder();
impersonate(NIRC_FULL_SUBMITTER_VET);
Expand Down