Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens

Browse Source
This commit is contained in:
Kathy Ruffing
2021-12-08 14:38:13 +00:00
parent 4522b2a636
commit 6abc29457f
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
View File

@@ -293,6 +293,7 @@ namespace VEPROMS.CSLA.Library
else if (val.ToUpper() == "<U-NUMBER>") val = MyDocVersionInfo.DocVersionConfig.Unit_Number; else if (val.ToUpper() == "<U-NUMBER>") val = MyDocVersionInfo.DocVersionConfig.Unit_Number;
else if (val.ToUpper() == "<U-NAME>") val = MyDocVersionInfo.DocVersionConfig.Unit_Name; else if (val.ToUpper() == "<U-NAME>") val = MyDocVersionInfo.DocVersionConfig.Unit_Name;
else if (val.ToUpper() == "<U-ID>") val = MyDocVersionInfo.DocVersionConfig.Unit_ID; else if (val.ToUpper() == "<U-ID>") val = MyDocVersionInfo.DocVersionConfig.Unit_ID;
// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the <20>OTHER<45> tokens
else if (val.ToUpper() == "<U-OTHERTEXT>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Text; else if (val.ToUpper() == "<U-OTHERTEXT>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Text;
else if (val.ToUpper() == "<U-OTHERNUMBER>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Number; else if (val.ToUpper() == "<U-OTHERNUMBER>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Number;
else if (val.ToUpper() == "<U-OTHERNAME>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Name; else if (val.ToUpper() == "<U-OTHERNAME>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Name;

9
PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs
View File

@@ -425,6 +425,15 @@ namespace VEPROMS.CSLA.Library
fromunitdes = DocVersionConfig.Unit_Name; fromunitdes = DocVersionConfig.Unit_Name;
else if (unitdes == "TEXT") else if (unitdes == "TEXT")
fromunitdes = DocVersionConfig.Unit_Text; fromunitdes = DocVersionConfig.Unit_Text;
// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the <20>OTHER<45> 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 else
fromunitdes = DocVersionConfig.Unit_ID; fromunitdes = DocVersionConfig.Unit_ID;

1
PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
View File

@@ -1004,6 +1004,7 @@ namespace VEPROMS.CSLA.Library
else if (sel.Text.ToUpper() == "<U-NUMBER>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_Number; else if (sel.Text.ToUpper() == "<U-NUMBER>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_Number;
else if (sel.Text.ToUpper() == "<U-NAME>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_Name; else if (sel.Text.ToUpper() == "<U-NAME>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_Name;
else if (sel.Text.ToUpper() == "<U-ID>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_ID; else if (sel.Text.ToUpper() == "<U-ID>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_ID;
// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the <20>OTHER<45> tokens
else if (sel.Text.ToUpper() == "<U-OTHERTEXT>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Text; else if (sel.Text.ToUpper() == "<U-OTHERTEXT>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Text;
else if (sel.Text.ToUpper() == "<U-OTHERNUMBER>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Number; else if (sel.Text.ToUpper() == "<U-OTHERNUMBER>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Number;
else if (sel.Text.ToUpper() == "<U-OTHERNAME>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Name; else if (sel.Text.ToUpper() == "<U-OTHERNAME>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Name;

1
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@@ -2319,6 +2319,7 @@ i = 0;
else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name); else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID); else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the <20>OTHER<45> tokens
else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text); else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number); else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name); else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);