diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 0ca5cbfe..b6f02379 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -7279,7 +7279,6 @@ namespace VEPROMS.CSLA.Library
_ByWordSuffix = byWordSuffix;
}
}
-
private void DataPortal_Fetch(ItemListSearchCriteria criteria)
{
this.RaiseListChangedEvents = false;
diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index 86ff26cb..d8b59abd 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -643,10 +643,9 @@ namespace Volian.Controls.Library
if (_docVersionInfo != null && fstid != -1 && fstid != MyROFSTLookup.RofstID)
{
string message = string.Empty;
- if (_progressBar?.Text != "Cannot check-out Working Draft" && !MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
+ if (_progressBar?.Text != "RO Check Paused - Other Users In Set" && !MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
{
- FlexibleMessageBox.Show(this, message, "Working Draft Has Items Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
- FinalProgressBarMessage = "Cannot check-out Working Draft";
+ FinalProgressBarMessage = "RO Check Paused - Other Users In Set";
}
else if (!MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
{
@@ -719,7 +718,7 @@ namespace Volian.Controls.Library
if (tmpROID != null) ExpandNode(ROFSTLookup.FormatRoidKey(tmpROID, true));
//doc version would have updated (if needed) so reset flag
- if (_progressBar?.Text != "Cannot check-out Working Draft")
+ if (_progressBar?.Text != "RO Check Paused - Other Users In Set")
{
changedDocVersion = false;
}
diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs
index 80bbc53a..5c2552de 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs
@@ -94,6 +94,15 @@ namespace Volian.Controls.Library
this.label2 = new System.Windows.Forms.Label();
this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components);
+ this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
+ this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
+ this.lblIncTran = new System.Windows.Forms.Label();
+ this.btnTranCvtAllToTxt = new System.Windows.Forms.Button();
+ this.lblSrchIncTran = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.rbFromEditor = new System.Windows.Forms.RadioButton();
+ this.rbFromTree = new System.Windows.Forms.RadioButton();
+ this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components);
this.contextMenuBar1 = new DevComponents.DotNetBar.ContextMenuBar();
this.btnCMIFindText = new DevComponents.DotNetBar.ButtonItem();
this.btnCMEdit = new DevComponents.DotNetBar.ButtonItem();
@@ -112,15 +121,6 @@ namespace Volian.Controls.Library
this.btnAND = new DevComponents.DotNetBar.ButtonItem();
this.btnOR = new DevComponents.DotNetBar.ButtonItem();
this.btnNOT = new DevComponents.DotNetBar.ButtonItem();
- this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components);
- this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
- this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
- this.lblIncTran = new System.Windows.Forms.Label();
- this.btnTranCvtAllToTxt = new System.Windows.Forms.Button();
- this.lblSrchIncTran = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.rbFromEditor = new System.Windows.Forms.RadioButton();
- this.rbFromTree = new System.Windows.Forms.RadioButton();
this.advTreeProcSets = new DevComponents.AdvTree.AdvTree();
this.elementStyle1 = new DevComponents.DotNetBar.ElementStyle();
this.node1 = new DevComponents.AdvTree.Node();
@@ -168,9 +168,9 @@ namespace Volian.Controls.Library
this.tabControlPanel3.SuspendLayout();
this.gpSrchAnnoText.SuspendLayout();
this.panel4.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
this.tabControlPanel1.SuspendLayout();
this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).BeginInit();
this.grpPanSearchResults.SuspendLayout();
@@ -974,6 +974,118 @@ namespace Volian.Controls.Library
this.tabAnnotationSearch.Text = "Annotations";
this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click);
//
+ // tabControlPanel1
+ //
+ this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
+ this.tabControlPanel1.Controls.Add(this.lblIncTran);
+ this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt);
+ this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
+ this.tabControlPanel1.Controls.Add(this.groupBox1);
+ this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
+ this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
+ this.tabControlPanel1.Name = "tabControlPanel1";
+ this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
+ this.tabControlPanel1.Size = new System.Drawing.Size(277, 113);
+ this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+ this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+ this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+ this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+ | DevComponents.DotNetBar.eBorderSide.Bottom)));
+ this.tabControlPanel1.Style.GradientAngle = 90;
+ this.tabControlPanel1.TabIndex = 17;
+ this.tabControlPanel1.TabItem = this.tabIncTrans;
+ this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
+ //
+ // btnTranCvtSelToTxt
+ //
+ this.btnTranCvtSelToTxt.Enabled = false;
+ this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63);
+ this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
+ this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
+ this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
+ "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+ this.btnTranCvtSelToTxt.TabIndex = 3;
+ this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
+ this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
+ this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click);
+ //
+ // lblIncTran
+ //
+ this.lblIncTran.AutoSize = true;
+ this.lblIncTran.Location = new System.Drawing.Point(4, 9);
+ this.lblIncTran.Name = "lblIncTran";
+ this.lblIncTran.Size = new System.Drawing.Size(23, 13);
+ this.lblIncTran.TabIndex = 2;
+ this.lblIncTran.Text = "To:";
+ //
+ // btnTranCvtAllToTxt
+ //
+ this.btnTranCvtAllToTxt.Enabled = false;
+ this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
+ this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
+ this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
+ this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
+ "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+ this.btnTranCvtAllToTxt.TabIndex = 1;
+ this.btnTranCvtAllToTxt.Text = "Convert All To Text";
+ this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
+ this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
+ //
+ // lblSrchIncTran
+ //
+ this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent;
+ this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9);
+ this.lblSrchIncTran.Name = "lblSrchIncTran";
+ this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
+ this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
+ "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
+ this.lblSrchIncTran.TabIndex = 1;
+ //
+ // groupBox1
+ //
+ this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+ this.groupBox1.Controls.Add(this.rbFromEditor);
+ this.groupBox1.Controls.Add(this.rbFromTree);
+ this.groupBox1.Location = new System.Drawing.Point(147, 4);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(130, 57);
+ this.groupBox1.TabIndex = 0;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Search Selection";
+ this.groupBox1.Visible = false;
+ //
+ // rbFromEditor
+ //
+ this.rbFromEditor.AutoSize = true;
+ this.rbFromEditor.Location = new System.Drawing.Point(22, 34);
+ this.rbFromEditor.Name = "rbFromEditor";
+ this.rbFromEditor.Size = new System.Drawing.Size(78, 17);
+ this.rbFromEditor.TabIndex = 1;
+ this.rbFromEditor.TabStop = true;
+ this.rbFromEditor.Text = "From Editor";
+ this.rbFromEditor.UseVisualStyleBackColor = true;
+ //
+ // rbFromTree
+ //
+ this.rbFromTree.AutoSize = true;
+ this.rbFromTree.Location = new System.Drawing.Point(22, 16);
+ this.rbFromTree.Name = "rbFromTree";
+ this.rbFromTree.Size = new System.Drawing.Size(73, 17);
+ this.rbFromTree.TabIndex = 0;
+ this.rbFromTree.TabStop = true;
+ this.rbFromTree.Text = "From Tree";
+ this.rbFromTree.UseVisualStyleBackColor = true;
+ //
+ // tabIncTrans
+ //
+ this.tabIncTrans.AttachedControl = this.tabControlPanel1;
+ this.tabIncTrans.Name = "tabIncTrans";
+ this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
+ "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
+ this.tabIncTrans.Text = "Incoming\nTransitions";
+ //
// contextMenuBar1
//
this.contextMenuBar1.DockSide = DevComponents.DotNetBar.eDockSide.Top;
@@ -1136,119 +1248,6 @@ namespace Volian.Controls.Library
this.btnNOT.Text = "NOT";
this.btnNOT.Click += new System.EventHandler(this.btnNOT_Click);
//
- // tabIncTrans
- //
- this.tabIncTrans.AttachedControl = this.tabControlPanel1;
- this.tabIncTrans.Name = "tabIncTrans";
- this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
- "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
- this.tabIncTrans.Text = "Incoming\nTransitions";
- //
- // tabControlPanel1
- //
- this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
- this.tabControlPanel1.Controls.Add(this.lblIncTran);
- this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt);
- this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
- this.tabControlPanel1.Controls.Add(this.groupBox1);
- this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
- this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
- this.tabControlPanel1.Name = "tabControlPanel1";
- this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
- this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.tabControlPanel1.Size = new System.Drawing.Size(277, 113);
- this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
- this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
- this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
- this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
- | DevComponents.DotNetBar.eBorderSide.Bottom)));
- this.tabControlPanel1.Style.GradientAngle = 90;
- this.tabControlPanel1.TabIndex = 17;
- this.tabControlPanel1.TabItem = this.tabIncTrans;
- //
- // btnTranCvtSelToTxt
- //
- this.btnTranCvtSelToTxt.Enabled = false;
- this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63);
- this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
- this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
- this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
- "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
- this.btnTranCvtSelToTxt.TabIndex = 3;
- this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
- this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
- this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click);
- //
- // lblIncTran
- //
- this.lblIncTran.AutoSize = true;
- this.lblIncTran.Location = new System.Drawing.Point(4, 9);
- this.lblIncTran.Name = "lblIncTran";
- this.lblIncTran.Size = new System.Drawing.Size(23, 13);
- this.lblIncTran.TabIndex = 2;
- this.lblIncTran.Text = "To:";
- //
- // btnTranCvtAllToTxt
- //
- this.btnTranCvtAllToTxt.Enabled = false;
- this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
- this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
- this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
- this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
- "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
- this.btnTranCvtAllToTxt.TabIndex = 1;
- this.btnTranCvtAllToTxt.Text = "Convert All To Text";
- this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
- this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
- //
- // lblSrchIncTran
- //
- this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent;
- this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9);
- this.lblSrchIncTran.Name = "lblSrchIncTran";
- this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
- this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
- "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
- this.lblSrchIncTran.TabIndex = 1;
- //
- // groupBox1
- //
- this.groupBox1.BackColor = System.Drawing.Color.Transparent;
- this.groupBox1.Controls.Add(this.rbFromEditor);
- this.groupBox1.Controls.Add(this.rbFromTree);
- this.groupBox1.Location = new System.Drawing.Point(147, 4);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(130, 57);
- this.groupBox1.TabIndex = 0;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Search Selection";
- this.groupBox1.Visible = false;
- //
- // rbFromEditor
- //
- this.rbFromEditor.AutoSize = true;
- this.rbFromEditor.Location = new System.Drawing.Point(22, 34);
- this.rbFromEditor.Name = "rbFromEditor";
- this.rbFromEditor.Size = new System.Drawing.Size(78, 17);
- this.rbFromEditor.TabIndex = 1;
- this.rbFromEditor.TabStop = true;
- this.rbFromEditor.Text = "From Editor";
- this.rbFromEditor.UseVisualStyleBackColor = true;
- //
- // rbFromTree
- //
- this.rbFromTree.AutoSize = true;
- this.rbFromTree.Location = new System.Drawing.Point(22, 16);
- this.rbFromTree.Name = "rbFromTree";
- this.rbFromTree.Size = new System.Drawing.Size(73, 17);
- this.rbFromTree.TabIndex = 0;
- this.rbFromTree.TabStop = true;
- this.rbFromTree.Text = "From Tree";
- this.rbFromTree.UseVisualStyleBackColor = true;
- //
// advTreeProcSets
//
this.advTreeProcSets.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline;
@@ -1407,6 +1406,7 @@ namespace Volian.Controls.Library
//
this.lbSrchResultsIncTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.lbSrchResultsIncTrans.CheckBoxesVisible = true;
+ this.lbSrchResultsIncTrans.CheckStateMember = null;
this.lbSrchResultsIncTrans.ContainerControlProcessDialogKey = true;
this.lbSrchResultsIncTrans.Dock = System.Windows.Forms.DockStyle.Fill;
this.lbSrchResultsIncTrans.DragDropSupport = true;
@@ -1733,6 +1733,11 @@ namespace Volian.Controls.Library
this.Controls.Add(this.xpSetToSearch);
this.Controls.Add(this.tabSearchTypes);
this.Controls.Add(this.tabControlPanel1);
+ //B2025-056 Click on Incoming Transitions
+ // This needs to be part of overall control
+ // since if it is part of tabSearchTypes,
+ // then when that is disabled, buttons on
+ // this will be also
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "DisplaySearch";
this.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
@@ -1755,11 +1760,11 @@ namespace Volian.Controls.Library
this.gpSrchAnnoText.ResumeLayout(false);
this.panel4.ResumeLayout(false);
this.panel4.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit();
this.tabControlPanel1.ResumeLayout(false);
this.tabControlPanel1.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).EndInit();
this.grpPanSearchResults.ResumeLayout(false);
diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs
index b22a7cb5..3ddbe677 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -2016,35 +2016,16 @@ namespace Volian.Controls.Library
{
ReportTitle = string.Format("Search for '{0}'", TextSearchString);
- // C2020-009: Search - Allow search 'By Word'.
string byWordPrefix = string.Empty;
string byWordSuffix = string.Empty;
if (cbxByWord.Checked)
{
- // Generate a prefix & suffix to be used in the sql query around the search string.
- // If the search string starts (prefix)/ends(suffix) with a number, then use an expression that
- // does not allow the preceding/following text to have a number, '.', letter or other rtf
- // commands. If the search string starts/ends with a letter, then use an expression that does not
- // find the preceding/following text that is text, i.e. a letter.
- if (Regex.IsMatch(TextSearchString, @"^[\d\.]")) // starts with a number or '.' decimal pt
- {
- byWordPrefix = @"[^0-9a-zA-Z.vbpi:\\-]";
- }
- else if (Regex.IsMatch(TextSearchString, @"^[a-zA-Z]")) // starts with a letter
- {
- byWordPrefix = @"[^a-zA-Z]";
- }
- if (Regex.IsMatch(TextSearchString, @"[\d\.]$")) // ends with a number or decimal
- {
- byWordSuffix = @"[^0-9a-zA-Z.vbpi:\\-]";
- }
- else if (Regex.IsMatch(TextSearchString, @"[a-zA-Z]$")) // ends with a letter
- {
- byWordSuffix = @"[^a-zA-Z]";
- }
+ byWordPrefix = GetByWordSettings(TextSearchString, true);
+ byWordSuffix = GetByWordSettings(TextSearchString, false);
}
- SearchString = TextSearchString;
- // B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
+
+ SearchString = TextSearchString;
+
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
cmbResultsStyleIndex = 3; // display step text in results
@@ -2078,9 +2059,8 @@ namespace Volian.Controls.Library
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
{
- string ROSearchList2 = exactsearch(ROSearchList); // match exact string
- // B2022-031 - added a exactsearch to filter out procedure and section titles from global search results.
- SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList2, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
+
+ SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, GetByWordSettings(ROSearchList, true), GetByWordSettings(ROSearchList, false));
cmbResultsStyleIndex = 3; // display step text in results
}
else
@@ -2190,27 +2170,52 @@ namespace Volian.Controls.Library
}
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
}
-
- private string exactsearch(string SearchString) // B2026-053
+ private string GetByWordSettings(string ss, bool checkstart)
{
- //string ss = "";
- StringBuilder ss = new StringBuilder();
- int sl = SearchString.Length;
- int LstIdxSp = SearchString.LastIndexOf(' ');
- if (sl == LstIdxSp + 1) // B2026-053 if ' ' the last char.
- {
- ss.Append(' ');
- ss.Append(SearchString); // B2026-053 add a space prefix to make the search exact if the end of the searchString is a space.
- }
- else
- {
- ss.Append(' ');
- ss.Append(SearchString); // B2026-053 Exact match add spaces before and after searchString.
- ss.Append(' ');
- }
- return ss.ToString();
- }
+ // C2020-009: Search - Allow search 'By Word'.
+
+ // // Generate a prefix & suffix to be used in the sql query around the search string.
+ // // If the search string starts (prefix)/ends(suffix) with a number, then use an expression that
+ // // does not allow the preceding/following text to have a number, '.', letter or other rtf
+ // // commands. If the search string starts/ends with a letter, then use an expression that does not
+ // // find the preceding/following text that is text, i.e. a letter.
+
+ if (ss.Length > 0)
+ {
+ //checking start
+ if (checkstart)
+ {
+ // starts with a number or '.' decimal pt
+ if (char.IsNumber(ss, 0) || ss[0] == '.')
+ {
+ return @"[^0-9a-zA-Z.vbpi:\\-]";
+ }
+ // starts with a letter
+ else if (char.IsLetter(ss, 0))
+ {
+ return @"[^a-zA-Z]";
+ }
+ }
+ //checking end
+ else
+ {
+ // ends with a number or '.' decimal pt
+ if (char.IsNumber(ss, ss.Length - 1) || ss[ss.Length - 1] == '.')
+ {
+ return @"[^0-9a-zA-Z.vbpi:\\-]";
+ }
+ // ends with a letter
+ else if (char.IsLetter(ss, ss.Length - 1))
+ {
+ return @"[^a-zA-Z]";
+ }
+ }
+ }
+
+ //default
+ return string.Empty;
+ }
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)
{
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 80a47892..b52a03cd 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -3684,15 +3684,14 @@ namespace Volian.Controls.Library
{
ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, null);
- string accpgid = accpageid;
-
- //B2022 - 083: Support Conditional RO Values
- ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+ //B2022-083: Support Conditional RO Values
+ //C2026-047 first try the RO Lookup with the ascii dash character in the accpageid. If not found, try again with the unicode dash
+ ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpageid.Replace(@"\u8209?", "-"), multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
if (roc.value == null)
{
- accpgid = accpgid.Replace(@"\u8209?", "-");
- roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+ // try again but this time with the unicode dash
+ roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpageid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
}
if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019
diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.Designer.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.Designer.cs
index d6e48711..95fa1523 100644
--- a/PROMS/Volian.Controls.Library/VlnFlexGrid.Designer.cs
+++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.Designer.cs
@@ -1,5 +1,4 @@
using System;
-using System.Windows.Forms;
namespace Volian.Controls.Library
{
@@ -79,10 +78,7 @@ namespace Volian.Controls.Library
// VlnFlexGrid
//
this.Rows.DefaultSize = 19;
- this.AllowDrop = true;
- this.DragEnter += new DragEventHandler(Control_DragEnter);
- this.DragDrop += new DragEventHandler(Control_DragDrop);
-
+
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false);
diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
index 6f85943f..f7f2310f 100644
--- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
+++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
@@ -1,23 +1,22 @@
-using C1.Win.C1FlexGrid;
-using C1.Win.C1SpellChecker;
-using DevComponents.DotNetBar.Controls;
-using JR.Utils.GUI.Forms;
using System;
+using System.ComponentModel;
using System.Collections;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Runtime.InteropServices;
using System.Text;
-using System.Text.RegularExpressions;
using System.Windows.Forms;
+using System.Drawing;
+using System.Runtime.InteropServices;
using System.Xml;
-using System.Xml.Serialization;
-using VEPROMS.CSLA.Library;
-using Volian.Base.Library;
+using System.IO;
using Volian.Controls.Library;
+using VEPROMS.CSLA.Library;
+using C1.Win.C1FlexGrid;
+using C1.Win.C1SpellChecker;
+using System.Text.RegularExpressions;
+using System.Xml.Serialization;
+using Volian.Base.Library;
+using JR.Utils.GUI.Forms;
namespace Volian.Controls.Library
{
@@ -4439,28 +4438,11 @@ namespace Volian.Controls.Library
// }
//}
- private void Control_DragEnter(object sender, DragEventArgs e)
- {
- if (e.Data.GetDataPresent(DataFormats.Text))
- {
- e.Effect = DragDropEffects.Copy; // Allow copy
- }
- else
- {
- e.Effect = DragDropEffects.None; // Disallow
- }
- }
- private void Control_DragDrop(object sender, DragEventArgs e)
- {
- string data = (string)e.Data.GetData(DataFormats.Text);
- // Process the data (e.g., display it in a TextBox)
- this.Text = data;
- }
#region Uneven Selections
- ///
- /// True if the top and bottom row of the selection is the same for every column
- ///
- public bool EvenSelection
+ ///
+ /// True if the top and bottom row of the selection is the same for every column
+ ///
+ public bool EvenSelection
{
get
{
diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
index 89efa648..a6cc1382 100644
--- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
+++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
@@ -1659,14 +1659,14 @@ i = 0;
private string ROLookup(string accpageid, string multiid, string deflt, string overrideChild)
{
ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, overrideChild);
-
- string accpgid = accpageid;
- ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+
+ //C2026-047 first try the RO Lookup with the ascii dash character in the accpageid. If not found, try again with the unicode dash
+ ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpageid.Replace(@"\u8209?", "-") + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
if (roc.value == null)
{
- accpgid = accpgid.Replace(@"\u8209?", "-");
- roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+ // try again but this time with the unicode dash
+ roc = myLookup.GetROChildByAccPageID("<" + accpageid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
}
if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019