From 78567f9e394f2ff673b4ad74594354f8aa6c291c Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Wed, 8 Feb 2023 10:26:59 -0700 Subject: [PATCH] Testing II --- Server/Repositories/PinRepository.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Server/Repositories/PinRepository.cs b/Server/Repositories/PinRepository.cs index 2d31fbd..8897818 100644 --- a/Server/Repositories/PinRepository.cs +++ b/Server/Repositories/PinRepository.cs @@ -36,24 +36,22 @@ public class PinRepository : IPinRepository } else { - const int rows = 11; List values; const int points = 9; Pinned headerCommond; List results = new(); if (bioRadHeader is not null) { - const int columns = 10; + const int thickness = 5; System.Data.DataTable dataTable = metrologyRepository.GetData((int)bioRadHeader.ToolTypeID, bioRadHeader.ID); - if (dataTable.Rows.Count == rows && dataTable.Columns.Count == columns) + if (dataTable.Rows.Count > points && dataTable.Columns.Count > thickness) { values = new(); - const int rs = 5; for (int i = 0; i < dataTable.Rows.Count - 1; i++) { - if (dataTable.Rows[i]?.ItemArray[rs] is null) + if (dataTable.Rows[i]?.ItemArray[thickness] is null) break; - values.Add(string.Concat(dataTable.Rows[i].ItemArray[rs])); + values.Add(string.Concat(dataTable.Rows[i].ItemArray[thickness])); } if (values.Count > points) { @@ -64,12 +62,11 @@ public class PinRepository : IPinRepository } if (cdeHeader is not null) { - const int columns = 7; + const int rs = 6; System.Data.DataTable dataTable = metrologyRepository.GetData((int)cdeHeader.ToolTypeID, cdeHeader.ID); - if (dataTable.Rows.Count == rows && dataTable.Columns.Count == columns) + if (dataTable.Rows.Count > points && dataTable.Columns.Count > rs) { values = new(); - const int rs = 5; for (int i = 0; i < dataTable.Rows.Count - 1; i++) { if (dataTable.Rows[i]?.ItemArray[rs] is null)