From 7b930fd143aa1529f03a36dfa557a09b501b5077 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Mon, 11 Nov 2019 14:04:38 +0000
Subject: [PATCH] B2019-168: Change bar code for not continuous cases should
 only be applicable based on format flag

---
 PROMS/Formats/fmtall/BASEall.xml              | Bin 91668 -> 91762 bytes
 PROMS/Formats/fmtall/BNPP1all.xml             | Bin 174020 -> 174112 bytes
 PROMS/Formats/fmtall/BNPP2all.xml             | Bin 178016 -> 178108 bytes
 PROMS/Formats/fmtall/BNPPalrall.xml           | Bin 163098 -> 163190 bytes
 PROMS/Formats/fmtall/BNPPbckall.xml           | Bin 147786 -> 147878 bytes
 PROMS/Formats/fmtall/BNPPcklall.xml           | Bin 127012 -> 127104 bytes
 PROMS/Formats/fmtall/BNPPdevall.xml           | Bin 43264 -> 43356 bytes
 PROMS/Formats/fmtall/BNPPsamall.xml           | Bin 170212 -> 170304 bytes
 .../Format/PlantFormat.cs                     |   8 ++++++++
 PROMS/Volian.Print.Library/vlnChangeBar.cs    |   4 +++-
 10 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml
