All entry forms modified to use Result.Entities.WaterMeter, EndStateAux introduced. TODO: display, saving, printing.

Results/Entities/WaterMeter.cs

@@ -12,19 +12,19 @@ namespace Results.Entities
 		public virtual string SerialNr			{ get; set; }	/// Main s/n for compound meters, PCB Number for iPerl water meter
 		public virtual string SerialNrEx		{ get; set; }	/// Aux s/n for compound meters, Serial number for iPerl water meter
 		public virtual string PurchaseOrder		{ get; set; }
-		public virtual int    WMPosition		{ get; set; }
-		public virtual string EndState			{ get; set; }
+		public virtual int    YearOfProduction  { get; set; }
+		public virtual int    WMPosition        { get; set; }
+		public virtual string EndState			{ get; set; }	/// End state (of the main water meter)
+		public virtual string EndStateAux       { get; set; }	/// End state of the auxiliary water meter
 		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 int    YearOfProduction	{ get; set; }
-		public virtual bool   Passed			{ get; set; }
+		public virtual bool   Passed            { get; set; }
 #if IPERLST
 		public virtual double OrigCalibFactor	{ get; set; }	/// iPerl calibration factor used during the test - Not mapped to DB !!!
 		public virtual double CalibFactor		{ get; set; }	/// iPerl calibration factor used during the test - Not mapped to DB !!!
 		public virtual bool   Q2CorrectionDone  { get; set; }   /// true = iPerl Q2 correction was done
 		public virtual double Q2Correction		{ get; set; }	/// iPerl Q2 correction used during the test - Not mapped to DB !!!
 #endif
-
 		public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
 		public virtual IList<MeterTestRslt> MeterTestRslts { get; set; }
@@ -50,6 +50,12 @@ namespace Results.Entities
 		public virtual DateTime StartTime()		  { return Batch.StartTime; }
 		public virtual DateTime EndTime()		  { return Batch.EndTime; }
 
+		///
+		/// Not mapped to the database
+		///
+		public virtual bool   Disabled	{ get; set; }	/// true = Disabled water meters (not saved into DB)
+
+
 		public virtual MeterTestRslt MeterTestRslt(string testName)
 		{
 			foreach (var tr in MeterTestRslts)

Results/Mappings/WaterMeterMap.cs

@@ -14,11 +14,12 @@ namespace Results.Mappings
 			Map(x => x.SerialNr);
 			Map(x => x.SerialNrEx);
 			Map(x => x.PurchaseOrder);
+			Map(x => x.YearOfProduction);
 			Map(x => x.WMPosition);
 			Map(x => x.EndState);
+			Map(x => x.EndStateAux);
 			Map(x => x.QRise);
 			Map(x => x.QFall);
-			Map(x => x.YearOfProduction);
 			Map(x => x.Passed);
 #if IPERLST
 			Map(x => x.OrigCalibFactor);