From 7ef8840ba0a000252b8e38737b18b8017e748825 Mon Sep 17 00:00:00 2001 From: Rich Date: Mon, 20 Jan 2014 04:23:21 +0000 Subject: [PATCH] Modified DisplayText and DisplayNumber methods of ItemInfo class --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 123c9eba..816e6fa2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1607,8 +1607,11 @@ namespace VEPROMS.CSLA.Library get { string str = MyContent.Text; - if (str.Contains("")) - str = str.Replace("", MyDocVersion.DocVersionConfig.Unit_Number); + str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); + //if (str.Contains("")) + // str = str.Replace("", MyDocVersion.DocVersionConfig.Unit_Number); + //if (str.Contains("")) + // str = str.Replace("", MyDocVersion.DocVersionConfig.Unit_Number); return ConvertToDisplayText(str); } } @@ -1617,8 +1620,9 @@ namespace VEPROMS.CSLA.Library get { string str = (this.IsProcedure) ? MyDocVersion.UnitSpecific(MyContent.Number, 0) : MyContent.Number; - if (str.Contains("")) - str = str.Replace("", MyDocVersion.DocVersionConfig.Unit_ID); + str = Regex.Replace(str, @"\<([uU]-[iI][dD])\>", MyDocVersion.DocVersionConfig.Unit_ID); + //if (str.Contains("")) + // str = str.Replace("", MyDocVersion.DocVersionConfig.Unit_ID); //if (str.Contains(@"")) // str = str.Replace(@"", MyDocVersion.DocVersionConfig.Unit_ID); str = ConvertToDisplayText(str);