index 124a13f7c549816a0df7b27d947db6670e737121..9832fb029244878fad661e9f19496f7a9c184cff 100644
GIT binary patch
delta 60
zcmbPohV|1K)(s{`lkGYLCLb~sk}PI$W5{PHVsK%|WJm)-KOnD!A(f$c^6!PplMDL!
Onw^ZcI~g%vG6n!;OcRd)

delta 22
ecmex#hIPsr)(s{`lP9d_YhGZqeSs0<C1U`4zzPEZ

diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml
index 7be6afbad75e88d2936f61d962e0346e5628d4f0..c3dc370e18128482d6e047f0b46fbe007dbb8e2f 100644
GIT binary patch
delta 97
zcmX?do@>Dct_?h*j=>D63<V5{3`Ia(0%SWgWB^%t4Cz3&6Ii^M!HppwDDT3M$&dzw
men1{bWie1~B17rqY)$Fu3JVwonq@@WWkeab%ZM_qm;?ZgTNf$-

delta 27
jcmZ2*f$PY5t_?h*(`yzm3N%-UwpWNUZm$q!S}_R#o7)Of

diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml
index b549505953734a253e441aa650627ad5558531c4..3e9186dc512fdfe104dfe9fe34494c252d0539b1 100644
GIT binary patch
delta 98
zcmaFxj%&|*t_@zIj=>D63<V5{3`Ia(0%SWgWB^%t4Cz3&6Ii^M!HppwDDT3M$&dzw
nen1{bWie1~B17qP?t6^V)BDyi3N%NFwnvFFZjTaWVp{|N_2(Gc

delta 22
ecmdn<p6kIot_@zI&C5jFmx(fNUna^Vwg>=v^a)A;

diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml
index 186afebfe03fe311426d3660a725e22179bd9e7d..7e03f54530bff16018f03173262493ed8db67a52 100644
GIT binary patch
delta 99
zcmbRBi}Twr&JAMP{J{*V3<V5{3`Ia(!jL+-P)k_7n8A%9A1LC&kjan+gnmFCP>!LP
u!5OHk6v)m5isVgxXeK<pU<;$bWD6aE$p!`-&34-DcG`^F?X;Qh1Ofm~iyGPh

delta 27
jcmezNi*wd5&JAMP)4QfJ@-;VTw>M}rZg0?L`W6TPuAmE9

diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml
index a646ba2bb6f7fb79b872466b186abdaa9020ac44..8074e1f77131d8b0fcb750bb8753aa5dbab5070b 100644
GIT binary patch
delta 91
zcmX@r#JQ}QbAyRAe=tKTLjgk~LlF>{Fr-dyloD1iW^iN32a32bWHO`yp&yV3lw&An
la0aR>1+p`NB6*V)Wre3(G%@ltJ4m-XNHcDCkY?gi0{{>n6=?tf

delta 22
ecmZ41%z3JbbAyR=^91Sk3DS()CrC4isR00Eu?L6%

diff --git a/PROMS/Formats/fmtall/BNPPcklall.xml b/PROMS/Formats/fmtall/BNPPcklall.xml
index 1cbf2c309909591866fb25e25cac031d856148ee..9ef5bbd6470aac7525af4615a1f7245b32a8b9c0 100644
GIT binary patch
delta 94
zcmZ4TfW6@%`-V+y-oXs13<V5{3`Ia(0%SWgWB^%t4Cz3&6Ii^M!HppwDDT3M$&dzw
gen1{bWie1~B10*Voe31lV<>K3$hLhU8)NfJ0Bo`sjsO4v

delta 28
kcmZp8$iCzO`-V+y(+y@Za!h}a#>mnv#lBsNoiXht0H~A-bN~PV

diff --git a/PROMS/Formats/fmtall/BNPPdevall.xml b/PROMS/Formats/fmtall/BNPPdevall.xml
index 589fa2b3d4df041bd2d37704c95eeac3ac3b4045..2ec949a1e656756875455879808865366c6709c1 100644
GIT binary patch
delta 92
zcmZp;#B}Ep(*`3E$6$t3h608}h9V#?0kWMLGJvc+hIAm?2`paB;Kq;-ly_msWJm)-
hKOhgJvKXi~k)d?*>j3G=C+r0#Hwd$Ab`#k(1pqhS7#RQn

delta 22
ecmca}iK*cd(*`4v$rG#uCN~JPY+fX?YYG5wGzm!n

diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml
index d9b8d53705cce525c48c58f8c28f5a2eb43c58e6..7003154697f11f212a71dacb07c897795836a5ab 100644
GIT binary patch
delta 88
zcmaE|k?X)Ft_>QZ{J{*V3<V5{3`Ia(!jL+dQB+vIn8A%9A1LC&kjan+gnmFCP>!LP
l!5OHkbUObvM(ODSOBe+vdx;4&dx*Ash%#>X5M`Rv3;^#S7ES;F

delta 36
ucmV+<0Nek-vI^v}3a}^@m*|E84wtZ60tAz&77l}?6^Eo10k@<T0-S>wvkox;

diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 8c8a761f..0b2b9262 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -2187,6 +2187,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _ChangeBarsOnLinkedText, "@ChangeBarsOnLinkedText");
 			}
 		}
+		private LazyLoad<bool> _SeparateChangeBarsForDiffNotesCautions;
+		public bool SeparateChangeBarsForDiffNotesCautions
+		{
+			get
+			{
+				return LazyLoad(ref _SeparateChangeBarsForDiffNotesCautions, "@SeparateChangeBarsForDiffNotesCautions");
+			}
+		}
 	}
 	#endregion
 	#endregion
diff --git a/PROMS/Volian.Print.Library/vlnChangeBar.cs b/PROMS/Volian.Print.Library/vlnChangeBar.cs
index 0c107fe2..16c2360d 100644
--- a/PROMS/Volian.Print.Library/vlnChangeBar.cs
+++ b/PROMS/Volian.Print.Library/vlnChangeBar.cs
@@ -131,7 +131,9 @@ namespace Volian.Print.Library
 						// the separator must exist and the previous must have a change bar.
 
 						// B2019-055 added check if the previous caution or note have the same type number
-						if ((sep != "") && (tmp.Text == sep) && parent.MyItemInfo.MyPrevious != null && parent.MyItemInfo.MyPrevious.HasChangeBar && (parent.MyItemInfo.MyContent.Type == parent.MyItemInfo.MyPrevious.MyContent.Type))
+						// B2019-168 added format flag 'SeparateChangeBarsForDiffNotesCautions' to control when fix for B2019-055 would take affect
+						if ((sep != "") && (tmp.Text == sep) && parent.MyItemInfo.MyPrevious != null && parent.MyItemInfo.MyPrevious.HasChangeBar 
+							&& (!parent.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.SeparateChangeBarsForDiffNotesCautions || parent.MyItemInfo.MyContent.Type == parent.MyItemInfo.MyPrevious.MyContent.Type))
 						{
 							if (MyPageHelper.MyParagraphs.ContainsKey(parent.MyItemInfo.MyPrevious.ItemID))
 							{