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

Symbols: introduced IPERL, ORACLE_DB, HEAT_METERS, TURA_IPERL, TURA_SPECIAL

Browse Source 
abandoned IPERLST, IPERLSTSPECIAL, HEAT_METERS_SUPPORT
This commit is contained in:
Milan Hanajik
2017-02-14 13:42:22 +01:00
parent f30d785fb3
commit 8d4910fcb0
30 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/WaterMeter.cs
+4 -4
View File
@@ -21,7 +21,7 @@ namespace Results.Entities
public virtual bool Passed { get; set; }
public virtual int ResultCode { get; set; }
#if IPERLST || IPERLST_SPECIAL
#if IPERL
public virtual int SerialNrEx { get; set; } /// Aux s/n for compound meters, Serial number for iPerl water meter
public virtual double OrigCalibFactor { get; set; } /// iPerl calibration factor used during the test
public virtual double CalibFactor { get; set; } /// iPerl calibration factor used during the test
@@ -35,7 +35,7 @@ namespace Results.Entities
public virtual int Pruefindex { get; set; } /// Not mapped to DB !!! 0=unknown (saving to Oracle failed), >=1 ... pruefindex
public virtual int HydrPruefung { get; set; } /// Not mapped to DB !!!
#endif
public virtual WaterMeterData WaterMeterData { get; set; }
public virtual WaterMeterData WaterMeterData { get; set; }
public virtual Batch Batch { get; set; }
public virtual IList<MeterTestRslt> MeterTestRslts { get; set; }
@@ -130,10 +130,10 @@ namespace Results.Entities
public override string ToString()
{
StringBuilder sb = new StringBuilder(80);
#if IPERLST || IPERLST_SPECIAL
#if IPERL
sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrEx);
#else
sb.AppendFormat("S/N:{0} ", SerialNr);
sb.AppendFormat("S/N:{0} ", SerialNr);
#endif
foreach (var tr in MeterTestRslts) sb.AppendFormat(" {0}:{1}%", tr.Name(), tr.Error.ToString("F2"));