Make sure CycleBeginForm is closed before the 1st test ends and s/n is in all results

2015-01-15 06:34:36 +01:00
parent 44b1f77b70
commit bb31cdae56
8 changed files with 138 additions and 89 deletions
@@ -303,6 +303,13 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
 			Bridge.OnActivity(this, Strings.Test_completed);
 			//------------------------------------------------

+			/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
+			if (cycleBeginFormOpened)
+			{
+				cycleBeginFormOpened = false;
+				if (CloseCycleBeginForm()) goto stopTest;
+			}
+
 			///
 			/// Populate TestResult data entity with data
 			///