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

Added Format Flag to account for Sub-sections levels in the Sequential Numbering

Browse Source 
B2015-162 Bug was able to be fixed with data.  Attachment 7 and 8 in Shared AOP 79 were incorrectly set to print Number and Title.
This commit is contained in:
Rich 2015-10-13 13:56:32 +00:00
parent fc05c5feec
commit 406ec0f036
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/wst1all.xml
View File

Binary file not shown.

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

@ -3336,6 +3336,9 @@ namespace VEPROMS.CSLA.Library
localPrintLevel = PrintLevel + ((ActiveFormat.PlantFormat.FormatData.Express && IsSequential) ? 0 : CurrentSectionLevel()); localPrintLevel = PrintLevel + ((ActiveFormat.PlantFormat.FormatData.Express && IsSequential) ? 0 : CurrentSectionLevel());
if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true; if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
} }
if(sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.CountSubSectionsForLevel)
if (SectionLevel() > 1)
localPrintLevel += 1;
SeqTabFmtList seqtabs = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList; SeqTabFmtList seqtabs = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList;
// Start with basic cases of alpha/numeric/seq: // Start with basic cases of alpha/numeric/seq:
// If we have metasections AND... // If we have metasections AND...
@ -3626,6 +3629,17 @@ namespace VEPROMS.CSLA.Library
_MyTab.Text = tbformat; _MyTab.Text = tbformat;
_MyTab.CleanText = cltext != null ? cltext : tbformat; _MyTab.CleanText = cltext != null ? cltext : tbformat;
} }
private int SectionLevel()
{
int level = 0;
ItemInfo ii = this;
while (!ii.IsProcedure)
{
if (ii.IsSection) level++;
ii = ii.ActiveParent as ItemInfo;
}
return level;
}
private bool InCaution() private bool InCaution()
{ {
// walk up until procedure level and if finding a caution type, return true, otherwise false. // walk up until procedure level and if finding a caution type, return true, otherwise false.
@ -6353,6 +6367,11 @@ namespace VEPROMS.CSLA.Library
[Serializable()] [Serializable()]
public partial class StepInfo : ItemInfo public partial class StepInfo : ItemInfo
{ {
#region StepConfig
private StepConfig _StepConfig;
public StepConfig StepConfig
{ get { return (_StepConfig != null ? _StepConfig : _StepConfig = new StepConfig(this)); } }
#endregion
#region Tab #region Tab
public override void SetupTags() public override void SetupTags()
{ {

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

@ -1893,6 +1893,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _UseMetaSections, "@UseMetaSections"); return LazyLoad(ref _UseMetaSections, "@UseMetaSections");
} }
} }
private LazyLoad<bool> _CountSubSectionsForLevel;
public bool CountSubSectionsForLevel
{
get
{
return LazyLoad(ref _CountSubSectionsForLevel, "@CountSubSectionsForLevel");
}
}
private LazyLoad<bool> _PrintPhoneList; private LazyLoad<bool> _PrintPhoneList;
public bool PrintPhoneList public bool PrintPhoneList
{ {

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

@ -437,9 +437,13 @@ namespace Volian.Print.Library
} }
// TODO - yEndMsg - compressed size? // TODO - yEndMsg - compressed size?
// ySize7LPI includes a blank line after the step which we don't want to include in the page break test. // ySize7LPI includes a blank line after the step which we don't want to include in the page break test.
else if (!KeepStepsOnPage && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CompressSteps else if (!KeepStepsOnPage && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CompressSteps
&& (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < (yPageSizeNextPage * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch && (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < (yPageSizeNextPage * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch
// if this is the first step, then the step has to fit in the space that remains on the page
// otherwise it needs to fit on a blank page
// This was originally (10/12/2015) added for Farley Shared AOP 79 but was found to be unnecessary
//&& (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < ((MyItemInfo.MyPrevious == null ? yWithinMargins : yPageSizeNextPage) * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch
{ {
// ooooooooo ooooo ooooooooo. ooooo // ooooooooo ooooo ooooooooo. ooooo
// d"""""""8' `888' `888 `Y88. `888' // d"""""""8' `888' `888 `Y88. `888'