From b7633a1f08d5bb0e96b90c5e57f224c0d316532d Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Tue, 14 May 2019 14:06:34 +0000
Subject: [PATCH] B2019-072: Include psi in outside transition text

---
 PROMS/Formats/fmtall/AEPCHIDall.xml           | Bin 68708 -> 69916 bytes
 PROMS/Formats/fmtall/AEPall.xml               | Bin 69010 -> 70222 bytes
 .../Extension/TransitionExt.cs                |  47 ++++++++++++++++++
 .../Format/PlantFormat.cs                     |  16 ++++++
 4 files changed, 63 insertions(+)

diff --git a/PROMS/Formats/fmtall/AEPCHIDall.xml b/PROMS/Formats/fmtall/AEPCHIDall.xml
index 46587b9275032e78630ac97fef3aa810837ff31e..af8272c790833170e233102dbf5e92f46d1e5c07 100644
GIT binary patch
delta 579
zcma)(PfG$(6vgl4Xn)WkQp%DX-3f(FVPsKMCgj2jMi(u`GVG6<I#7sNQZ958-c5^$
z=mSLM*6$GX8KQM<qebVXF50yi-h21FbMEiHdApWx?&Zg4$*zz_8QP&ZB`JX~P9aKR
zmu7Xv&P{30r=g<IF)fgrRGK0mR)tP}&ok{)fMQ6=!=Hv5H#sfa_)G5NitOf(ZxcV5
ztelap9u2+n@UO#hh`l0uQ5Ne4=}>aW*cNquDcPhPKdlY%lF2Gf^1jh2sa!L9dA4W7
zqEV0{NLi*Z1$o}QCHYwG9^`uOI4k|K0n`n9*MKzLiq+b&5wwZ{F^91QNC!g<Co~;Z
zcf(`w7x}g7K-bu%%ee_5jh7MBI;e{@j(vgJb^a`mN(vvH+v^p_|1a}hWy}>uzZ616
zpdgBaX%%Y%lsX+yo?}&iDT+HuC>@X%yM{^@^%U*GEhZ31;&;ta6sRFg6u`5F0XzY%
prTlrgw$gF6v=9h{L;PkhEs})`WtFdPWgfmTbF*x2oSwbcegJ-_fU5ui

delta 46
zcmV+}0MY-Pq6Fla1hBFJ1wH@`01A_#7EhBd0wA-11Ox$-pjix)umlFP$^|BUvl@j0
EjAU95A^-pY

diff --git a/PROMS/Formats/fmtall/AEPall.xml b/PROMS/Formats/fmtall/AEPall.xml
index 38490ca8f8154884ee70224069f974a8ef09d9d5..9da1fe687b55a26251b324ebcc6163864acac867 100644
GIT binary patch
delta 505
zcmaix%S!@L7{$-jm|7$)>|qZbD`+#N7PW{9dKkD+gHc<CsD(i)no(qlv?{W!Z&wr&
zEm{WtAFXRwty&ees1`weqt>>?aPR!iz2}_y=J-^+xfHJpf=Pmc1R@9_ibZ}xa3RLK
zIOP{ibRsNwDNH1+V;tRZU=YK+O4umBkI;9mi7rI*(VCG0qJf^@>u6hJWYlT(Acz&V
zmQ*_=dG#WVRirp3ta1uwTj}wtg}yXK!A^Y|3l$qg616hT)|>S{crXb!ob;fZ7aZi!
zG?Pa!YsX;Y(k}WCUV18yO4ZTFDM7BEVm-o1<p%T`u$10vo&;g4bSHW<bl;|<&zzcg
zxMQ`<@trt-w#28?+;<By?>AB9bhc-qM9yygBmbQ2rA(oTZu3SuFSL_qSI+vmQIy;K
zCRMsAOp?rFSYk(YxN3qr>{0l+iwizX^TgcTsGqfpqQJ?#I+v>Qd#j?kFjMC0PqJYG
Rjnr{4L`8#G8pwtBe*iwgdXxYF

delta 61
zcmV-D0K)&yqy&<i1h9|+1wH@`01A_FKW&p-1mu$-UksCu1O~H+1>ymdU<e4abO%O!
TlQ0nmlbnePlRk(HvW8BKghv%T

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
index d20a722b..23557a4b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
@@ -600,6 +600,7 @@ namespace VEPROMS.CSLA.Library
 		public ItemInfo _RangeItem;
 		public bool _UsedRangeAncestor;
 		private string _Token;
+		public string _UnitProcSetString;
 		public bool SectNumWithStepNum;
 		private int _SectionNumberLength = 0;
 		public int SectionNumberLength
@@ -847,6 +848,7 @@ namespace VEPROMS.CSLA.Library
 			tb._TranType = tranType;
 			tb._ToItem = toItem;
 			tb._RangeItem = rangeItem;
+			tb._UnitProcSetString = tb._FormatData.TransData.TransTypeList[tranType].UnitProcSetString;
 			return tb;
 		}
 		private static string BuildString(TransitionBuilder tb)
@@ -938,9 +940,54 @@ namespace VEPROMS.CSLA.Library
 				unitnum = unitnum.Replace("-", @"\u8209?");
 				retstr = unitnum.Replace("#", retstr);
 			}
+			// B2019-072: use si & psi as a prefix to the transition
+			string outsideprefix = null;
+			if (tb._ToItem.MyDocVersion != tb._FromItem.MyDocVersion)		// doc versions not equal means it is an outside transition
+			{
+				if (tb._FromItem.ActiveFormat.PlantFormat.FormatData.PrintData.OutSideTransSetName)		// must have format flag to include prefix
+				{
+					bool foundnull = false;
+					if (tb._UnitProcSetString != null && tb._UnitProcSetString != "")		// must have a string on transition to use as format
+					{
+						// get the type/token strings from the format so that can grab si or psi info.  An example format
+						// as used by AEP is:   UnitProcSetString ="{PSI:UNITCOM}-{SI:SETNAME}-{PSI:SETID}-"
+						string findMatch = "{.*?}";
+						MatchCollection ms = Regex.Matches(tb._UnitProcSetString,findMatch);
+						string txt = tb._UnitProcSetString;
+						FolderConfig fc = tb._ToItem.MyDocVersion.MyFolder.FolderConfig as FolderConfig;
+						ProcedureConfig pc = new ProcedureConfig(tb._ToItem.MyProcedure.MyContent.Config);
+						// Use a dictionary to get all of the tokens from the format string, then
+						// go through all dictionary entries to make the replacements.
+						Dictionary<string, string> repStr = new Dictionary<string, string>();		
+						foreach (Match mtch in ms)
+						{
+							int offset = mtch.Index;
+							string str = tb._UnitProcSetString.Substring(mtch.Index, mtch.Length);
+							int indxcn = str.IndexOf(":");
+							string pt1 = str.Substring(1, indxcn - 1);
+							string pt2 = str.Substring(indxcn+1, str.Length - 2 - indxcn);
+							string add = null;
+							if (pt1.StartsWith("SI"))			// SI fields go to the folder specific information
+								add = fc.GetValue(pt1, pt2);
+							else
+								add = pc.GetValue(pt1, pt2);
+							if (add == null || add == "") foundnull = true;		// don't do prefix if any of the fields are null.
+							else repStr.Add(str, add);
+						}
+						if (!foundnull)
+						{
+							outsideprefix = tb._UnitProcSetString;
+							foreach (string key in repStr.Keys)
+								outsideprefix = outsideprefix.Replace(key, repStr[key]);
+							outsideprefix = outsideprefix.Replace("-", @"\u8209?");			// use unicode for dashes
+						}
+					}
+				}
+			}
 			// LATER: Format Flag TruncateProcNmAfter1stSpace  (dropped plants)
 			// LATER: Format Flag HardSpTranProcNumb (active plants)
 			tb.AppendPrefix();
+			if (outsideprefix != null) retstr = outsideprefix + retstr;
 			if (tb._FormatData.TransData.HardSpTranProcNumb) retstr = retstr.Replace(" ", @"\u160?");
 			tb.ReplaceToken(retstr);
 			return (retstr != null && retstr != "");
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 549768bb..02a7a9c3 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -1050,6 +1050,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _UnitNumber, "@UnitNumber");
 			}
 		}
+		private LazyLoad<bool> _OutSideTransSetName;		//B2019-072: For AEP, use PSI & SI for outside transition text
+		public bool OutSideTransSetName
+		{
+			get
+			{
+				return LazyLoad(ref _OutSideTransSetName, "@OutSideTransSetName");
+			}
+		}
 		private LazyLoad<bool> _SpecialCaseCalvert;
 		public bool SpecialCaseCalvert
 		{
@@ -6667,6 +6675,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _TransMenu, "@TransMenu");
 			}
 		}
+		private LazyLoad<string> _UnitProcSetString;		//B2019-072: For AEP, use PSI & SI for outside transition text
+		public string UnitProcSetString									//    this is format of string to preface transition with
+		{
+			get
+			{
+				return LazyLoad(ref _UnitProcSetString, "@UnitProcSetString");
+			}
+		}
 		public override string GetPDDisplayName()
 		{ return string.Format("[{0}] - Type {1}", Index, Type); }
 		public override string GetPDCategory()