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

Removed debug code

Browse Source 
Fixed format logic
Removed unnecessary logic
This commit is contained in:
Rich 2015-01-20 19:21:52 +00:00
parent 8df668c5e2
commit e66cc71db9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,8 +480,6 @@ namespace VEPROMS.CSLA.Library
} }
foreach (ItemInfo ii in pi.MyItems) foreach (ItemInfo ii in pi.MyItems)
{ {
if (ii.ItemID == 95759)
Console.WriteLine("\"SetFromType\",{0},{1},\"{2}\",{3}", ii.ItemID, ii.MyContent.Type, ii.DisplayNumber, ii.MyItemInfoUnique);
ii.FromType = (E_FromType)pi.FromType; ii.FromType = (E_FromType)pi.FromType;
SetFromType(ii); SetFromType(ii);
ii.MyPrevious = il; ii.MyPrevious = il;
@ -499,7 +497,7 @@ namespace VEPROMS.CSLA.Library
// Fix for Active Section when printing. BGE_OI4 OI27D-2 // Fix for Active Section when printing. BGE_OI4 OI27D-2
//itemInfo.ActiveSection = (itemInfo as SectionInfo) ?? sectionInfo;// - possible fix for not accessing correct format //itemInfo.ActiveSection = (itemInfo as SectionInfo) ?? sectionInfo;// - possible fix for not accessing correct format
itemInfo.ActiveSection = sectionInfo; itemInfo.ActiveSection = sectionInfo;
itemInfo.ActiveFormat = sectionInfo == null ? itemParent.ActiveFormat : sectionInfo.ActiveFormat; itemInfo.ActiveFormat = itemInfo.MyContent.MyFormat != null ? itemInfo.MyContent.MyFormat : sectionInfo == null ? itemParent.ActiveFormat : sectionInfo.ActiveFormat;
itemInfo.MyProcedure = procInfo; itemInfo.MyProcedure = procInfo;
itemInfo.MyDocVersion = docVersionInfo; itemInfo.MyDocVersion = docVersionInfo;
if (itemInfo.IsStep) if (itemInfo.IsStep)
@ -518,13 +516,14 @@ namespace VEPROMS.CSLA.Library
if (itemInfo.MyContent.ContentPartCount > 0) if (itemInfo.MyContent.ContentPartCount > 0)
foreach (PartInfo pi in itemInfo.MyContent.ContentParts) foreach (PartInfo pi in itemInfo.MyContent.ContentParts)
{ {
ItemInfo il = null; //ItemInfo il = null;
foreach (ItemInfo ii in pi.MyItems) foreach (ItemInfo ii in pi.MyItems)
{ {
SetParentSectionAndDocVersion(ii, itemInfo, (itemInfo as SectionInfo) ?? sectionInfo, procInfo, docVersionInfo); SetParentSectionAndDocVersion(ii, itemInfo, (itemInfo as SectionInfo) ?? sectionInfo, procInfo, docVersionInfo);
ii.MyPrevious = il; //if (ii._MyPrevious == null && il!=null)
//ii.MyPrevious = il;
//if (il != null) il.NextItem = ii; //if (il != null) il.NextItem = ii;
il = ii; //il = ii;
} }
} }
} }
@ -609,7 +608,7 @@ namespace VEPROMS.CSLA.Library
itemInfo.MyParent = itemParent as ItemInfo; itemInfo.MyParent = itemParent as ItemInfo;
// itemInfo.ActiveSection = (itemInfo as SectionInfo) ?? sectionInfo; // itemInfo.ActiveSection = (itemInfo as SectionInfo) ?? sectionInfo;
itemInfo.ActiveSection = sectionInfo; itemInfo.ActiveSection = sectionInfo;
itemInfo.ActiveFormat = sectionInfo == null ? itemParent.ActiveFormat : sectionInfo.ActiveFormat; itemInfo.ActiveFormat = itemInfo.MyContent.MyFormat != null ? itemInfo.MyContent.MyFormat : sectionInfo == null ? itemParent.ActiveFormat : sectionInfo.ActiveFormat;
itemInfo.MyDocVersion = docVersionInfo; itemInfo.MyDocVersion = docVersionInfo;
if (itemInfo.IsStep) if (itemInfo.IsStep)
{ {
@ -642,13 +641,14 @@ namespace VEPROMS.CSLA.Library
{ {
foreach (PartInfo pi in itemInfo.MyContent.ContentParts) foreach (PartInfo pi in itemInfo.MyContent.ContentParts)
{ {
ItemInfo il = null; //ItemInfo il = null;
foreach (ItemInfo ii in pi.MyItems) foreach (ItemInfo ii in pi.MyItems)
{ {
SetParentSectionAndDocVersion(ii, itemInfo, (itemInfo as SectionInfo) ?? sectionInfo, docVersionInfo, tranLookup); SetParentSectionAndDocVersion(ii, itemInfo, (itemInfo as SectionInfo) ?? sectionInfo, docVersionInfo, tranLookup);
ii.MyPrevious = il; //if(ii._MyPrevious == null)
// ii.MyPrevious = il;
//if (il != null) il.NextItem = ii; //if (il != null) il.NextItem = ii;
il = ii; //il = ii;
} }
} }
} }