diff --git a/PROMS/DataLoader/PROMSFixes.Sql b/PROMS/DataLoader/PROMSFixes.Sql index 25cc92ec..ca82a08f 100644 --- a/PROMS/DataLoader/PROMSFixes.Sql +++ b/PROMS/DataLoader/PROMSFixes.Sql @@ -6446,14 +6446,14 @@ IF(ISNULL(@DocVersionList,'')='') BEGIN INSERT INTO @FoundContents -- Do a case insensitive search select ContentID,Type,Text from contents - where Replace([Text],'-','\u8209?') like @SearchString Collate SQL_Latin1_General_CP1_CI_AS + where Replace(Replace([Text],'-','\u8209?'),'\u160?',' ') like @SearchString Collate SQL_Latin1_General_CP1_CI_AS END ELSE BEGIN INSERT INTO @FoundContents -- Do a case insensitive search select ContentID,Type,Text from contents where [ContentID] in (select [ContentID] from vefn_DVContent(@DocVersionList)) - AND Replace([Text],'-','\u8209?') like @SearchString Collate SQL_Latin1_General_CP1_CI_AS + AND Replace(Replace([Text],'-','\u8209?'),'\u160?',' ') like @SearchString Collate SQL_Latin1_General_CP1_CI_AS END RETURN diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index e3228b8d..0a9f99b9 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -220,8 +220,8 @@ namespace VEPROMS displayBookMarks.SetupBookMarks(); DateTime dtSunday = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfWeek)); ChangeLogFileName("LogFileAppender", Database.SelectedDatabase + " " + dtSunday.ToString("yyyyMMdd") + " ErrorLog.txt"); - _MyLog.InfoFormat("\r\nSession Beginning\r\n<===================== User: {0}/{1} Started {2} =====================>" - , Environment.UserDomainName,Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt")); + _MyLog.InfoFormat("\r\nSession Beginning\r\n<========={0}=========== User: {1}/{2} Started {3} =====================>" + , Application.ProductVersion, Environment.UserDomainName,Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt")); foreach (string parameter in parameters) { if (parameter.ToUpper().StartsWith("/UF=")) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 4bc40b59..4f9cc530 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2636,7 +2636,7 @@ namespace VEPROMS.CSLA.Library tbformat = tbformat.Replace("{Section Prefix}", SectionPrefix(tbformat)); if (tbformate != null) tbformate = tbformate.Replace("{Section Prefix}", SectionPrefix(tbformate)); } - + bool isAlpha = tbformat.ToUpper().Contains("ALPHA"); int ordinal = Ordinal; string alpha = AlphabeticalNumbering(ordinal); tbformat = tbformat.Replace("{alpha}", alpha.ToLower()); @@ -2706,6 +2706,7 @@ namespace VEPROMS.CSLA.Library int indxnewtab = FormatStepData.TabData.IdentAltPrint.LastIndexOf('\\'); if (indxnewtab >= 0) { + _MyTab.BasicTab = isAlpha ? alpha : ordinal.ToString(); newtab = FormatStepData.TabData.IdentAltPrint.Substring(indxnewtab + 1); // also see if there is the 'pagelist' string in this tab: HighLevelStepTabPageList = FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab) + tbformat; @@ -3379,6 +3380,12 @@ namespace VEPROMS.CSLA.Library get { return _AltPrintTab; } set { _AltPrintTab = value; } } + private string _BasicTab = null; + public string BasicTab + { + get { return _BasicTab; } + set { _BasicTab = value; } + } private bool _RemovedStyleUnderline = false; public bool RemovedStyleUnderline { diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 2b16bc08..ad8e63e4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -702,7 +702,8 @@ namespace VEPROMS.CSLA.Library if (!doStep && item.IsHigh) doStep = true; if (doStep && pitem.IsHigh) { - string hlsTab = StepInfo.Get(pitem.ItemID).MyTab.CleanTextNoSymbols; + Tab myTab = StepInfo.Get(pitem.ItemID).MyTab; + string hlsTab = myTab.BasicTab ?? myTab.CleanTextNoSymbols; if (!sret.StartsWith(hlsTab.Trim(" ".ToCharArray()))) { if (!hasDelim)