Merge pull request 'B2026-063 - Issue Deleting Steps with Grids' (#783) from B2026-063 into Development

good for testing

PROMS/SQL/PROMStoCM.sql

@@ -1817,7 +1817,7 @@ ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete a
 		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
 		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
 		where ii.DeleteStatus > 0
-		update ga set ga.contentauditid = (select max(auditid) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
+		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
 		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
 	end
 go

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -24990,6 +24990,34 @@ IF (@@Error = 0) PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber
 ELSE PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Error on Creation'
 GO
 
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	06/29/2026
+ Description:	Added an ISNULL check when setting GridAudits.contentauditid.
+    Was Causing Deletion of some Grids to fail.
+==========================================================================================================
+*/
+/****** Object:  Trigger [tr_Contents_Delete] ******/
+ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete as 
+	begin
+		update ii set DeleteStatus = (select max(DeleteID) from DeleteLog where SPID = @@spid), ActionDTS = getdate(),
+		UserID = (select top 1 UserID from DeleteLog where SPID = @@spid order by deleteid desc)
+		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
+		insert into ContentAudits(ContentID,Number,Text,Type,FormatID,Config,DTS,UserID,DeleteStatus,ActionDTS)
+		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
+		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
+		where ii.DeleteStatus > 0
+		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
+		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
+	end
+go
+
+-- Display the status of Trigger alter
+IF (@@Error = 0) PRINT 'Trigger Alteration: tr_Contents_Delete Succeeded'
+ELSE PRINT 'Trigger Alteration: tr_Contents_Delete Error on Creation'
+GO
+
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -25023,8 +25051,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '05/26/2026 7:00 AM'
-	set @RevDescription = 'Get Most Recent Revision when Duplicates'
+	set @RevDate = '06/29/2026 7:00 AM'
+	set @RevDescription = 'Update to Grid Deletion Audits'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -2,13 +2,12 @@ using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
@@ -92,6 +91,10 @@ namespace Volian.Controls.Library
         //This flag will be set when the docversion gets updated to let it know that the full tree needs a refresh
         private bool changedDocVersion = false;
 
+        //B2026-057 PROMS Crash when Closing Tabs
+        // this flag will prevent multiple asking in a row if should updste ROs
+        private static bool askedAboutchangedDocVersion = false;
+
         public ROFstInfo MyROFST
         {
             get { return _myROFST; }
@@ -135,6 +138,7 @@ namespace Volian.Controls.Library
                     if (_docVersionInfo?.VersionID != value?.VersionID)
                     {
                         changedDocVersion = true;
+                        askedAboutchangedDocVersion = false;
                     }
 
                     _docVersionInfo = value;
@@ -648,9 +652,12 @@ namespace Volian.Controls.Library
                     {
                         //do nothing - is still checked out
                     }
-					else if (changedDocVersion && MessageBox.Show($"There exists a newer ROFST for this RO database that was loaded for other sets.\r\n\r\nDo you want to update this set's ROs to be consistent/use the latest loaded ROFST?", "Load ROs", MessageBoxButtons.YesNo) == DialogResult.Yes)
+                    else if (changedDocVersion && !askedAboutchangedDocVersion)
+                    {
+                        Task.Run(() =>
+                        {
+                            if (MessageBox.Show($"There exists a newer ROFST for this RO database that was loaded for other sets.\r\n\r\nDo you want to update this set's ROs to be consistent/use the latest loaded ROFST?", "Load ROs", MessageBoxButtons.YesNo) == DialogResult.Yes)
                             {
-
                                 InitialProgressBarMessage = "Updating ROs";
 
                                 ROFstInfo roFstInfo = ROFstInfo.Get(fstid);
@@ -664,6 +671,15 @@ namespace Volian.Controls.Library
                                 MyROFST = roFstInfo;
 
                                 updatedROs = true;
+
+                                askedAboutchangedDocVersion = false;
+                            }
+                            else
+                            {
+                                askedAboutchangedDocVersion = true;
+                            }
+                        });
+
                     }
                 }