michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BatchResultsDlg moved to TBF.UI.ResultsMI

Browse Source
This commit is contained in:
Milan Hanajik 2023-02-27 12:36:50 +01:00
parent 78575e4f6f
commit f47e7670a3
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Results/Results.csproj
View File

@ -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>

9
TBF/TBF.csproj
View File

@ -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>

2
Results/Forms/BatchResultsDlg.Designer.cs → TBF/UI/ResultsMI/BatchResultsDlg.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace Results.Forms
namespace TBF.UI.ResultsMI
{
partial class BatchResultsDlg
{

10
Results/Forms/BatchResultsDlg.cs → TBF/UI/ResultsMI/BatchResultsDlg.cs
View File

@ -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
{

0
Results/Forms/BatchResultsDlg.resx → TBF/UI/ResultsMI/BatchResultsDlg.resx
View File

2
TBF/UI/ResultsMI/PreviousResultsDlg.cs
View File

@ -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),