diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 9abc5ec4..a4a9c53c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -812,17 +812,17 @@ namespace VEPROMS.CSLA.Library { case 1: tb.Append(" (Next Page)"); - Console.WriteLine("Next Page: {0}", tb._FromItem.ShortPath); + //Console.WriteLine("Next Page: {0}", tb._FromItem.ShortPath); break; case -1: tb.Append(" (Previous Page)"); - Console.WriteLine("Prev Page: {0}", tb._FromItem.ShortPath); + //Console.WriteLine("Prev Page: {0}", tb._FromItem.ShortPath); break; case 0: break; default: tb.Append(string.Format(" (Page {0})", tb._ToItem.PageNumber + 1)); - Console.WriteLine("Page: {0}, {1}", tb._FromItem.ShortPath, tb._ToItem.PageNumber); + //Console.WriteLine("Page: {0}, {1}", tb._FromItem.ShortPath, tb._ToItem.PageNumber); break; } } @@ -1060,7 +1060,8 @@ namespace VEPROMS.CSLA.Library ItemInfo tmpitm = TranGetSectionItem(itminfo); if (!tmpitm.IsSection) return ""; string str = tmpitm.MyContent.Number; - str = Regex.Replace(str, @"\<[uU]\>", itminfo.MyDocVersion.DocVersionConfig.Unit_Number); + str = Regex.Replace(str, @"\", itminfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase ); + str = Regex.Replace(str, @"\", itminfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); return (str); } private static string TranGetSectionTitle(TransitionBuilder tb, ItemInfo itminfo) diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 3223abd5..2df7adf1 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -1287,9 +1287,20 @@ namespace fmtxml break; case "EXCLN.Y00": AddEXCLN00Doc(ref dcstyles); + CWEDocFixCB(ref dcstyles); + break; + case "EXCLN.Y01": + CWEDocFixCB(ref dcstyles); + break; + case "EXCLN.DOC": + CWEDocFixCB(ref dcstyles); break; case "CWE.DOC": AddCWEDoc(ref dcstyles); + CWEDocFixCB(ref dcstyles); + break; + case "CWE.Y00": + CWEDocFixCB(ref dcstyles); break; case "EXEDEV.DOC": AddEXEDEVDoc(ref dcstyles); diff --git a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs index 9de17c51..e65cec25 100644 --- a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs +++ b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs @@ -114,6 +114,15 @@ namespace fmtxml dcstyles.DcStyles[1].PageWidth = 579.2F; dcstyles.DcStyles[1].PageLength = 578F; } + private void CWEDocFixCB(ref DocStyles dcstyles) + { + for(int i=0;i