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

B2019-100: UCF check off & check off header issues

Browse Source
This commit is contained in:
Kathy Ruffing 2019-08-01 15:01:32 +00:00
parent c6f615bceb
commit 2b74bd52ab
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/VEPROMS User Interface/frmSectionProperties.cs
View File

@ -775,6 +775,10 @@ namespace VEPROMS
lblCheckoffHeading.Enabled = true; lblCheckoffHeading.Enabled = true;
ppCmbxCheckoffHeading.Enabled = true; ppCmbxCheckoffHeading.Enabled = true;
ppCmbxCheckoffHeading.DataSource = chkoffHeaderList; ppCmbxCheckoffHeading.DataSource = chkoffHeaderList;
// B2019-100: the checkoffselection may be larger than number in the list if elements of list were made inactive from UCF. Adjust as necessary:
if (_SectionConfig.Section_CheckoffHeaderSelection >= ppCmbxCheckoffHeading.Items.Count)
ppCmbxCheckoffHeading.SelectedIndex = -1;
else
ppCmbxCheckoffHeading.SelectedIndex = _SectionConfig.Section_CheckoffHeaderSelection; ppCmbxCheckoffHeading.SelectedIndex = _SectionConfig.Section_CheckoffHeaderSelection;
} }
else else

4
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -1672,8 +1672,8 @@ namespace VEPROMS.CSLA.Library
if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc==null) if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc==null)
{ {
_CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat); _CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat);
// If Ignoring the UCF data, just return the entire list. Also, return entire list if there is no UCF data (fc == null) // B2019-100: If Ignoring the UCF data, just return the entire list. Also, return entire list if there is no UCF data (fc == null)
if (!PlantFormat.IgnoreUCF || fc == null) return _CheckOffList; if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffList;
// If not ignoring UCF settings, only return those that are active // If not ignoring UCF settings, only return those that are active
foreach (FormatConfig.CheckOff co in fc.PlantFormat.FormatData.CheckOffList) foreach (FormatConfig.CheckOff co in fc.PlantFormat.FormatData.CheckOffList)
{ {

9
PROMS/Volian.Base.Library/PropGridCollEditor.cs
View File

@ -87,10 +87,11 @@ namespace Volian.Base.Library
ResetValue(propertyGrid.SelectedGridItem.Parent.Value, "PageLength"); ResetValue(propertyGrid.SelectedGridItem.Parent.Value, "PageLength");
else if (SelectedGridField.Contains("WindowsFont")) else if (SelectedGridField.Contains("WindowsFont"))
ResetValue(propertyGrid.SelectedGridItem.Parent.Value, "WindowsFont"); ResetValue(propertyGrid.SelectedGridItem.Parent.Value, "WindowsFont");
else if (SelectedGridField.Contains("Inactive CheckOff Header")) // B2019-100: for headers, use Parent's parent and also for both header & checkoffs the field name is 'Active' (not 'Inactive')
ResetValue(propertyGrid.SelectedGridItem.Parent.Value, "Inactive"); else if (SelectedGridField.Contains("Active CheckOff Header"))
else if (SelectedGridField.Contains("Inactive CheckOff")) ResetValue(propertyGrid.SelectedGridItem.Parent.Parent.Value, "Active");
ResetValue(propertyGrid.SelectedGridItem.Parent.Parent.Value, "Inactive"); else if (SelectedGridField.Contains("Active CheckOff"))
ResetValue(propertyGrid.SelectedGridItem.Parent.Parent.Value, "Active");
} }
private void ShowReflection(Object data) private void ShowReflection(Object data)
{ {