From bea71aac2b745a18b770dfd08080041804b0de6b Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Dec 2013 04:01:16 +0000 Subject: [PATCH] Needed to add the extra four digits to the ROID when searching for an RO that had multiiple return values. Changed color of Search button so that it stands out. --- .../Volian.Controls.Library/DisplaySearch.Designer.cs | 10 +++++----- PROMS/Volian.Controls.Library/DisplaySearch.cs | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 3b8961b9..b4799c1c 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -765,6 +765,10 @@ namespace Volian.Controls.Library this.galSymbols.Name = "galSymbols"; this.galSymbols.Text = "galleryContainer1"; // + // + // + this.galSymbols.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // // buttonItem1 // this.buttonItem1.Name = "buttonItem1"; @@ -1006,7 +1010,6 @@ namespace Volian.Controls.Library this.btnClearSearchResults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnClearSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnClearSearchResults.Enabled = false; - this.btnClearSearchResults.FocusOnLeftMouseButtonDown = true; this.btnClearSearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnClearSearchResults.Location = new System.Drawing.Point(316, 4); this.btnClearSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -1024,7 +1027,6 @@ namespace Volian.Controls.Library this.btnCopySearchResults.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCopySearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnCopySearchResults.Enabled = false; - this.btnCopySearchResults.FocusOnLeftMouseButtonDown = true; this.btnCopySearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnCopySearchResults.Location = new System.Drawing.Point(140, 36); this.btnCopySearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -1116,8 +1118,7 @@ namespace Volian.Controls.Library // this.btnSearch.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnSearch.BackColor = System.Drawing.SystemColors.Control; - this.btnSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; - this.btnSearch.FocusOnLeftMouseButtonDown = true; + this.btnSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb; this.btnSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnSearch.Location = new System.Drawing.Point(5, 36); this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -1135,7 +1136,6 @@ namespace Volian.Controls.Library this.btnPrnSrchRslts.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnPrnSrchRslts.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnPrnSrchRslts.Enabled = false; - this.btnPrnSrchRslts.FocusOnLeftMouseButtonDown = true; this.btnPrnSrchRslts.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnPrnSrchRslts.Location = new System.Drawing.Point(77, 36); this.btnPrnSrchRslts.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 5d0d1828..7c2cd543 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -944,6 +944,7 @@ namespace Volian.Controls.Library chld = ch.children; // build a list of ROs to search return _MyRODbID.ToString() + ":" + GetROsToSearch(chld); + //return _MyRODbID.ToString() + ":" + ch.roid + "0000," + GetROsToSearch(chld); //if (strRtnStr.EndsWith(",")) // strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1); } @@ -982,6 +983,7 @@ namespace Volian.Controls.Library { ROFSTLookup.rochild ro = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag; rtnstr += string.Format("{0}", ro.roid); + if (rtnstr.Length == 12) rtnstr += "0000"; } else { // spin through the child list and get the ROIDs.