aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RhSolutions.AddIn/Services/ExcelReader.cs27
-rw-r--r--RhSolutions.AddIn/Services/FileDialog.cs2
2 files changed, 8 insertions, 21 deletions
diff --git a/RhSolutions.AddIn/Services/ExcelReader.cs b/RhSolutions.AddIn/Services/ExcelReader.cs
index 5cc5e86..d2b77cd 100644
--- a/RhSolutions.AddIn/Services/ExcelReader.cs
+++ b/RhSolutions.AddIn/Services/ExcelReader.cs
@@ -110,27 +110,14 @@ public class ExcelReader : IReader, IDisposable
object name = worksheet.Cells[row, NameCell.Column].Value2;
object sku = worksheet.Cells[row, SkuCell.Column].Value2;
object measure = worksheet.Cells[row, MeasureCell.Column].Value2;
- Measure productMeasure;
-
- switch (measure.ToString())
+ var productMeasure = measure.ToString() switch
{
- case "м":
- productMeasure = Measure.M;
- break;
- case "шт":
- productMeasure = Measure.P;
- break;
- case "м2":
- productMeasure = Measure.M2;
- break;
- case "кг":
- productMeasure = Measure.Kg;
- break;
- default:
- productMeasure = Measure.P;
- break;
- }
-
+ "м" => Measure.M,
+ "шт" => Measure.P,
+ "м2" => Measure.M2,
+ "кг" => Measure.Kg,
+ _ => Measure.P,
+ };
if (productLine == null || name == null || sku == null)
continue;
diff --git a/RhSolutions.AddIn/Services/FileDialog.cs b/RhSolutions.AddIn/Services/FileDialog.cs
index f211307..bc2fbb7 100644
--- a/RhSolutions.AddIn/Services/FileDialog.cs
+++ b/RhSolutions.AddIn/Services/FileDialog.cs
@@ -2,7 +2,7 @@
public class FileDialog : IFileDialog
{
- private Application _application;
+ private readonly Application _application;
public FileDialog(Application application)
{