From e66cc71db92bfb1da976c31ce4c7d4c413f87f17 Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 20 Jan 2015 19:21:52 +0000 Subject: [PATCH] Removed debug code Fixed format logic Removed unnecessary logic --- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index b260a72b..ad2dd9e7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -480,8 +480,6 @@ namespace VEPROMS.CSLA.Library } 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; SetFromType(ii); ii.MyPrevious = il; @@ -499,7 +497,7 @@ namespace VEPROMS.CSLA.Library // 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 = 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.MyDocVersion = docVersionInfo; if (itemInfo.IsStep) @@ -518,13 +516,14 @@ namespace VEPROMS.CSLA.Library if (itemInfo.MyContent.ContentPartCount > 0) foreach (PartInfo pi in itemInfo.MyContent.ContentParts) { - ItemInfo il = null; + //ItemInfo il = null; foreach (ItemInfo ii in pi.MyItems) { 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; - il = ii; + //il = ii; } } } @@ -609,7 +608,7 @@ namespace VEPROMS.CSLA.Library itemInfo.MyParent = itemParent as ItemInfo; // itemInfo.ActiveSection = (itemInfo as SectionInfo) ?? 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; if (itemInfo.IsStep) { @@ -642,13 +641,14 @@ namespace VEPROMS.CSLA.Library { foreach (PartInfo pi in itemInfo.MyContent.ContentParts) { - ItemInfo il = null; + //ItemInfo il = null; foreach (ItemInfo ii in pi.MyItems) { 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; - il = ii; + //il = ii; } } }