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

MethodClass added to TestRslt, RegReaderClass added to MeterTestRslt, not mapped to DB.

Browse Source
This commit is contained in:
Milan Hanajik
2018-02-26 12:34:51 +01:00
parent d8de284c37
commit 4c70ac6412
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/MeterTestRslt.cs
+5 -1
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2013-2016 Sensus Metering Systems /// Copyright (c) 2013-2018 Sensus Slovensko a.s.
/// ///
using System; using System;
@@ -10,6 +10,8 @@ namespace Results.Entities
public virtual int Id { get; protected set; } 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 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 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 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] 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; if (src == null) return;
CompoundMeterId = src.CompoundMeterId;
RegReaderClass = src.RegReaderClass;
PulsesMeter = src.PulsesMeter; PulsesMeter = src.PulsesMeter;
PulsesMaster = src.PulsesMaster; PulsesMaster = src.PulsesMaster;
PulsesPerLiter = src.PulsesPerLiter; PulsesPerLiter = src.PulsesPerLiter;
Results/Entities/TestRslt.cs
+3 -1
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2015-2017 Sensus Metering Systems /// Copyright (c) 2015-2018 Sensus Slovensko a.s.
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -16,6 +16,7 @@ namespace Results.Entities
public virtual Components Components { 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 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 /// Main results
public virtual bool TestDone { get; set; } public virtual bool TestDone { get; set; }
@@ -203,6 +204,7 @@ namespace Results.Entities
Components = src.Components; /// ??? Components = src.Components; /// ???
Part = src.Part; Part = src.Part;
RepetitionNr = src.RepetitionNr; RepetitionNr = src.RepetitionNr;
MethodClass = src.MethodClass;
TestDone = src.TestDone; TestDone = src.TestDone;
Remark = src.Remark; Remark = src.Remark;
StartTime = src.StartTime; StartTime = src.StartTime;
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.18.815.0")] [assembly: AssemblyVersion("2.18.824.0")]
[assembly: AssemblyFileVersion("2.18.815.0")] [assembly: AssemblyFileVersion("2.18.824.0")]