Compare commits
	
		
			8 Commits
		
	
	
		
			C2025-006_
			...
			C2025-007
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 96e61aea2b | |||
| 565779c9c8 | |||
| b4ccd682c3 | |||
| dba1331556 | |||
| 8803ae2274 | |||
| 69d09b7fc2 | |||
| 8ddfc8654e | |||
| 7a3243e882 | 
@@ -1154,7 +1154,10 @@ namespace ROEditor
 | 
			
		||||
				tbtnCancel.Enabled = true;
 | 
			
		||||
				tbtnSave.Enabled = true;
 | 
			
		||||
				tbtnRestore.Enabled = true;
 | 
			
		||||
				tbtnSaveAs.Enabled = true;
 | 
			
		||||
				if (newone == null)
 | 
			
		||||
					{ tbtnSaveAs.Enabled = true; }
 | 
			
		||||
				else
 | 
			
		||||
					{ tbtnSaveAs.Enabled = false; }
 | 
			
		||||
			}
 | 
			
		||||
			menuROSave.Enabled = tbtnSave.Enabled;
 | 
			
		||||
		}
 | 
			
		||||
@@ -1170,7 +1173,10 @@ namespace ROEditor
 | 
			
		||||
 | 
			
		||||
			tbtnSave.Enabled = true;
 | 
			
		||||
			tbtnRestore.Enabled = true;
 | 
			
		||||
			tbtnSaveAs.Enabled = true;
 | 
			
		||||
			if (newone == null)
 | 
			
		||||
				{ tbtnSaveAs.Enabled = true; }
 | 
			
		||||
			else
 | 
			
		||||
				{ tbtnSaveAs.Enabled = false; }
 | 
			
		||||
			tbtnCancel.Enabled = true;
 | 
			
		||||
			menuROSave.Enabled = tbtnSave.Enabled;
 | 
			
		||||
			//B2021-080 set the mysavexml flag to true to ensure the text change will be saved
 | 
			
		||||
@@ -2392,20 +2398,26 @@ namespace ROEditor
 | 
			
		||||
		 */
 | 
			
		||||
		private void menuRODelete_Click(object sender, System.EventArgs e)
 | 
			
		||||
		{
 | 
			
		||||
			bool success=false;
 | 
			
		||||
			XmlNode nd = (XmlNode) roTreeView.SelectedNode.Tag;
 | 
			
		||||
			if (nd.ParentNode.Name == "RO_Root")
 | 
			
		||||
				success = myrodb.RODB_DeleteGroup(nd,null,null);
 | 
			
		||||
			else
 | 
			
		||||
				success = myrodb.RODB_DeleteRO(nd);
 | 
			
		||||
			if (success == true)
 | 
			
		||||
			string msgstr = "It is recommended that you may wish to create a backup zip of your RO folder prior to performing deletions.\n\nAre you sure you wish to delete the selected RO/RO Group?";
 | 
			
		||||
 | 
			
		||||
			DialogResult AnswerYN = MessageBox.Show(msgstr, "Deleting ROs/RO Group", MessageBoxButtons.YesNo);
 | 
			
		||||
			if (AnswerYN == DialogResult.Yes)
 | 
			
		||||
			{
 | 
			
		||||
				// remove from xml tree & the tree control
 | 
			
		||||
				XmlNode parent = nd.ParentNode;
 | 
			
		||||
				parent.RemoveChild(nd);	
 | 
			
		||||
				updateRoListView(roTreeView.SelectedNode.Parent);
 | 
			
		||||
				roTreeView.SelectedNode.Remove();
 | 
			
		||||
				roTreeView.Refresh();	
 | 
			
		||||
				bool success = false;
 | 
			
		||||
				XmlNode nd = (XmlNode)roTreeView.SelectedNode.Tag;
 | 
			
		||||
				if (nd.ParentNode.Name == "RO_Root")
 | 
			
		||||
					success = myrodb.RODB_DeleteGroup(nd, null, null);
 | 
			
		||||
				else
 | 
			
		||||
					success = myrodb.RODB_DeleteRO(nd);
 | 
			
		||||
				if (success == true)
 | 
			
		||||
				{
 | 
			
		||||
					// remove from xml tree & the tree control
 | 
			
		||||
					XmlNode parent = nd.ParentNode;
 | 
			
		||||
					parent.RemoveChild(nd);
 | 
			
		||||
					updateRoListView(roTreeView.SelectedNode.Parent);
 | 
			
		||||
					roTreeView.SelectedNode.Remove();
 | 
			
		||||
					roTreeView.Refresh();
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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<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)
 | 
			
		||||
		{
 | 
			
		||||
 
 | 
			
		||||
@@ -1148,8 +1148,7 @@ namespace VEPROMS.CSLA.Library
 | 
			
		||||
					}
 | 
			
		||||
					catch (Exception ex)
 | 
			
		||||
					{
 | 
			
		||||
						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
 | 
			
		||||
						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
 | 
			
		||||
						Database.LogException("ItemExt.DeactivateStateDisplayTabTmp", ex);
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
				}
 | 
			
		||||
@@ -1176,8 +1175,7 @@ namespace VEPROMS.CSLA.Library
 | 
			
		||||
					}
 | 
			
		||||
					catch (Exception ex)
 | 
			
		||||
					{
 | 
			
		||||
						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
 | 
			
		||||
						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
 | 
			
		||||
						Database.LogException("ItemExt.AddDisplayTabsState", ex);
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
@@ -1194,13 +1192,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 +1203,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();
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
				}
 | 
			
		||||
 
 | 
			
		||||
@@ -48,7 +48,6 @@ namespace VEPROMS.CSLA.Library
 | 
			
		||||
			catch (Exception ex)
 | 
			
		||||
			{
 | 
			
		||||
				Database.LogException("UserSettings_GetData", ex);
 | 
			
		||||
				throw new DbCslaException("UserSettings_GetData", ex);
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user