From 7facefb305f2444218418c7a9f36087469a583fb Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 13 Jan 2022 13:14:01 +0100 Subject: [PATCH] Radio address format "D9" defined on one place: SharedDatabase.Const.RAFormat --- OrderManagement/EditOrderDlg.cs | 9 +++++---- OrderManagement/OrderManagementDlg.cs | 4 ++-- OrderManagement/OrderPrintDocument.cs | 4 ++-- OrderManagement/OrderStateDlg.cs | 2 +- SharedDatabase/Enums.cs | 1 + TBF/Rig/TestMethods/S640Communication/S640CommForm.cs | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/OrderManagement/EditOrderDlg.cs b/OrderManagement/EditOrderDlg.cs index 113a467fe..529ebd2ca 100644 --- a/OrderManagement/EditOrderDlg.cs +++ b/OrderManagement/EditOrderDlg.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using SharedDatabase; using SharedDatabase.Entities; using OrderManagement.Resources; using NHibernate; @@ -204,11 +205,11 @@ namespace OrderManagement if (MessageBox.Show(string.Format("{0}\r\n{1}: radio {2} .. {3}\r\n{4}: radio {5} .. {6}\r\n{7}", Strings.There_is_a_conflict, order.POName, - order.RAPrefix + order.RAFirst.ToString("D9") + snStdSuffix, - order.RAPrefix + (order.RAFirst + order.PiecesCount).ToString("D9") + snStdSuffix, + order.RAPrefix + order.RAFirst.ToString(Const.RAFormat) + snStdSuffix, + order.RAPrefix + (order.RAFirst + order.PiecesCount).ToString(Const.RAFormat) + snStdSuffix, another.POName, - another.RAPrefix + another.RAFirst.ToString("D9") + StandardSuffix(another, true), - another.RAPrefix + (another.RAFirst + another.PiecesCount).ToString("D9") + StandardSuffix(another, true), + another.RAPrefix + another.RAFirst.ToString(Const.RAFormat) + StandardSuffix(another, true), + another.RAPrefix + (another.RAFirst + another.PiecesCount).ToString(Const.RAFormat) + StandardSuffix(another, true), Strings.Abort_creating_an_order_QM), Strings.Warning, MessageBoxButtons.YesNo, diff --git a/OrderManagement/OrderManagementDlg.cs b/OrderManagement/OrderManagementDlg.cs index 240320026..5cbe01ad1 100644 --- a/OrderManagement/OrderManagementDlg.cs +++ b/OrderManagement/OrderManagementDlg.cs @@ -149,7 +149,7 @@ namespace OrderManagement lvi.SubItems.Add(o.SNDigitsCount.ToString()); lvi.SubItems.Add(o.SNSuffix); lvi.SubItems.Add(o.RAPrefix); - lvi.SubItems.Add(o.RAFirst.ToString("D9")); + lvi.SubItems.Add(o.RAFirst.ToString(SharedDatabase.Const.RAFormat)); lvi.SubItems.Add(o.RASuffix); lvi.SubItems.Add(o.Remark); lvi.Tag = o; @@ -176,7 +176,7 @@ namespace OrderManagement lvi.SubItems[i++].Text = o.SNDigitsCount.ToString(); lvi.SubItems[i++].Text = o.SNSuffix; lvi.SubItems[i++].Text = o.RAPrefix; - lvi.SubItems[i++].Text = o.RAFirst.ToString("D9"); + lvi.SubItems[i++].Text = o.RAFirst.ToString(SharedDatabase.Const.RAFormat); lvi.SubItems[i++].Text = o.RASuffix; lvi.SubItems[i++].Text = o.Remark; } diff --git a/OrderManagement/OrderPrintDocument.cs b/OrderManagement/OrderPrintDocument.cs index d760dcbab..f18b61daf 100644 --- a/OrderManagement/OrderPrintDocument.cs +++ b/OrderManagement/OrderPrintDocument.cs @@ -91,11 +91,11 @@ namespace OrderManagement (order.SNSuffix != null) ? order.SNSuffix : string.Empty), Strings.First_radio_address + " :", string.Format("{0}{1}{2}", (order.RAPrefix != null) ? order.RAPrefix : string.Empty, - order.RAFirst.ToString("D9"), + order.RAFirst.ToString(SharedDatabase.Const.RAFormat), (order.RASuffix != null) ? order.RASuffix : string.Empty), Strings.Last_radio_address + " :", string.Format("{0}{1}{2}", (order.RAPrefix != null) ? order.RAPrefix : string.Empty, - (order.RAFirst + order.PiecesCount - 1).ToString("D9"), + (order.RAFirst + order.PiecesCount - 1).ToString(SharedDatabase.Const.RAFormat), (order.RASuffix != null) ? order.RASuffix : string.Empty), Strings.Workflow + " :", (order.Workflow != null) ? order.Workflow : string.Empty, diff --git a/OrderManagement/OrderStateDlg.cs b/OrderManagement/OrderStateDlg.cs index d2719e553..90c897a11 100644 --- a/OrderManagement/OrderStateDlg.cs +++ b/OrderManagement/OrderStateDlg.cs @@ -32,7 +32,7 @@ namespace OrderManagement producedPcsCountTextBox.Text = order.CurrentPcsCount.ToString(); currentSnTextBox.Text = (order.SNPrefix != null ? order.SNPrefix : string.Empty) + order.CurrentSN.ToString(string.Format("D{0}", order.SNDigitsCount)) + (order.SNSuffix != null ? order.SNSuffix : string.Empty); - currentRATextBox.Text = (order.RAPrefix != null ? order.RAPrefix : string.Empty) + order.CurrentRA.ToString("D9") + currentRATextBox.Text = (order.RAPrefix != null ? order.RAPrefix : string.Empty) + order.CurrentRA.ToString(SharedDatabase.Const.RAFormat) + (order.RASuffix != null ? order.RASuffix : string.Empty); } diff --git a/SharedDatabase/Enums.cs b/SharedDatabase/Enums.cs index 6f9ce3ece..a801061a5 100644 --- a/SharedDatabase/Enums.cs +++ b/SharedDatabase/Enums.cs @@ -10,6 +10,7 @@ namespace SharedDatabase public class Const { public const int MaxPartNameLen = 10; + public const string RAFormat = "D9"; /// Radio address digits count = 9 } public enum CodeType diff --git a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs index f4eee0956..1f0414ea9 100644 --- a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs +++ b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs @@ -988,7 +988,7 @@ namespace TBF.Rig.TestMethods.S640Communication wm.RadioAddress = string.Format("{0}{1}{2}", order.RAPrefix, - currentRadioAddress.ToString("D9"), + currentRadioAddress.ToString(SharedDatabase.Const.RAFormat), order.RASuffix); assignedRadioAddresses[i].Text = wm.RadioAddress;