PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -499,14 +499,14 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region IsType
-		public bool IsCautionStructure
+		public bool IsFirstCautionPart
 		{
 			get
 			{
 				return ((ItemPartCount > 0) && (ItemParts[0].PartType == E_FromType.Caution));
 			}
 		}
-		public bool IsNoteStructure
+		public bool IsFirstNotePart
 		{
 			get
 			{
@@ -514,14 +514,14 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		public bool IsCautionStructureFirstSib
+		public bool IsCautionPart
 		{
 			get
 			{
 				return ((FirstSibling.ItemPartCount > 0) && (FirstSibling.ItemParts[0].PartType == E_FromType.Caution));
 			}
 		}
-		public bool IsNoteStructureFirstSib
+		public bool IsNotePart
 		{
 			get
 			{
@@ -657,7 +657,14 @@ namespace VEPROMS.CSLA.Library
 				return false;
 			}
 		}
-		public bool IsRNO
+		public bool IsTablePart
+		{
+			get
+			{
+				return ((ItemPartCount > 0) && (ItemParts[0].PartType == E_FromType.Table));
+			}
+		}
+		public bool IsRNOPart
 		{
 			get
 			{
@@ -669,7 +676,7 @@ namespace VEPROMS.CSLA.Library
 			get 
 			{
 				if (IsHigh) return false;
-				if (IsRNO) return true;
+				if (IsRNOPart) return true;
 				ItemInfo parent = ActiveParent as ItemInfo;
 				if (parent == null) return false;
 				return parent.IsInRNO;
@@ -681,7 +688,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			get
 			{
-				return ((IsProcedure || IsSection || IsHigh)?0:(IsRNO?1:0)+((ItemInfo)ActiveParent).RNOLevel);
+				return ((IsProcedure || IsSection || IsHigh)?0:(IsRNOPart?1:0)+((ItemInfo)ActiveParent).RNOLevel);
 			}
 		}
 		public int ColumnMode
@@ -756,12 +763,25 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region More IsType
-		public bool IsSubStep
+		public bool IsProcedurePart
 		{
 			get
 			{
-				ItemInfo temp = FirstSibling;
-				return ((temp.ItemPartCount > 0) && (temp.ItemParts[0].PartType == E_FromType.Step));
+				return ((FirstSibling.ItemPartCount > 0) && (FirstSibling.ItemParts[0].PartType == E_FromType.Procedure));
+			}
+		}
+		public bool IsSectionPart
+		{
+			get
+			{
+				return ((FirstSibling.ItemPartCount > 0) && (FirstSibling.ItemParts[0].PartType == E_FromType.Section));
+			}
+		}
+		public bool IsStepPart
+		{
+			get
+			{
+				return ((FirstSibling.ItemPartCount > 0) && (FirstSibling.ItemParts[0].PartType == E_FromType.Step));
 			}
 		}
 		public bool IsInSubStep
@@ -769,7 +789,7 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				if (IsHigh) return false;
-				if (IsSubStep) return true;
+				if (IsStepPart) return true;
 				ItemInfo parent = ActiveParent as ItemInfo;
 				if (parent == null) return false;
 				return parent.IsInSubStep;
@@ -781,8 +801,9 @@ namespace VEPROMS.CSLA.Library
 			{
 				ItemInfo temp = FirstSibling;
 				if(temp.ActiveParent.GetType() == typeof(VEPROMS.CSLA.Library.DocVersionInfo))return false;
+				if (temp.MyParent.IsSection) return false;   // already at hls
 				while (((ItemInfo)temp.ActiveParent).IsHigh == false) temp = ((ItemInfo)temp.ActiveParent).FirstSibling;
-				return temp.IsSubStep;
+				return temp.IsStepPart;
 			}
 		}
 		public bool IsStepSection
@@ -1532,7 +1553,7 @@ namespace VEPROMS.CSLA.Library
 			int stepType = (int)(MyContent.Type % 10000);
 			string tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint;
 			// rno gets parent tab
-			if (IsRNO)
+			if (IsRNOPart)
 			{
 				try
 				{
@@ -1565,7 +1586,7 @@ namespace VEPROMS.CSLA.Library
 					//if (par.IsRNO) // do I need to save 'lastrnoptr'
 					//if (!IsRNO(ptr) && (IsSequential(ptr) ||
 					//        (!IsText(ptr) && CountAllSubLevels))) - Add this line of code for non-hlp
-					if (!par.IsRNO && par.IsSequential) level++;
+					if (!par.IsRNOPart && par.IsSequential) level++;
 					par = par.MyParent;
 				}
 				SeqTabFmtList seqtabs = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList;