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

Search not listing Approved folders, sorted results not opening procedures

Browse Source
This commit is contained in:
John Jenko 2009-12-18 14:32:10 +00:00
parent b3c742d586
commit 2cd2c471a8
2 changed files with 89 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs generated
View File

@ -195,11 +195,20 @@ namespace Volian.Controls.Library
this.gpSrchText.Style.BorderRightWidth = 1; this.gpSrchText.Style.BorderRightWidth = 1;
this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpSrchText.Style.BorderTopWidth = 1; this.gpSrchText.Style.BorderTopWidth = 1;
this.gpSrchText.Style.Class = "";
this.gpSrchText.Style.CornerDiameter = 4; this.gpSrchText.Style.CornerDiameter = 4;
this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpSrchText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.gpSrchText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpSrchText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; this.gpSrchText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpSrchText.StyleMouseDown.Class = "";
//
//
//
this.gpSrchText.StyleMouseOver.Class = "";
this.gpSrchText.TabIndex = 5; this.gpSrchText.TabIndex = 5;
this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged); this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged);
// //
@ -263,6 +272,10 @@ namespace Volian.Controls.Library
// //
// cbxBooleanTxtSrch // cbxBooleanTxtSrch
// //
//
//
//
this.cbxBooleanTxtSrch.BackgroundStyle.Class = "";
this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(11, 28); this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(11, 28);
this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4); this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4);
this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch"; this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch";
@ -273,6 +286,10 @@ namespace Volian.Controls.Library
// //
// cbxIncROTextSrch // cbxIncROTextSrch
// //
//
//
//
this.cbxIncROTextSrch.BackgroundStyle.Class = "";
this.cbxIncROTextSrch.Checked = true; this.cbxIncROTextSrch.Checked = true;
this.cbxIncROTextSrch.CheckState = System.Windows.Forms.CheckState.Checked; this.cbxIncROTextSrch.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxIncROTextSrch.CheckValue = "Y"; this.cbxIncROTextSrch.CheckValue = "Y";
@ -287,6 +304,10 @@ namespace Volian.Controls.Library
// cbxCaseSensitive // cbxCaseSensitive
// //
this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent; this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.cbxCaseSensitive.BackgroundStyle.Class = "";
this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbxCaseSensitive.Location = new System.Drawing.Point(11, 1); this.cbxCaseSensitive.Location = new System.Drawing.Point(11, 1);
this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@ -300,6 +321,10 @@ namespace Volian.Controls.Library
// rbtnSrchTxt // rbtnSrchTxt
// //
this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent; this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.rbtnSrchTxt.BackgroundStyle.Class = "";
this.rbtnSrchTxt.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rbtnSrchTxt.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
this.rbtnSrchTxt.Checked = true; this.rbtnSrchTxt.Checked = true;
this.rbtnSrchTxt.CheckState = System.Windows.Forms.CheckState.Checked; this.rbtnSrchTxt.CheckState = System.Windows.Forms.CheckState.Checked;
@ -316,6 +341,10 @@ namespace Volian.Controls.Library
// cbxSrchTypeUsage // cbxSrchTypeUsage
// //
this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent; this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.cbxSrchTypeUsage.BackgroundStyle.Class = "";
this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom; this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom;
this.cbxSrchTypeUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxSrchTypeUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -381,17 +410,30 @@ namespace Volian.Controls.Library
this.gpFindROs.Style.BorderRightWidth = 1; this.gpFindROs.Style.BorderRightWidth = 1;
this.gpFindROs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.gpFindROs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpFindROs.Style.BorderTopWidth = 1; this.gpFindROs.Style.BorderTopWidth = 1;
this.gpFindROs.Style.Class = "";
this.gpFindROs.Style.CornerDiameter = 4; this.gpFindROs.Style.CornerDiameter = 4;
this.gpFindROs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.gpFindROs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpFindROs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.gpFindROs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpFindROs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.gpFindROs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpFindROs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; this.gpFindROs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpFindROs.StyleMouseDown.Class = "";
//
//
//
this.gpFindROs.StyleMouseOver.Class = "";
this.gpFindROs.TabIndex = 3; this.gpFindROs.TabIndex = 3;
this.gpFindROs.EnabledChanged += new System.EventHandler(this.gpFindROs_EnabledChanged); this.gpFindROs.EnabledChanged += new System.EventHandler(this.gpFindROs_EnabledChanged);
// //
// cbxFndUnLnkROVals // cbxFndUnLnkROVals
// //
this.cbxFndUnLnkROVals.BackColor = System.Drawing.Color.Transparent; this.cbxFndUnLnkROVals.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.cbxFndUnLnkROVals.BackgroundStyle.Class = "";
this.cbxFndUnLnkROVals.Enabled = false; this.cbxFndUnLnkROVals.Enabled = false;
this.cbxFndUnLnkROVals.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxFndUnLnkROVals.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbxFndUnLnkROVals.Location = new System.Drawing.Point(0, 4); this.cbxFndUnLnkROVals.Location = new System.Drawing.Point(0, 4);
@ -476,11 +518,20 @@ namespace Volian.Controls.Library
this.gpSrchAnnoText.Style.BorderRightWidth = 1; this.gpSrchAnnoText.Style.BorderRightWidth = 1;
this.gpSrchAnnoText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.gpSrchAnnoText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpSrchAnnoText.Style.BorderTopWidth = 1; this.gpSrchAnnoText.Style.BorderTopWidth = 1;
this.gpSrchAnnoText.Style.Class = "";
this.gpSrchAnnoText.Style.CornerDiameter = 4; this.gpSrchAnnoText.Style.CornerDiameter = 4;
this.gpSrchAnnoText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.gpSrchAnnoText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpSrchAnnoText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.gpSrchAnnoText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpSrchAnnoText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.gpSrchAnnoText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpSrchAnnoText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; this.gpSrchAnnoText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpSrchAnnoText.StyleMouseDown.Class = "";
//
//
//
this.gpSrchAnnoText.StyleMouseOver.Class = "";
this.gpSrchAnnoText.TabIndex = 6; this.gpSrchAnnoText.TabIndex = 6;
this.gpSrchAnnoText.EnabledChanged += new System.EventHandler(this.gpSrchAnnoText_EnabledChanged); this.gpSrchAnnoText.EnabledChanged += new System.EventHandler(this.gpSrchAnnoText_EnabledChanged);
// //
@ -500,6 +551,10 @@ namespace Volian.Controls.Library
// //
// cbxBooleanAnoTxtSrch // cbxBooleanAnoTxtSrch
// //
//
//
//
this.cbxBooleanAnoTxtSrch.BackgroundStyle.Class = "";
this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(16, 50); this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(16, 50);
this.cbxBooleanAnoTxtSrch.Margin = new System.Windows.Forms.Padding(4); this.cbxBooleanAnoTxtSrch.Margin = new System.Windows.Forms.Padding(4);
this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch";
@ -512,6 +567,10 @@ namespace Volian.Controls.Library
// //
this.cbxCaseSensitiveAnnoText.AutoSize = true; this.cbxCaseSensitiveAnnoText.AutoSize = true;
this.cbxCaseSensitiveAnnoText.BackColor = System.Drawing.Color.Transparent; this.cbxCaseSensitiveAnnoText.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.cbxCaseSensitiveAnnoText.BackgroundStyle.Class = "";
this.cbxCaseSensitiveAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxCaseSensitiveAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(16, 31); this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(16, 31);
this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@ -671,6 +730,10 @@ namespace Volian.Controls.Library
// //
// galSymbols // galSymbols
// //
//
//
//
this.galSymbols.BackgroundStyle.Class = "";
this.galSymbols.EnableGalleryPopup = false; this.galSymbols.EnableGalleryPopup = false;
this.galSymbols.MinimumSize = new System.Drawing.Size(150, 200); this.galSymbols.MinimumSize = new System.Drawing.Size(150, 200);
this.galSymbols.Name = "galSymbols"; this.galSymbols.Name = "galSymbols";
@ -765,6 +828,7 @@ namespace Volian.Controls.Library
// //
// elementStyle1 // elementStyle1
// //
this.elementStyle1.Class = "";
this.elementStyle1.Name = "elementStyle1"; this.elementStyle1.Name = "elementStyle1";
this.elementStyle1.TextColor = System.Drawing.SystemColors.ControlText; this.elementStyle1.TextColor = System.Drawing.SystemColors.ControlText;
// //
@ -811,6 +875,7 @@ namespace Volian.Controls.Library
// //
// elementStyle2 // elementStyle2
// //
this.elementStyle2.Class = "";
this.elementStyle2.Name = "elementStyle2"; this.elementStyle2.Name = "elementStyle2";
this.elementStyle2.TextColor = System.Drawing.SystemColors.ControlText; this.elementStyle2.TextColor = System.Drawing.SystemColors.ControlText;
// //
@ -849,11 +914,20 @@ namespace Volian.Controls.Library
this.grpPanSearchResults.Style.BorderRightWidth = 1; this.grpPanSearchResults.Style.BorderRightWidth = 1;
this.grpPanSearchResults.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.grpPanSearchResults.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grpPanSearchResults.Style.BorderTopWidth = 1; this.grpPanSearchResults.Style.BorderTopWidth = 1;
this.grpPanSearchResults.Style.Class = "";
this.grpPanSearchResults.Style.CornerDiameter = 4; this.grpPanSearchResults.Style.CornerDiameter = 4;
this.grpPanSearchResults.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.grpPanSearchResults.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.grpPanSearchResults.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.grpPanSearchResults.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.grpPanSearchResults.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.grpPanSearchResults.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.grpPanSearchResults.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; this.grpPanSearchResults.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.grpPanSearchResults.StyleMouseDown.Class = "";
//
//
//
this.grpPanSearchResults.StyleMouseOver.Class = "";
this.grpPanSearchResults.TabIndex = 3; this.grpPanSearchResults.TabIndex = 3;
this.grpPanSearchResults.Text = "Search Results"; this.grpPanSearchResults.Text = "Search Results";
// //
@ -914,6 +988,10 @@ namespace Volian.Controls.Library
// //
// labelX1 // labelX1
// //
//
//
//
this.labelX1.BackgroundStyle.Class = "";
this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX1.Location = new System.Drawing.Point(4, 6); this.labelX1.Location = new System.Drawing.Point(4, 6);
this.labelX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.labelX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@ -961,6 +1039,10 @@ namespace Volian.Controls.Library
// //
// cbSorted // cbSorted
// //
//
//
//
this.cbSorted.BackgroundStyle.Class = "";
this.cbSorted.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbSorted.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbSorted.Location = new System.Drawing.Point(152, 41); this.cbSorted.Location = new System.Drawing.Point(152, 41);
this.cbSorted.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbSorted.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);

