Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4399f31a83 | |||
| ca4b21e593 | |||
| accc1c622c | |||
| e50ea6a5db | |||
| 04ce6f55db | |||
| f0493e60d8 | |||
| 13edc9c9ff | |||
| fd0ea4404b | |||
| df9d0f908a | |||
| 779394ffd6 | |||
| a230ecef9b | |||
| 061bcfdc0f | |||
| aced10498b | |||
| cd963d01e4 | |||
| 458dd5fff4 | |||
| 0c342fa188 | |||
| 43b13443ab | |||
| c867d4e4b1 | |||
| 0f541142cc | |||
| b0c55d09b0 | |||
| ee71431210 | |||
| a8196db676 | |||
| 8dc78d49eb | |||
| 3999d1c49b | |||
| aceb928dba | |||
| f17db695d3 |
@@ -1,6 +0,0 @@
|
||||
# ---> VisualStudio
|
||||
## Show diffs for xml files in GIT
|
||||
##
|
||||
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitattributes
|
||||
|
||||
*.xml text
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -377,6 +377,7 @@ namespace ROEditor
|
||||
this.btnOK.TabIndex = 3;
|
||||
this.btnOK.Text = "OK";
|
||||
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
|
||||
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
@@ -553,6 +554,7 @@ namespace ROEditor
|
||||
// update the local/internal copy of the schema.
|
||||
if (success != true)
|
||||
{
|
||||
this.DialogResult = DialogResult.Cancel;
|
||||
return; // DO YET process an error.
|
||||
}
|
||||
else
|
||||
|
||||
@@ -266,6 +266,7 @@ namespace ROEditor
|
||||
|
||||
if (success != true)
|
||||
{
|
||||
this.DialogResult = DialogResult.Cancel;
|
||||
return; // DO YET process an error.
|
||||
}
|
||||
else
|
||||
@@ -367,6 +368,7 @@ namespace ROEditor
|
||||
//
|
||||
// btnOK
|
||||
//
|
||||
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
this.btnOK.Location = new System.Drawing.Point(216, 72);
|
||||
this.btnOK.Name = "btnOK";
|
||||
this.btnOK.Size = new System.Drawing.Size(88, 24);
|
||||
|
||||
@@ -220,6 +220,7 @@ namespace ROEditor
|
||||
return;
|
||||
}
|
||||
|
||||
string origFieldName = myrof.GetFieldname;
|
||||
myrof.SetFieldname(this.tbFieldName.Text);
|
||||
uint ftype=0;
|
||||
if (this.rbSingleLine.Checked == true)
|
||||
@@ -247,6 +248,7 @@ namespace ROEditor
|
||||
|
||||
if (success != true)
|
||||
{
|
||||
this.DialogResult = DialogResult.Cancel;
|
||||
return; // DO YET process an error.
|
||||
}
|
||||
return;
|
||||
@@ -270,7 +272,9 @@ namespace ROEditor
|
||||
}
|
||||
myrof.SetFieldType(ftype);
|
||||
FieldTextFrm ftxt = new FieldTextFrm(myrof, myrodb, myelem, original_type, editlevel, origname, avlist, iulist);
|
||||
ftxt.ShowDialog();
|
||||
if (ftxt.ShowDialog() == DialogResult.Cancel)
|
||||
myrof.SetFieldname(origFieldName);
|
||||
|
||||
this.Close();
|
||||
}
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
@@ -433,6 +433,7 @@ namespace ROEditor
|
||||
//
|
||||
// btnOK
|
||||
//
|
||||
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
this.btnOK.Location = new System.Drawing.Point(24, 248);
|
||||
this.btnOK.Name = "btnOK";
|
||||
this.btnOK.Size = new System.Drawing.Size(144, 24);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -125,7 +125,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAARwBAAEcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
@@ -175,7 +175,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
|
||||
CwAAAk1TRnQBSQFMAgEBBgEAARwBAAEcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
|
||||
@@ -336,7 +336,7 @@ namespace RODBInterface
|
||||
public abstract bool RODB_GetChildData(VlnXmlElement node, bool CheckChildCount);
|
||||
public abstract bool IsDuplicateAccPageID(VlnXmlElement ro, string newacc);
|
||||
public abstract VlnXmlElement RODB_ReadRO(string tbl, string recid);
|
||||
public abstract bool RODB_WriteRO(VlnXmlElement ro);
|
||||
public abstract bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false);
|
||||
public abstract bool RODB_InsertRO(VlnXmlElement ro);
|
||||
public abstract ushort RODB_GetFieldType(VlnXmlElement elem, string TableName, string Fld);
|
||||
public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false);
|
||||
@@ -2120,7 +2120,7 @@ namespace RODBInterface
|
||||
return retele;
|
||||
}
|
||||
|
||||
public override bool RODB_WriteRO(VlnXmlElement ro)
|
||||
public override bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false)
|
||||
{
|
||||
bool success;
|
||||
if (ro.Name == "vlnGroup")
|
||||
@@ -2140,6 +2140,13 @@ namespace RODBInterface
|
||||
string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
|
||||
string xmlstr = GenerateXmlString(ro, false);
|
||||
string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
|
||||
if (movedRO)
|
||||
{
|
||||
VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
|
||||
ro.SetAttribute("ParentID", parent.GetAttribute("RecID"));
|
||||
strUpdate += ", ParentID = '" + ro.GetAttribute("ParentID") + "'";
|
||||
}
|
||||
|
||||
strUpdate = strUpdate + ", ModDateTime = '" + dt + "', AccPageID = '" + wraccid + "' WHERE RecID='" + ro.GetAttribute("RecID") + "'";
|
||||
try
|
||||
{
|
||||
@@ -2192,6 +2199,8 @@ namespace RODBInterface
|
||||
ro.SetAttribute("HasChild", "False");
|
||||
if (ro.HasAttribute("AccPageID"))
|
||||
{
|
||||
// Code is never reached, but this was noticed - this next line should likely be:
|
||||
// strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageID, ModDateTime, Info ) ";
|
||||
strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
|
||||
strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
|
||||
strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
|
||||
@@ -2396,7 +2405,7 @@ namespace RODBInterface
|
||||
Info = null;
|
||||
DBE.ReaderClose();
|
||||
DBE.CommandDispose();
|
||||
return Info.Replace("'", "\'");
|
||||
return Info?.Replace("'", "\'");
|
||||
}
|
||||
|
||||
public override bool RODB_NewSchemaPiece(string recid, string parentid, string table, string schpiece, uint rtype)
|
||||
@@ -2671,8 +2680,8 @@ namespace RODBInterface
|
||||
// Generic definition, i.e. all Groups, and No updates only Local definition, i.e. just this Group Added a
|
||||
// Cancel button to Cancel from this dialog and return to previous dialog. Added more information to the
|
||||
// dialog to inform user of this
|
||||
string dmsg = "Update Generic definition?\r\n\r\n Yes - updates Generic definitions, \r\n No - updates Local definitions, \r\n Cancel - returns to previous dialog." +
|
||||
"\r\n\r\n 'Generic' updates definition in ALL groups that use the name\r\n 'Local' updates definition only in the selected group.";
|
||||
string dmsg = $"Update Generic definition?\r\n\r\n Yes - updates Generic definitions, \r\n No - updates Local definitions, \r\n Cancel - returns to previous dialog." +
|
||||
$"\r\n\r\n 'Generic' updates definition in ALL groups that use the name\r\n 'Local' updates definition only in the selected group, and will change the definition for all items in that table ({GetTopParentName(myelem)}).";
|
||||
System.Windows.Forms.DialogResult result = MessageBox.Show(dmsg, "Referenced Object Definition", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
|
||||
if (result == DialogResult.Cancel) return false;
|
||||
if (result == DialogResult.No) changegeneric = false;
|
||||
@@ -2777,6 +2786,19 @@ namespace RODBInterface
|
||||
return success;
|
||||
}
|
||||
|
||||
//CSM-C2024-030
|
||||
//Explain that Local is local to that table (and include Table name in wording displayed to user)
|
||||
public string GetTopParentName(VlnXmlElement elem)
|
||||
{
|
||||
VlnXmlElement nodetocheck = elem;
|
||||
while (nodetocheck.GetAttribute("ParentID") != "00000000" && nodetocheck.ParentNode != null)
|
||||
{
|
||||
nodetocheck = (VlnXmlElement) nodetocheck.ParentNode;
|
||||
}
|
||||
|
||||
return nodetocheck.FirstChild.InnerText;
|
||||
}
|
||||
|
||||
public override XmlSchema RODB_GetGroupSchema(VlnXmlElement elem)
|
||||
{
|
||||
XmlSchema myschema;
|
||||
|
||||
@@ -1557,7 +1557,7 @@ namespace RODBInterface
|
||||
}
|
||||
return retele;
|
||||
}
|
||||
public override bool RODB_WriteRO(VlnXmlElement ro)
|
||||
public override bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false)
|
||||
{
|
||||
bool success;
|
||||
if (ro.Name == "vlnGroup")
|
||||
@@ -1589,6 +1589,13 @@ namespace RODBInterface
|
||||
command.Parameters.AddWithValue("@ModDateTime", dt);
|
||||
command.Parameters.AddWithValue("@AccPageID", wraccid); // B2020-003: set accpageid to correct value
|
||||
command.Parameters.AddWithValue("@RecID", ro.GetAttribute("RecID"));
|
||||
if (movedRO)
|
||||
{
|
||||
VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
|
||||
ro.SetAttribute("ParentID", parent.GetAttribute("RecID"));
|
||||
command.Parameters.AddWithValue("@ParentID", ro.GetAttribute("ParentID"));
|
||||
}
|
||||
|
||||
using (SqlDataReader reader = command.ExecuteReader())
|
||||
{
|
||||
success = true;
|
||||
@@ -1914,7 +1921,7 @@ namespace RODBInterface
|
||||
command.Parameters.AddWithValue("@RecID", Recid);
|
||||
using (SqlDataReader reader = command.ExecuteReader())
|
||||
{
|
||||
if (DBE.Read())
|
||||
if (reader.Read())
|
||||
Info = reader.GetString(0);
|
||||
else
|
||||
Info = null;
|
||||
|
||||
@@ -674,7 +674,8 @@ CREATE PROCEDURE [dbo].[updateInfoAccidByRecid]
|
||||
@RecID char(8),
|
||||
@AccPageID char(32),
|
||||
@Info nvarchar(max),
|
||||
@ModDateTime char(14)
|
||||
@ModDateTime char(14),
|
||||
@ParentID varchar(8) = NULL
|
||||
)
|
||||
WITH EXECUTE AS OWNER
|
||||
AS
|
||||
@@ -684,7 +685,8 @@ BEGIN TRY -- Try Block
|
||||
SET
|
||||
[Info]=@Info,
|
||||
[ModDateTime]=@ModDateTime,
|
||||
[AccPageID]=@AccPageID
|
||||
[AccPageID]=@AccPageID,
|
||||
[ParentID]=ISNULL(@ParentID, ParentID)
|
||||
WHERE [ROTable]=@ROTable AND [RecID]=@RecID
|
||||
IF @@ROWCOUNT = 0
|
||||
BEGIN
|
||||
|
||||
@@ -474,6 +474,25 @@ namespace VEPROMS.CSLA.Library
|
||||
OnPropertyChanged("Step_FixedTblForSrch");
|
||||
}
|
||||
}
|
||||
//CSM F2024-080: For South Texas - Ability to toggle off Initial Line
|
||||
public bool Step_DisableInitialLine
|
||||
{
|
||||
get
|
||||
{
|
||||
string s = _Xp["Step", "DisableInitialLine"];
|
||||
|
||||
if (s == string.Empty) return false;
|
||||
if (s == "True") return true;
|
||||
return false;
|
||||
}
|
||||
set
|
||||
{
|
||||
string s = _Xp["Step", "DisableInitialLine"];
|
||||
if (value.ToString() == s) return;
|
||||
_Xp["Step", "DisableInitialLine"] = value.ToString();
|
||||
OnPropertyChanged("Step_DisableInitialLine");
|
||||
}
|
||||
}
|
||||
#region RO image sizing
|
||||
// if the RO image (figure) is resized, save it in the step config, not in the ROImageConfig. If stored in ROImageConfig
|
||||
// the size is set for ALL uses.
|
||||
|
||||
@@ -4251,6 +4251,13 @@ namespace VEPROMS.CSLA.Library
|
||||
if (tbformat.Contains("{!.+?}"))
|
||||
tstr = tbformat.Replace("{!.+?}", " "); // Comanche Peak Indented Paragraph
|
||||
_MyTab.Text = tstr;
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
|
||||
{
|
||||
if (tstr.StartsWith(" "))
|
||||
tstr = tstr.Substring(1);
|
||||
tstr = FormatStepData.TabData.MacroEditTag + tstr;
|
||||
}
|
||||
_MyTab.CleanText = tstr;
|
||||
return;
|
||||
}
|
||||
@@ -4341,25 +4348,73 @@ namespace VEPROMS.CSLA.Library
|
||||
incSub = (ord + 1).ToString();
|
||||
if (MyParent.MyTab.CleanText.Trim().EndsWith(")"))
|
||||
{
|
||||
_MyTab.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub;
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub;
|
||||
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
|
||||
{
|
||||
if (tstr.StartsWith(" "))
|
||||
tstr = tstr.Substring(1);
|
||||
tstr = FormatStepData.TabData.MacroEditTag + tstr;
|
||||
}
|
||||
else if (IsInitialLineDisabled && tstr.StartsWith("_"))
|
||||
tstr = tstr.Substring(1);
|
||||
|
||||
_MyTab.CleanText = tstr;
|
||||
_MyTab.Text = _MyTab.CleanText;
|
||||
return;
|
||||
}
|
||||
if (MyParent.MyTab.CleanText.Contains(ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB))
|
||||
{
|
||||
_MyTab.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
|
||||
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
|
||||
{
|
||||
if (tstr.StartsWith(" "))
|
||||
tstr = tstr.Substring(1);
|
||||
tstr = FormatStepData.TabData.MacroEditTag + tstr;
|
||||
}
|
||||
else if(IsInitialLineDisabled && tstr.StartsWith("_"))
|
||||
tstr = tstr.Substring(1);
|
||||
|
||||
_MyTab.CleanText = tstr;
|
||||
_MyTab.Text = _MyTab.CleanText;
|
||||
return;
|
||||
}
|
||||
string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub;
|
||||
_MyTab.CleanText = tmprnotab.TrimStart();
|
||||
_MyTab.Text = tmprnotab.TrimStart();
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
tmprnotab = tmprnotab.TrimStart();
|
||||
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_"))
|
||||
{
|
||||
if (tmprnotab.StartsWith(" "))
|
||||
tmprnotab = tmprnotab.Substring(1);
|
||||
tmprnotab = FormatStepData.TabData.MacroEditTag + tmprnotab;
|
||||
}
|
||||
else if (IsInitialLineDisabled && tmprnotab.StartsWith("_"))
|
||||
tmprnotab = tmprnotab.Substring(1);
|
||||
|
||||
_MyTab.CleanText = tmprnotab;
|
||||
_MyTab.Text = tmprnotab;
|
||||
return;
|
||||
}
|
||||
if ((((ItemInfo)ActiveParent).IsHigh && FormatStepData.NumberHighLevel) || ((!((ItemInfo)ActiveParent).IsHigh) && ((tbformat == null || tbformat == "") && (RNOLevel <= ColumnMode))))
|
||||
{
|
||||
_MyTab.CleanText = ((ItemInfo)ActiveParent).MyTab.CleanText;
|
||||
_MyTab.Text = ((ItemInfo)ActiveParent).MyTab.Text;
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !_MyTab.CleanText.StartsWith("_"))
|
||||
{
|
||||
if (_MyTab.CleanText.StartsWith(" "))
|
||||
_MyTab.CleanText = _MyTab.CleanText.Substring(1);
|
||||
_MyTab.CleanText = FormatStepData.TabData.MacroEditTag + _MyTab.CleanText;
|
||||
}
|
||||
if (IsInitialLineDisabled && _MyTab.CleanText.StartsWith("_"))
|
||||
{
|
||||
_MyTab.CleanText = _MyTab.CleanText.Substring(1);
|
||||
}
|
||||
if (IsInitialLineDisabled && _MyTab.Text.StartsWith("_"))
|
||||
{
|
||||
_MyTab.Text = _MyTab.Text.Substring(1);
|
||||
}
|
||||
_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)
|
||||
@@ -4716,6 +4771,15 @@ namespace VEPROMS.CSLA.Library
|
||||
cltext = cltext + " ";
|
||||
}
|
||||
}
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
else if (macroindx == -1 && !string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
|
||||
{
|
||||
if (cltext == null)
|
||||
cltext = tbformat;
|
||||
if (cltext.StartsWith(" "))
|
||||
cltext = cltext.Substring(1);
|
||||
cltext = FormatStepData.TabData.MacroEditTag + cltext;
|
||||
}
|
||||
}
|
||||
macroindx = tbformat.IndexOf("{!diamond1}");
|
||||
if (macroindx > -1) //i found it
|
||||
@@ -5520,15 +5584,32 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
if (count <= macro.Grouping) addToList = false;
|
||||
}
|
||||
|
||||
//CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro
|
||||
if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled)
|
||||
addToList = false;
|
||||
|
||||
if (addToList) tmp.Add(macro);
|
||||
}
|
||||
if (tmp.Count > 0) _MyMacros = tmp;
|
||||
}
|
||||
#endregion
|
||||
#region UseSmartTemplate
|
||||
|
||||
// TemplateIndex is for Calvert only:
|
||||
private int _TemplateIndex = -2; // -2 not set; -1 not a template
|
||||
//CSM F2024 - 080: For South Texas - check if initial line is disabled for this step
|
||||
public bool IsInitialLineDisabled
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!IsStep) return false;
|
||||
StepConfig sc = MyConfig as StepConfig;
|
||||
return sc.Step_DisableInitialLine;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
#region UseSmartTemplate
|
||||
|
||||
// TemplateIndex is for Calvert only:
|
||||
private int _TemplateIndex = -2; // -2 not set; -1 not a template
|
||||
public int TemplateIndex
|
||||
{
|
||||
get
|
||||
|
||||
@@ -3175,6 +3175,17 @@ namespace VEPROMS.CSLA.Library
|
||||
return LazyLoad(ref _ChangeFontUpperCaseIinArial, "@ChangeFontUpperCaseIinArial");
|
||||
}
|
||||
}
|
||||
|
||||
// F2024-080 South Texas
|
||||
// Used to show if "Initial Line Disable" checkbox should show in the DisplayTab
|
||||
private LazyLoad<bool> _ShowInitialLineDisable;
|
||||
public bool ShowInitialLineDisable
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _ShowInitialLineDisable, "@ShowInitialLineDisable");
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion - StepSectionData
|
||||
#region TextTypeValue
|
||||
|
||||
+721
-698
File diff suppressed because it is too large
Load Diff
@@ -142,6 +142,8 @@ namespace Volian.Controls.Library
|
||||
tbChgID.Enabled = false;
|
||||
lblChgId.Visible = tbChgID.Visible = false;
|
||||
CurItemInfo = null;
|
||||
cbInitialLine.Visible = cbInitialLine.Enabled = false;
|
||||
|
||||
}
|
||||
private bool StepOverRide()
|
||||
{
|
||||
@@ -553,6 +555,16 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//CSM F2024 - 080: For South Texas (HLP formats), enable the initial line checkbox if it is in the formats
|
||||
//Also, they want disable being selected to impact substeps - so do not show toggle if selected on a parent step
|
||||
cbInitialLine.Visible = cbInitialLine.Enabled = false;
|
||||
if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(CurItemInfo.FormatStepData.TabData.MacroEditTag) && CurItemInfo.FormatStepData.TabData.MacroEditTag == "_" && CurItemInfo.FormatStepData.TabData.MacroList != null && CurItemInfo.FormatStepData.TabData.MacroList.Count > 0 && !(CurItemInfo.IsRNOPart && CurItemInfo.FormatStepData.TabData.MacroList[0].NotInRNO))
|
||||
{
|
||||
cbInitialLine.Visible = cbInitialLine.Enabled = true;
|
||||
cbInitialLine.Checked = sc.Step_DisableInitialLine;
|
||||
}
|
||||
|
||||
_Initalizing = false;
|
||||
}
|
||||
public void SetFigure(double wd, double wd2)
|
||||
@@ -969,25 +981,42 @@ namespace Volian.Controls.Library
|
||||
sc.Step_PreferredPagebreak = cbPrefPageBreak.Checked;
|
||||
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||
}
|
||||
//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;
|
||||
// }
|
||||
|
||||
//}
|
||||
private void cbInitialLine_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (_Initalizing) return;
|
||||
MyEditItem.SaveContents();
|
||||
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
||||
if (sc == null) return;
|
||||
MyEditItem.ChangeBarForConfigItemChange = false;
|
||||
sc.Step_DisableInitialLine = cbInitialLine.Checked;
|
||||
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||
|
||||
}
|
||||
//needed to refresh display changing
|
||||
MyEditItem.RefreshContent();
|
||||
MyEditItem.SetAllTabs();
|
||||
|
||||
}
|
||||
|
||||
//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;
|
||||
// }
|
||||
|
||||
//}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user