Merge pull request 'Development' (#410) from Development into master

Merging all items through B2024-03 from development into master after successful testing.

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -11,7 +11,6 @@ using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using Volian.Controls.Library;
-using System.Linq;
 
 namespace VEPROMS
 {
@@ -1800,21 +1799,6 @@ namespace VEPROMS
 				}
 			}
 
-			//B2024-074 If only deleting annotations from an individual procedure, verify can check out procedure.
-			string msgpi = string.Empty;
-			foreach (ProcedureInfo pi in pil)
-			{
-				//LINQ used for 1st check of if statement
-				//basically check if procedure was already part of a docVersionsFolder
-				//before checking if procedure was checked out already
-				//to avoid duplicate messages for checked out procedures
-				if (!dvil.Any(x => x.Procedures.Any(y => y.ItemID == pi.ItemID)) && !MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgpi))
-				{
-					sbDocVersions.AppendLine(msgpi);
-					cancelledOut = true;
-				}
-			}
-
 			if (cancelledOut)
 			{
 				StringBuilder sb = new StringBuilder();

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1670,36 +1670,16 @@ namespace VEPROMS
 					return;
 				}
 
-				string stk = Volian.Base.Library.vlnStackTrace.StackToString(); 
+				string stk = Volian.Base.Library.vlnStackTrace.StackToString();
 
 				if (!stk.Contains("Exception"))
 				{
 					// B2018-091 Allow PROMS to close if only MSWord sections have been opened.
 					// B2019-071 we will now close one or all of the tabs (even step editor ones)
-
-					string DisplayTabID = "";
-					int pos;
-					int TabItemID;
-					string DisplayTabName = "";
-					int cnt = 0;
-						// Deactivate previous procedure tab state by user
-					VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
-						// Save current procedure tab state
-					foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
-					{
-						cnt++;
-						DisplayTabID = pgTab.Key;
-						TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
-						DisplayTabName = pgTab.Value.ToString();
-						//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
-						VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
-					}
-
 					int n = tc._MyDisplayTabItems.Count;
 
 					while (n-- > 0 && tc._MyDisplayTabItems.Count > 0)
 					{
-
 						tc.CloseTabItem(tc.SelectedDisplayTabItem);
 
 						// B2019-071 close just the current tab and continue working
@@ -2340,27 +2320,6 @@ namespace VEPROMS
 					CurrentID = txtSearch.Text;
 				}
 			}
-
-			// Add retrieve displaytabs state here.
-			openDisplaytabstate();
-		}
-
-		public void openDisplaytabstate()
-		{
-			DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
-		
-			if (DisPlayTabState.Rows.Count > 0)
-			{
-				foreach (DataRow TabState in DisPlayTabState.Rows)
-				{
-					int _ItemID = (int)TabState["ItemID"];
-					//ItemInfoList _Procedures = ItemInfoList.GetList(_ItemID, (int)E_FromType.Procedure));
-					ItemInfo _Procedure = ItemInfo.Get(_ItemID);
-					//ItemInfo.Get
-					//ItemInfo.Get
-					OpenItem(_Procedure);
-				}
-			}
 		}
 
 		void tc_RefreshEnhancedDocument(object sender, ItemSelectedChangedEventArgs args)

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -8004,171 +8004,6 @@ namespace VEPROMS.CSLA.Library
 			MyContent.Config = _ProcedureConfig.ToString();
 		}
 		#endregion
-		public class DisplayTabs
-		{
-			private int _ItemID;
-			public int ItemID
-			{
-				get { return _ItemID; }
-				set { _ItemID = value; }
-
-			}
-			private string _DisplayTabID;
-			public string DisplayTabID
-			{
-				get { return _DisplayTabID; }
-				set { _DisplayTabID = value; }
-			}
-			private string _DisplayTabName;
-			public string DisplayTabName
-			{
-				get { return _DisplayTabName; }
-				set { _DisplayTabName = value; }
-			}
-
-			public SafeDataReader Dr { get; }
-
-			public DisplayTabs()
-			{
-
-			}
-
-			public DisplayTabs(int itemID, String displayTabID, String displayTabName)
-			{
-				_ItemID = itemID;
-				_DisplayTabID = displayTabID;
-				_DisplayTabName = displayTabName;
-			}
-
-			public DisplayTabs(SafeDataReader 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)
-		//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.AddDisplayTabsState", ex);
-						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
-					}
-
-				}
-			}
-
-		}
 	}
 	#endregion
 	#region SectionInfo

PROMS/VEPROMS.CSLA.Library/Extension/MultiUserExt.cs

@@ -156,38 +156,32 @@ namespace VEPROMS.CSLA.Library
 				SessionInfoList sil = DataPortal.Fetch<SessionInfoList>(new SessionInfoList.CanCheckOutItemCriteria(objectID, objectType));
 				if (sil.Count == 0)
 					return true;
