diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index b9c0e2d4..0ffa972d 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -290,6 +290,7 @@ namespace VEPROMS Database.LastDatabase = Properties.Settings.Default.DefaultDB; // Setup the Context menu for DisplaySearch including the symbols displaySearch1.SetupContextMenu(); + displaySearch1.SearchComplete += displaySearch1_SearchComplete; if (!FormatInfo.HasLatestChanges()) throw new Exception("Inconsistent Formats"); if (!ItemAuditInfo.IsChangeManagerVersion()) @@ -323,6 +324,10 @@ namespace VEPROMS tv.PauseRefresh += tv_PauseRefresh; tv.UnPauseRefresh += tv_UnPauseRefresh; } + void displaySearch1_SearchComplete(object sender, DisplaySearchEventArgs args) + { + ProgBarText = string.Format("{0} Seconds", args.HowLong.TotalSeconds); + } private bool _PauseRefresh = false; public bool PauseRefresh { diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs index b9c80052..db2b3548 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs @@ -32,25 +32,34 @@ namespace VEPROMS.CSLA.Library #region Log4Net private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); #endregion + private static string _DBServer = null; public static string DBServer - { get + { + get { - try + if (_DBServer == null) { - string server = ""; - string db = ""; - Match m = Regex.Match(Database.VEPROMS_SqlConnection.ConnectionString, "Data Source=([^;]+)(;[^;]+)*;*Initial Catalog=([^;]+)(;[^;]+)*"); - if (m.Success && m.Groups.Count > 4) + string cnstr = null; + try { - server = m.Groups[1].Value; - db = m.Groups[3].Value; + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + cnstr = cn.ConnectionString; + string server = ""; + string db = ""; + Match m = Regex.Match(cnstr, "Data Source=([^;]+)(;[^;]+)*;*Initial Catalog=([^;]+)(;[^;]+)*"); + if (m.Success && m.Groups.Count > 4) + { + server = m.Groups[1].Value; + db = m.Groups[3].Value; + } + _DBServer = string.Format("{0} - {1}", server, db); + } + catch (Exception) + { + _DBServer = cnstr; } - return string.Format("{0} - {1}", server, db); - } - catch (Exception) - { - return Database.VEPROMS_SqlConnection.ConnectionString; } + return _DBServer; } } private static int _DefaultTimeout = 600; // 600 seconds, i.e. 10 minutes diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 9baa5b2e..bdcf9e7d 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -22,6 +22,12 @@ namespace Volian.Controls.Library if (PrintRequest != null) PrintRequest(this, args); } + public event DisplaySearchEvent SearchComplete; + private void OnSearchComplete(DisplaySearchEventArgs args) + { + if (SearchComplete != null) + SearchComplete(this, args); + } #endregion #region Properties private string _strSrchText = ""; @@ -1369,7 +1375,8 @@ namespace Volian.Controls.Library { Cursor = savcursor; } - Console.WriteLine("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds); + //Console.WriteLine("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds); + OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks))); //if (VlnSettings.DebugMode) // MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds)); } @@ -2190,6 +2197,16 @@ namespace Volian.Controls.Library get { return _MyItemInfoList; } set { _MyItemInfoList = value; } } + private TimeSpan _HowLong = TimeSpan.FromTicks(0); + public TimeSpan HowLong + { + get { return _HowLong; } + set { _HowLong = value; } + } + public DisplaySearchEventArgs(TimeSpan howLong) + { + HowLong = howLong; + } public DisplaySearchEventArgs(string reportTitle, string typesSelected, string searchString, ICollection myItemInfoList) { _ReportTitle = reportTitle; diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 6b30d730..e69a18d1 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -697,7 +697,7 @@ namespace Volian.Controls.Library if (_MyEditItem.RTBLastFocus) { trackerSC++; - /*if (trackerSC>20) */Console.WriteLine("ShowCaret: {0}", trackerSC); + /*if (trackerSC>20) *///Console.WriteLine("ShowCaret: {0}", trackerSC); //Volian.Base.Library.vlnStackTrace.ShowStack("ShowCaret: EI: {0} StepRTB: {1}", _MyEditItem.MyItemInfo.ItemID, _MyStepRTB.MyItemInfo.ItemID); if (!_MyStepRTB.Visible) _MyStepRTB.Visible = true; @@ -727,7 +727,7 @@ namespace Volian.Controls.Library if (_MyStepRTB != null && !_MyStepRTB.Disposing && !_MyStepRTB.Closed) { trackerHC++; - /* if (trackerHC>20)*/ Console.WriteLine("HideCaret {0}", trackerHC); + /* if (trackerHC>20)*/ //Console.WriteLine("HideCaret {0}", trackerHC); //Volian.Base.Library.vlnStackTrace.ShowStack("HideCaret: StepRTB: {0}", _MyStepRTB.MyItemInfo.ItemID); HideTheCaret(); if (_MyStepRTB.SelectionLength > 0) diff --git a/PROMS/Volian.Print.Library/PDFReport.cs b/PROMS/Volian.Print.Library/PDFReport.cs index 521e21c9..a632d614 100644 --- a/PROMS/Volian.Print.Library/PDFReport.cs +++ b/PROMS/Volian.Print.Library/PDFReport.cs @@ -836,7 +836,10 @@ namespace Volian.Print.Library StepInfo stpinfo = StepInfo.Get(pitem.ItemID); string thisTab = stpinfo.MyTab.CleanText; //StepInfo.Get(pitem.ItemID).MyTab.CleanText; if (IncludesParentToHLS(stpinfo)) - return thisTab; + if (!thisTab.Contains("\u25CF")) //Remove Bullet + return thisTab; + else + thisTab = null; string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;//stpinfo.FormatStepData.ToString(); // remove delimiters of '.' and ')' in tab. if (thisTab != null)