Compare commits
No commits in common. "69d09b7fc27ad6064b4a72a76628989e665c18ed" and "8ddfc8654ea3a5be1bf9824c22e19a4ff36f378d" have entirely different histories.
69d09b7fc2
...
8ddfc8654e
@ -8447,7 +8447,97 @@ namespace VEPROMS.CSLA.Library
|
|||||||
Dr = dr;
|
Dr = dr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public static DataTable GetDisplayTabs(int itemID) //, string displayTabID, string displayTabName)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
DataTable tmp = DataPortal.Fetch<DataTable>(new DisplayTabs(itemID, "", "")); //, displayTabID, displayTabName));
|
||||||
|
//ItemInfo.AddList(tmp);
|
||||||
|
//tmp.AddEvents();
|
||||||
|
return tmp;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private DataTable dt = new DataTable();
|
||||||
|
private DataTable DataPortal_Fetch(DisplayTabs criteria)
|
||||||
|
{
|
||||||
|
|
||||||
|
using (SqlConnection cn = Database.VEPROMS_SqlConnection)
|
||||||
|
{
|
||||||
|
using (SqlCommand cm = cn.CreateCommand())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
cm.CommandType = CommandType.StoredProcedure;
|
||||||
|
cm.CommandText = "GetDisplayTabData";
|
||||||
|
cm.CommandTimeout = Database.DefaultTimeout;
|
||||||
|
SqlDataAdapter da = new SqlDataAdapter(cm);
|
||||||
|
da.Fill(dt);
|
||||||
|
cn.Close();
|
||||||
|
da.Dispose();
|
||||||
|
return dt;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
|
||||||
|
throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
//public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
|
||||||
|
//{
|
||||||
|
// try
|
||||||
|
// {
|
||||||
|
// //DisplayTabs tmp =
|
||||||
|
// DataPortal.Fetch<DisplayTabs>(new DisplayTabs(itemID, displayTabID, displayTabName)); //, displayTabID, displayTabName));
|
||||||
|
// //ItemInfo.AddList(tmp);
|
||||||
|
// //tmp.AddEvents();
|
||||||
|
// //return tmp;
|
||||||
|
// }
|
||||||
|
// catch (Exception ex)
|
||||||
|
// {
|
||||||
|
// throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//private DataTable dt = new DataTable();
|
||||||
|
//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
|
||||||
|
//{
|
||||||
|
|
||||||
|
// using (SqlConnection cn = Database.VEPROMS_SqlConnection)
|
||||||
|
// {
|
||||||
|
// using (SqlCommand cm = cn.CreateCommand())
|
||||||
|
// {
|
||||||
|
// try
|
||||||
|
// {
|
||||||
|
// cm.CommandType = CommandType.StoredProcedure;
|
||||||
|
// cm.CommandText = "AddDisplayTabState";
|
||||||
|
// cm.CommandTimeout = Database.DefaultTimeout;
|
||||||
|
// cm.Parameters.AddWithValue("@ItemID", ItemID);
|
||||||
|
// cm.Parameters.AddWithValue("@displayTabID", displayTabID);
|
||||||
|
// cm.Parameters.AddWithValue("@displayTabName", displayTabName);
|
||||||
|
// cm.ExecuteNonQuery();
|
||||||
|
// //SqlDataAdapter da = new SqlDataAdapter(cm);
|
||||||
|
// //da.Fill(dt);
|
||||||
|
// //cn.Close();
|
||||||
|
// //da.Dispose();
|
||||||
|
// //return dt; // fix
|
||||||
|
// }
|
||||||
|
// catch (Exception ex)
|
||||||
|
// {
|
||||||
|
// //if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
|
||||||
|
// throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
//}
|
||||||
public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
|
public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
|
||||||
//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
|
//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
|
||||||
{
|
{
|
||||||
|
@ -1194,8 +1194,13 @@ namespace VEPROMS.CSLA.Library
|
|||||||
cm.CommandType = CommandType.StoredProcedure;
|
cm.CommandType = CommandType.StoredProcedure;
|
||||||
cm.CommandText = "GetDisplayTabdata";
|
cm.CommandText = "GetDisplayTabdata";
|
||||||
cm.CommandTimeout = Database.DefaultTimeout;
|
cm.CommandTimeout = Database.DefaultTimeout;
|
||||||
cm.Parameters.AddWithValue("@UserID", UserID);
|
cm.Parameters.AddWithValue("@UserID", UserID);
|
||||||
|
//cm.ExecuteNonQuery();
|
||||||
SqlDataAdapter da = new SqlDataAdapter(cm);
|
SqlDataAdapter da = new SqlDataAdapter(cm);
|
||||||
|
//da.Fill(dt);
|
||||||
|
//cn.Close();
|
||||||
|
//da.Dispose();
|
||||||
|
//return dt; // fix
|
||||||
|
|
||||||
SqlDataReader reader = cm.ExecuteReader();
|
SqlDataReader reader = cm.ExecuteReader();
|
||||||
DataTable dt = new DataTable();
|
DataTable dt = new DataTable();
|
||||||
@ -1205,10 +1210,8 @@ namespace VEPROMS.CSLA.Library
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
//B2025-004
|
//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
|
||||||
//if it fails loading previously open tabs, simply treat it as if no tabs were open
|
throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
|
||||||
//instead of crashing
|
|
||||||
return new DataTable();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user