DataEntry.Standard12 modified, Results.Entities modified (WaterMeter.ResultCode, Batch.Remark), DB changed, ver.2.8.308

This commit is contained in:
Milan Hanajik
2016-06-20 09:58:26 +02:00
parent 0c3ed1e1bf
commit b909c82b28
25 changed files with 448 additions and 74 deletions
+3
View File
@@ -215,6 +215,9 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(72, "Batch end time", Strings.End, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime)));
AllItems.Add(new WMeterRsltItemSpec(73, null, "1 / PlsPerLtr_Read", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString()
: ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString(p)));
/// Extra water meter data
AllItems.Add(new WMeterRsltItemSpec(74, null, Strings.Result_code, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.ResultCode.ToString() : string.Format(f, w.ResultCode)));
AllItems.Add(new WMeterRsltItemSpec(75, null, Strings.Remark, (w, t, u, f, p) => w.Batch.Remark));
}
/// <summary>