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

Added code to apply selected applicability when expanding steps while steps are being setup in SetupEditItem method

Browse Source 
Added additonal condition to check for null value for section steps when no steps exist due to applicability settings
This commit is contained in:
Rich 2013-07-23 04:06:09 +00:00
parent 681d94d304
commit 2ef2f898b1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PROMS/Volian.Controls.Library/EditItem.cs
View File

@ -2367,6 +2367,7 @@ namespace Volian.Controls.Library
MyStepPanel.ItemMoving--; MyStepPanel.ItemMoving--;
LastMethodsPop(); LastMethodsPop();
} }
this.Enabled = this.MyItemInfo.IsApplicable(MyStepPanel.ApplDisplayMode);
_Loading = false; _Loading = false;
//// TIMING: DisplayItem.TimeIt("CSLARTB Controls Add"); //// TIMING: DisplayItem.TimeIt("CSLARTB Controls Add");
} }

6
PROMS/Volian.Print.Library/PromsPrinter.cs
View File

@ -385,7 +385,7 @@ namespace Volian.Print.Library
LastFmtName = mySection.ActiveFormat.Name; LastFmtName = mySection.ActiveFormat.Name;
string hlsText = ""; string hlsText = "";
int hlsItemId = 0; int hlsItemId = 0;
if (mySection.IsStepSection && mySection.Steps.Count > 0) if (mySection.IsStepSection && mySection.Steps != null && mySection.Steps.Count > 0)
{ {
hlsItemId = mySection.Steps[0].ItemID; hlsItemId = mySection.Steps[0].ItemID;
hlsText = mySection.Steps[0].DisplayText; // save the High level step text for use in the page list hlsText = mySection.Steps[0].DisplayText; // save the High level step text for use in the page list
@ -778,10 +778,10 @@ namespace Volian.Print.Library
vlnParagraph myParagraph = new vlnParagraph(null, cb, myItemInfo, (float)myItemInfo.MyDocStyle.Layout.LeftMargin, _NoBreakYOffset, 0, myItemInfo.ColumnMode, myItemInfo.ActiveFormat, null, null); vlnParagraph myParagraph = new vlnParagraph(null, cb, myItemInfo, (float)myItemInfo.MyDocStyle.Layout.LeftMargin, _NoBreakYOffset, 0, myItemInfo.ColumnMode, myItemInfo.ActiveFormat, null, null);
float localYPageStart = 0; float localYPageStart = 0;
float yPageStart = yTopMargin; float yPageStart = yTopMargin;
if (myItemInfo.HasChildren) if (myItemInfo.HasChildren || myItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave > 0)
localYPageStart = myParagraph.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin); localYPageStart = myParagraph.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
else if(!myItemInfo.MyDocStyle.OptionalSectionContent) else if(!myItemInfo.MyDocStyle.OptionalSectionContent)
PrintTextMessage(cb, "No Section Content", _TextLayer); PrintTextMessage(cb, "No Section Content", _TextLayer);
SectionConfig.SectionPagination sp = SectionConfig.SectionPagination.Separate; // always the default SectionConfig.SectionPagination sp = SectionConfig.SectionPagination.Separate; // always the default
if ( section.NextItemCount > 0) if ( section.NextItemCount > 0)
{ {