From 32765615c6d60cb62780e7da373fcc3f1d2f92e0 Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Thu, 14 Feb 2013 17:38:55 +0000
Subject: [PATCH] Updated format for Westinghouse Alarm Procedures Allow the
 user to change which Multiple Return value is selected for a n RO. Allow user
 to select an RO for MEL including Room #

---
 PROMS/Volian.Controls.Library/DisplayRO.cs    |   9 +++++++--
 .../Volian.Controls.Library/StepTabRibbon.cs  |   5 ++++-
 PROMS/fmtxml/WSTALRall.xml                    | Bin 51022 -> 45288 bytes
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index 3ac2e79e..35355354 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -205,8 +205,13 @@ namespace Volian.Controls.Library
 					if (_SavCurROLink != null)
 						SavROLink = _SavCurROLink; ;
 					lbROId.Text = chld.appid;
-					btnSaveRO.Enabled = ((_SavCurROLink == null) || !(chld.roid.Substring(0, 12).ToLower().Equals(SavROLink.ROID.Substring(0, 12).ToLower())));
-					btnCancelRO.Enabled = ((_SavCurROLink != null) && chld.roid.Substring(0, 12).ToLower() != SavROLink.ROID.Substring(0, 12).ToLower());
+					// Allow the user to select a different return value.
+					//btnSaveRO.Enabled = ((_SavCurROLink == null) || !(chld.roid.Substring(0, 12).ToLower().Equals(SavROLink.ROID.Substring(0, 12).ToLower())));
+					//btnCancelRO.Enabled = ((_SavCurROLink != null) && chld.roid.Substring(0, 12).ToLower() != SavROLink.ROID.Substring(0, 12).ToLower());
+					string childroid = chld.roid.ToLower() + "0000";
+					childroid = childroid.Substring(0, 16);
+					btnSaveRO.Enabled = ((_SavCurROLink == null) || !(childroid.Equals(SavROLink.ROID.ToLower())));
+					btnCancelRO.Enabled = ((_SavCurROLink != null) && childroid != SavROLink.ROID.ToLower());
 					btnGoToRO.Enabled = true;
 					switch (chld.type)
 					{
diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index dfb18b63..3846cfed 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -171,8 +171,11 @@ namespace Volian.Controls.Library
 					if (index > -1)
 					{
 						MyAvailableROs.Add(((ROFSTLookup.rochild)roc).children[index].roid, ((ROFSTLookup.rochild)roc).children[index].value.Replace(@"\u160?", " "));
-						if(accPageID.StartsWith("MEL") && index == 0) // If equipment and 1st return value, then add option to add 4th Return Value
+						if (accPageID.StartsWith("MEL") && index == 0) // If equipment and 1st return value, then add option to add 4th Return Value
+						{
 							MyAvailableROs.Add(((ROFSTLookup.rochild)roc).children[3].roid, ((ROFSTLookup.rochild)roc).children[3].value.Replace(@"\u160?", " "));
+							MyAvailableROs.Add(((ROFSTLookup.rochild)roc).children[4].roid, ((ROFSTLookup.rochild)roc).children[4].value.Replace(@"\u160?", " "));
+						}
 						rv = true;
 					}
 				}
diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml
index b14199ffdd684799abfd0a1022f7dd9e5660932f..592f9907ee61d4e1d5b9cb146934229f5a0c82f7 100644
GIT binary patch
delta 914
zcmX@t$Nb_U(}oj5lh28YZGIpm$2*xxL2a{^f*SKAc9zKrN(;C(7=jq`fiRarVe&&I
z(a8$(T%riE7=}^?Lk2Sj0|xuafr^%*P7J9GX+YIQKsp3SCNktP6a)3ibEX4D6&Okw
z@}Z{i2qyvga8ZUBh9m}q$rGi-Cl|=7;5J7PWO516)*_(EDCS9n%)^i+)?D#qp!@QG
zCT9Z4QlK3Q4CO#}$>fi+;y^$1D1%JLp@t!YSX)>NfF>8gLVzD+CRl`6{k#y>kPyy=
znIn!c2P#9XdHkU8N&~qG=n|y3k%WaMk{sMj(aizMC83-O3{Jox%V9{FoX;dWIg5pF
z@(od*%@-<GaZE0#lrz-<npn*c3^Y3#XtDx>A23vN8ESzn4HWSZP$&b9Nd?MjPTtrU
zN|A2U$p%#_lh-wbOb$?H+5E04k5SMc>^VPh^2-55@8tVCMJHbXO82y+aZEn9Q*H8v
zDwf4cy^NFB%#+zXX<7!`WStdOlP{>TOzzmtH`$=~%H#qew#fohB{s`!DqxxXYLgyN
z2ixW)+x9R{zOkig^P?S$m?kIeFx$Lqw-MuH1y&JpXJ}$d1t%#5a5hL`P}ux>&wh{=
hv&|3oSusy;*)1^HK!j!T0#=sE@3tsx4m$LQ1pt6I_5A<<

delta 1239
zcmb_cT}V@57=DjumRO4HFz3%QTbi>b%x(T8R;Gp(YQwfL5y^`TLR7jbiqyhZxVg<e
z{)9o9l!ziOKIx*1z=#M6LFl5ZU^fv2LD5A}7rkdQn_JOM91eWn`}@4l`<(M3oV4nb
zLoc=Xs?QSdw0UW=ney>{XOUzUyYh=<gcOZ%oBCYB*#9^s;#}*`#?c`II&RdW=cYE!
zW`}Q}K$vg6knrYSj%37VlTH|hyHfBxa$T!d#C$MGg26M0kXMs-f=b9iPHLvZ)P(!P
ziejTmGEzR(Q7?7V0X|nCj9jb+Qc>;o%4KB5E3Z(qWzNRRNOqwb-@@@1Bk_q9tfXdz
z#~a}Aw{2@7wX2g(lSA#OPmH&dWh36Lv&Z4F64&Eu`;b|afk9u^ArsHgN$2P+<G4cg
zT)&PV7h`hpTn%)DuCk|>x?=oJj&er*2>W#Ua<000Zadl3K9SkC<J&-b&||>txKXZP
z^T!bv@+MP}8Qd!@qn9L{pL&l$k3r1Cy#?-BGp_qhn3#H^8j<6%VvC~1C!{lxkzxp-
zQkOV-3E9?L9z>6~O~=F~!os7#4*VE5Go9_28_Osz<pKY_1p5Z5kt_r!wfZuqdh^&;
z`W@%Svk9$irP2+$1OA-dCz;SXChr(i*i4OlJH>A!pIy{MwR~>DieJ$sR<==jL<Tj!
z*8j4!O2!(GKH4KH4o0j03tB9W<?8n*h~3Idk78u07S{5Ftt{SncFSV>LQ?dxn`N04
zMH9;t5=)ux7|4G}RTZXVg~f(NJ}djWE=<342g~SfDc;%*%T$%jEpW|W%=&waj$i@u
z78_&rC~`dYTM-IrP#@Hap*w9F{#Ee50hU1xmS>NP_UQ`}zC0+$nY)d`F*B2d<%JCN
lE$tDehgM0rXP-)v4V_D6;__UT%ple(6ig>;#Onn^@=roVT?haG