Compare commits
6 Commits
B2026-007_
...
B2026-009_
| Author | SHA1 | Date | |
|---|---|---|---|
| 63a74e1aef | |||
| 69e45e9ae8 | |||
| 53cf35014c | |||
| d6e4239573 | |||
| c76808e11e | |||
| b2428a4211 |
Binary file not shown.
@@ -333,6 +333,7 @@ namespace VEPROMS
|
|||||||
User u = User.MakeUser("[Enter New UserID]", "", "", "", "", "", "", "", "", "", "", DateTime.Now, "");
|
User u = User.MakeUser("[Enter New UserID]", "", "", "", "", "", "", "", "", "", "", DateTime.Now, "");
|
||||||
frmManageUser frm = new frmManageUser("add");
|
frmManageUser frm = new frmManageUser("add");
|
||||||
frm.MyUser = u;
|
frm.MyUser = u;
|
||||||
|
frm.Text = "Enter New UserID"; //C2026-002 Change Title bar on Add/Edit User
|
||||||
if (frm.ShowDialog(this) == DialogResult.OK)
|
if (frm.ShowDialog(this) == DialogResult.OK)
|
||||||
{
|
{
|
||||||
u = frm.MyUser;
|
u = frm.MyUser;
|
||||||
|
|||||||
@@ -20,7 +20,27 @@ namespace VEPROMS
|
|||||||
_MyUser = value;
|
_MyUser = value;
|
||||||
SimpleUser su = new SimpleUser(_MyUser);
|
SimpleUser su = new SimpleUser(_MyUser);
|
||||||
pgUser.SelectedObject = su;
|
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;
|
private string _Mode;
|
||||||
|
|||||||
@@ -4749,13 +4749,20 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
|
if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
|
||||||
IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null)
|
IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null)
|
||||||
{
|
{
|
||||||
StepConfig sc = MyConfig as StepConfig;
|
// B2026-009 needed to make sure parent wasn't a continuous action step type
|
||||||
if (sc != null && sc.Step_CAS == "True")
|
// 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")
|
||||||
{
|
{
|
||||||
if (FormatStepData.TabData.CASPrintMacro != null)
|
StepConfig sc = MyConfig as StepConfig;
|
||||||
_MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text;
|
if (sc != null && sc.Step_CAS == "True")
|
||||||
if (FormatStepData.TabData.CASEditTag != null)
|
{
|
||||||
_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText;
|
if (FormatStepData.TabData.CASPrintMacro != null)
|
||||||
|
_MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text;
|
||||||
|
if (FormatStepData.TabData.CASEditTag != null)
|
||||||
|
_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;
|
_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user