From f47e7670a344c04a0c5ada992f907eb2a460d115 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Mon, 27 Feb 2023 12:36:50 +0100
Subject: [PATCH] BatchResultsDlg moved to TBF.UI.ResultsMI

---
 Results/Results.csproj                                 |  9 ---------
 TBF/TBF.csproj                                         |  9 +++++++++
 .../UI/ResultsMI}/BatchResultsDlg.Designer.cs          |  2 +-
 {Results/Forms => TBF/UI/ResultsMI}/BatchResultsDlg.cs | 10 +++++++---
 .../Forms => TBF/UI/ResultsMI}/BatchResultsDlg.resx    |  0
 TBF/UI/ResultsMI/PreviousResultsDlg.cs                 |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)
 rename {Results/Forms => TBF/UI/ResultsMI}/BatchResultsDlg.Designer.cs (98%)
 rename {Results/Forms => TBF/UI/ResultsMI}/BatchResultsDlg.cs (98%)
 rename {Results/Forms => TBF/UI/ResultsMI}/BatchResultsDlg.resx (100%)

diff --git a/Results/Results.csproj b/Results/Results.csproj
index fa731fdf0..0314fd656 100644
--- a/Results/Results.csproj
+++ b/Results/Results.csproj
@@ -75,12 +75,6 @@
     <Compile Include="Entities\WaterMeterData.cs" />
     <Compile Include="Entities\WaterMeter.cs" />
     <Compile Include="DB.cs" />
-    <Compile Include="Forms\BatchResultsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\BatchResultsDlg.Designer.cs">
-      <DependentUpon>BatchResultsDlg.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\IOneWMResultsCtrl.cs" />
     <Compile Include="Forms\ManualEntryConfigCtrl.cs">
       <SubType>UserControl</SubType>
@@ -213,9 +207,6 @@
     <Folder Include="Output\FileWriters\OneFilePerMeter\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Forms\BatchResultsDlg.resx">
-      <DependentUpon>BatchResultsDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\ManualEntryConfigCtrl.resx">
       <DependentUpon>ManualEntryConfigCtrl.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj
index 451ccb1e3..11d3bec74 100644
--- a/TBF/TBF.csproj
+++ b/TBF/TBF.csproj
@@ -2582,6 +2582,12 @@
     <Compile Include="UI\Process\ProcessTabPageExCtrl.designer.cs">
       <DependentUpon>ProcessTabPageExCtrl.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\ResultsMI\BatchResultsDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UI\ResultsMI\BatchResultsDlg.Designer.cs">
+      <DependentUpon>BatchResultsDlg.cs</DependentUpon>
+    </Compile>
     <Compile Include="UI\ResultsMI\DeleteFromOracleForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -3569,6 +3575,9 @@
     <EmbeddedResource Include="UI\Process\ProcessTabPageExCtrl.resx">
       <DependentUpon>ProcessTabPageExCtrl.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UI\ResultsMI\BatchResultsDlg.resx">
+      <DependentUpon>BatchResultsDlg.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UI\ResultsMI\DeleteFromOracleForm.resx">
       <DependentUpon>DeleteFromOracleForm.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/Results/Forms/BatchResultsDlg.Designer.cs b/TBF/UI/ResultsMI/BatchResultsDlg.Designer.cs
similarity index 98%
rename from Results/Forms/BatchResultsDlg.Designer.cs
rename to TBF/UI/ResultsMI/BatchResultsDlg.Designer.cs
index 631d06700..516f4fee2 100644
--- a/Results/Forms/BatchResultsDlg.Designer.cs
+++ b/TBF/UI/ResultsMI/BatchResultsDlg.Designer.cs
@@ -1,4 +1,4 @@
-namespace Results.Forms
+namespace TBF.UI.ResultsMI
 {
     partial class BatchResultsDlg
     {
diff --git a/Results/Forms/BatchResultsDlg.cs b/TBF/UI/ResultsMI/BatchResultsDlg.cs
similarity index 98%
rename from Results/Forms/BatchResultsDlg.cs
rename to TBF/UI/ResultsMI/BatchResultsDlg.cs
index d289bdf09..4bef95f7f 100644
--- a/Results/Forms/BatchResultsDlg.cs
+++ b/TBF/UI/ResultsMI/BatchResultsDlg.cs
@@ -1,13 +1,17 @@
-using System;
+///
+/// Copyright (c) 2016-2023 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
 using Common;
-using Results.Resources;
+using Results.Forms;
 using NHibernate;
 using TracingDB.Entities;
+using TBF.Resources;
 
-namespace Results.Forms
+namespace TBF.UI.ResultsMI
 {
     public partial class BatchResultsDlg : Form
     {
diff --git a/Results/Forms/BatchResultsDlg.resx b/TBF/UI/ResultsMI/BatchResultsDlg.resx
similarity index 100%
rename from Results/Forms/BatchResultsDlg.resx
rename to TBF/UI/ResultsMI/BatchResultsDlg.resx
diff --git a/TBF/UI/ResultsMI/PreviousResultsDlg.cs b/TBF/UI/ResultsMI/PreviousResultsDlg.cs
index 19a3a2273..f78d9fc8f 100644
--- a/TBF/UI/ResultsMI/PreviousResultsDlg.cs
+++ b/TBF/UI/ResultsMI/PreviousResultsDlg.cs
@@ -326,7 +326,7 @@ namespace TBF.UI.ResultsMI
                     if (items == null) items = new List<WMeterRsltItemSpec>();
 
                     /// Show dialog with results
-                    Results.Forms.BatchResultsDlg dlg = new Results.Forms.BatchResultsDlg
+                    BatchResultsDlg dlg = new BatchResultsDlg
                         {
                             Text = string.Format(Strings.Results_of_batch_0, b.BatchNr),
                             Results = BatchResults.FromBatch(b),