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

MainSeq change to Restore a previously saved batch results, ver. 2.12.544

Browse Source
This commit is contained in:
Milan Hanajik
2017-04-20 15:53:11 +02:00
parent 45869401ad
commit 9cc9e4b4c9
3 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/DB.cs
+10
View File
@@ -286,6 +286,16 @@ namespace Results
batches = session.QueryOver<Batch>() batches = session.QueryOver<Batch>()
.Where(x => (x.BatchNr == batchNr)) .Where(x => (x.BatchNr == batchNr))
.List(); .List();
foreach (var batch in batches)
{
batch.TestRslts = session.QueryOver<TestRslt>()
.Where(x => (x.Batch.Id == batch.Id))
.List();
batch.WaterMeters = session.QueryOver<WaterMeter>()
.Where(x => (x.Batch.Id == batch.Id))
.List();
}
} }
catch (Exception exc) catch (Exception exc)
{ {
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.12.486.0")] [assembly: AssemblyVersion("2.12.544.0")]
[assembly: AssemblyFileVersion("2.12.486.0")] [assembly: AssemblyFileVersion("2.12.544.0")]
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+34 -7
View File
@@ -240,8 +240,8 @@ namespace TBF.BenchControl.Sequences
if (selection == Selection.RestoreBatch) if (selection == Selection.RestoreBatch)
{ {
BatchRslts = RestoreBatchResults(TBF.UiBridge.Bridge.BatchNr, /// Original batch number BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure);
newBatchNr); /// New batch number RestoreBatchResults(TBF.UiBridge.Bridge.BatchNr, ref BatchRslts); /// pass the original batch number of the batch to be restored
} }
else if (selection == Selection.Custom) else if (selection == Selection.Custom)
{ {
@@ -1358,15 +1358,42 @@ namespace TBF.BenchControl.Sequences
/// <param name="newBatchNr">New unique batch number</param> /// <param name="newBatchNr">New unique batch number</param>
/// <param name="procedure">Reloaded procedure</param> /// <param name="procedure">Reloaded procedure</param>
/// <returns></returns> /// <returns></returns>
Results.BatchResults RestoreBatchResults(int oriBatchNr, int newBatchNr) void RestoreBatchResults(int oriBatchNr, ref Results.BatchResults batchResults)
{ {
Batch batch = Results.DB.LoadBatch(oriBatchNr); Batch oriBatch = Results.DB.LoadBatch(oriBatchNr);
batch.BatchNr = newBatchNr;
return Results.BatchResults.FromBatch(batch); batchResults.Batch.StartTime = oriBatch.StartTime;
foreach (var testRslt in batchResults.Batch.TestRslts)
{
foreach (var oriTstRslt in oriBatch.TestRslts)
{
if (testRslt.Name() == oriTstRslt.Name() &&
testRslt.Part == oriTstRslt.Part &&
testRslt.RepetitionNr == oriTstRslt.RepetitionNr)
{
testRslt.CopyContentFrom(oriTstRslt);
break;
}
}
}
for (int i = 0; i < batchResults.WaterMeters.Length; i++)
{
WaterMeter wm = batchResults.WaterMeters[i];
foreach (var wm2 in oriBatch.WaterMeters)
{
if (wm.WMPosition == wm2.WMPosition)
{
wm.CopyContentFrom(wm2);
break;
}
}
}
} }
void CollectSimultSteps() void CollectSimultSteps()
{ {
/// ///
/// Collect steps (e.g. iPerl communication) to be done simultaneously with purging /// Collect steps (e.g. iPerl communication) to be done simultaneously with purging