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

Results.Entities.WaterMeter bug fixes, style changes.

Browse Source
This commit is contained in:
Milan Hanajik 2021-11-08 11:45:40 +01:00
parent 7cf862410b
commit 30c8433cb0
3 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Results/Entities/WaterMeter.cs
View File

@ -93,16 +93,16 @@ namespace Results.Entities
public virtual string Prefix { get; set; } public virtual string Prefix { get; set; }
public virtual string Suffix { get; set; } public virtual string Suffix { get; set; }
public virtual string CompleteSerialNr { get; set; } public virtual string CompleteSerialNr { get; set; }
public virtual string OriRadioAddress { get; set; } /// Not mapped to DB !!! Original radio address of a 640 water meter (albatrosID) public virtual string OriRadioAddress { get; set; } /// Original radio address of a 640 water meter (AlbatrosID)
public virtual int WMTypeRevision { get; set; } public virtual int WMTypeRevision { get; set; }
public virtual int Pruefindex { get; set; } /// >= 1 ... pruefindex public virtual int Pruefindex { get; set; } /// >= 1 ... pruefindex
public virtual int HydrPruefung { get; set; } public virtual int HydrPruefung { get; set; }
public virtual object RawTestInfos { get; set; } /// IList<SensusTestInfo> fetched from Oracle at the beginning of the cycle, not mapped to DB !!! public virtual object RawTestInfos { get; set; } /// Not mapped to DB !!! IList<SensusTestInfo> fetched from Oracle at the beginning of the cycle, not mapped to DB !!!
public virtual object CompleteTestInfos { get; set; } /// SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!! public virtual object CompleteTestInfos { get; set; } /// Not mapped to DB !!! SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!!
#endif #endif
public virtual int ProcessId { get; set; } /// Not mapped to DB !!! Tracing DB Process ID public virtual int ProcessId { get; set; } /// Not mapped to DB !!! Tracing DB Process ID
public virtual int SessionId { get; set; } /// Not mapped to DB !!! 1 (regular tracing DB session) or 2 (alternative tracing DB session) public virtual int SessionId { get; set; } /// Not mapped to DB !!! 1 (regular tracing DB session) or 2 (alternative tracing DB session)
public virtual bool LastRecordIsNok { get; set; } /// Not mapped to DB !!! Previous record verification result public virtual bool LastRecordIsNok { get; set; } /// Not mapped to DB !!! Previous record verification result
public virtual WaterMeterData WaterMeterData { get; set; } public virtual WaterMeterData WaterMeterData { get; set; }
public virtual Batch Batch { get; set; } public virtual Batch Batch { get; set; }
@ -418,11 +418,31 @@ namespace Results.Entities
public WaterMeter() public WaterMeter()
{ {
MeterTestRslts = new List<MeterTestRslt>(); MeterTestRslts = new List<MeterTestRslt>();
/// Initialize strings
SerialNr = string.Empty;
SerialNrAux = string.Empty;
RadioAddress = string.Empty;
PurchaseOrder = string.Empty;
EndState = string.Empty;
EndStateAux = string.Empty;
ErrorFlags = 0;
InfoFlags = 0;
ArchivePath = string.Empty;
Remark = string.Empty;
#if IPERL
FWVersion = string.Empty;
#endif
#if TURA_SPECIAL
ProdUserName = string.Empty;
ProdPurchaseOrder = string.Empty;
#endif
#if ORACLE_DB #if ORACLE_DB
AssignedSerialNr = 0; AssignedSerialNr = 0;
Prefix = string.Empty; Prefix = string.Empty;
Suffix = string.Empty; Suffix = string.Empty;
CompleteSerialNr = string.Empty; CompleteSerialNr = string.Empty;
OriRadioAddress = string.Empty;
WMTypeRevision = 0; WMTypeRevision = 0;
Pruefindex = 1; Pruefindex = 1;
HydrPruefung = 0; HydrPruefung = 0;
@ -431,25 +451,7 @@ namespace Results.Entities
#endif #endif
ProcessId = 0; ProcessId = 0;
SessionId = 0; SessionId = 0;
ErrorFlags = 0;
LastRecordIsNok = false; LastRecordIsNok = false;
/// Initialize strings
SerialNr = string.Empty;
SerialNrAux = string.Empty;
PurchaseOrder = string.Empty;
EndState = string.Empty;
EndStateAux = string.Empty;
ArchivePath = string.Empty;
Remark = string.Empty;
#if TURA_SPECIAL
RadioAddress = string.Empty;
ProdUserName = string.Empty;
ProdPurchaseOrder = string.Empty;
#endif
#if IPERL
FWVersion = string.Empty;
#endif
} }
@ -459,6 +461,7 @@ namespace Results.Entities
SerialNr = src.SerialNr; SerialNr = src.SerialNr;
SerialNrAux = src.SerialNrAux; SerialNrAux = src.SerialNrAux;
RadioAddress = src.RadioAddress;
PurchaseOrder = src.PurchaseOrder; PurchaseOrder = src.PurchaseOrder;
YearOfProduction = src.YearOfProduction; YearOfProduction = src.YearOfProduction;
WMPosition = src.WMPosition; WMPosition = src.WMPosition;
@ -487,23 +490,23 @@ namespace Results.Entities
FWVersion = src.FWVersion; FWVersion = src.FWVersion;
#endif #endif
#if TURA_SPECIAL #if TURA_SPECIAL
RadioAddress = src.RadioAddress; PaletteNr = src.PaletteNr;
PaletteNr = src.PaletteNr; UmkartonNr = src.UmkartonNr;
UmkartonNr = src.UmkartonNr; ProdTestBench = src.ProdTestBench;
ProdTestBench = src.ProdTestBench; ProdWMPosition = src.ProdWMPosition;
ProdWMPosition = src.ProdWMPosition; ProdUserName = src.ProdUserName;
ProdUserName = src.ProdUserName; ProdPurchaseOrder = src.ProdPurchaseOrder;
ProdPurchaseOrder = src.ProdPurchaseOrder; ProdPassed = src.ProdPassed;
ProdPassed = src.ProdPassed; ProdResultCode = src.ProdResultCode;
ProdResultCode = src.ProdResultCode; ProdQ2CorrRL = src.ProdQ2CorrRL;
ProdQ2CorrRL = src.ProdQ2CorrRL; ProdQ2CorrLR = src.ProdQ2CorrLR;
ProdQ2CorrLR = src.ProdQ2CorrLR;
#endif #endif
#if ORACLE_DB #if ORACLE_DB
AssignedSerialNr = src.AssignedSerialNr; AssignedSerialNr = src.AssignedSerialNr;
Prefix = src.Prefix; Prefix = src.Prefix;
Suffix = src.Suffix; Suffix = src.Suffix;
CompleteSerialNr = src.CompleteSerialNr; CompleteSerialNr = src.CompleteSerialNr;
OriRadioAddress = src.OriRadioAddress;
WMTypeRevision = src.WMTypeRevision; WMTypeRevision = src.WMTypeRevision;
Pruefindex = src.Pruefindex; Pruefindex = src.Pruefindex;
HydrPruefung = src.HydrPruefung; HydrPruefung = src.HydrPruefung;
@ -640,6 +643,7 @@ namespace Results.Entities
writer.Write(Id); writer.Write(Id);
writer.Write((SerialNr != null) ? SerialNr : string.Empty); writer.Write((SerialNr != null) ? SerialNr : string.Empty);
writer.Write((SerialNrAux != null) ? SerialNrAux : string.Empty); writer.Write((SerialNrAux != null) ? SerialNrAux : string.Empty);
writer.Write((RadioAddress != null) ? RadioAddress : string.Empty);
writer.Write((PurchaseOrder != null) ? PurchaseOrder : string.Empty); writer.Write((PurchaseOrder != null) ? PurchaseOrder : string.Empty);
writer.Write(YearOfProduction); writer.Write(YearOfProduction);
writer.Write(WMPosition); writer.Write(WMPosition);
@ -668,7 +672,6 @@ namespace Results.Entities
writer.Write((FWVersion != null) ? FWVersion : string.Empty); writer.Write((FWVersion != null) ? FWVersion : string.Empty);
#endif #endif
#if TURA_SPECIAL #if TURA_SPECIAL
writer.Write((RadioAddress != null) ? RadioAddress : string.Empty);
writer.Write(PaletteNr); writer.Write(PaletteNr);
writer.Write(UmkartonNr); writer.Write(UmkartonNr);
writer.Write((ProdTestBench != null) ? ProdTestBench : string.Empty); writer.Write((ProdTestBench != null) ? ProdTestBench : string.Empty);
@ -685,6 +688,7 @@ namespace Results.Entities
writer.Write((Prefix != null) ? Prefix : string.Empty); writer.Write((Prefix != null) ? Prefix : string.Empty);
writer.Write((Suffix != null) ? Suffix : string.Empty); writer.Write((Suffix != null) ? Suffix : string.Empty);
writer.Write((CompleteSerialNr != null) ? CompleteSerialNr : string.Empty); writer.Write((CompleteSerialNr != null) ? CompleteSerialNr : string.Empty);
writer.Write((OriRadioAddress != null) ? OriRadioAddress : string.Empty);
writer.Write(WMTypeRevision); writer.Write(WMTypeRevision);
writer.Write(Pruefindex); writer.Write(Pruefindex);
writer.Write(HydrPruefung); writer.Write(HydrPruefung);
@ -735,6 +739,7 @@ namespace Results.Entities
Id = reader.ReadInt32(); Id = reader.ReadInt32();
SerialNr = reader.ReadString(); SerialNr = reader.ReadString();
SerialNrAux = reader.ReadString(); SerialNrAux = reader.ReadString();
RadioAddress = reader.ReadString();
PurchaseOrder = reader.ReadString(); PurchaseOrder = reader.ReadString();
YearOfProduction = reader.ReadInt32(); YearOfProduction = reader.ReadInt32();
WMPosition = reader.ReadInt32(); WMPosition = reader.ReadInt32();
@ -763,7 +768,6 @@ namespace Results.Entities
FWVersion = reader.ReadString(); FWVersion = reader.ReadString();
#endif #endif
#if TURA_SPECIAL #if TURA_SPECIAL
RadioAddress = reader.ReadString();
PaletteNr = reader.ReadInt32(); PaletteNr = reader.ReadInt32();
UmkartonNr = reader.ReadInt32(); UmkartonNr = reader.ReadInt32();
ProdTestBench = reader.ReadString(); ProdTestBench = reader.ReadString();
@ -780,6 +784,7 @@ namespace Results.Entities
Prefix = reader.ReadString(); Prefix = reader.ReadString();
Suffix = reader.ReadString(); Suffix = reader.ReadString();
CompleteSerialNr = reader.ReadString(); CompleteSerialNr = reader.ReadString();
OriRadioAddress = reader.ReadString();
WMTypeRevision = reader.ReadInt32(); WMTypeRevision = reader.ReadInt32();
Pruefindex = reader.ReadInt32(); Pruefindex = reader.ReadInt32();
HydrPruefung = reader.ReadInt32(); HydrPruefung = reader.ReadInt32();

