Merge pull request #273 from DougSchmidt-AI/feature/PF-1235-MoreNwfwmdLabFileImporterFixes

Feature/pf 1235 more nwfwmd lab file importer fixes

Author: Doug Schmidt

Samples/DotNetSdk/NWFWMD-LabFileImporter/Context.cs

@@ -16,11 +16,14 @@ public class Context
         public Dictionary<string, string> AnalysisMethodAliases { get; } = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
         public Dictionary<string, string> UnitAliases { get; } = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
         public List<string> Files { get; } = new List<string>();
+        public string EquipmentBlankLocation { get; set; } = "000000";
+        public HashSet<string> EquipmentBlankPatterns { get; } = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
         public bool DryRun { get; set; }
         public string ResultGrade { get; set; } = "OK";
         public string LabResultStatus { get; set; } = "Preliminary";
         public string DefaultLaboratory { get; set; } = "";
         public string DefaultMedium { get; set; } = "Water";
+        public string DefaultCollectionAgency { get; set; } = "NWFWMD";
         public string NonDetectCondition { get; set; } = "Non-Detect";
         public bool StopOnFirstError { get; set; }
         public int ErrorLimit { get; set; } = 10;

Samples/DotNetSdk/NWFWMD-LabFileImporter/CsvWriter.cs

@@ -47,6 +47,7 @@ public void WriteObservations(StreamWriter writer, IEnumerable<ObservationV2> ob
                 {nameof(ObservationV2.QCSourceSampleID), "QC: Source Sample ID"},
                 {nameof(ObservationV2.EARequestID), "EA: RequestId"},
                 {nameof(ObservationV2.EASampler), "EA: Sampler"},
+                {nameof(ObservationV2.EACollectionAgency), "EA: CollectionAgency"},
             };
 
             writer.Write(CsvSerializer.SerializeToCsv(observations).Trim());

Samples/DotNetSdk/NWFWMD-LabFileImporter/LabFileLoader.cs

@@ -169,13 +169,14 @@ private ObservationV2 ParseRow()
                 LabQualityFlag = valueQualifier,
                 EARequestID = GetColumn("REQUEST_ID"),
                 EASampler = GetColumn("SAMPLER"),
+                EACollectionAgency = Context.DefaultCollectionAgency,
             };
         }
 
         private string LookupLocation(string fieldId)
         {
-            if (EquipmentBlanks.Any(text => fieldId.IndexOf(text, StringComparison.InvariantCultureIgnoreCase) >= 0))
-                return "000000";
+            if (Context.EquipmentBlankPatterns.Any(text => fieldId.IndexOf(text, StringComparison.InvariantCultureIgnoreCase) >= 0))
+                return Context.EquipmentBlankLocation;
 
             var leadingNumberText = fieldId.Split('-')[0];
             var locationId = leadingNumberText;
@@ -197,12 +198,6 @@ private string LookupLocation(string fieldId)
             return fieldId;
         }
 
-        private static readonly string[] EquipmentBlanks =
-        {
-            "Equipment Blank",
-            "Equipment Blk",
-        };
-
         private (string PropertyId, string UnitId) LookupObservedProperty(string paramCode, string paramName, string unitOfMeasure)
         {
             var propertyId = paramCode;

Samples/DotNetSdk/NWFWMD-LabFileImporter/MainForm.Designer.cs

@@ -122,8 +122,15 @@ private void LoadContext()
             labResultStatusTextBox.Text = Context.LabResultStatus;
             defaultLaboratoryTextBox.Text = Context.DefaultLaboratory;
             defaultMediumTextBox.Text = Context.DefaultMedium;
+            defaultCollectionAgencyTextBox.Text = Context.DefaultCollectionAgency;
             nonDetectConditionTextBox.Text = Context.NonDetectCondition;
 
+            equipmentBlankLocationTextBox.Text = Context.EquipmentBlankLocation;
+            foreach (var pattern in Context.EquipmentBlankPatterns)
+            {
+                equipmentBlankPatternsListView.Items.Add(pattern);
+            }
+
             overwriteCheckBox.Checked = Context.Overwrite;
             CsvOutputPathTextBox.Text = Context.CsvOutputPath;
 
@@ -365,11 +372,21 @@ private void defaultLaboratoryTextBox_TextChanged(object sender, EventArgs e)
             Context.DefaultLaboratory = defaultLaboratoryTextBox.Text.Trim();
         }
 
