From 9db537d288b5b28c7d6f12e769cc02fc3b1293b5 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Wed, 20 Oct 2021 12:54:06 +0000
Subject: [PATCH] C2021-051: Use all Applicability tokens in Procedure Set and
 Folder Specific information in page list items

---
 PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
index 95d9989b..b6befdbd 100644
--- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
+++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
@@ -2163,6 +2163,12 @@ i = 0;
 							if (qindx == -1)
 							{
 								val = DocVersionInfo.GetInheritedSIValue(section.MyProcedure, token.Substring(4, token.Length - 5));
+								// C2021-051: Applicability tokens in Procedure Set and Folder Specific Information
+								if (val.ToUpper().Contains("<U>") || val.ToUpper().Contains("<U-")) // Replace token with the applicable unit information
+								{
+									string unbr3 = ResolveUnitApp(MySection.MyDocVersion, val);
+									plstr = unbr3 ?? "";
+								}
 								plstr = plstr.Replace(token, val);
 								break; // B2019-134 break out of switch statement after processing the <SI- token so that it can loop and handle any other tokens on the same line
 							}
@@ -2170,10 +2176,12 @@ i = 0;
 							{
 								string pstok = token.Substring(indx + 1, qindx - indx - 1);
 								plstr = DocVersionInfo.GetInheritedSIValue(section.MyProcedure, pstok);
-								//if (dvConfig != null)
-								//	plstr = dvConfig.GetValue("SI", pstok);
-								//if ((plstr == null || plstr == "") && folderConfig != null)
-								//	plstr = folderConfig.GetValue("SI", pstok);
+								// C2021-051: Applicability tokens in Procedure Set and Folder Specific Information
+								if (plstr.ToUpper().Contains("<U>") || val.ToUpper().Contains("<U-")) // Replace token with the applicable unit information
+								{
+									string unbr3 = ResolveUnitApp(MySection.MyDocVersion, val);
+									plstr = unbr3 ?? "";
+								}
 								// the first part of the string between the ? and ' ' is the other logical
 								// to see if it's on.  If on, just use col and/or row as defined.  Otherwise use  
 								// value between = and |.