C2022-003-Change-Textboxes-to-RTF-3

good for testing

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -627,10 +627,15 @@ namespace VEPROMS
 			// 
 			this.btnFilter.Name = "btnFilter";
 			this.btnFilter.Text = "Tree View Search:";
+			this.btnFilter.Click += SubmitFilter;
 			// 
 			// txtFilter
 			// 
+			this.txtFilter.TextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
 			this.txtFilter.Name = "txtFilter";
+			this.txtFilter.TextBoxWidth = 120;
+			this.txtFilter.TextBox.TabIndex = 0;
+			this.txtFilter.TextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.FilterEnterKey);
 			this.superTooltip1.SetSuperTooltip(this.txtFilter, new DevComponents.DotNetBar.SuperTooltipInfo("Filter", "", "This will filter the Procedure Tree in PROMS to Procedures containing entered wor" +
             "ds in the Procedure Number or Title. Press enter or the Tree View Search button " +
             "to submit.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -3312,7 +3312,26 @@ namespace VEPROMS.CSLA.Library
 				return retval;
 			}
 		}
-		public string DisplayNumber
+
+        //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
+		// for enhanced documents, when copying content, need to not resolve the 
+		//unit designators until print time
+        public string DisplayTextKeepSpecialCharsKeepUnitSpecific
+        {
+            get
+            {
+                string str = MyContent.Text;
+                foreach (string key in SpecialCharacters.Keys)
+                    str = str.Replace(key, SpecialCharacters[key]);
+                string retval = ConvertToDisplayText(str);
+                foreach (string key in SpecialCharacters.Keys)
+                    retval = retval.Replace(SpecialCharacters[key], key);
+                return retval;
+            }
+        }
+
+
+        public string DisplayNumber
 		{
 			get
 			{
@@ -8357,8 +8376,11 @@ namespace VEPROMS.CSLA.Library
 					if (seds != null && seds.Count != 0)
 					{
 						ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
-						// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced.  Null reference check
-						if (srcItem != null && srcItem.DisplayTextKeepSpecialChars != ii.DisplayTextKeepSpecialChars)
+                        // B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced.  Null reference check
+                        //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
+                        // for enhanced documents, when copying content, need to not resolve the 
+                        //unit designators until print time
+                        if (srcItem != null && srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific != ii.DisplayTextKeepSpecialCharsKeepUnitSpecific)
 						{
 							if (retiil == null) retiil = new ItemInfoList(ii);
 							else retiil.AddItem(ii);
@@ -8384,7 +8406,10 @@ namespace VEPROMS.CSLA.Library
 						ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
 						using (Item enhItem = Item.Get(ii.ItemID))
 						{
-							enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialChars;
+                            //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
+                            // for enhanced documents, when copying content, need to not resolve the 
+                            //unit designators until print time
+                            enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific;
 							enhItem.Save();
 						}
 					}