This commit is contained in:
Kathy Ruffing 2010-01-25 13:49:08 +00:00
parent a5d0baf8c3
commit 5f239397f6

View File

@ -159,22 +159,22 @@ namespace Volian.Controls.Library
} }
} }
else else
{
// there is override settings in the config... If the date time stamp says that text was changed
// so a change bar should exist - check override to see how change bar controls are set:
// if Override is 'Off' then
if (curDts > _CurItemInfo.MyProcedure.DTS)
{ {
rbChgBarOff.Checked = (sc.Step_CBOverride == "Off") ? true : false; rbChgBarOff.Checked = (sc.Step_CBOverride == "Off") ? true : false;
rbChgBarOn.Checked = (sc.Step_CBOverride == "On") ? true : false; rbChgBarOn.Checked = (sc.Step_CBOverride == "On") ? true : false;
// there is override settings in the config... If the date time stamp says that text was changed
// so a change bar should exist - check override to see how change bar controls are set:
// If the date of this is greater than the procedure, a change bar should be displayed -
// see what the override says. The override states whether change bar is on/off (not
// whether override is on/off)
if (curDts > _CurItemInfo.MyProcedure.DTS)
{
rbChgBarOff.Text = "OFF (Override)"; rbChgBarOff.Text = "OFF (Override)";
rbChgBarOn.Text = "ON"; rbChgBarOn.Text = "ON";
} }
else // if (curDts <= _CurItemInfo.MyProcedure.DTS && sc.Step_CBOverride == "On") else
{ {
// date time stamp says no change bar should be displayed: // date time stamp says no change bar should be displayed:
rbChgBarOff.Checked = (sc.Step_CBOverride == "On") ? true : false;
rbChgBarOn.Checked = (sc.Step_CBOverride == "Off") ? true : false;
rbChgBarOff.Text = "OFF"; rbChgBarOff.Text = "OFF";
rbChgBarOn.Text = "ON (Override)"; rbChgBarOn.Text = "ON (Override)";
} }
@ -284,7 +284,7 @@ namespace Volian.Controls.Library
{ {
if (_Initalizing) return; if (_Initalizing) return;
// if checked, set the config data to 'On'. Otherwise, the 'check' event // if checked, set the config data to 'Off'. Otherwise, the 'check' event
// handler for the other control sets the data appropriately. // handler for the other control sets the data appropriately.
if (rbChgBarOff.Checked) if (rbChgBarOff.Checked)
{ {