From c0ae487ce158c0c515d7befa5b13bd3acda08c9d Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 27 Sep 2012 11:09:51 +0000 Subject: [PATCH] --- .../Extension/DocVersionExt.cs | 36 +++++++++++++++++++ .../Extension/FolderExt.cs | 35 ++++++++++++++++++ .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 18 ++++++++-- 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs index 44f70a72..a00d714f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs @@ -453,7 +453,43 @@ namespace VEPROMS.CSLA.Library } return null; } + public bool IsFolder + { + get + { + return false; + } + } + public bool IsDocVersion + { + get + { + return true; + } + } + public bool IsProcedure + { + get + { + return false; + } + } + public bool IsSection + { + get + { + return false; + } + } + public bool IsStep + { + get + { + return false; + } + } } + public enum VersionTypeEnum : int { WorkingDraft = 0, Temporary = 1, Revision = 128, Approved = 129 diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs index 5cceb3fe..21a4000e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs @@ -364,6 +364,41 @@ namespace VEPROMS.CSLA.Library { public TopCriteria() { ;} } + public bool IsFolder + { + get + { + return true; + } + } + public bool IsDocVersion + { + get + { + return false; + } + } + public bool IsProcedure + { + get + { + return false; + } + } + public bool IsSection + { + get + { + return false; + } + } + public bool IsStep + { + get + { + return false; + } + } } } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 8e677de4..b41a0b98 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1083,7 +1083,7 @@ namespace VEPROMS.CSLA.Library get { ItemInfo temp = FirstSibling; - if(temp.ActiveParent.GetType() == typeof(VEPROMS.CSLA.Library.DocVersionInfo))return false; + if(temp.ActiveParent.IsDocVersion)return false; if (temp.MyParent.IsSection) return false; // already at hls if (temp.IsProcedure || temp.IsSection) return false; while (((ItemInfo)temp.ActiveParent).IsHigh == false) @@ -1125,6 +1125,20 @@ namespace VEPROMS.CSLA.Library return false; } } + public bool IsFolder + { + get + { + return false; + } + } + public bool IsDocVersion + { + get + { + return false; + } + } public bool IsProcedure { get @@ -1788,7 +1802,7 @@ namespace VEPROMS.CSLA.Library { // Walk up active parents until the parent is not an item ItemInfo tmp = this; - while (tmp.ActiveParent != null && tmp.ActiveParent.GetType() != typeof(DocVersionInfo)) + while (tmp.ActiveParent != null && !tmp.ActiveParent.IsDocVersion) tmp = (ItemInfo)tmp.ActiveParent; if (tmp is ProcedureInfo) return tmp as ProcedureInfo;