B2025-009 RO Editor - Disable the Save As button if it is a new RO that has not been saved yet.

Adding a new RO:  when you click Save As, you get the Problem Saving Data message box. Should only be able to “Save As” if it has already been previously saved.

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs

@@ -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

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -1129,7 +1129,7 @@ namespace ctlXMLEditLib
 			mylabel.BackColor = chlbckcolor; // PC Applic fields are shaded blue otherwise backcolor is transparent
 			mylabel.Location = new Point(screenx+indent, screeny);
 			mylabel.Name = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName); 
-			mylabel.Text = (applicLabel.Length > 0) ? applicLabel : CvtFldToUserFld(element.Name); // C2021-026  applicLabel is the P/C Child name
+			mylabel.Text = (applicLabel.Length > 0) ? applicLabel : CvtFldToUserFld(element.Name).Replace("Image_",""); // C2021-026  applicLabel is the P/C Child name
 			mylabel.AutoSize = true;
 			Controls.Add(mylabel);
 			// add 3 onto screeny so that textbox is slightly below label.
@@ -1696,7 +1696,7 @@ namespace ctlXMLEditLib
 				}
 				catch (Exception ee)
 				{
-					MessageBox.Show("Invalid Height Input",ee.ToString());
+					MessageBox.Show("The Height and Width cannot be empty fields. Enter a number in either field and the other will automatically adjust to a proportional size.", "Invalid Height Input");
 				}
 			}
 		}
@@ -1713,7 +1713,7 @@ namespace ctlXMLEditLib
 				}
 				catch (Exception ee)
 				{
-					MessageBox.Show("Invalid Width Input", ee.ToString());
+					MessageBox.Show("The Height and Width cannot be empty fields. Enter a number in either field and the other will automatically adjust to a proportional size.", "Invalid Width Input");
 				}
 			}
 		}					

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<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)
 		{

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

@@ -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();
 					}
 
 				}

PROMS/VEPROMS.CSLA.Library/Minimal/UserSettings.cs

@@ -48,7 +48,6 @@ namespace VEPROMS.CSLA.Library
 			catch (Exception ex)
 			{
 				Database.LogException("UserSettings_GetData", ex);
-				throw new DbCslaException("UserSettings_GetData", ex);
 			}
 
 		}