Skip to content

Issue 52461: Luminex Levey-Jennings report 4PL curve fit comparison report not working for assay run selected from another folder #851

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
cnathe merged 1 commit into from
Mar 5, 2025
Merged

Issue 52461: Luminex Levey-Jennings report 4PL curve fit comparison report not working for assay run selected from another folder #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions luminex/test/src/org/labkey/test/tests/luminex/LuminexGuideSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,10 @@ private void verifyGuideSetThresholds(Map<String, Integer> guideSetIds, String[]
@LogMethod
private void verifyLeveyJenningsPlots()
{
// Issue 52461: view the LJ report and curve fit comparison plots from subfolder
goToProjectFolder(getProjectName(), TEST_ASSAY_SUBFOLDER);
clickAndWait(Locator.linkWithText(TEST_ASSAY_LUM));

_guideSetHelper.goToLeveyJenningsGraphPage(TEST_ASSAY_LUM, "Standard1");
_guideSetHelper.setUpLeveyJenningsGraphParams("GS Analyte B");

Expand Down Expand Up @@ -434,6 +438,8 @@ private void verifyLeveyJenningsPlots()
selectCurveComparisonPlotOption("curvecomparison-legend-combo", "Notebook No.");
Locator.extButton("Close").findElement(curveComparisonWindow).click();
_extHelper.waitForExt3MaskToDisappear(WAIT_FOR_JAVASCRIPT);

goToProjectHome();
}

private void selectCurveComparisonPlotOption(String comboName, String value)
Expand Down
9 changes: 7 additions & 2 deletions luminex/test/src/org/labkey/test/tests/luminex/LuminexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
@BaseWebDriverTest.ClassTimeout(minutes = 40)
public abstract class LuminexTest extends BaseWebDriverTest
{
protected final static String TEST_ASSAY_PRJ_LUMINEX = "LuminexTest Project"; //project for luminex test
protected final static String TEST_ASSAY_PRJ_LUMINEX = "LuminexTest Project";
protected final static String TEST_ASSAY_SUBFOLDER = "Subfolder";//project for luminex test

public static final String TEST_ASSAY_LUM = "&TestAssayLuminex></% 1";// put back TRICKY_CHARACTERS_NO_QUOTES when issue 20061 is resolved
protected static final String TEST_ASSAY_LUM_DESC = "Description for Luminex assay";
Expand Down Expand Up @@ -181,6 +182,10 @@ private void doInit() throws Exception
goToProjectHome();
}

// create a subfolder to the project
_containerHelper.createSubfolder(getProjectName(), TEST_ASSAY_SUBFOLDER, "Assay");
goToProjectHome();

PortalHelper portalHelper = new PortalHelper(this);
//add the Assay List web part so we can create a new luminex assay
portalHelper.addWebPart("Assay List");
Expand Down Expand Up @@ -575,7 +580,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException
//helper function to go to test assay home from anywhere the project link is visible
public void goToTestAssayHome(String assayName)
{
if (!isTextPresent(assayName + " Runs"))
if (!getDriver().getTitle().startsWith(assayName + " Runs"))
{
goToProjectHome();
clickAndWait(Locator.linkWithText(assayName));
Expand Down
5 changes: 3 additions & 2 deletions luminex/webapp/luminex/LeveyJenningsTrackingDataPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ LABKEY.LeveyJenningsTrackingDataPanel = Ext.extend(Ext.Component, {
queryName: this.controlType === 'SinglePoint' ? 'AnalyteSinglePointControl' : 'AnalyteTitration',
columns: 'Analyte/Data/Run/RowId',
filterArray: [LABKEY.Filter.create('Analyte', analyteIds, LABKEY.Filter.Types.IN)],
containerFilter: LABKEY.Query.containerFilter.allFolders,
success: function(data) {
var runIds = [];
for (var i = 0; i < data.rows.length; i++) {
Expand Down Expand Up @@ -457,11 +458,11 @@ LABKEY.LeveyJenningsTrackingDataPanel = Ext.extend(Ext.Component, {
if (Ext.getDom(divId)) {
var html = Ext.getDom(divId).innerHTML;
html = html.replace(/&amp;/g, "&");
var pdfHref = html.substring(html.indexOf('href="') + 6, html.indexOf('&attachment=true'));
var pdfHref = html.substring(html.indexOf('href="') + 6, html.indexOf('Curve Comparison Plot.pdf') - 2);
if (pdfHref.indexOf("deleteFile") == -1) {
pdfHref = pdfHref + "&deleteFile=false";
}
window.location = pdfHref + "&attachment=true";
window.location = pdfHref;
}
}
},
Expand Down