From 8ec9d416ff2750ec7d4eb65a66e877119fa7a828 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 14 Jun 2017 14:00:58 +0000 Subject: [PATCH] B2017-119: Find/Replace function never found text that was in the supplemental information. --- .../Extension/ItemInfoSearchExt.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInfoSearchExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInfoSearchExt.cs index 4f7a7ea3..c3a747ee 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInfoSearchExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInfoSearchExt.cs @@ -19,6 +19,7 @@ namespace VEPROMS.CSLA.Library if (skip < SkipPartType.Note && Notes != null && Notes.Count > 0) return Notes[0].SearchTop; if (skip < SkipPartType.This) return this; if (skip < SkipPartType.RNO && RNOs != null && RNOs.Count > 0) return RNOs[0].SearchTop; + if (skip < SkipPartType.SupInfo && SupInfos != null && SupInfos.Count > 0) return SupInfos[0].SearchTop; if (skip < SkipPartType.Table && Tables != null && Tables.Count > 0) return Tables[0].SearchTop; if (skip < SkipPartType.Procedures && Procedures != null && Procedures.Count > 0) return Procedures[0].SearchTop; if (skip < SkipPartType.Sections && Sections != null && Sections.Count > 0) return Sections[0].SearchTop; @@ -53,6 +54,7 @@ namespace VEPROMS.CSLA.Library if (IsCautionPart) return parentItem.SearchNextSkip(SkipPartType.Caution); if (IsNotePart) return parentItem.SearchNextSkip(SkipPartType.Note); if (IsRNOPart) return parentItem.SearchNextSkip(SkipPartType.RNO); + if (IsSupInfoPart) return parentItem.SearchNextSkip(SkipPartType.SupInfo); if (IsTablePart) return parentItem.SearchNextSkip(SkipPartType.Table); if (IsProcedurePart) return parentItem.SearchNextSkip(SkipPartType.Procedures); if (IsSectionPart) return parentItem.SearchNextSkip(SkipPartType.Sections); @@ -74,6 +76,7 @@ namespace VEPROMS.CSLA.Library if (skip > SkipPartType.Sections && Sections != null) return Sections[0].LastSibling.SearchBottom; if (skip > SkipPartType.Procedures && Procedures != null) return Procedures[0].LastSibling.SearchBottom; if (skip > SkipPartType.Table && Tables != null) return Tables[0].LastSibling.SearchBottom; + if (skip > SkipPartType.SupInfo && SupInfos != null) return SupInfos[0].LastSibling.SearchBottom; if (skip > SkipPartType.RNO && RNOs != null) return RNOs[0].LastSibling.SearchBottom; if (skip > SkipPartType.This) return this; if (skip > SkipPartType.Note && Notes != null) return Notes[0].LastSibling.SearchBottom; @@ -90,6 +93,7 @@ namespace VEPROMS.CSLA.Library if (Procedures != null) return Procedures[0].LastSibling.SearchBottom; if (Tables != null) return Tables[0].LastSibling.SearchBottom; if (RNOs != null) return RNOs[0].LastSibling.SearchBottom; + if (SupInfos != null) return SupInfos[0].LastSibling.SearchBottom; return this; } } @@ -102,6 +106,7 @@ namespace VEPROMS.CSLA.Library if (IsCautionPart) return parentItem.SearchPrevSkip(SkipPartType.Caution); if (IsNotePart) return parentItem.SearchPrevSkip(SkipPartType.Note); if (IsRNOPart) return parentItem.SearchPrevSkip(SkipPartType.RNO); + if (IsSupInfoPart) return parentItem.SearchPrevSkip(SkipPartType.SupInfo); if (IsTablePart) return parentItem.SearchPrevSkip(SkipPartType.Table); if (IsProcedurePart) return parentItem.SearchPrevSkip(SkipPartType.Procedures); if (IsSectionPart) return parentItem.SearchPrevSkip(SkipPartType.Sections); @@ -117,10 +122,11 @@ namespace VEPROMS.CSLA.Library Note=2, This=3, RNO=4, - Table=5, - Procedures=6, - Sections=7, - Steps=8 + SupInfo = 5, + Table=6, + Procedures=7, + Sections=8, + Steps=9 } } }