iPerl ST component, symbol IPERLST_SPECIAL, etc. added to the project, ver. 2.4.260.

Results/Entities/WaterMeter.cs

@@ -19,7 +19,7 @@ namespace Results.Entities
 		public virtual double QRise				{ get; set; }	///![m3/h] detected Q_rise of a composed meter
 		public virtual double QFall				{ get; set; }	///![m3/h] detected Q_fall of a composed meter
 		public virtual bool   Passed            { get; set; }
-#if IPERLST
+#if IPERLST || IPERLST_SPECIAL
 		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
@@ -33,7 +33,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; }
 
@@ -122,10 +122,10 @@ namespace Results.Entities
 		public override string ToString()
 		{
 			StringBuilder sb = new StringBuilder(80);
-#if IPERLST
+#if IPERLST || IPERLST_SPECIAL
 			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"));