From 611cdce9708a0d9def82af13217e39573a35c793 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Feb 2013 14:45:48 +0000 Subject: [PATCH] B2013-018 - Needed to add logic to check if the DoRevDate RevDateWithForwardSlash flags are both false - in which case only use the Rev Number --- PROMS/VEPROMS User Interface/DlgPrintProcedure.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index fc946623..062467cf 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -41,7 +41,16 @@ namespace VEPROMS { get { - if (txbRevDate.Text == "") + // the RevDate and Rev number are stored in the procedure config separtly as strings + // we put these two strings to gether to pass into the Print module. + // the Rev Number followed by a forward slash or backslash logic is from the 16-bit code + // and is treated as just string. + // Therefore we need to build a revison number string with a revdate appended to it but only + // if either the DoRevDate or the RevDateWithForwardSlash is true. otherwise we should use + // only the RevNumber. + if (txbRevDate.Text == "" || + (!MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash && + !MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.DoRevDate)) return RevNum; if (MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash) return RevNum + "\\" + RevDate;