From 6abc29457f0a504ab6a935f7a7a3bd0989860ba0 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 8 Dec 2021 14:38:13 +0000 Subject: [PATCH] =?UTF-8?q?B2021-145:=20For=20applicability,=20the=20tree?= =?UTF-8?q?=20view=20&=20pdf=20file=20name=20are=20not=20getting=20resolve?= =?UTF-8?q?d=20when=20using=20any=20of=20the=20=E2=80=98OTHER=E2=80=99=20t?= =?UTF-8?q?okens?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs | 9 +++++---- PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs | 11 ++++++++++- PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs | 9 +++++---- PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 9 +++++---- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index ebeadcb3..f3b1313a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -293,10 +293,11 @@ namespace VEPROMS.CSLA.Library else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Unit_Number; else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Unit_Name; else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Unit_ID; - else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Text; - else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Number; - else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Name; - else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_ID; + // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens + else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Text; + else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Number; + else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Name; + else if (val.ToUpper() == "") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_ID; } return val; } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs index 0d391bbd..f9d23702 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs @@ -393,7 +393,7 @@ namespace VEPROMS.CSLA.Library { ProcedureInfo pi = ii as ProcedureInfo; if (pi == null) return ""; - string unitdes = "ID"; + string unitdes = "ID"; string prefix = null; string fromunitdes = null; str = ItemInfo.ConvertToDisplayText(pi.MyContent.Number); @@ -425,6 +425,15 @@ namespace VEPROMS.CSLA.Library fromunitdes = DocVersionConfig.Unit_Name; else if (unitdes == "TEXT") fromunitdes = DocVersionConfig.Unit_Text; + // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens + else if (unitdes == "OTHERTEXT") + fromunitdes = DocVersionConfig.Other_Unit_Text; + else if (unitdes == "OTHERNUMBER") + fromunitdes = DocVersionConfig.Other_Unit_Number; + else if (unitdes == "OTHERNAME") + fromunitdes = DocVersionConfig.Other_Unit_Name; + else if (unitdes == "OTHERID") + fromunitdes = DocVersionConfig.Other_Unit_ID; else fromunitdes = DocVersionConfig.Unit_ID; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 37314b67..2b409279 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -1004,10 +1004,11 @@ namespace VEPROMS.CSLA.Library else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_Number; else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_Name; else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_ID; - else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Text; - else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Number; - else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Name; - else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_ID; + // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens + else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Text; + else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Number; + else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Name; + else if (sel.Text.ToUpper() == "") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_ID; //val = "",MyDocVersion.DocVersionConfig.Unit_ID); //text = text.Replace(@"", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ProcedureSetID); //text = text.Replace("", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Number); diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index c609f151..d049471f 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -2319,10 +2319,11 @@ i = 0; else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name); else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID); + // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens + else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text); + else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number); + else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name); + else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID); } return str; }