Compare commits
5 Commits
B2026-006
...
B2026-007_
| Author | SHA1 | Date | |
|---|---|---|---|
| aa0e919713 | |||
| 7e2a41b6cb | |||
| 258b1d2d1f | |||
| a4ea200e38 | |||
| 3c693baab0 |
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user