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

(1) Results.Entities.Batch.ProtocolTitle removed, (2) Munich related stuff removed

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-02 14:20:24 +01:00
parent be07d04f67
commit 3f9973f8b8
65 changed files with 101 additions and 9736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/Batch.cs
+2 -8
View File
@@ -26,7 +26,6 @@ namespace Results.Entities
public virtual string ProcedureDescription { get; set; } /// CEVAK, not mapped to DB
public virtual int ProcedureRevision { get; set; }
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 SampleDensity { get; set; } /// Sample denisty in [kg/m3]
public virtual double SampleTemp { get; set; } /// Sample temperature when density measured [°C]
@@ -114,8 +113,6 @@ namespace Results.Entities
IsRemoteProcedure = false;
ProcedureDescription = string.Empty;
WatermetersStr = string.Empty;
ProtocolTitle = string.Empty;
ProtocolTitle = string.Empty;
Remark = string.Empty;
SampleDensity = Config.Data.SampleDensity;
SampleTemp = Config.Data.SampleTemp;
@@ -282,11 +279,10 @@ namespace Results.Entities
public virtual string ToString(int i)
{
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}",
return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} Remark={8} RealDensity={9} AtTemperature={10} Buoyancy={11} StartTime={12} EndTime={13} Dirty={14} RsltsSent={15} RsltsPrinted={16}",
BatchNr, ProgramVersion, TestBenchId, UserName, UserNumber,
ProcedureName, (IsRemoteProcedure ? "(R)" : ""), ProcedureRevision,
ProtocolTitle, Remark, SampleDensity, SampleTemp, Buoyancy,
StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted);
Remark, SampleDensity, SampleTemp, Buoyancy, StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted);
}
public virtual void WriteBinary(BinaryWriter writer)
@@ -308,7 +304,6 @@ namespace Results.Entities
writer.Write((ProcedureDescription != null) ? ProcedureDescription : string.Empty);
writer.Write(ProcedureRevision);
writer.Write((WatermetersStr != null) ? WatermetersStr : string.Empty);
writer.Write((ProtocolTitle != null) ? ProtocolTitle : string.Empty);
writer.Write((Remark != null) ? Remark : string.Empty);
writer.Write(SampleDensity);
writer.Write(SampleTemp);
@@ -375,7 +370,6 @@ namespace Results.Entities
ProcedureDescription = reader.ReadString();
ProcedureRevision = reader.ReadInt32();
WatermetersStr = reader.ReadString();
ProtocolTitle = reader.ReadString();
Remark = reader.ReadString();
SampleDensity = reader.ReadDouble();
SampleTemp = reader.ReadDouble();