12
PROMS/Volian.Controls.Library/DisplaySearch.cs
View File

@ -283,8 +283,8 @@ namespace Volian.Controls.Library
{ {
foreach (DocVersionInfo dv in fi.FolderDocVersions) foreach (DocVersionInfo dv in fi.FolderDocVersions)
{ {
if ((VersionTypeEnum)dv.VersionType == VersionTypeEnum.WorkingDraft) //if ((VersionTypeEnum)dv.VersionType == VersionTypeEnum.WorkingDraft)
{ //{
DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node(); DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node();
newnode.Text = dv.ToString(); newnode.Text = dv.ToString();
newnode.Tag = dv; newnode.Tag = dv;
@ -294,7 +294,7 @@ namespace Volian.Controls.Library
newnode.CheckBoxThreeState = false; newnode.CheckBoxThreeState = false;
newnode.CheckBoxVisible = true; newnode.CheckBoxVisible = true;
par.Nodes.Add(newnode); par.Nodes.Add(newnode);
} //}
} }
} }
} }
@ -603,10 +603,12 @@ namespace Volian.Controls.Library
private void lbSrchResults_SelectedValueChanged(object sender, EventArgs e) private void lbSrchResults_SelectedValueChanged(object sender, EventArgs e)
{ {
if (_LoadingList) return;
ItemInfoList iil = lbSrchResults.DataSource as ItemInfoList; ItemInfoList iil = lbSrchResults.DataSource as ItemInfoList;
if (!_LoadingList && iil != null && !iil.RefreshingList) // iil will be null for a sorted list, so only check RefreshingList for ItemInfoList
if(iil == null || !iil.RefreshingList)
{ {
_ItemInfo = lbSrchResults.SelectedValue as ItemInfo; _ItemInfo = lbSrchResults.SelectedValue as ItemInfo;
if ((tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) && (_ItemInfo != null)) if ((tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) && (_ItemInfo != null))
{ {
_AnnotationDetails.CurrentAnnotation = AnnotationInfo.Get(_ItemInfo.SearchAnnotationID); _AnnotationDetails.CurrentAnnotation = AnnotationInfo.Get(_ItemInfo.SearchAnnotationID);