From 2f27415e101e26832be2982a4a7bbdd76a47ea8b Mon Sep 17 00:00:00 2001
From: jryurkanin <104916543+jryurkanin@users.noreply.github.com>
Date: Tue, 29 Aug 2023 20:04:30 -0700
Subject: [PATCH 1/3] Update AnalysisPlan060.sql

---
 hvtnFlow/resources/queries/flow/AnalysisPlan060.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hvtnFlow/resources/queries/flow/AnalysisPlan060.sql b/hvtnFlow/resources/queries/flow/AnalysisPlan060.sql
index c278df3..12f858d 100644
--- 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,

From 1a19bdf1398e3d1834eb95cab05026e6ef7b048c Mon Sep 17 00:00:00 2001
From: jryurkanin <104916543+jryurkanin@users.noreply.github.com>
Date: Fri, 1 Sep 2023 12:47:24 -0700
Subject: [PATCH 2/3] Update AnalysisPlan059.sql

---
 hvtnFlow/resources/queries/flow/AnalysisPlan059.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hvtnFlow/resources/queries/flow/AnalysisPlan059.sql b/hvtnFlow/resources/queries/flow/AnalysisPlan059.sql
index 6f9cf37..6ffb2c4 100644
--- 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'
\ No newline at end of file
+WHERE A.ANALYSIS_PLAN_ID = '59'

From 0d08849c82b06c87f6c5991e4e22637641754d9c Mon Sep 17 00:00:00 2001
From: jryurkanin <104916543+jryurkanin@users.noreply.github.com>
Date: Fri, 1 Sep 2023 12:47:57 -0700
Subject: [PATCH 3/3] Update AnalysisPlan054.sql

---
 hvtnFlow/resources/queries/flow/AnalysisPlan054.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hvtnFlow/resources/queries/flow/AnalysisPlan054.sql b/hvtnFlow/resources/queries/flow/AnalysisPlan054.sql
index 61d628b..b8fdc4e 100644
--- 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'
\ No newline at end of file
+WHERE A.ANALYSIS_PLAN_ID = '54'