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

B2018-054 Added a HasSectionContent method to tell us if a section has sub-sections (used in frmSectionProperties.cs)

Browse Source 
B2018-054 Don’t allow user to change a step section (with no steps) to a word section, if that section has sub sections
This commit is contained in:
John Jenko 2018-03-21 18:57:07 +00:00
parent b0269d4f56
commit d97b6bccf5
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ namespace VEPROMS
PlantFormat pf = (ppCmbxFormat.SelectedIndex != -1) ? FormatInfoList.SortedFormatInfoList[ppCmbxFormat.SelectedIndex].PlantFormat : (_SectionConfig.MyFormat != null) ? _SectionConfig.MyFormat.PlantFormat : _SectionConfig.MyDefaultFormat.PlantFormat; PlantFormat pf = (ppCmbxFormat.SelectedIndex != -1) ? FormatInfoList.SortedFormatInfoList[ppCmbxFormat.SelectedIndex].PlantFormat : (_SectionConfig.MyFormat != null) ? _SectionConfig.MyFormat.PlantFormat : _SectionConfig.MyDefaultFormat.PlantFormat;
ItemInfo ii = ItemInfo.Get(_SectionConfig.MySection.ItemID); ItemInfo ii = ItemInfo.Get(_SectionConfig.MySection.ItemID);
// if creating a new section, enable the StepSect and WordSect radio buttons // if creating a new section, enable the StepSect and WordSect radio buttons
bool isNewSection = !(ii.HasWordContent || ii.HasStepContent); bool isNewSection = !(ii.HasWordContent || ii.HasStepContent || ii.HasSectionContent); // B2018-054 added check for sub sections
int numStepSects = 0; int numStepSects = 0;
int numWordSects = 0; int numWordSects = 0;
foreach (DocStyle nds in pf.DocStyles.DocStyleListActive) foreach (DocStyle nds in pf.DocStyles.DocStyleListActive)

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

@ -3392,6 +3392,16 @@ namespace VEPROMS.CSLA.Library
return true; return true;
} }
} }
// B2018-054 added check for sub sections - fixes issue of added a new section (step section) then adding sub-section, then changing main section to word section
public bool HasSectionContent
{
get
{
if (MyContent.ContentPartCount == 0) return false;
if (MyContent.ContentPartCount == 1 && MyContent.ContentParts[0].PartType == E_FromType.Section) return true;
return false;
}
}
private ProcedureInfo _MyProcedure; private ProcedureInfo _MyProcedure;
public ProcedureInfo MyProcedure public ProcedureInfo MyProcedure
{ {