From d898b0a056b14075f6180ee86e35c05a7b146674 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 18 Dec 2013 18:28:11 +0000 Subject: [PATCH] Fixed to allow search of selected multiple return RO value Added comments --- PROMS/Volian.Controls.Library/DisplayReports.cs | 5 +++-- PROMS/Volian.Controls.Library/DisplaySearch.cs | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayReports.cs b/PROMS/Volian.Controls.Library/DisplayReports.cs index 59f101ff..88a44562 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.cs @@ -128,7 +128,7 @@ namespace Volian.Controls.Library } } - //private string GetROList(ROFSTLookup.rochild[] chld) + // same function as GetROsToSearch in DisplaySearch.cs private string GetROChildren(object roObj) { ROFSTLookup.rochild chld = (ROFSTLookup.rochild)roObj; @@ -136,7 +136,8 @@ namespace Volian.Controls.Library if (chld.children == null) // get a single ROID { //ROFSTLookup.rochild ro = (ROFSTLookup.rochild)roObj; - rtnstr += string.Format("{0}", chld.roid); + rtnstr += string.Format("{0}", chld.roid); + if (rtnstr.Length == 12) rtnstr += "0000"; // last four digits are used for multiple return values } else { // spin through the child list and get the ROIDs. diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 7c2cd543..afb3240e 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -975,7 +975,7 @@ namespace Volian.Controls.Library } return rtnVal; } - + // Same funtion as GetROChildren in DisplayReport.cs private string GetROsToSearch(ROFSTLookup.rochild[] chld) { string rtnstr = ""; @@ -983,7 +983,7 @@ namespace Volian.Controls.Library { ROFSTLookup.rochild ro = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag; rtnstr += string.Format("{0}", ro.roid); - if (rtnstr.Length == 12) rtnstr += "0000"; + if (rtnstr.Length == 12) rtnstr += "0000"; // last four digits are used for multiple return values } else { // spin through the child list and get the ROIDs.