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 @@ - - Form - - - BatchResultsDlg.cs - UserControl @@ -213,9 +207,6 @@ - - BatchResultsDlg.cs - ManualEntryConfigCtrl.cs 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 @@ ProcessTabPageExCtrl.cs + + Form + + + BatchResultsDlg.cs + Form @@ -3569,6 +3575,9 @@ ProcessTabPageExCtrl.cs + + BatchResultsDlg.cs + DeleteFromOracleForm.cs 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(); /// 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),