Merge 23.7 to 23.9

LabKey · Sep 6, 2023 · 633166d · 633166d
2 parents 913ff39 + 4331305
commit 633166d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 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,