Merge 23.9 to develop

LabKey · Sep 13, 2023 · f6a91ea · f6a91ea
2 parents 913ff39 + 29d24e2
commit f6a91ea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/hvtnFlow/resources/queries/flow/AnalysisPlan054.sql b/hvtnFlow/resources/queries/flow/AnalysisPlan054.sql
@@ -22,7 +22,7 @@ A.ASSAY,
 A.ASSAY_METHOD,
 A.ASSAYID,
 A._well.Run AS FLOWJO_XML_FILENAME,
-A._well AS FCS_FILENAME,
+REPLACE(A._well.Name, '.fcs', '') AS FCS_FILENAME,
 A.SPECROLE,
 A.PTID,
 A.SID,
@@ -66,4 +66,4 @@ A.COMMENTS,
 A._well @hidden, A._fcsfile @hidden, A._sample @hidden
 
 FROM AnalysisPlanTemplate A
-WHERE A.ANALYSIS_PLAN_ID = '54'
+WHERE A.ANALYSIS_PLAN_ID = '54'
diff --git a/hvtnFlow/resources/queries/flow/AnalysisPlan059.sql b/hvtnFlow/resources/queries/flow/AnalysisPlan059.sql
@@ -22,7 +22,7 @@ A.ASSAY,
 A.ASSAY_METHOD,
 A.ASSAYID,
 A._well.Run AS FLOWJO_XML_FILENAME,
-A._well AS FCS_FILENAME,
+REPLACE(A._well.Name, '.fcs', '') AS FCS_FILENAME,
 A.SPECROLE,
 A.PTID,
 A.SID,
@@ -66,4 +66,4 @@ A.COMMENTS,
 A._well @hidden, A._fcsfile @hidden, A._sample @hidden
 
 FROM AnalysisPlanTemplate A
-WHERE A.ANALYSIS_PLAN_ID = '59'
+WHERE A.ANALYSIS_PLAN_ID = '59'
diff --git a/hvtnFlow/resources/queries/flow/AnalysisPlan060.sql b/hvtnFlow/resources/queries/flow/AnalysisPlan060.sql
@@ -22,7 +22,7 @@ A.ASSAY,
 A.ASSAY_METHOD,
 A.ASSAYID,
 A._well.Run AS FLOWJO_XML_FILENAME,
-A._well AS FCS_FILENAME,
+REPLACE(A._well.Name, '.fcs', '') AS FCS_FILENAME,
 A.SPECROLE,
 A.PTID,
 A.SID,

diff --git a/viscstudies/test/src/org/labkey/test/tests/viscstudies/CAVDStudyTest.java b/viscstudies/test/src/org/labkey/test/tests/viscstudies/CAVDStudyTest.java
@@ -190,7 +190,8 @@ private void doVerifyStudyDesign()
         addGroup("Vaccine2", true, "3", 3);
         addTimepoint("CAVDImmTimepoint", "0", TimeUnit.Days);
         finishRevision();
-        waitForText("Immunization Schedule", 4, defaultWaitForPage); // WebPart title and schedule table header
+        waitForText("Immunization Schedule", 3, defaultWaitForPage); // WebPart title and schedule table header
+        assertElementPresent(Locator.tagWithId("a", "ImmunizationSchedule")); // Verify anchor tag on WebPart title
         assertTextPresent(_expectedImmunizationText);
         assertElementNotPresent(Locator.tagWithText("div", "30")); // From deleted rows