diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index d9e0d88d..a439510b 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -544,7 +544,7 @@ namespace Volian.Controls.Library foreach (DocVersionInfo dvi in dvil) { DocVersionConfig dvc = dvi.DocVersionConfig; - if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0") + if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit { args += " \"PC=" + dvc.Unit_Name + "\""; break; @@ -1018,7 +1018,7 @@ namespace Volian.Controls.Library { DocVersionConfig jdvc = dvi.DocVersionConfig; - if (jdvc != null && jdvc.Unit_Name != "" && jdvc.Unit_Name != "0") + if (jdvc != null && jdvc.Unit_Name != "" && jdvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit { args += " \"PC=" + jdvc.Unit_Name + "\""; break; diff --git a/PROMS/Volian.Controls.Library/DisplayReports.cs b/PROMS/Volian.Controls.Library/DisplayReports.cs index 7246de37..7bdf8f43 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.cs @@ -733,7 +733,7 @@ namespace Volian.Controls.Library foreach (DocVersionInfo dvi in dvil) { DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig; - if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0") + if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit roloc += " \"/PC=" + dvc.Unit_Name + "\""; break; } diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 19776863..3d4532d4 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -1094,20 +1094,6 @@ namespace Volian.Controls.Library // cbxSrchTypeUsage // this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent; - // - 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.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom; diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index b41df472..10ab6520 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -628,6 +628,11 @@ namespace Volian.Controls.Library AddMessageForEmptyAnnotations(); cmbResultsStyle.SelectedIndex = 1; //display step locations in results DisplayResults(); + //If any transitions are listed after the Convert, Admin Tools/Links/Refresh Transitions can be used to fix incorrect links. This will eliminate any in the list. + // B2023-103 if any items are left in search list, there may be bad transition link data - put out a message box + if (fromTranCvtBtn) + FlexibleMessageBox.Show(this, "If items remain in the list after performing Convert All to Text, running Admin Tools/Links/Refresh Transitions will clear the list.", + "Convert Transitions to Text", MessageBoxButtons.OK); } else { @@ -1178,8 +1183,11 @@ namespace Volian.Controls.Library } else { - DialogResult ans = FlexibleMessageBox.Show("Are you sure you want to convert the transitions to text?", - "Convert Transition to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + // B2023-103 add spinner (WaitCursor) and also, change FlexibleMessageBox to regular MessageBox since restore of cursor to + // wait cursor did not work after FlexibleMessageBox + Cursor savcursor = Cursor; + DialogResult ans = MessageBox.Show(this, "Are you sure you want to convert the transitions to text?", "Convert Transitions to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + this.Cursor = savcursor; if (ans == DialogResult.No) return null; } @@ -1254,6 +1262,8 @@ namespace Volian.Controls.Library // C2020-033: For items in list, do the actual conversion of the Incoming Transition to text private void TranCvtToTxt(List itmsEditable) { + // B2023-103 Add wait cursor (and remove at end) + this.Cursor = Cursors.WaitCursor; ItemInfo trII = SearchIncTransII; if (trII != null) @@ -1301,6 +1311,7 @@ namespace Volian.Controls.Library } } + this.Cursor = Cursors.Default; } #region (ProgressBar) @@ -3322,9 +3333,15 @@ namespace Volian.Controls.Library // C2020-033: Convert All (that have permissions) Incoming Transitions to text private void btnTranCvtAllToTxt_Click(object sender, EventArgs e) { + Cursor = Cursors.WaitCursor; List itmsEditable = TranCvtCheckPermission(true); // Get list based on permissions - if (itmsEditable == null || itmsEditable.Count == 0) return; + if (itmsEditable == null || itmsEditable.Count == 0) + { + Cursor = Cursors.Default; + return; + } TranCvtToTxt(itmsEditable); + Cursor = Cursors.Default; fromTranCvtBtn = true; UpdateSearchIncTransResults(); // B2021-009: Research after convert transitions to text fromTranCvtBtn = false; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index fc242db9..dbf29f8a 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -3148,7 +3148,7 @@ namespace Volian.Controls.Library foreach (DocVersionInfo dvi in dvil) { DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig; - if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0") + if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit { args += " \"PC=" + dvc.Unit_Name + "\""; break; @@ -3318,7 +3318,7 @@ namespace Volian.Controls.Library foreach (DocVersionInfo dvi in dvil) { DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig; - if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0") + if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit { roloc += " \"PC=" + dvc.Unit_Name + "\""; break; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 55e0ba55..9e8ce687 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1942,7 +1942,12 @@ namespace Volian.Controls.Library case "Incoming Transitions": // C2020-033: Support the menu item to bring up Search/Incoming Transitions panel VETreeNode tnx = SelectedNode as VETreeNode; ItemInfo iii = tnx.VEObject as ItemInfo; - if (iii != null) OnSearchIncTransIn(this, new vlnTreeItemInfoEventArgs(iii)); + if (iii != null) + { + this.Cursor = Cursors.WaitCursor; // B2023-103 add spinner when searching for incoming transitions + OnSearchIncTransIn(this, new vlnTreeItemInfoEventArgs(iii)); + this.Cursor = Cursors.Default; + } break; case "Properties..."://Show the properties for the selected node SetLastValues((VETreeNode)SelectedNode); @@ -2246,7 +2251,7 @@ namespace Volian.Controls.Library foreach (DocVersionInfo dvi in dvil) { DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig; - if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0") + if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit { roloc += " \"PC=" + dvc.Unit_Name + "\""; break;