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

Results.Entities.WaterMeter.RadioAddress added, ver. 2.27.1776

Browse Source
This commit is contained in:
Milan Hanajik 2021-10-14 14:02:41 +02:00
parent df63f4300a
commit 352f2c1e28
9 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Results/Entities/WaterMeter.cs
View File

@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2015-2020 Sensus Slovensko a.s. /// Copyright (c) 2015-2021 Sensus Slovensko a.s.
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -43,8 +43,9 @@ namespace Results.Entities
{ {
public virtual int Id { get; protected set; } public virtual int Id { get; protected set; }
public virtual string SerialNr { get; set; } /// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter public virtual string SerialNr { get; set; } /// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter
public virtual string SerialNrAux { get; set; } /// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter public virtual string SerialNrAux { get; set; } /// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
public virtual string PurchaseOrder { get; set; } public virtual string RadioAddress { get; set; }
public virtual string PurchaseOrder { get; set; }
public virtual int YearOfProduction { get; set; } public virtual int YearOfProduction { get; set; }
public virtual int WMPosition { get; set; } /// 1-based water meter position public virtual int WMPosition { get; set; } /// 1-based water meter position
public virtual string EndState { get; set; } /// End state (of the main water meter) public virtual string EndState { get; set; } /// End state (of the main water meter)

16
Results/ItemID.cs
View File

@ -333,15 +333,17 @@ namespace Results
RegValve, /// 282 RegValve, /// 282
X1, /// 283 X1, /// 283
X2, X2, /// 284
X3, X3, /// 285
X4, X4, /// 286
X5, X5, /// 287
X6, X6, /// 288
X7, X7, /// 289
X8, X8, /// 290
X9, /// 291 X9, /// 291
RadioAddress, /// 292
Count, Count,
} }
} }

5
Results/Mappings/WaterMeterMap.cs
View File

@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2015-2017 Sensus Metering Systems /// Copyright (c) 2015-2021 Sensus Slovensko a.s.
/// ///
using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
using Results.Entities; using Results.Entities;
@ -13,7 +13,8 @@ namespace Results.Mappings
Id(x => x.Id); Id(x => x.Id);
Map(x => x.SerialNr); Map(x => x.SerialNr);
Map(x => x.SerialNrAux); Map(x => x.SerialNrAux);
Map(x => x.PurchaseOrder); Map(x => x.RadioAddress);
Map(x => x.PurchaseOrder);
Map(x => x.YearOfProduction); Map(x => x.YearOfProduction);
Map(x => x.WMPosition); Map(x => x.WMPosition);
Map(x => x.EndState); Map(x => x.EndState);

4
Results/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.26.1622.0")] [assembly: AssemblyVersion("2.27.1776.0")]
[assembly: AssemblyFileVersion("2.26.1622.0")] [assembly: AssemblyFileVersion("2.27.1776.0")]

18
Results/Resources/Strings.Designer.cs generated
View File

@ -906,6 +906,15 @@ namespace Results.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Radio address.
/// </summary>
internal static string Radio_address {
get {
return ResourceManager.GetString("Radio_address", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Ref.pulses. /// Looks up a localized string similar to Ref.pulses.
/// </summary> /// </summary>
@ -1581,6 +1590,15 @@ namespace Results.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Radio address.
/// </summary>
internal static string Tooltip_RA {
get {
return ResourceManager.GetString("Tooltip_RA", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Calculated density of water from table or formula at water density calibration temperature (r). /// Looks up a localized string similar to Calculated density of water from table or formula at water density calibration temperature (r).
/// </summary> /// </summary>

6
Results/Resources/Strings.resx
View File

@ -831,4 +831,10 @@
<data name="Info_flags" xml:space="preserve"> <data name="Info_flags" xml:space="preserve">
<value>Info flags</value> <value>Info flags</value>
</data> </data>
<data name="Tooltip_RA" xml:space="preserve">
<value>Radio address</value>
</data>
<data name="Radio_address" xml:space="preserve">
<value>Radio address</value>
</data>
</root> </root>

11
Results/WMeterRsltItemSpec.cs
View File

@ -367,11 +367,12 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text5))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text5)));
/// Water meters results /// Water meters results
AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr, Strings.sn, Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr, Strings.sn, Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order, Strings.PO, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder))); AllItems.Add(new WMeterRsltItemSpec(ItemID.RadioAddress, Strings.Radio_address, Strings.Tooltip_RA, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.YearOfProduction))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order, Strings.PO, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position, Strings.Pos, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.WMPosition))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID, "Formatted WM ID", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr))); AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position, Strings.Pos, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.WMPosition)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID, "Formatted WM ID", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr)));
/// Water meters results (single) /// Water meters results (single)
AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state, Strings.End_state, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState))); AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state, Strings.End_state, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));

4
TBF/BenchControl/TestMethods/S640Communication/S640CommForm.cs
View File

@ -441,8 +441,8 @@ namespace TBF.BenchControl.TestMethods.S640Communication
if ((optoHeadsConfig & (1L << i)) != 0 && checkBoxes[i].Checked && optoHeads[i] != null) if ((optoHeadsConfig & (1L << i)) != 0 && checkBoxes[i].Checked && optoHeads[i] != null)
{ {
/// Save PCB Number of the water meter /// Save PCB Number of the water meter
ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNr = optoHeads[i].PcbNumber.ToString(); /// PCB number (640) or body number (620) ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNr = optoHeads[i].PcbNumber.ToString(); /// PCB number (640) or body number (620)
ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNrAux = optoHeads[i].RadioAddress.ToString(); /// Radio address (640) ProcessData.BatchRslts.Batch.WaterMeters[i].RadioAddress = optoHeads[i].RadioAddress.ToString(); /// Radio address (640)
} }
else else
{ {

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.26.1775.0")] [assembly: AssemblyVersion("2.27.1776.0")]
[assembly: AssemblyFileVersion("2.26.1775.0")] [assembly: AssemblyFileVersion("2.27.1776.0")]