Compare commits
13 Commits
C2019-025_
...
F2025-001_
Author | SHA1 | Date | |
---|---|---|---|
c1c93cbdc4 | |||
47a14e143e | |||
b7aa85f4fc | |||
90e25f3fcf | |||
d67e81d8a6 | |||
057915baaa | |||
fe268b6122 | |||
ca61597863 | |||
a04def360d | |||
5e43a8501b | |||
e893264075 | |||
82d8fe6e17 | |||
4ca3697845 |
Binary file not shown.
Binary file not shown.
@@ -12,6 +12,12 @@ using JR.Utils.GUI.Forms;
|
|||||||
namespace VEPROMS.CSLA.Library
|
namespace VEPROMS.CSLA.Library
|
||||||
{
|
{
|
||||||
public enum E_FieldToEdit { StepText, Text, Number, PSI };
|
public enum E_FieldToEdit { StepText, Text, Number, PSI };
|
||||||
|
public enum ReplaceWords
|
||||||
|
{
|
||||||
|
Inherit = 0,
|
||||||
|
Show = 1,
|
||||||
|
DoNotShow = 2
|
||||||
|
}
|
||||||
public class DisplayText
|
public class DisplayText
|
||||||
{
|
{
|
||||||
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
@@ -55,22 +61,20 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (sc == null) return "N";
|
if (sc == null) return "N";
|
||||||
return sc.Section_ShwRplWords;
|
return sc.Section_ShwRplWords;
|
||||||
}
|
}
|
||||||
|
// C2019-025 c2025-010 Ability-to-Toggle-Replace-Words
|
||||||
// C2029-025 Show or hide replace words. Can highlight replace words in editor.
|
|
||||||
private bool ShwRplWdsIndex(ItemInfo _MyItemInfo)
|
private bool ShwRplWdsIndex(ItemInfo _MyItemInfo)
|
||||||
{
|
{
|
||||||
StepConfig sc = _MyItemInfo.MyConfig as StepConfig;
|
StepConfig sc = _MyItemInfo.MyConfig as StepConfig;
|
||||||
int setting = sc.Step_ShwRplWdsIndex;
|
int setting = sc.Step_ShwRplWdsIndex;
|
||||||
switch (setting)
|
switch (setting)
|
||||||
{
|
{
|
||||||
case 3:
|
case (int)ReplaceWords.DoNotShow:
|
||||||
return false;
|
return false;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case (int)ReplaceWords.Show:
|
||||||
return true;
|
return true;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case (int)ReplaceWords.Inherit:
|
||||||
case 0:
|
|
||||||
//SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig;
|
//SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig;
|
||||||
SectionConfig sc2 = _MyItemInfo.ActiveSection.MyConfig as SectionConfig;
|
SectionConfig sc2 = _MyItemInfo.ActiveSection.MyConfig as SectionConfig;
|
||||||
if (sc2 == null || sc2.Section_ShwRplWords == "Y")
|
if (sc2 == null || sc2.Section_ShwRplWords == "Y")
|
||||||
@@ -87,6 +91,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Item _MyItem;
|
private Item _MyItem;
|
||||||
private string EditText
|
private string EditText
|
||||||
{
|
{
|
||||||
|
@@ -105,7 +105,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (tmp._MyContent != null)
|
if (tmp._MyContent != null)
|
||||||
{
|
{
|
||||||
ContentInfo.Refresh(tmp._MyContent);
|
ContentInfo.Refresh(tmp._MyContent);
|
||||||
if (tmp._MyContent.MyImage != null) ImageInfo.Refresh(tmp._MyContent.MyImage);
|
if (tmp._MyContent?.MyImage != null) ImageInfo.Refresh(tmp._MyContent.MyImage);
|
||||||
}
|
}
|
||||||
ItemInfo.Refresh(tmp);
|
ItemInfo.Refresh(tmp);
|
||||||
}
|
}
|
||||||
|
@@ -2362,6 +2362,17 @@ namespace Volian.Controls.Library
|
|||||||
if (n.Nodes != null && n.Nodes.Count > 0 && n.Nodes[0].Text != DummyNodeText) CheckTreeNodeChildren(n.Nodes);
|
if (n.Nodes != null && n.Nodes.Count > 0 && n.Nodes[0].Text != DummyNodeText) CheckTreeNodeChildren(n.Nodes);
|
||||||
checkingChildren = false;
|
checkingChildren = false;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//C2025-005 Find Step Elements
|
||||||
|
//uncheck the parents if there are any
|
||||||
|
DevComponents.AdvTree.Node tmp_n = n;
|
||||||
|
while (tmp_n.Parent != null)
|
||||||
|
{
|
||||||
|
tmp_n = tmp_n.Parent;
|
||||||
|
tmp_n.Checked = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// if the selected folder has a docversion, handle it:
|
// if the selected folder has a docversion, handle it:
|
||||||
if (n.Tag != SelectAllProcedureSetsText)
|
if (n.Tag != SelectAllProcedureSetsText)
|
||||||
@@ -2379,6 +2390,26 @@ namespace Volian.Controls.Library
|
|||||||
|
|
||||||
SetupContextMenu();
|
SetupContextMenu();
|
||||||
buildSetToSearchPanelTitle();
|
buildSetToSearchPanelTitle();
|
||||||
|
|
||||||
|
//C2025-005 Find Step Elements
|
||||||
|
//Need to refresh the Doc List and Available Step Types
|
||||||
|
//if All Procedure Sets was selected
|
||||||
|
if (n.Tag == SelectAllProcedureSetsText)
|
||||||
|
{
|
||||||
|
if (n.Checked)
|
||||||
|
{
|
||||||
|
checkingChildren = true;
|
||||||
|
foreach (Node node in advTreeProcSets.Nodes[0].Nodes)
|
||||||
|
{
|
||||||
|
node.Checked = true;
|
||||||
|
CheckTreeNodeChildren(node.Nodes);
|
||||||
|
}
|
||||||
|
checkingChildren = false;
|
||||||
|
}
|
||||||
|
RefreshLstCheckedDocVersions();
|
||||||
|
RefreshStepTypes();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// check all folder nodes below this
|
// check all folder nodes below this
|
||||||
@@ -2452,14 +2483,19 @@ namespace Volian.Controls.Library
|
|||||||
ResetStepTypes("....select a procedure set for types to appear...");
|
ResetStepTypes("....select a procedure set for types to appear...");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ResetStepTypes(string str)
|
//C2025-005 Find Step Elements
|
||||||
|
//improve messaging when multiple formats
|
||||||
|
private void ResetStepTypes(params string[] strs)
|
||||||
{
|
{
|
||||||
advTreeStepTypes.Nodes.Clear();
|
advTreeStepTypes.Nodes.Clear();
|
||||||
lstCheckedStepTypes.Clear();
|
lstCheckedStepTypes.Clear();
|
||||||
lstCheckedStepTypesStr.Clear();
|
lstCheckedStepTypesStr.Clear();
|
||||||
Node newnode = new DevComponents.AdvTree.Node();
|
foreach (string str in strs)
|
||||||
newnode.Text = str;
|
{
|
||||||
advTreeStepTypes.Nodes.Add(newnode);
|
Node newnode = new DevComponents.AdvTree.Node();
|
||||||
|
newnode.Text = str;
|
||||||
|
advTreeStepTypes.Nodes.Add(newnode);
|
||||||
|
}
|
||||||
buildStepTypePannelTitle();
|
buildStepTypePannelTitle();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2486,7 +2522,11 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
if (formatName != dvi.ActiveFormat.Name)
|
if (formatName != dvi.ActiveFormat.Name)
|
||||||
{
|
{
|
||||||
ResetStepTypes("...folders selected include multiple formats");
|
//C2025-005 Find Step Elements
|
||||||
|
//improve messaging when multiple formats
|
||||||
|
string frmt1 = $" Format is {formatName} before {dvi.MyFolder.Name}";
|
||||||
|
string frmt2 = $" which begins format: {dvi.ActiveFormat.Name}";
|
||||||
|
ResetStepTypes("...folders selected include multiple formats.", frmt1, frmt2);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
1589
PROMS/Volian.Controls.Library/DisplayTags.Designer.cs
generated
1589
PROMS/Volian.Controls.Library/DisplayTags.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@@ -142,6 +142,7 @@ namespace Volian.Controls.Library
|
|||||||
tbChgID.Text = "";
|
tbChgID.Text = "";
|
||||||
tbChgID.Enabled = false;
|
tbChgID.Enabled = false;
|
||||||
lblChgId.Visible = tbChgID.Visible = false;
|
lblChgId.Visible = tbChgID.Visible = false;
|
||||||
|
btnSaveChangeID.Enabled = btnSaveChangeID.Visible = false;
|
||||||
CurItemInfo = null;
|
CurItemInfo = null;
|
||||||
cbInitialLine.Visible = cbInitialLine.Enabled = false;
|
cbInitialLine.Visible = cbInitialLine.Enabled = false;
|
||||||
|
|
||||||
@@ -521,9 +522,10 @@ namespace Volian.Controls.Library
|
|||||||
tbChgID.Text = sc1.Step_ChangeID;
|
tbChgID.Text = sc1.Step_ChangeID;
|
||||||
tbChgID.Enabled = true;
|
tbChgID.Enabled = true;
|
||||||
lblChgId.Visible = tbChgID.Visible = true;
|
lblChgId.Visible = tbChgID.Visible = true;
|
||||||
|
btnSaveChangeID.Enabled = btnSaveChangeID.Visible = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
lblChgId.Visible = tbChgID.Visible = false;
|
lblChgId.Visible = tbChgID.Visible = btnSaveChangeID.Enabled = btnSaveChangeID.Visible = false;
|
||||||
|
|
||||||
// Walk up tree until this step type's parentType is "Base". Start adding menuitems from this step type.
|
// Walk up tree until this step type's parentType is "Base". Start adding menuitems from this step type.
|
||||||
StepData top = fmtdata.StepDataList[formatSteptype];
|
StepData top = fmtdata.StepDataList[formatSteptype];
|
||||||
@@ -903,18 +905,6 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private void tbChgID_TextChanged(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
MyEditItem.SaveContents();
|
|
||||||
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
|
||||||
// if the changeID changed, then reset the change bar override
|
|
||||||
// B2021-029: don't change changeid if the config & text box are both empty
|
|
||||||
if (sc.Step_ChangeID != tbChgID.Text && sc.Step_ChangeID != null && tbChgID.Text != "")
|
|
||||||
{
|
|
||||||
sc.Step_ChangeID = tbChgID.Text;
|
|
||||||
sc.Step_CBOverride = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#region WCNTRN format
|
#region WCNTRN format
|
||||||
// The following supports the Wolf Creek Training format/Responsibility data
|
// The following supports the Wolf Creek Training format/Responsibility data
|
||||||
// off of the High Level Step
|
// off of the High Level Step
|
||||||
@@ -1037,25 +1027,41 @@ namespace Volian.Controls.Library
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//private void txbxAltConActSumText_Leave(object sender, EventArgs e)
|
//B2025-010 PROMS -Fixed issues updating Changeid
|
||||||
//{
|
// Changed to a Save button instead of onTextChanged
|
||||||
// // User left Atlernate Continuous Action Text field. If text changed, then prompt
|
// Also was issue where sometimes would lave last character / digit (not allowing the change id to be completely removed)
|
||||||
// // to see if save should occur.
|
private void btnSaveChangeID_Click(object sender, EventArgs e)
|
||||||
// StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
{
|
||||||
// if (sc == null) return;
|
MyEditItem.SaveContents();
|
||||||
// bool bothEmpty = (sc.Step_AlternateContActSumText == null || sc.Step_AlternateContActSumText == "") && (txbxAltConActSumText.Text == null || txbxAltConActSumText.Text == "");
|
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
||||||
// if (!bothEmpty && sc.Step_AlternateContActSumText != txbxAltConActSumText.Text)
|
// if the changeID changed, then reset the change bar override
|
||||||
// {
|
// B2021-029: don't change changeid if the config & text box are both empty
|
||||||
// if (MessageBox.Show(this, "Do you want to save the Alternate Continuous Action Text?", "Confirm Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
if (sc.Step_ChangeID != tbChgID.Text && (!string.IsNullOrEmpty(sc.Step_ChangeID) || !string.IsNullOrEmpty(tbChgID.Text)))
|
||||||
// {
|
{
|
||||||
// MyEditItem.SaveContents();
|
sc.Step_ChangeID = tbChgID.Text;
|
||||||
// sc.Step_AlternateContActSumText = txbxAltConActSumText.Text; // this actually saves the config
|
sc.Step_CBOverride = null;
|
||||||
// }
|
}
|
||||||
// else
|
}
|
||||||
// txbxAltConActSumText.Text = sc.Step_AlternateContActSumText;
|
|
||||||
// }
|
|
||||||
|
|
||||||
//}
|
//private void txbxAltConActSumText_Leave(object sender, EventArgs e)
|
||||||
|
//{
|
||||||
|
// // User left Atlernate Continuous Action Text field. If text changed, then prompt
|
||||||
|
// // to see if save should occur.
|
||||||
|
// StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
||||||
|
// if (sc == null) return;
|
||||||
|
// bool bothEmpty = (sc.Step_AlternateContActSumText == null || sc.Step_AlternateContActSumText == "") && (txbxAltConActSumText.Text == null || txbxAltConActSumText.Text == "");
|
||||||
|
// if (!bothEmpty && sc.Step_AlternateContActSumText != txbxAltConActSumText.Text)
|
||||||
|
// {
|
||||||
|
// if (MessageBox.Show(this, "Do you want to save the Alternate Continuous Action Text?", "Confirm Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
||||||
|
// {
|
||||||
|
// MyEditItem.SaveContents();
|
||||||
|
// sc.Step_AlternateContActSumText = txbxAltConActSumText.Text; // this actually saves the config
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// txbxAltConActSumText.Text = sc.Step_AlternateContActSumText;
|
||||||
|
// }
|
||||||
|
|
||||||
}
|
//}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -409,7 +409,7 @@ namespace Volian.Print.Library
|
|||||||
else if (cai.Type > 20099) // B2020-054: Always put out 'Equation' (removed checking for null text)
|
else if (cai.Type > 20099) // B2020-054: Always put out 'Equation' (removed checking for null text)
|
||||||
txt = "Equation";
|
txt = "Equation";
|
||||||
else
|
else
|
||||||
txt = ItemInfo.ConvertToDisplayText(cai.Text);
|
txt = ItemInfo.ConvertToDisplayText(cai.Text).Replace("Go to \u25cf", "Go to ?");
|
||||||
if (MyProc.MyDocVersion.MultiUnitCount > 1)
|
if (MyProc.MyDocVersion.MultiUnitCount > 1)
|
||||||
{
|
{
|
||||||
System.Xml.XmlNode nd;
|
System.Xml.XmlNode nd;
|
||||||
@@ -1570,7 +1570,7 @@ namespace Volian.Print.Library
|
|||||||
else if (cai.Type > 20099)
|
else if (cai.Type > 20099)
|
||||||
txt = "Equation";
|
txt = "Equation";
|
||||||
else
|
else
|
||||||
txt = ItemInfo.ConvertToDisplayText(cai.Text);
|
txt = ItemInfo.ConvertToDisplayText(cai.Text).Replace("Go to \u25cf", "Go to ?");
|
||||||
// Add Parent/Child information if applicable
|
// Add Parent/Child information if applicable
|
||||||
// We were doing this for the Chronology report so I added the same logic here for the Summary report
|
// We were doing this for the Chronology report so I added the same logic here for the Summary report
|
||||||
if (MyProc.MyDocVersion.MultiUnitCount > 1)
|
if (MyProc.MyDocVersion.MultiUnitCount > 1)
|
||||||
|
Reference in New Issue
Block a user