From 7a3243e8823f9e1d91f7fa605d73ab9d7eb430e8 Mon Sep 17 00:00:00 2001 From: mschill Date: Wed, 22 Jan 2025 06:59:03 -0500 Subject: [PATCH] B2025-004 Remove dependency on stored procedure (GetDisplayTabdata). --- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 90 ------------------- PROMS/VEPROMS.CSLA.Library/Generated/Item.cs | 13 ++- 2 files changed, 5 insertions(+), 98 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 9ac26d14..88810cfc 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -8447,97 +8447,7 @@ namespace VEPROMS.CSLA.Library Dr = dr; } } - public static DataTable GetDisplayTabs(int itemID) //, string displayTabID, string displayTabName) - { - try - { - DataTable tmp = DataPortal.Fetch(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(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) //private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName) { diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs index 94168c79..8abf1fdd 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs @@ -1194,13 +1194,8 @@ namespace VEPROMS.CSLA.Library cm.CommandType = CommandType.StoredProcedure; cm.CommandText = "GetDisplayTabdata"; cm.CommandTimeout = Database.DefaultTimeout; - cm.Parameters.AddWithValue("@UserID", UserID); - //cm.ExecuteNonQuery(); + cm.Parameters.AddWithValue("@UserID", UserID); SqlDataAdapter da = new SqlDataAdapter(cm); - //da.Fill(dt); - //cn.Close(); - //da.Dispose(); - //return dt; // fix SqlDataReader reader = cm.ExecuteReader(); DataTable dt = new DataTable(); @@ -1210,8 +1205,10 @@ namespace VEPROMS.CSLA.Library } catch (Exception ex) { - //if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex); - throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex); + //B2025-004 + //if it fails loading previously open tabs, simply treat it as if no tabs were open + //instead of crashing + return new DataTable(); } }