Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing
2013-02-20 11:42:32 +00:00
parent 68a5f7171f
commit 4c673f0ea3
5 changed files with 95 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@@ -1122,8 +1122,13 @@ namespace VEPROMS.CSLA.Library
StepConfig sc = MyConfig as StepConfig;
int iiForFoldout = sc != null ? sc.Step_FloatingFoldout : -1;
if (iiForFoldout <= 0) return -1;
// FOR NOW, Just return the first one. Later need to find foldout list & return the one we're pointing
// to.
int fldid = sc.Step_FloatingFoldout;
int indxOfFoldout = 0;
foreach (ItemInfo sect in MyProcedure.Sections)
{
if (sect.ItemID == fldid) return indxOfFoldout;
if (sect.DisplayText.ToUpper().StartsWith("FOLDOUT")) indxOfFoldout++;
}
return 0;
}
return -1; // does not have a foldout
@@ -1293,7 +1298,7 @@ namespace VEPROMS.CSLA.Library
//string number = cont.Number;
string number = DisplayNumber;
//if (cont.Type >= 20000) number = Ordinal.ToString() + ".";
if (cont.Type >= 20000) number = MyTab.CleanText;
if (cont.Type >= 20000) number = MyTab==null?"":MyTab.CleanText;
return string.Format("{0} {1}", number, DisplayText).Trim();
//return string.Format("{0} {1}", number, cont.Text).Trim();
//return string.Format("{0} {1}", cont.Number, cont.Text);
@@ -2250,7 +2255,7 @@ namespace VEPROMS.CSLA.Library
if (ActiveFormat.Name.ToUpper() == "WCNCKL" || ActiveFormat.Name.ToUpper() == "WSTCKL")
{
tbformat = FormatStepData.TabData.IdentEdit;
if (FormatStepData.StepLayoutData.AlignWithParentTab) tbformat = tbformat.TrimStart(" ".ToCharArray());
if (ActiveFormat.Name.ToUpper() == "WCNCKL" && FormatStepData.StepLayoutData.AlignWithParentTab) tbformat = tbformat.TrimStart(" ".ToCharArray());
}
// rno gets parent tab
if (IsRNOPart && FormatStepData.NumberSubs)
@@ -2683,6 +2688,8 @@ namespace VEPROMS.CSLA.Library
// 'bb', 'cc'. The Westinghouse work required this and 16bit was tested and it worked the
// same way as the Westinghouse requirement. The original code to do 'aa', 'ab' was left here,
// commented out, in case a future plant needs it and then should tie it to a format flag.
// And Westinghouse had so many steps, added in to do 'aaa'
if (number > 52) retval += Letter(1 + ((number - 1) % 52));
if (number > 26) retval += Letter(1 + ((number - 1) % 26)); // Letter((number - 1) / 26);
retval += Letter(1 + ((number - 1) % 26));
return retval;