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

If a subsections number included the parent section’s number, don’t prepend the parents tab to the subsection

Browse Source
This commit is contained in:
Rich 2015-02-04 21:58:31 +00:00
parent 56816c2cba
commit e500ec710f
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,26 +720,26 @@ namespace VEPROMS.CSLA.Library
} }
if (docVersionInfo.DocVersionAssociationCount == 1) if (docVersionInfo.DocVersionAssociationCount == 1)
{ {
ROFstInfo rofstinfo = docVersionInfo.DocVersionAssociations[0].MyROFst; ROFstInfo rofstinfo = docVersionInfo.DocVersionAssociations[0].MyROFst;
//rofstinfo.docVer = docVersionInfo; //rofstinfo.docVer = docVersionInfo;
ROFSTLookup lookup = rofstinfo.GetROFSTLookup(docVersionInfo); ROFSTLookup lookup = rofstinfo.GetROFSTLookup(docVersionInfo);
lookup.MyDocVersionInfo = docVersionInfo; lookup.MyDocVersionInfo = docVersionInfo;
//DateTime dts = DateTime.Now; //DateTime dts = DateTime.Now;
if (itemInfo.MyContent.ContentGridCount > 0) if (itemInfo.MyContent.ContentGridCount > 0)
itemInfo.MyContent.LoadNonCachedGrid(); itemInfo.MyContent.LoadNonCachedGrid();
if (itemInfo.MyContent.ContentRoUsageCount > 0) if (itemInfo.MyContent.ContentRoUsageCount > 0)
{
foreach (RoUsageInfo rousage in itemInfo.MyContent.ContentRoUsages)
{ {
foreach (RoUsageInfo rousage in itemInfo.MyContent.ContentRoUsages) if (sectionInfo != null)
{ {
if (sectionInfo != null) string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta);
{ ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
}
} }
} }
} }
}
else else
{ {
// Force Error Message // Force Error Message
@ -1864,6 +1864,12 @@ namespace VEPROMS.CSLA.Library
string parNumber = par.DisplayNumber; string parNumber = par.DisplayNumber;
string myNumber = DisplayNumber; string myNumber = DisplayNumber;
if (parNumber == null || myNumber == null) return false; if (parNumber == null || myNumber == null) return false;
ItemInfo par2 = par.ActiveParent as ItemInfo;
if (par2 != null && par2.IsSection)
{
// check for 6.1 (parent) and 6.1.1.
if (DisplayNumber.StartsWith((ActiveParent as SectionInfo).DisplayNumber.Trim())) return true;
}
if (!parNumber.Trim().EndsWith(".0")) return false; if (!parNumber.Trim().EndsWith(".0")) return false;
return (myNumber.Trim().StartsWith(parNumber.Trim().Substring(0, parNumber.Length - 1))); return (myNumber.Trim().StartsWith(parNumber.Trim().Substring(0, parNumber.Length - 1)));
} }
@ -5908,6 +5914,14 @@ namespace VEPROMS.CSLA.Library
if (ch[0] == ' ') ch = DisplayNumber != null && DisplayNumber.TrimStart() != "" ? DisplayNumber.TrimStart().Substring(0, 1) : null; if (ch[0] == ' ') ch = DisplayNumber != null && DisplayNumber.TrimStart() != "" ? DisplayNumber.TrimStart().Substring(0, 1) : null;
retStr = ch + "."; retStr = ch + ".";
} }
else if (Snum == -2) // -2 flags to just use display number as is, don't prepend the parent's number.
{
string tmp = DisplayNumber.Trim();
if (underline)
retStr = @"\ul " + DisplayNumber.Trim() + @"\ul0 ";
else
retStr = DisplayNumber.Trim();
}
else else
{ {
string tmp = DisplayNumber.IndexOf(".") > -1 ? DisplayNumber.Substring(0, DisplayNumber.IndexOf(".")) : DisplayNumber; string tmp = DisplayNumber.IndexOf(".") > -1 ? DisplayNumber.Substring(0, DisplayNumber.IndexOf(".")) : DisplayNumber;
@ -5932,6 +5946,12 @@ namespace VEPROMS.CSLA.Library
if (tmpstr == null) return 0; if (tmpstr == null) return 0;
Int32 x; Int32 x;
if (Int32.TryParse(tmpstr, out x)) return x; if (Int32.TryParse(tmpstr, out x)) return x;
// flag the case where the current section's tab already has prefixed in the parent's tab:
// (without this, BGE's section headers were coming up as 6.1.6.1.1...)
if (IsSection && ActiveParent.IsSection)
{
if (DisplayNumber.StartsWith((ActiveParent as SectionInfo).DisplayNumber.Trim())) return -2;
}
return -1; return -1;
} }
return (-1); return (-1);