From 62e562c2455509ac292b49bdb38b92c166ff6960 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 6 Jun 2017 15:09:59 +0200 Subject: [PATCH] DB changes : TestRslt table : TestDone, Remark, both FlowMean an FlowMin, ver. 2.14.572 --- Config/Properties/AssemblyInfo.cs | 4 ++-- Results/Entities/TestRslt.cs | 13 +++++++++---- Results/Entities/WaterMeter.cs | 1 + Results/Mappings/TestRsltMap.cs | 9 +++++++-- Results/Properties/AssemblyInfo.cs | 4 ++-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index c213f77ff..fe3f1ae82 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.13.555.0")] -[assembly: AssemblyFileVersion("2.13.555.0")] +[assembly: AssemblyVersion("2.14.572.0")] +[assembly: AssemblyFileVersion("2.14.572.0")] diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index 18a8c3de4..2d897c65f 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -17,6 +17,8 @@ namespace Results.Entities public virtual int RepetitionNr { get; set; } /// Repetition number from the set of repeated tests (1...) /// Main results + public virtual bool TestDone { get; set; } + public virtual string Remark { get; set; } public virtual DateTime StartTime { get; set; } /// Date and time of the test start public virtual DateTime EndTime { get; set; } /// Date and time of the test end public virtual int FlowSetTime { get; set; } /// [s] Measurement time in seconds @@ -86,9 +88,9 @@ namespace Results.Entities public virtual float TempDivEnd { get; set; } /// [°C] public virtual float TempDivMin { get; set; } /// [°C] public virtual float TempDivMax { get; set; } /// [°C] + public virtual float FlowMean { get; set; } /// [m3/h] mean flow from the reference flowmeter public virtual float FlowStart { get; set; } /// [m3/h] flow at the start of test from the reference flowmeter public virtual float FlowEnd { get; set; } /// [m3/h] flow at the end of test from the reference flowmeter - public virtual float FlowMean { get; set; } /// [m3/h] mean flow from the reference flowmeter public virtual float FlowMin { get; set; } /// [m3/h] not mapped to DB public virtual float FlowMax { get; set; } /// [m3/h] @@ -138,6 +140,8 @@ namespace Results.Entities Components = src.Components; /// ??? Part = src.Part; RepetitionNr = src.RepetitionNr; + TestDone = src.TestDone; + Remark = src.Remark; StartTime = src.StartTime; EndTime = src.EndTime; FlowSetTime = src.FlowSetTime; @@ -203,10 +207,11 @@ namespace Results.Entities TempDivEnd = src.TempDivEnd; TempDivMin = src.TempDivMin; TempDivMax = src.TempDivMax; - FlowStart = src.FlowStart; + FlowMean = src.FlowMean; + FlowStart = src.FlowStart; FlowEnd = src.FlowEnd; - FlowMean = src.FlowMean; - FlowMax = src.FlowMax; + FlowMin = src.FlowMin; + FlowMax = src.FlowMax; Custom1 = src.Custom1; Custom2 = src.Custom2; Custom3 = src.Custom3; diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index ba67df05f..2e5a67e0b 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -170,6 +170,7 @@ namespace Results.Entities QFall = src.QFall; Passed = src.Passed; ResultCode = src.ResultCode; + Remark = src.Remark; #if IPERL SerialNrEx = src.SerialNrEx; OrigCalibFactor = src.OrigCalibFactor; diff --git a/Results/Mappings/TestRsltMap.cs b/Results/Mappings/TestRsltMap.cs index ddfe62f32..99f531127 100644 --- a/Results/Mappings/TestRsltMap.cs +++ b/Results/Mappings/TestRsltMap.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2015 Sensus Metering Systems +/// Copyright (c) 2015-2017 Sensus Metering Systems /// using FluentNHibernate.Mapping; using Results.Entities; @@ -17,6 +17,10 @@ namespace Results.Mappings Map(x => x.Part); Map(x => x.RepetitionNr); + Map(x => x.TestDone); + Map(x => x.Remark) + .CustomType("StringClob") + .CustomSqlType("varchar(2000)"); Map(x => x.StartTime); Map(x => x.EndTime); Map(x => x.FlowSetTime); @@ -84,9 +88,10 @@ namespace Results.Mappings Map(x => x.TempDivEnd); Map(x => x.TempDivMin); Map(x => x.TempDivMax); + Map(x => x.FlowMean); Map(x => x.FlowStart); Map(x => x.FlowEnd); - Map(x => x.FlowMean).Column("FlowMin"); + Map(x => x.FlowMin); Map(x => x.FlowMax); Map(x => x.Custom1); diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 83e0e34ee..236401db7 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.13.555.0")] -[assembly: AssemblyFileVersion("2.13.555.0")] +[assembly: AssemblyVersion("2.14.572.0")] +[assembly: AssemblyFileVersion("2.14.572.0")] diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index b178b8905..54ab71464 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.13.560.1")] -[assembly: AssemblyFileVersion("2.13.560.1")] +[assembly: AssemblyVersion("2.14.572.1")] +[assembly: AssemblyFileVersion("2.14.572.1")]