Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Added GetCombinedSlaveValue method to correct how master unit values are obtained

Browse Source
This commit is contained in:
Rich 2014-01-10 03:12:50 +00:00
parent 15e744eb2c
commit c97f0d38e0
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs
View File

@ -829,7 +829,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "Number"];// get the saved value string s = GetCombinedSlaveValue("Number") ?? _Xp["Unit", "Number"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "Number"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "Number"];
return s; return s;
@ -863,7 +863,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "OtherNumber"];// get the saved value string s = GetCombinedSlaveValue("OtherNumber") ?? _Xp["Unit", "OtherNumber"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "OtherNumber"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "OtherNumber"];
return s; return s;
@ -885,7 +885,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "Name"];// get the saved value string s = GetCombinedSlaveValue("Name") ?? _Xp["Unit", "Name"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "Name"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "Name"];
return s; return s;
@ -907,7 +907,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "OtherName"];// get the saved value string s = GetCombinedSlaveValue("OtherName") ?? _Xp["Unit", "OtherName"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "OtherName"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "OtherName"];
return s; return s;
@ -929,7 +929,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "Text"];// get the saved value string s = GetCombinedSlaveValue("Text") ?? _Xp["Unit", "Text"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "Text"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "Text"];
return s; return s;
@ -951,7 +951,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "OtherText"];// get the saved value string s = GetCombinedSlaveValue("OtherText") ?? _Xp["Unit", "OtherText"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "OtherText"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "OtherText"];
return s; return s;
@ -973,7 +973,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "ID"];// get the saved value string s = GetCombinedSlaveValue("ID") ?? _Xp["Unit", "ID"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "ID"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "ID"];
return s; return s;
@ -995,7 +995,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "OtherID"];// get the saved value string s = GetCombinedSlaveValue("OtherID") ?? _Xp["Unit", "OtherID"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "OtherID"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "OtherID"];
return s; return s;
@ -1017,7 +1017,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["Unit", "ProcedureNumber"];// get the saved value string s = GetCombinedSlaveValue("ProcedureNumber") ?? _Xp["Unit", "ProcedureNumber"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "ProcedureNumber"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "ProcedureNumber"];
return s; return s;
@ -1039,7 +1039,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["ProcedureSet", "Name"];// get the saved value string s = GetCombinedSlaveValue("SetName") ?? _Xp["ProcedureSet", "Name"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "SetName"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "SetName"];
return s; return s;
@ -1061,7 +1061,7 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
string s = _Xp["ProcedureSet", "ID"];// get the saved value string s = GetCombinedSlaveValue("SetID") ?? _Xp["ProcedureSet", "ID"];// get the saved value
if (SelectedSlave > 0) if (SelectedSlave > 0)
s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "SetID"]; s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "SetID"];
return s; return s;
@ -1639,5 +1639,24 @@ OnPropertyChanged("Default_BkColor");
return k; return k;
} }
} }
//added by jcb to fix master issue byron/braidwood
private string GetCombinedSlaveValue(string item)
{
if (MaxSlaveIndex > 0)
{
string s = "";
string sep = "";
XmlNodeList nl = _Xp.XmlContents.SelectNodes("//Slave");
foreach (XmlNode nd in nl)
{
string ss = nd.Attributes.GetNamedItem("index").InnerText;
s += sep + _Xp["Slave[@index='" + ss + "']", item];
sep = ",";
}
return s;
}
return null;
}
//end added by jcb to fix master issue byron/braidwood
} }
} }