+        private void defaultCollectionAgencyTextBox_TextChanged(object sender, EventArgs e)
+        {
+            Context.DefaultCollectionAgency = defaultCollectionAgencyTextBox.Text.Trim();
+        }
+
         private void defaultMediumTextBox_TextChanged(object sender, EventArgs e)
         {
             Context.DefaultMedium = defaultMediumTextBox.Text.Trim();
         }
 
+        private void equipmentBlankLocationTextBox_TextChanged(object sender, EventArgs e)
+        {
+            Context.EquipmentBlankLocation = equipmentBlankLocationTextBox.Text.Trim();
+        }
+
         private void nonDetectConditionTextBox_TextChanged(object sender, EventArgs e)
         {
             Context.NonDetectCondition = nonDetectConditionTextBox.Text.Trim();

Samples/DotNetSdk/NWFWMD-LabFileImporter/MainForm.cs

@@ -39,5 +39,6 @@ public class ObservationV2
         public string QCSourceSampleID { get; set; }
         public string EARequestID { get; set; }
         public string EASampler { get; set; }
+        public string EACollectionAgency { get; set; }
     }
 }

Samples/DotNetSdk/NWFWMD-LabFileImporter/ObservationV2.cs

@@ -121,7 +121,10 @@ private static Context ParseArgs(string[] args)
                 new Option {Key = nameof(context.LabResultStatus), Setter = value => context.LabResultStatus = value, Getter = () => context.LabResultStatus, Description = $"Lab result status."},
                 new Option {Key = nameof(context.DefaultLaboratory), Setter = value => context.DefaultLaboratory = value, Getter = () => context.DefaultLaboratory, Description = $"Default laboratory ID for lab results"},
                 new Option {Key = nameof(context.DefaultMedium), Setter = value => context.DefaultMedium = value, Getter = () => context.DefaultMedium, Description = $"Default medium for results"},
+                new Option {Key = nameof(context.DefaultCollectionAgency), Setter = value => context.DefaultCollectionAgency = value, Getter = () => context.DefaultCollectionAgency, Description = $"Default collection agency"},
                 new Option {Key = nameof(context.NonDetectCondition), Setter = value => context.NonDetectCondition = value, Getter = () => context.NonDetectCondition, Description = $"Lab detect condition for non-detect events."},
+                new Option {Key = nameof(context.EquipmentBlankLocation), Setter = value => context.EquipmentBlankLocation = value, Getter = () => context.EquipmentBlankLocation, Description = $"The sampling location ID used for equipment blanks."},
+                new Option {Key = nameof(context.EquipmentBlankPatterns), Setter = value => context.EquipmentBlankPatterns.Add(value), Getter = () => string.Join(", ", context.EquipmentBlankPatterns), Description = $"When the FIELD_ID column contains one of these patterns, use the configured -{nameof(Context.EquipmentBlankLocation)}=value."},
                 new Option {Key = nameof(context.VerboseErrors), Setter = value => context.VerboseErrors = ParseBoolean(value), Getter = () => $"{context.VerboseErrors}", Description = "Show row-by-row errors?"},
 
                 new Option(), new Option{Description = "Alias options: (these help you map from your external system to AQUARIUS Samples)"},

Samples/DotNetSdk/NWFWMD-LabFileImporter/Program.cs

@@ -100,7 +100,10 @@ Supported -option=value settings (/option=value works too):
   -LabResultStatus          Lab result status. [default: Preliminary]
   -DefaultLaboratory        Default laboratory ID for lab results
   -DefaultMedium            Default medium for results [default: Water]
+  -DefaultCollectionAgency  Default collection agency [default: NWFWMD]
   -NonDetectCondition       Lab detect condition for non-detect events. [default: Non-Detect]
+  -EquipmentBlankLocation   The sampling location ID used for equipment blanks. [default: 000000]
+  -EquipmentBlankPatterns   When the FIELD_ID column contains one of these patterns, use the configured -EquipmentBlankLocation=value.
   -VerboseErrors            Show row-by-row errors? [default: False]
 
   ========================= Alias options: (these help you map from your external system to AQUARIUS Samples)