Compare commits
16 Commits
B2026-006
...
Developmen
| Author | SHA1 | Date | |
|---|---|---|---|
| 7afca6a254 | |||
| 1c56aa2eb1 | |||
| f38aa4595f | |||
| aa0b906a9f | |||
| f43d1e5f47 | |||
| 63a74e1aef | |||
| 69e45e9ae8 | |||
| 53cf35014c | |||
| d6e4239573 | |||
| c76808e11e | |||
| b2428a4211 | |||
| aa0e919713 | |||
| 7e2a41b6cb | |||
| 258b1d2d1f | |||
| a4ea200e38 | |||
| 3c693baab0 |
Binary file not shown.
@@ -145,6 +145,9 @@ namespace VEPROMS
|
||||
}
|
||||
|
||||
LoadRefreshGroupUsers();
|
||||
|
||||
// C2026-004 - messagebox when create group
|
||||
MessageBox.Show($"{txt} group successfully created.", "Create group", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
private void tvFolders_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
|
||||
{
|
||||
@@ -186,6 +189,9 @@ namespace VEPROMS
|
||||
|
||||
//Add a Member to a Group
|
||||
private void addMember_Click(object sender, EventArgs e)
|
||||
{
|
||||
// B2026-007 PROMS Security - don't error when add a user to a group but no group selected
|
||||
if (lstNonMembers.SelectedValue != null)
|
||||
{
|
||||
int groupIndex = cbGroupSelection.SelectedIndex;
|
||||
string selectedUserID = lstNonMembers.SelectedValue.ToString();
|
||||
@@ -200,6 +206,7 @@ namespace VEPROMS
|
||||
int index = lstMembers.FindString(selectedUserID);
|
||||
lstMembers.SetSelected(index, true);
|
||||
}
|
||||
}
|
||||
|
||||
//Remove a Member From a Group
|
||||
private void removeMember_Click(object sender, EventArgs e)
|
||||
@@ -326,6 +333,7 @@ namespace VEPROMS
|
||||
User u = User.MakeUser("[Enter New UserID]", "", "", "", "", "", "", "", "", "", "", DateTime.Now, "");
|
||||
frmManageUser frm = new frmManageUser("add");
|
||||
frm.MyUser = u;
|
||||
frm.Text = "Enter New UserID"; //C2026-002 Change Title bar on Add/Edit User
|
||||
if (frm.ShowDialog(this) == DialogResult.OK)
|
||||
{
|
||||
u = frm.MyUser;
|
||||
|
||||
@@ -20,7 +20,27 @@ namespace VEPROMS
|
||||
_MyUser = value;
|
||||
SimpleUser su = new SimpleUser(_MyUser);
|
||||
pgUser.SelectedObject = su;
|
||||
this.Text = string.Format("{0} ({1} {2}) Information",su.UserID,su.FirstName,su.LastName);
|
||||
|
||||
//C2026-002 Change Title bar on Add/Edit User
|
||||
string tmp;
|
||||
if (!string.IsNullOrEmpty(su.FirstName) && !string.IsNullOrEmpty(su.LastName))
|
||||
{
|
||||
tmp = $"{su.UserID} ({su.FirstName} {su.LastName}) Information";
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(su.LastName))
|
||||
{
|
||||
tmp = $"{su.UserID} ({su.LastName}) Information";
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(su.FirstName))
|
||||
{
|
||||
tmp = $"{su.UserID} ({su.FirstName}) Information";
|
||||
}
|
||||
else
|
||||
{
|
||||
tmp = $"{su.UserID} Information";
|
||||
}
|
||||
|
||||
this.Text = tmp;
|
||||
}
|
||||
}
|
||||
private string _Mode;
|
||||
|
||||
@@ -3312,6 +3312,25 @@ namespace VEPROMS.CSLA.Library
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
|
||||
//B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
|
||||
// for enhanced documents, when copying content, need to not resolve the
|
||||
//unit designators until print time
|
||||
public string DisplayTextKeepSpecialCharsKeepUnitSpecific
|
||||
{
|
||||
get
|
||||
{
|
||||
string str = MyContent.Text;
|
||||
foreach (string key in SpecialCharacters.Keys)
|
||||
str = str.Replace(key, SpecialCharacters[key]);
|
||||
string retval = ConvertToDisplayText(str);
|
||||
foreach (string key in SpecialCharacters.Keys)
|
||||
retval = retval.Replace(SpecialCharacters[key], key);
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public string DisplayNumber
|
||||
{
|
||||
get
|
||||
@@ -4748,6 +4767,12 @@ namespace VEPROMS.CSLA.Library
|
||||
// C2026-003 Vogtle Continuous Action high level RNO (AER is not continuous action)
|
||||
if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
|
||||
IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null)
|
||||
{
|
||||
// B2026-009 needed to make sure parent wasn't a continuous action step type
|
||||
// the ExcludeFromContActSum is set to False for continuous action
|
||||
// step types and True for all others
|
||||
StepConfig psc = MyParent.MyConfig as StepConfig;
|
||||
if (MyParent.FormatStepData.ExcludeFromContActSum && psc != null && psc.Step_CAS != "True")
|
||||
{
|
||||
StepConfig sc = MyConfig as StepConfig;
|
||||
if (sc != null && sc.Step_CAS == "True")
|
||||
@@ -4758,6 +4783,7 @@ namespace VEPROMS.CSLA.Library
|
||||
_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText;
|
||||
}
|
||||
}
|
||||
}
|
||||
_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;
|
||||
if (((ItemInfo)ActiveParent).MyTab.Offset != 0) _MyTab.Offset = ((ItemInfo)ActiveParent).MyTab.Offset;
|
||||
if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOExcludeMacros)
|
||||
@@ -8351,7 +8377,10 @@ namespace VEPROMS.CSLA.Library
|
||||
{
|
||||
ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
|
||||
// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced. Null reference check
|
||||
if (srcItem != null && srcItem.DisplayTextKeepSpecialChars != ii.DisplayTextKeepSpecialChars)
|
||||
//B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
|
||||
// for enhanced documents, when copying content, need to not resolve the
|
||||
//unit designators until print time
|
||||
if (srcItem != null && srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific != ii.DisplayTextKeepSpecialCharsKeepUnitSpecific)
|
||||
{
|
||||
if (retiil == null) retiil = new ItemInfoList(ii);
|
||||
else retiil.AddItem(ii);
|
||||
@@ -8377,7 +8406,10 @@ namespace VEPROMS.CSLA.Library
|
||||
ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
|
||||
using (Item enhItem = Item.Get(ii.ItemID))
|
||||
{
|
||||
enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialChars;
|
||||
//B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
|
||||
// for enhanced documents, when copying content, need to not resolve the
|
||||
//unit designators until print time
|
||||
enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific;
|
||||
enhItem.Save();
|
||||
}
|
||||
}
|
||||
|
||||
89
PROMS/Volian.Controls.Library/CustomMessageBox.Designer.cs
generated
Normal file
89
PROMS/Volian.Controls.Library/CustomMessageBox.Designer.cs
generated
Normal file
@@ -0,0 +1,89 @@
|
||||
namespace Volian.Controls.Library
|
||||
{
|
||||
partial class CustomMessageBox
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.btn1 = new System.Windows.Forms.Button();
|
||||
this.btn2 = new System.Windows.Forms.Button();
|
||||
this.lblMessage = new System.Windows.Forms.Label();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// btn1
|
||||
//
|
||||
this.btn1.AutoSize = true;
|
||||
this.btn1.Location = new System.Drawing.Point(12, 99);
|
||||
this.btn1.Name = "btn1";
|
||||
this.btn1.Size = new System.Drawing.Size(75, 23);
|
||||
this.btn1.TabIndex = 0;
|
||||
this.btn1.UseVisualStyleBackColor = true;
|
||||
this.btn1.Click += new System.EventHandler(this.Btn1_Click);
|
||||
//
|
||||
// btn2
|
||||
//
|
||||
this.btn2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btn2.AutoSize = true;
|
||||
this.btn2.Location = new System.Drawing.Point(322, 99);
|
||||
this.btn2.Name = "btn2";
|
||||
this.btn2.Size = new System.Drawing.Size(75, 23);
|
||||
this.btn2.TabIndex = 1;
|
||||
this.btn2.UseVisualStyleBackColor = true;
|
||||
this.btn2.Click += new System.EventHandler(this.Btn2_Click);
|
||||
//
|
||||
// lblMessage
|
||||
//
|
||||
this.lblMessage.AutoSize = true;
|
||||
this.lblMessage.Location = new System.Drawing.Point(33, 41);
|
||||
this.lblMessage.Name = "lblMessage";
|
||||
this.lblMessage.Size = new System.Drawing.Size(0, 13);
|
||||
this.lblMessage.TabIndex = 2;
|
||||
this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// CustomMessageBox
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.AutoSize = true;
|
||||
this.ClientSize = new System.Drawing.Size(419, 130);
|
||||
this.Controls.Add(this.lblMessage);
|
||||
this.Controls.Add(this.btn2);
|
||||
this.Controls.Add(this.btn1);
|
||||
this.Name = "CustomMessageBox";
|
||||
this.ShowIcon = false;
|
||||
this.Text = "CustomMessageBox";
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.Button btn1;
|
||||
private System.Windows.Forms.Button btn2;
|
||||
private System.Windows.Forms.Label lblMessage;
|
||||
}
|
||||
}
|
||||
58
PROMS/Volian.Controls.Library/CustomMessageBox.cs
Normal file
58
PROMS/Volian.Controls.Library/CustomMessageBox.cs
Normal file
@@ -0,0 +1,58 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace Volian.Controls.Library
|
||||
{
|
||||
public partial class CustomMessageBox : Form
|
||||
{
|
||||
//Custome Message Box Class to allow renaming of buttons
|
||||
// originally devleoped for use with
|
||||
// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
|
||||
// in order to allow the user to decide if they wanted to search on the selected step or the selected procedure
|
||||
public CustomMessageBox(string message, string title, string button1Text = "OK", string button2Text = "")
|
||||
{
|
||||
InitializeComponent();
|
||||
this.Text = title;
|
||||
lblMessage.Text = message;
|
||||
btn1.Text = button1Text;
|
||||
|
||||
if (!string.IsNullOrEmpty(button2Text))
|
||||
{
|
||||
btn2.Text = button2Text;
|
||||
btn2.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
btn2.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void Btn1_Click(object sender, EventArgs e)
|
||||
{
|
||||
DialogResult = DialogResult.Yes;
|
||||
Close();
|
||||
}
|
||||
|
||||
private void Btn2_Click(object sender, EventArgs e)
|
||||
{
|
||||
DialogResult = DialogResult.No;
|
||||
Close();
|
||||
}
|
||||
|
||||
//static method for calling custommessagebox directly
|
||||
public static DialogResult Show(string message, string title, string button1Text = "OK", string button2Text = "")
|
||||
{
|
||||
using (var messageBox = new CustomMessageBox(message, title, button1Text, button2Text))
|
||||
{
|
||||
return messageBox.ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
120
PROMS/Volian.Controls.Library/CustomMessageBox.resx
Normal file
120
PROMS/Volian.Controls.Library/CustomMessageBox.resx
Normal file
@@ -0,0 +1,120 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@@ -414,6 +414,15 @@ namespace Volian.Controls.Library
|
||||
lbSrchResults.Visible = true;
|
||||
lbSrchResultsIncTrans.Visible = false;
|
||||
cbxRnoOnly.Visible = true;
|
||||
|
||||
// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
|
||||
//don't allow changing the Style for Incoming Transitions
|
||||
//but allow them to change it if there are search results and it is another tab
|
||||
if (_SearchResults != null && _SearchResults.Count > 0)
|
||||
{
|
||||
cmbResultsStyle.Enabled = true;
|
||||
}
|
||||
|
||||
if (e.NewTab == tabIncTrans) // C2020-033: Incoming transitions
|
||||
{
|
||||
xpSetToSearch.Enabled = false;
|
||||
@@ -422,7 +431,7 @@ namespace Volian.Controls.Library
|
||||
lbSrchResultsIncTrans.Visible = true;
|
||||
lbSrchResultsIncTrans.CheckBoxesVisible = true;
|
||||
lbSrchResultsIncTrans.AutoScroll = true;
|
||||
btnSearch.Enabled = false; // C2021 - 002: disable search button - no functionality for Incoming Transitions
|
||||
cmbResultsStyle.Enabled = false;
|
||||
cbxRnoOnly.Visible = false;
|
||||
}
|
||||
else if (e.NewTab == tabROSearch)
|
||||
@@ -648,7 +657,6 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
btnTranCvtAllToTxt.Enabled = IncTransCvtAllToTextPerm();
|
||||
btnTranCvtSelToTxt.Enabled = false;
|
||||
btnSearch.Enabled = false; // C2021 - 002: disable search button - no functionality for Incoming Transitions
|
||||
}
|
||||
|
||||
public bool IncTranCvtPerm()
|
||||
@@ -1765,6 +1773,7 @@ namespace Volian.Controls.Library
|
||||
btnClearSearchResults.Enabled = true;
|
||||
btnCopySearchResults.Enabled = true;
|
||||
btnSaveSearchResults.Enabled = true;
|
||||
if (tabSearchTypes.SelectedTab != tabIncTrans)
|
||||
cmbResultsStyle.Enabled = true;
|
||||
}
|
||||
else
|
||||
@@ -2188,21 +2197,39 @@ namespace Volian.Controls.Library
|
||||
// C2019-001: Search in RNO steps only
|
||||
if (cbxRnoOnlyTrans.Checked) GetInRNOResults();
|
||||
}
|
||||
else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4])
|
||||
else if (tabSearchTypes.SelectedTab == tabIncTrans)
|
||||
{
|
||||
// C2020-033: Incoming Transitions: Make an iteminfolist from the list returned from
|
||||
// GetExternalTransitionsToChildren (also gets transitions to the item itself)
|
||||
// B2021-010: Use IncomingTranGetMergedTranList to get a complete list of incoming transitions (transitions to procedure
|
||||
// were only included if there were NO transitions to items within procedure)
|
||||
ReportTitle = string.Format("Search For Incoming Transitions to {0}: ", SearchIncTransII.Path);
|
||||
SearchResults = IncomingTranGetMergedTranList();
|
||||
cmbResultsStyleIndex = 1; //display step locations in results
|
||||
if (SearchResults == null || SearchResults.Count == 0)
|
||||
// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
|
||||
|
||||
if (_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure != null)
|
||||
{
|
||||
FlexibleMessageBox.Show("No Matches Found.", "Search");
|
||||
|
||||
if (_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure.ItemID == _TabControl?.MyEditItem?.MyItemInfo?.ItemID)
|
||||
{
|
||||
_ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure));
|
||||
}
|
||||
else
|
||||
{
|
||||
//if on a step, check if the user wants to load incoming transitions for that step or the entire procedure
|
||||
switch (CustomMessageBox.Show("Would you like to load incoming transitions for this procedure or this step?", "Load Incoming Transitions", "This Procedure", "This Step"))
|
||||
{
|
||||
case DialogResult.Yes:
|
||||
_ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure));
|
||||
break;
|
||||
case DialogResult.No:
|
||||
_ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo));
|
||||
break;
|
||||
default: //Cancel was pressed
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (SearchResults != null)
|
||||
}
|
||||
else
|
||||
{
|
||||
FlexibleMessageBox.Show("Please open a procedure before selecting this option to load incoming transitions for that procedure.", "Search");
|
||||
}
|
||||
}
|
||||
if (SearchResults != null && tabSearchTypes.SelectedTab != tabIncTrans)
|
||||
{
|
||||
AddMessageForEmptyAnnotations();
|
||||
if (cmbResultsStyleIndex == 3 && cmbResultsStyle.Items.Count == 3) cmbResultsStyleIndex--;
|
||||
@@ -2303,6 +2330,17 @@ namespace Volian.Controls.Library
|
||||
cmbResultsStyle.Items.Add(comboItem2);
|
||||
if (hasAnnot) cmbResultsStyle.Items.Add(comboItem3);
|
||||
cmbResultsStyle.Items.Add(comboItem4);
|
||||
|
||||
// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
|
||||
if (tabSearchTypes.SelectedTab == tabIncTrans)
|
||||
{
|
||||
cmbResultsStyle.SelectedIndex = -1;
|
||||
cmbResultsStyle.Enabled = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
cmbResultsStyle.Enabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void cbxTextSearchText_Leave(object sender, EventArgs e)
|
||||
|
||||
@@ -537,6 +537,10 @@ namespace Volian.Controls.Library
|
||||
// if it is a modify and there will be no usages if it is new (the usage gets created on the save)
|
||||
if (!MyFlexGrid.IsRoTable)
|
||||
{
|
||||
// B2026-003 we where using a string.format on this inside the while loop - allocating memory each time
|
||||
// so I move it outside the while loop and did a simple assigment of text
|
||||
string lookForLinks = @"<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v '?{{}}~\\]+)*\\v(\\[^v \\]+)* #Link:(ReferencedObject|Transition[^:]*?):.*?\[END>";
|
||||
|
||||
while (r < h)
|
||||
{
|
||||
CellRange cr = MyFlexGrid.GetMergedRange(r, c);
|
||||
@@ -546,8 +550,7 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
// see if there are any links and save these so that any deleted ROs or transitions in the
|
||||
// steprtb can have associated usages/transitions records removed from the database.
|
||||
string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v '?{{}}~\\]+)*\\v(\\[^v \\]+)* #Link:(ReferencedObject|Transition[^:]*?):.*?\[END>");
|
||||
MatchCollection matches = Regex.Matches((string)MyFlexGrid[r, c], lookFor);
|
||||
MatchCollection matches = Regex.Matches((string)MyFlexGrid[r, c], lookForLinks);
|
||||
for (int i = matches.Count - 1; i >= 0; i--)
|
||||
{
|
||||
Match m = matches[i];
|
||||
|
||||
@@ -272,10 +272,12 @@ namespace Volian.Controls.Library
|
||||
for (int i = 0; i < rows * cols; i++)
|
||||
datum.Add("|");
|
||||
XmlNodeList nl = xd.SelectNodes("C1FlexGrid/Cells/Cell/Data");
|
||||
string data = string.Empty;
|
||||
// B2026-003 use StringBuilder a "using" statement around the RichTextBox for better mememory management
|
||||
StringBuilder data = new StringBuilder();
|
||||
foreach (XmlNode xn in nl)
|
||||
{
|
||||
RichTextBox rtb = new RichTextBox();
|
||||
using (RichTextBox rtb = new RichTextBox())
|
||||
{
|
||||
rtb.Rtf = xn.InnerText;
|
||||
XmlAttribute xa = xn.ParentNode.Attributes.GetNamedItem("index") as XmlAttribute;
|
||||
string[] rc = xa.InnerText.Split(',');
|
||||
@@ -284,9 +286,10 @@ namespace Volian.Controls.Library
|
||||
int index = r * cols + c;
|
||||
datum[index] = "|" + (rtb.Text == "" ? "" : rtb.Text);
|
||||
}
|
||||
}
|
||||
foreach (string s in datum)
|
||||
data += s;
|
||||
return data;
|
||||
data.Append(s);
|
||||
return data.ToString();
|
||||
}
|
||||
private string GetCellFormatString(XmlDocument xd)
|
||||
{
|
||||
|
||||
@@ -154,6 +154,12 @@
|
||||
<Compile Include="ConvertTable.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CustomMessageBox.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CustomMessageBox.Designer.cs">
|
||||
<DependentUpon>CustomMessageBox.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DisplayApplicability.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -454,6 +460,9 @@
|
||||
<DependentUpon>AnnotationSearch.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="CustomMessageBox.resx">
|
||||
<DependentUpon>CustomMessageBox.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DisplayBookMarks.resx">
|
||||
<DependentUpon>DisplayBookMarks.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
|
||||
Reference in New Issue
Block a user