diff --git a/Results/Entities/MeterTestRslt.cs b/Results/Entities/MeterTestRslt.cs index fcc8f27ef..b6c9b48b6 100644 --- a/Results/Entities/MeterTestRslt.cs +++ b/Results/Entities/MeterTestRslt.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2018 Sensus Slovensko a.s. /// using System; @@ -10,6 +10,8 @@ namespace Results.Entities public virtual int Id { get; protected set; } public virtual byte CompoundMeterId { get; set; } /// 0=single, 1=compound/main, 2=compound/aux., 3=compound/overal, 4=heat meter volume, 5=heat meter energy + public virtual string RegReaderClass { get; set; } /// Not mapped to the DB, does not depent on localisation and customer + public virtual double PulsesMeter { get; set; } /// # of water meter or heat meter pulses public virtual double PulsesMaster { get; set; } /// # of reference flowmeter pulses (gated by this water meter pulses) public virtual double PulsesPerLiter { get; set; } /// [l ^ -1], in case of heat meters (CompoundMeterId==5) pulses per kWh in [kWh ^ -1] @@ -96,6 +98,8 @@ namespace Results.Entities { if (src == null) return; + CompoundMeterId = src.CompoundMeterId; + RegReaderClass = src.RegReaderClass; PulsesMeter = src.PulsesMeter; PulsesMaster = src.PulsesMaster; PulsesPerLiter = src.PulsesPerLiter; diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index 772d00b86..1f1840f94 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2015-2017 Sensus Metering Systems +/// Copyright (c) 2015-2018 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -14,12 +14,13 @@ namespace Results.Entities public virtual Batch Batch { get; set; } public virtual TestData TestData { get; set; } public virtual Components Components { get; set; } - public virtual int Part { get; set; } + public virtual int Part { get; set; } public virtual int RepetitionNr { get; set; } /// Repetition number from the set of repeated tests (1...) + public virtual string MethodClass { get; set; } /// Not mapped to the DB, does not depent on localisation and customer /// Main results public virtual bool TestDone { get; set; } - public virtual string Remark { 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 @@ -203,7 +204,8 @@ namespace Results.Entities Components = src.Components; /// ??? Part = src.Part; RepetitionNr = src.RepetitionNr; - TestDone = src.TestDone; + MethodClass = src.MethodClass; + TestDone = src.TestDone; Remark = src.Remark; StartTime = src.StartTime; EndTime = src.EndTime; diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index e52e601c4..101ad3525 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.18.815.0")] -[assembly: AssemblyFileVersion("2.18.815.0")] +[assembly: AssemblyVersion("2.18.824.0")] +[assembly: AssemblyFileVersion("2.18.824.0")]