-				if (objectType == CheckOutType.Session)
-				{
-					if (sil.Count == 1)
-					{
-						OwnerInfoList oil = OwnerInfoList.GetBySessionID(sil[0].SessionID);
-						if (oil.Count == 0)
-							return true;
-						else
-						{
-							message = "Export Procedure Set and Import Procedure Set are not available because you have open procedures or documents";
-							return false;
-						}
-					}
-					else
-					{
-						message = "Export Procedure Set and Import Procedure Set are not available because there are other sessions open in the database";
-						return false;
-					}
-				}
+        if (objectType == CheckOutType.Session)
+        {
+          if (sil.Count == 1)
+          {
+            OwnerInfoList oil = OwnerInfoList.GetBySessionID(sil[0].SessionID);
+            if (oil.Count == 0)
+              return true;
+            else
+            {
+              message = "Export Procedure Set and Import Procedure Set are not available because you have open procedures or documents";
+              return false;
+            }
+          }
+          else
+          {
+            message = "Export Procedure Set and Import Procedure Set are not available because there are other sessions open in the database";
+            return false;
+          }
+        }
 				bool rv = true;
 				// C2015-022 part of separate windows logic, check the processID instead of the sessionID
 				foreach (SessionInfo si in sil)
 				{
 					if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Procedure)
 					{
-						//B2024-074 If no Number for Procedure, Display Title
-						ProcedureInfo tmpproc = ItemInfo.Get(objectID).MyProcedure;
-						string name = tmpproc.DisplayNumber;
-						if (string.IsNullOrEmpty(name))
-						{ name = tmpproc.DisplayText; }
-
-						message = string.Format("The procedure {0} is already checked out to {1}", name, si.UserID);
+						message = string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(objectID).MyProcedure.DisplayNumber, si.UserID);
 						rv = rv && false;
 					}
 					else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Document)
@@ -201,16 +195,8 @@ namespace VEPROMS.CSLA.Library
 						OwnerInfo oi = OwnerInfo.GetBySessionIDandVersionID(si.SessionID, objectID);
 						if (oi == null)
 							message = message + string.Format("The working draft is already checked out to {0}", si.UserID) + Environment.NewLine;
-						else if (oi.OwnerType == 0)
-						{
-							//B2024-074 If no Number for Procedure, Display Title
-							ProcedureInfo tmpproc = ItemInfo.Get(oi.OwnerItemID).MyProcedure;
-							string name = tmpproc.DisplayNumber;
-							if (string.IsNullOrEmpty(name))
-							{ name = tmpproc.DisplayText; }
-
-							message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
-						}
+						else if(oi.OwnerType == 0)
+							message = message + string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(oi.OwnerItemID).MyProcedure.DisplayNumber, si.UserID) + Environment.NewLine;
 						else if (oi.OwnerType == 1)
 							message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
 						else if (oi.OwnerType == 2)
@@ -225,15 +211,7 @@ namespace VEPROMS.CSLA.Library
 						if (oi != null)
 						{
 							if (oi.OwnerType == 0)
-							{
-								//B2024-074 If no Number for Procedure, Display Title
-								ProcedureInfo tmpproc = ItemInfo.Get(oi.OwnerItemID).MyProcedure;
-								string name = tmpproc.DisplayNumber;
-								if (string.IsNullOrEmpty(name))
-								{ name = tmpproc.DisplayText; }
-
-								message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
-							}
+								message = message + string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(oi.OwnerItemID).MyProcedure.DisplayNumber, si.UserID) + Environment.NewLine;
 							else if (oi.OwnerType == 1)
 								message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
 							else if (oi.OwnerType == 2)

PROMS/VEPROMS.CSLA.Library/Generated/Item.cs

@@ -1132,91 +1132,6 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Item.Add", ex);
 			}
 		}
-		public static void DeactivateStateDisplayTabTmp(string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "DeactivateStateDisplayTabTmp";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						cm.Parameters.AddWithValue("@UserID", UserID);
-						cm.ExecuteNonQuery();
-					}
-					catch (Exception ex)
-					{
-						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
-						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
-					}
-
-				}
-			}
-		}
-		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName, string UserID, int order)
-		//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.Parameters.AddWithValue("@UserID", UserID);
-						cm.Parameters.AddWithValue("@order", order);
-						cm.ExecuteNonQuery();
-					}
-					catch (Exception ex)
-					{
-						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
-						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
-					}
-				}
-			}
-		}
-		public static DataTable GetDisplayTabs(string UserID) //, string displayTabID, string displayTabName)
-														   //public static void DeactivateStateDisplayTabTmp(string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "GetDisplayTabdata";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						cm.Parameters.AddWithValue("@UserID", UserID);
-						//cm.ExecuteNonQuery();						
-						SqlDataAdapter da = new SqlDataAdapter(cm);
-						//da.Fill(dt);
-						//cn.Close();
-						//da.Dispose();
-						//return dt; // fix
-
-						SqlDataReader reader = cm.ExecuteReader();
-						DataTable dt = new DataTable();
-						dt.Load(reader);
-						return dt;
-
-					}
-					catch (Exception ex)
-					{
-						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
-						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
-					}
-
-				}
-			}
-		}
 		[Transactional(TransactionalTypes.TransactionScope)]
 		protected override void DataPortal_Update()
 		{

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -16,12 +16,6 @@ namespace Volian.Controls.Library
 	public delegate ItemInfo DisplayTabControlEditorSearchIncTransEvent(object sender, vlnTreeItemInfoEventArgs args);
 	public delegate void DisplayTabControlEvent(object sender, EventArgs args);
 	public delegate void DisplayTabControlStatusEvent(object sender, DisplayTabControlStatusEventArgs args);
-	public class DisplayTabData
-	{
-		public int ItemID { get; set; }
-		public string DisplayTabID { get; set; }
-		public string DisplayTabName { get; set; }
-	}
 	public partial class DisplayTabControlStatusEventArgs : EventArgs
 	{
 		private VolianStatusType _Type;
@@ -1151,9 +1145,6 @@ namespace Volian.Controls.Library
 			}
 			else // If not already open, create a new Page
 			{
-
-				List<DisplayTabData> DisplayTabs = new List<DisplayTabData>();
-
 				pg = new DisplayTabItem(this.components, this, proc, key); // Open a new Procedure Tab
 				_MyDisplayTabItems.Add(key, pg);
 				if (setFocus)