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

DataEntry.Standard12.CycleBeginningForm shows WM result only at the end, not at the beginning, ver.2.8.311

Browse Source
This commit is contained in:
Milan Hanajik
2016-06-23 13:01:47 +02:00
parent 550be3f8a3
commit 799c7b6fdb
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs
+22 -8
View File
@@ -19,6 +19,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// <summary> Number of water meters </summary>
public readonly int WaterMetersCount;
public readonly bool AtTheEnd;
public readonly bool SensusExtensions;
/// To be retrieved after the form is closed
@@ -75,11 +76,12 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// Constructor
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public CycleBeginningForm(Results.Entities.WaterMeter[] waterMeters, bool sensusExtensions)
public CycleBeginningForm(Results.Entities.WaterMeter[] waterMeters, bool atTheEnd, bool sensusExtensions)
: this()
{
this.WaterMeters = waterMeters;
this.WaterMetersCount = waterMeters.Length;
this.AtTheEnd = atTheEnd;
this.SensusExtensions = sensusExtensions;
SNText = new string[WaterMetersCount];
Disabled = new bool[WaterMetersCount];
@@ -147,8 +149,12 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
comboBoxes[i].Items.Add(Program.LocalSettings.LastSNTexts[i]);
}
labels[i].Visible = comboBoxes[i].Visible = checkBoxes[i].Visible = pictureBoxes[i].Visible = true;
labels[i].Visible = comboBoxes[i].Visible = checkBoxes[i].Visible = true;
enabledComboBoxes.Add(comboBoxes[i]);
if (AtTheEnd)
{
pictureBoxes[i].Visible = true;
}
}
UpdateIcons();
@@ -193,10 +199,10 @@ namespace TBF.BenchControl.DataEntry.Standard12
void UpdateIcons()
{
Image imgP = Properties.Resources.TestPassedImage; /// Passed
Image imgF = Properties.Resources.TestFailedImage; /// Failed
Image imgP2 = Properties.Resources.TestPassedImage2; /// Passed after re-work
Image imgF2 = Properties.Resources.TestFailedImage2; /// Failed after re-work
Image imgP = null;
Image imgF = null;
Image imgP2 = null;
Image imgF2 = null;
int nrRedone = 0;
if (SensusExtensions)
@@ -214,8 +220,16 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
checkBoxes[i].Checked = true;
}
else
else if (AtTheEnd)
{
if (imgP == null || imgF == null || imgP2 == null || imgF2 == null)
{
imgP = Properties.Resources.TestPassedImage; /// Passed
imgF = Properties.Resources.TestFailedImage; /// Failed
imgP2 = Properties.Resources.TestPassedImage2; /// Passed after re-work
imgF2 = Properties.Resources.TestFailedImage2; /// Failed after re-work
}
pictureBoxes[i].Image = (WaterMetersCount - i > nrRedone) ? (wm.Passed ? imgP : imgF) : (wm.Passed ? imgP2 : imgF2);
}
}
@@ -486,7 +500,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
for (int i = 0; i < textBoxesCount; i++)
{
if (WaterMeters[i].Passed)
if (!AtTheEnd || WaterMeters[i].Passed)
{
if (!snFound)
{
TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx
+4 -4
View File
@@ -1597,13 +1597,13 @@
<value>73, 120</value>
</data>
<data name="ext3Label.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 23</value>
<value>20, 23</value>
</data>
<data name="ext3Label.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="ext3Label.Text" xml:space="preserve">
<value>s tlakovou skúškou</value>
<value>?</value>
</data>
<data name="&gt;&gt;ext3Label.Name" xml:space="preserve">
<value>ext3Label</value>
@@ -1648,13 +1648,13 @@
<value>73, 81</value>
</data>
<data name="ext2Label.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 23</value>
<value>20, 23</value>
</data>
<data name="ext2Label.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="ext2Label.Text" xml:space="preserve">
<value>predregulovaných</value>
<value>?</value>
</data>
<data name="&gt;&gt;ext2Label.Name" xml:space="preserve">
<value>ext2Label</value>
TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs
+1 -1
View File
@@ -123,7 +123,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
///
void OpenBeginningDlg(EntryForm myRef)
{
myRef.modelessDlg = new CycleBeginningForm(myRef.waterMeters, entryFormCfg.SensusExtensions);
myRef.modelessDlg = new CycleBeginningForm(myRef.waterMeters, entryFormCfg.EnterSerialNrsAtTheEnd, entryFormCfg.SensusExtensions);
modelessDlg.Show();
}
///
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.8.310.1")]
[assembly: AssemblyFileVersion("2.8.310.1")]
[assembly: AssemblyVersion("2.8.311.1")]
[assembly: AssemblyFileVersion("2.8.311.1")]