2
Results/Mappings/WaterMeterMap.cs
View File

@ -61,9 +61,9 @@ namespace Results.Mappings
Map(x => x.Suffix); Map(x => x.Suffix);
Map(x => x.CompleteSerialNr); Map(x => x.CompleteSerialNr);
Map(x => x.OriRadioAddress); Map(x => x.OriRadioAddress);
Map(x => x.WMTypeRevision);
Map(x => x.Pruefindex); Map(x => x.Pruefindex);
Map(x => x.HydrPruefung); Map(x => x.HydrPruefung);
Map(x => x.WMTypeRevision);
#endif #endif
References(x => x.WaterMeterData); References(x => x.WaterMeterData);
References(x => x.Batch); References(x => x.Batch);

10
Results/WMeterRsltItemSpec.cs
View File

@ -24,7 +24,7 @@ namespace Results
public readonly ItemCategory Category; /// public readonly ItemCategory Category; ///
public string Caption; /// Specifies item description to be printed as a caption (in the header, etc.) public string Caption; /// Specifies item description to be printed as a caption (in the header, etc.)
public string TestID; /// Specifies the test public string TestID; /// Specifies the test
public Config.Unit Units; /// Specifies units for the output public Unit Units; /// Specifies units for the output
public string Format; /// Specifies format for the output public string Format; /// Specifies format for the output
public string Precision; /// Specifies precision for the output public string Precision; /// Specifies precision for the output
public int Width; /// Specifies the number of characters of the output, 0 = automatic public int Width; /// Specifies the number of characters of the output, 0 = automatic
@ -46,7 +46,7 @@ namespace Results
/// ///
/// Function to pick a MeterTestResult field and convert it into a string /// Function to pick a MeterTestResult field and convert it into a string
/// ///
public delegate string PrintDlgt(WaterMeter waterMeterResult, string testID, Config.Unit units, string format, string precision); public delegate string PrintDlgt(WaterMeter waterMeterResult, string testID, Unit units, string format, string precision);
private readonly PrintDlgt printDlgt; private readonly PrintDlgt printDlgt;
@ -660,7 +660,7 @@ namespace Results
return string.IsNullOrEmpty(format) ? value.ToString() : string.Format(format, value); return string.IsNullOrEmpty(format) ? value.ToString() : string.Format(format, value);
} }
public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v) public static string FormatDbl(Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v)
{ {
return FormatDbl(units, format, precisionOrEmpty, dfltPrecision, v, CultureInfo.CurrentCulture); return FormatDbl(units, format, precisionOrEmpty, dfltPrecision, v, CultureInfo.CurrentCulture);
} }
@ -697,12 +697,12 @@ namespace Results
} }
} }
public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v1, double v2) public static string FormatDbl(Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v1, double v2)
{ {
return FormatDbl(units, format, precisionOrEmpty, dfltPrecision, v1, v2, CultureInfo.CurrentCulture); return FormatDbl(units, format, precisionOrEmpty, dfltPrecision, v1, v2, CultureInfo.CurrentCulture);
} }
/// ///
public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v1, double v2, CultureInfo ci) public static string FormatDbl(Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v1, double v2, CultureInfo ci)
{ {
double val1 = Config.Units.ConvertTo(units, v1); double val1 = Config.Units.ConvertTo(units, v1);
double val2 = Config.Units.ConvertTo(units, v2); double val2 = Config.Units.ConvertTo(units, v2);