Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Search was failing when searching for a space, if the data contained a hardspace.

Browse Source 
Added Version into ErrorLog for the Session Begin
Fix transition text in Background Documents to say "5" rather than "EOP STEP 5:"
This commit is contained in:
Rich 2013-10-14 15:46:25 +00:00
parent 2deb6dc799
commit 883392a51a
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/DataLoader/PROMSFixes.Sql
View File

@ -6446,14 +6446,14 @@ IF(ISNULL(@DocVersionList,'')='')
BEGIN BEGIN
INSERT INTO @FoundContents -- Do a case insensitive search INSERT INTO @FoundContents -- Do a case insensitive search
select ContentID,Type,Text from contents 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 END
ELSE ELSE
BEGIN BEGIN
INSERT INTO @FoundContents -- Do a case insensitive search INSERT INTO @FoundContents -- Do a case insensitive search
select ContentID,Type,Text from contents select ContentID,Type,Text from contents
where [ContentID] in (select [ContentID] from vefn_DVContent(@DocVersionList)) 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 END
RETURN RETURN

4
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -220,8 +220,8 @@ namespace VEPROMS
displayBookMarks.SetupBookMarks(); displayBookMarks.SetupBookMarks();
DateTime dtSunday = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfWeek)); DateTime dtSunday = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfWeek));
ChangeLogFileName("LogFileAppender", Database.SelectedDatabase + " " + dtSunday.ToString("yyyyMMdd") + " ErrorLog.txt"); ChangeLogFileName("LogFileAppender", Database.SelectedDatabase + " " + dtSunday.ToString("yyyyMMdd") + " ErrorLog.txt");
_MyLog.InfoFormat("\r\nSession Beginning\r\n<===================== User: {0}/{1} Started {2} =====================>" _MyLog.InfoFormat("\r\nSession Beginning\r\n<========={0}=========== User: {1}/{2} Started {3} =====================>"
, Environment.UserDomainName,Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt")); , Application.ProductVersion, Environment.UserDomainName,Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"));
foreach (string parameter in parameters) foreach (string parameter in parameters)
{ {
if (parameter.ToUpper().StartsWith("/UF=")) if (parameter.ToUpper().StartsWith("/UF="))

9
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -2636,7 +2636,7 @@ namespace VEPROMS.CSLA.Library
tbformat = tbformat.Replace("{Section Prefix}", SectionPrefix(tbformat)); tbformat = tbformat.Replace("{Section Prefix}", SectionPrefix(tbformat));
if (tbformate != null) tbformate = tbformate.Replace("{Section Prefix}", SectionPrefix(tbformate)); if (tbformate != null) tbformate = tbformate.Replace("{Section Prefix}", SectionPrefix(tbformate));
} }
bool isAlpha = tbformat.ToUpper().Contains("ALPHA");
int ordinal = Ordinal; int ordinal = Ordinal;
string alpha = AlphabeticalNumbering(ordinal); string alpha = AlphabeticalNumbering(ordinal);
tbformat = tbformat.Replace("{alpha}", alpha.ToLower()); tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
@ -2706,6 +2706,7 @@ namespace VEPROMS.CSLA.Library
int indxnewtab = FormatStepData.TabData.IdentAltPrint.LastIndexOf('\\'); int indxnewtab = FormatStepData.TabData.IdentAltPrint.LastIndexOf('\\');
if (indxnewtab >= 0) if (indxnewtab >= 0)
{ {
_MyTab.BasicTab = isAlpha ? alpha : ordinal.ToString();
newtab = FormatStepData.TabData.IdentAltPrint.Substring(indxnewtab + 1); newtab = FormatStepData.TabData.IdentAltPrint.Substring(indxnewtab + 1);
// also see if there is the 'pagelist' string in this tab: // also see if there is the 'pagelist' string in this tab:
HighLevelStepTabPageList = FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab) + tbformat; HighLevelStepTabPageList = FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab) + tbformat;
@ -3379,6 +3380,12 @@ namespace VEPROMS.CSLA.Library
get { return _AltPrintTab; } get { return _AltPrintTab; }
set { _AltPrintTab = value; } set { _AltPrintTab = value; }
} }
private string _BasicTab = null;
public string BasicTab
{
get { return _BasicTab; }
set { _BasicTab = value; }
}
private bool _RemovedStyleUnderline = false; private bool _RemovedStyleUnderline = false;
public bool RemovedStyleUnderline public bool RemovedStyleUnderline
{ {

3
PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
View File

@ -702,7 +702,8 @@ namespace VEPROMS.CSLA.Library
if (!doStep && item.IsHigh) doStep = true; if (!doStep && item.IsHigh) doStep = true;
if (doStep && pitem.IsHigh) 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 (!sret.StartsWith(hlsTab.Trim(" ".ToCharArray())))
{ {
if (!hasDelim) if (!hasDelim)