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

Initialize static variable containing the BASEall.xml format information

Browse Source 
Added a static variable for the BASEall.xml format information
Added parameters to allow a transition search in selected step elements. (B2015-055)
Make symbol list available without first selecting a procedure set, fixed searching for symbols bug (B2014-057), fix for transition search by type (B2015-055),
This commit is contained in:
John Jenko
2015-08-20 18:59:16 +00:00
parent d5b30b523f
commit 6f68a01ca9
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PROMS/VEPROMS.CSLA.Library/Extension/FormatExt.cs
View File

@@ -403,6 +403,20 @@ namespace VEPROMS.CSLA.Library
return true;
}
}
// return the base PROMS format (BASEall.xml)
// this was but in for bug fix B2014-057 so that we can get to the symbol list when no DocVersion is selected (Search All Procedure Sets)
private static PlantFormat _PROMSBaseFormat = null;
public static PlantFormat PROMSBaseFormat
{
get
{
if (_PROMSBaseFormat == null)
{
_PROMSBaseFormat = FormatList.ToFormat("Default (base)").PlantFormat;
}
return _PROMSBaseFormat;
}
}
public static FormatInfo Get(string name)
{
try

13
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@@ -5291,11 +5291,12 @@ namespace VEPROMS.CSLA.Library
}
#endregion
#region Transition Search
public static ItemInfoList GetListFromTransitionSearch(string docVersionList, int tranType, string tranCategory)
// added stepTypeList parameter to allow a transition search is selected step elements (B2015-055)
public static ItemInfoList GetListFromTransitionSearch(string docVersionList, int tranType, string tranCategory, string stepTypeList)
{
try
{
ItemInfoList tmp = DataPortal.Fetch<ItemInfoList>(new ItemListTransitionSearchCriteria(docVersionList, tranType, tranCategory));
ItemInfoList tmp = DataPortal.Fetch<ItemInfoList>(new ItemListTransitionSearchCriteria(docVersionList, tranType, tranCategory, stepTypeList));
ItemInfo.AddList(tmp);
tmp.AddEvents();
return tmp;
@@ -5314,11 +5315,15 @@ namespace VEPROMS.CSLA.Library
public int TranType { get { return _TranType; } }
private string _TranCategory;
public string TranCategory { get { return _TranCategory; } }
public ItemListTransitionSearchCriteria(string docVersionList, int tranType, string tranCategory)
// added stepTypeList parameter to allow a transition search is selected step elements (B2015-055)
private string _StepTypeList;
public string StepTypeList { get { return _StepTypeList;} }
public ItemListTransitionSearchCriteria(string docVersionList, int tranType, string tranCategory, string stepTypeList)
{
_DocVersionList = docVersionList;
_TranType = tranType;
_TranCategory = tranCategory;
_StepTypeList = stepTypeList;
}
}
private void DataPortal_Fetch(ItemListTransitionSearchCriteria criteria)
@@ -5335,6 +5340,8 @@ namespace VEPROMS.CSLA.Library
cm.Parameters.AddWithValue("@DocVersionList", criteria.DocVersionList);
cm.Parameters.AddWithValue("@TranType", criteria.TranType);
cm.Parameters.AddWithValue("@TranCategory", criteria.TranCategory);
// added stepTypeList parameter to allow a transition search is selected step elements (B2015-055)
cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList);
cm.CommandTimeout = Database.DefaultTimeout;
using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
{