From 60bc70dbc57381c62f48ff01311b4fe5406ff404 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 20 Mar 2018 18:03:18 +0000 Subject: [PATCH] =?UTF-8?q?B2018-051=20Inserting=20a=20new=20enhanced=20(n?= =?UTF-8?q?on-linked)=20step=20was=20inserting=20the=20same=20HLS=20type?= =?UTF-8?q?=20as=20current=20step=20instead=20of=20the=20selected=20HLS=20?= =?UTF-8?q?type=20from=20the=20insert=20menu.=20B2018-052=20=E2=80=93=20Th?= =?UTF-8?q?e=20old=20hard=20space=20character=20in=20the=20enhanced=20docu?= =?UTF-8?q?ment=20template=20will=20now=20be=20inserted=20as=20a=20hard=20?= =?UTF-8?q?space=20instead=20of=20a=20question=20mark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs | 6 +++--- PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs index d6f60572..5fc5bd8a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs @@ -343,8 +343,8 @@ namespace VEPROMS.CSLA.Library public ItemInfo InsertSiblingBefore(string text, string number,int? type) { ItemInfo tmp = null; - if (!IsSection && (FormatStepData.UseSmartTemplate || (MyHLS!=null && MyHLS.FormatStepData.UseSmartTemplate) || FormatStepData.UseOldTemplate)) - tmp = InsertSmartTemplateSteps(text, number, tmp, EAddpingPart.Before, (int)MyContent.Type); + if (!IsSection && (FormatStepData.UseSmartTemplate || (MyHLS != null && MyHLS.FormatStepData.UseSmartTemplate) || FormatStepData.UseOldTemplate)) + tmp = InsertSmartTemplateSteps(text, number, tmp, EAddpingPart.Before, (int)((type == null) ? MyContent.Type : type)); // B2018-051 use the type passed in instead of current step type if (tmp == null) tmp = NewItemInfoFetch(ItemID, EAddpingPart.Before, number, text, type, null, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID); @@ -688,7 +688,7 @@ namespace VEPROMS.CSLA.Library { ItemInfo tmp = null; if (!IsSection && (FormatStepData.UseSmartTemplate || (MyHLS != null && MyHLS.FormatStepData.UseSmartTemplate) || FormatStepData.UseOldTemplate)) - tmp = InsertSmartTemplateSteps(text, number, tmp, EAddpingPart.After, (int)MyContent.Type); + tmp = InsertSmartTemplateSteps(text, number, tmp, EAddpingPart.After, (int)((type == null)? MyContent.Type : type)); // B2018-051 use the type passed in instead of current step type if (tmp == null) tmp = NewItemInfoFetch(ItemID, EAddpingPart.After, number, text, type, null, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID); // if next exists, it is updated in SQL so we have to manually force the iteminfo updates diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index d0cac8f9..5cfb1be1 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -360,7 +360,10 @@ namespace VEPROMS.CSLA.Library } // some plants (Wolf Creek, Turkey Point) have two line titles in their templates with "[(0014])" representing the hard return in the title if (stmp != null) + { stmp = stmp.Replace("[(0014])", "\\line "); // Hard Return + stmp = stmp.Replace("\xFFFD", @"\u160?"); // Hard Space B2018-052 replace old(from 16-bit) hardspace character with the unicode hardspace character + } TPlate tp = new TPlate(level, type, start, width, row, nocol, stmp); _Templates.Add(tp); cnt++;