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

All DataEntry forms bug fix : PurchaseOrder of water meters is updated only when a form was closed by OK, ver. 2.18.997

Browse Source
This commit is contained in:
Milan Hanajik
2018-09-14 09:52:11 +02:00
parent 769e68d49b
commit 64646486e9
10 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/DataEntry/Combined/EntryForm.cs
+5 -2
View File
@@ -274,8 +274,11 @@ namespace TBF.BenchControl.DataEntry.Combined
{
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
}
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}
}
TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs
+5 -2
View File
@@ -313,8 +313,11 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
}
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}
}
TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs
+4 -1
View File
@@ -313,7 +313,10 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
{
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}
TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs
+5 -2
View File
@@ -272,8 +272,11 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
}
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}
}
TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs
+4 -1
View File
@@ -272,7 +272,10 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}
TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs
+5 -2
View File
@@ -272,8 +272,11 @@ namespace TBF.BenchControl.DataEntry.Standard48
{
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
}
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}
}
TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs
+5 -2
View File
@@ -285,8 +285,11 @@ namespace TBF.BenchControl.DataEntry.Standard6
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
}
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}
}
TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs
+5 -2
View File
@@ -397,8 +397,11 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
{
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
}
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}
}
TBF/BenchControl/DataEntry/iPerl/EntryForm.cs
+4 -1
View File
@@ -257,7 +257,10 @@ namespace TBF.BenchControl.DataEntry.iPerl
{
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
{
wm.PurchaseOrder = PurchaseOrder; /// PurchaseOrder == null if form button OK has not been used => no update
}
}
}
}