Merge branch 'Development' of https://git.volian.com/Volian/SourceCode into Development

good for testing

PROMS/Formats/Formats.csproj

@@ -179,6 +179,7 @@
     <Content Include="fmtall\CPL_00all.xml" />
     <Content Include="fmtall\CPL_01all.xml" />
     <Content Include="fmtall\CPL_02all.xml" />
+    <Content Include="fmtall\CPL_04all.xml" />
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />

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 @RevDate = '06/29/2026 7:00 AM'
-	set @RevDescription = 'Get Most Recent Revision when Duplicates'
+	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

@@ -654,8 +654,6 @@ namespace Volian.Controls.Library
                     }
                     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";
@@ -678,7 +676,6 @@ namespace Volian.Controls.Library
                             {
                                 askedAboutchangedDocVersion = true;
                             }
-                        });
 
                     }
                 }

PROMS/Volian.Controls.Library/VlnFlexGrid.Designer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Windows.Forms;
 
 namespace Volian.Controls.Library
 {
@@ -78,7 +79,10 @@ namespace Volian.Controls.Library
 			// VlnFlexGrid
 			// 
 			this.Rows.DefaultSize = 19;
-			
+			this.AllowDrop = true;
+			this.DragEnter += new DragEventHandler(Control_DragEnter);
+			this.DragDrop += new DragEventHandler(Control_DragDrop);
+
 			((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 			this.ResumeLayout(false);
 

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

@@ -1,22 +1,23 @@
-using System;
-using System.ComponentModel;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-using System.Windows.Forms;
-using System.Drawing;
-using System.Runtime.InteropServices;
-using System.Xml;
-using System.IO;
-using Volian.Controls.Library;
-using VEPROMS.CSLA.Library;
 using C1.Win.C1FlexGrid;
 using C1.Win.C1SpellChecker;
-using System.Text.RegularExpressions;
+using DevComponents.DotNetBar.Controls;
-using System.Xml.Serialization;
-using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using System.Xml;
+using System.Xml.Serialization;
+using VEPROMS.CSLA.Library;
+using Volian.Base.Library;
+using Volian.Controls.Library;
 
 namespace Volian.Controls.Library
 {
@@ -4438,11 +4439,28 @@ namespace Volian.Controls.Library
 		//        }
 
 		//}
+		private void Control_DragEnter(object sender, DragEventArgs e)
+		{
+			if (e.Data.GetDataPresent(DataFormats.Text))
+			{
+				e.Effect = DragDropEffects.Copy; // Allow copy
+			}
+			else
+			{
+				e.Effect = DragDropEffects.None; // Disallow
+			}
+		}
+		private void Control_DragDrop(object sender, DragEventArgs e)
+		{
+			string data = (string)e.Data.GetData(DataFormats.Text);
+			// Process the data (e.g., display it in a TextBox)
+			this.Text = data;
+		}
 		#region Uneven Selections
-			/// <summary>
+		/// <summary>
-			/// True if the top and bottom row of the selection is the same for every column
+		/// True if the top and bottom row of the selection is the same for every column
-			/// </summary>
+		/// </summary>
-			public bool EvenSelection
+		public bool EvenSelection
 			{
 				get
 				{