Database cleanup, columns correctly renamed, DataContainer namespace, etc.

Results/Entities/Batch.cs

@@ -28,8 +28,8 @@ namespace Results.Entities
 		public virtual string WatermetersStr { get; set; }			/// CEVAK, not mapped to DB
 		public virtual string ProtocolTitle { get; set; }
         public virtual string Remark { get; set; }
-        public virtual double RealDensity { get; set; }				/// Density correction in [kg/m3]
-		public virtual double AtTemperature { get; set; }
+        public virtual double SampleDensity { get; set; }			/// Sample denisty in [kg/m3]
+        public virtual double SampleTemp { get; set; }              /// Sample temperature when density measured [°C]
 		public virtual double Buoyancy { get; set; }
         public virtual int Counter6 { get; set; }
         public virtual int Counter7 { get; set; }
@@ -117,8 +117,8 @@ namespace Results.Entities
             ProtocolTitle = string.Empty;
             ProtocolTitle = string.Empty;
             Remark = string.Empty;
-            RealDensity = Config.Data.RealDensity;
-            AtTemperature = Config.Data.AtTemperature;
+            SampleDensity = Config.Data.SampleDensity;
+            SampleTemp = Config.Data.SampleTemp;
             Buoyancy = Config.Data.Buoyancy;
 		}
 
@@ -285,7 +285,7 @@ namespace Results.Entities
             return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} ProtocolTitle={8} Remark={9} RealDensity={10} AtTemperature={11} Buoyancy={12} StartTime={13} EndTime={14} Dirty={15} RsltsSent={16} RsltsPrinted={17}",
                                 BatchNr, ProgramVersion, TestBenchId, UserName, UserNumber,
 								ProcedureName, (IsRemoteProcedure ? "(R)" : ""), ProcedureRevision,
-                                ProtocolTitle, Remark, RealDensity, AtTemperature, Buoyancy,
+                                ProtocolTitle, Remark, SampleDensity, SampleTemp, Buoyancy,
                                 StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted);
 		}
 
@@ -310,8 +310,8 @@ namespace Results.Entities
             writer.Write((WatermetersStr != null) ? WatermetersStr : string.Empty);
             writer.Write((ProtocolTitle != null) ? ProtocolTitle : string.Empty);
             writer.Write((Remark != null) ? Remark : string.Empty);
-            writer.Write(RealDensity);
-            writer.Write(AtTemperature);
+            writer.Write(SampleDensity);
+            writer.Write(SampleTemp);
             writer.Write(Buoyancy);
             writer.Write(Counter6);
             writer.Write(Counter7);
@@ -377,8 +377,8 @@ namespace Results.Entities
             WatermetersStr = reader.ReadString();
             ProtocolTitle = reader.ReadString();
             Remark = reader.ReadString();
-            RealDensity = reader.ReadDouble();
-            AtTemperature = reader.ReadDouble();
+            SampleDensity = reader.ReadDouble();
+            SampleTemp = reader.ReadDouble();
             Buoyancy = reader.ReadDouble();
             Counter6 = reader.ReadInt32();
             Counter7 = reader.ReadInt32();

Results/Entities/TestData.cs

@@ -47,7 +47,7 @@ namespace Results.Entities
             Qfrom = (double)test.Qfrom;
 			Qto = (double)test.Qto;
 			TargetVolume = (double)test.Volume;
-			TargetTime = (double)test.TstTime;
+			TargetTime = (double)test.TestTime;
 			Method = test.Method;
 			ErrLimLo = (double)test.ErrLimLo;
 			ErrLimHi = (double)test.ErrLimHi;