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

Merging F2024-005 and B2024-004 from development into master after successful testing

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -27,7 +27,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/AdjustBuildRevision/Program.cs

@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
 						{
 							// Allow for setting build revision on either proms or the roeditor:
 							if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
-								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
-							else
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
+							else
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
 					//		if (outline != line)
 					//		{
 					//			Console.WriteLine("Before: '{0}'", line);

PROMS/AdjustBuildRevision/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

PROMS/Baseline/App.config

@@ -6,7 +6,7 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
     <userSettings>
         <Baseline.Properties.Settings>

PROMS/Baseline/Baseline.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Baseline</RootNamespace>
     <AssemblyName>Baseline</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>

PROMS/DropDownPanel/DropDownPanel.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FlexableMessageBox</RootNamespace>
     <AssemblyName>FlexableMessageBox</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>

PROMS/FlexableMessageBox/FlexibleMessageBox.cs

@@ -241,21 +241,6 @@ namespace JR.Utils.GUI.Forms
             return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
         }
 
-        /// <summary>
-        /// Shows the specified message box.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <param name="text">The text.</param>
-        /// <param name="caption">The caption.</param>
-        /// <param name="buttons">The buttons.</param>
-        /// <param name="icon">The icon.</param>
-        /// <param name="defaultButton">The default button.</param>
-        /// <returns>The dialog result.</returns>
-        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-        {
-            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
-        }
-
         #endregion
 
         #region Internal form class
@@ -435,15 +420,15 @@ namespace JR.Utils.GUI.Forms
             private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
 
             //These are the possible buttons (in a standard MessageBox)
-            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
+            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE };
             
             //These are the buttons texts for different languages. 
             //If you want to add a new language, add it here and in the GetButtonText-Function
             private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
-            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore" }; //Note: This is also the fallback language
+            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren" };
+            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" };
 
             #endregion
 
@@ -709,7 +694,6 @@ namespace JR.Utils.GUI.Forms
                         flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
                         break;
 
-
                     case MessageBoxButtons.OK:
                     default:
                         flexibleMessageBoxForm.visibleButtonsCount = 1;
@@ -725,28 +709,6 @@ namespace JR.Utils.GUI.Forms
                 flexibleMessageBoxForm.defaultButton = defaultButton;
             }
 
-            private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
-            {
-                flexibleMessageBoxForm.visibleButtonsCount = 3;
-
-                flexibleMessageBoxForm.button1.Visible = true;
-                flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
-                flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
-
-                flexibleMessageBoxForm.button2.Visible = true;
-                flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
-                flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
-
-                flexibleMessageBoxForm.button3.Visible = true;
-                flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
-                flexibleMessageBoxForm.button3.DialogResult = DialogResult.Ignore;
-
-                flexibleMessageBoxForm.ControlBox = false;
-            }
-
-
-
-
             #endregion
 
             #region Private event handlers
@@ -904,46 +866,6 @@ namespace JR.Utils.GUI.Forms
                 return flexibleMessageBoxForm.ShowDialog(owner);
             }
 
-            /// <summary>
-            /// Shows the specified message box.
-            /// </summary>
-            /// <param name="owner">The owner.</param>
-            /// <param name="text">The text.</param>
-            /// <param name="caption">The caption.</param>
-            /// <param name="buttons">The buttons.</param>
-            /// <param name="icon">The icon.</param>
-            /// <param name="defaultButton">The default button.</param>
-            /// <returns>The dialog result.</returns>
-            public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-            {
-                //Create a new instance of the FlexibleMessageBox form
-                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
-                flexibleMessageBoxForm.ShowInTaskbar = false;
-
-                //Bind the caption and the message text
-                flexibleMessageBoxForm.CaptionText = caption;
-                flexibleMessageBoxForm.MessageText = text;
-                flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
-
-                //Set the buttons visibilities and texts. Also set a default button.
-                SetDialogButtonsCustom(flexibleMessageBoxForm);
-
-                //Set the dialogs icon. When no icon is used: Correct placement and width of rich text box.
-                SetDialogIcon(flexibleMessageBoxForm, icon);
-
-                //Set the font for all controls
-                flexibleMessageBoxForm.Font = FONT;
-                flexibleMessageBoxForm.richTextBoxMessage.Font = FONT;
-
-                //Calculate the dialogs start size (Try to auto-size width to show longest text row). Also set the maximum dialog size. 
-                SetDialogSizes(flexibleMessageBoxForm, text, caption);
-
-				//Set the dialogs start position when given. Otherwise center the dialog on the current screen.
-				SetDialogStartPosition(flexibleMessageBoxForm, owner);
-				//Show the dialog
-				return flexibleMessageBoxForm.ShowDialog(owner);
-			}
-
             #endregion
         } //class FlexibleMessageBoxForm
 

PROMS/Formats/Formats.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -126,7 +126,6 @@
     <Content Include="fmtall\BVPSAOPall.xml" />
     <Content Include="fmtall\BVPSAtchall.xml" />
     <Content Include="fmtall\BVPSBCKall.xml" />
-    <Content Include="fmtall\BVPSAOPDEVall.xml" />
     <Content Include="fmtall\BVPSFlexDEVall.xml" />
     <Content Include="fmtall\BVPSDEVall.xml" />
     <Content Include="fmtall\BVPSNIBCKall.xml" />
@@ -407,7 +406,6 @@
     <Content Include="genmacall\BVPSAOP.svg" />
     <Content Include="genmacall\BVPSAtch.svg" />
     <Content Include="genmacall\BVPSbck.svg" />
-    <Content Include="genmacall\BVPSAOPdev.svg" />
     <Content Include="genmacall\BVPSFlexdev.svg" />
     <Content Include="genmacall\BVPSdev.svg" />
     <Content Include="genmacall\BVPSNIBCK.svg" />

PROMS/Formats/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime></configuration>

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

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[assembly: AssemblyVersion("2.2.2306.2212")]
+[assembly: AssemblyFileVersion("2.2.2306.2212")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -89,8 +89,6 @@ using System.Runtime.CompilerServices;
 
 
 
-
-
 
 
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj

@@ -44,7 +44,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime>
 	<appSettings>

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj

@@ -51,7 +51,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj

@@ -46,7 +46,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/RoAccessToSql/App.config

@@ -60,6 +60,6 @@
 			</logger>
 		</log4net>
 		<startup>
-			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
 		</startup>
 	</configuration>

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RoAccessToSql</RootNamespace>
     <AssemblyName>RoAccessToSql</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>

PROMS/TablePicker/TablePicker.csproj

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/VEPROMS User Interface/App.config

@@ -181,12 +181,8 @@
     </UISampleNetBar1.Properties.Settings>
   </userSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
-  <runtime>
-    <AppContextSwitchOverrides
-      value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
-  </runtime>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -59,13 +59,6 @@ namespace VEPROMS
 			get { return _Automatic; }
 			set { _Automatic = value; }
 		}
-		private int _prtSectID = -1;
-		public int PrtSectID
-		{
-			get { return _prtSectID; }
-			set { _prtSectID = value; }
-		}
-
 
 		// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
 		//           This is needed so the the automatic baselines can compare results from different runs of PROMS
@@ -775,7 +768,7 @@ namespace VEPROMS
 							// B2021-102 put in the using for better memory management
 							using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
 								cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
-								swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//;//C2018-009 print PROMS version
+								swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor))//;//C2018-009 print PROMS version
 							{
 								frmStatus.CloseWhenDone = true;
 								Application.DoEvents();
@@ -856,9 +849,8 @@ namespace VEPROMS
 						// B2016-249 Output Procedure to folder associated with Parent Child
 						using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked,
 							cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text,
-							new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID)) // ;//C2018-009 print PROMS version
+							new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor)) // ;//C2018-009 print PROMS version
 						{
-							frmStatus.PrtSectID = PrtSectID;
 							frmStatus.CloseWhenDone = true;
 							Application.DoEvents();
 							frmStatus.CancelStop = true;
@@ -1009,7 +1001,7 @@ namespace VEPROMS
 			// B2018-124 use text of watermark form drop down list instead of enum value
 			using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
 				cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
-				swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//; //C2018-009 print PROMS version
+				swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor))//; //C2018-009 print PROMS version
 			{
 				frmStatus.MakePlaceKeeper = swtbtnGeneratePlacekeeper.Value;
 				frmStatus.MakeContinuousActionSummary = cbxGenerateConActSum.Checked;
@@ -1320,10 +1312,6 @@ namespace VEPROMS
 			if (swtbtnPDFLinks.Value)
 				swtbtnPDFdtPrefixSuffix.Value = false;
 			BuildPDFFileName();
-			// C2024-013: When Create RO & Transition Hyperlinks in pdf is ON, disable the MergePdf
-			//	button.  The Create RO & Transition Hyperlinks option looks for individual file names
-			//	for procedures.
-			btnMergePDFs.Enabled = !swtbtnPDFLinks.Value; 
 		}
 
 		// C2019-004: Allow user to define duplex blank page text.  The text box for blank page text is always enabled for procedures with

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -22148,495 +22148,6 @@ AS
 		[Folders].[FormatID]=@FormatID
 
 	RETURN
-	GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [vesp_ListUnlinkedItems];
-GO
-	
-	/*****************************************************************************
-	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-		   Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
-	*****************************************************************************/
-	/*
-	==========================================================================================================
-	 Author:		Kathy Ruffing
-	 Create Date:	03/27/2024
-	 Description:	B2024-018: Gets list of procedures/sections/steps for possible enhanced linking
-	==========================================================================================================
-	 */
-Create Procedure[dbo].[vesp_ListUnlinkedItems]
-(
-	@ItemID int,
-	@EnhType int
-)
-WITH EXECUTE AS OWNER
-AS
-BEGIN 
-DECLARE @ParItemID int
-	DECLARE @EItemID int
-	set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings 
-	outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked
-	where EitemID is not null)
-
-	if @EItemID is null
-	BEGIN
-		select @EItemID = epp.ItemID  
-			from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent
-			JOIN  ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
-			outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
-			JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID 
-			JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child
-	END
-	if @EItemID is null	-- B2024-018: If not found at the current level, check at the parent level
-	BEGIN
-	
-		select @ParItemID = dbo.ve_getparentitem(@ItemID)
-		select @EItemID = epp.ItemID  
-			from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent
-			JOIN  ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
-			outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
-			JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID 
-			JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect) 
-	
-	END
-	if @EItemID is null
-	BEGIN
-		select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions 
-		where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion
-		cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion
-		Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure
-	END
-	Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount],
-		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount],
-		(SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount],
-		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount]
-		from Items II 
-		Left Join Entries EE ON II.ContentID = EE.ContentID	
-		where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB 
-		outer apply vefn_GetNewEnhancedData(ItemID,0) VIE
-		Where VIE.EItemID is null)
-		and EE.ContentID is null
-END
-Go
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
-	ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
-	GO
-
-
-
-/*
-==========================================================================================================
- Begin: C2024-004: KL - Update Copy Replace functionality, (remove ''copy of'')
-==========================================================================================================
-*/
-	
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[CopyItemAndChildren]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [CopyItemAndChildren];
-GO
-	
-	/*****************************************************************************
-	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-		   Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
-	*****************************************************************************/
-	/*
-	==========================================================================================================
-	 Author:		Kevin Laskey
-	 Modified Date:	07/09/2024
-	 Description:	Copy Item and its Children
-	==========================================================================================================
-	 */
-CREATE PROCEDURE [dbo].[CopyItemAndChildren]
-(
-	@StartItemID INT,
-	@DestFormatID INT,
-	@UserID NVARCHAR(100),
-	@NewStartItemID int output
-)
-WITH EXECUTE AS OWNER
-AS
-BEGIN TRY -- Try Block
-
---+-----------------------------------------------------------------+
---& BEGIN TRANSACTION to make these changes temporary               &
---+-----------------------------------------------------------------+
-	BEGIN TRANSACTION
-	if exists (select * from tblitems where itemid = @StartItemID and DeleteStatus !=0)
-		BEGIN
-			RAISERROR ('###Cannot Paste Step###This step has been deleted',16,1)
-			RETURN
-		END
-DECLARE @Children AS TABLE
-(
-	ItemID INT PRIMARY KEY,
-	NewItemID INT,
-	ContentID INT,
-	NewContentID INT,
-	FormatID INT,
-	NewFormatID INT
-)
-DECLARE @NewDocuments AS TABLE
-(
-	DocID INT PRIMARY KEY,
-	NewDocID INT
-)
--- Locals
-DECLARE @DTS DATETIME -- DTS of all New Items
-DECLARE @StartContentID INT
-Select @StartContentID = ContentID from Items where ItemID = @StartItemID
-SET @DTS = GETDATE() -- Get the current Date and Time
--- Get a list of all of the Items to be copied based upon StartItemID and EndItemID
--- If the StartItemID = EndItemID then it is a single item and it's children
-INSERT INTO @Children SELECT ItemID,ItemID,ContentID,ContentID,FormatID,FormatID FROM vefn_ChildItemsRange(@StartItemID,@StartItemID,null)
--- <<< Copy Contents >>>
--- Create new content rows to match the existing rows.  Set the type to the Current ContentID temporarily
--- so that the new content rows can be associated with the existing content rows.
--- Rem 'Copy Of ' + before first [Number] for C2024-004 (KL)
-INSERT INTO Contents
-  ([Number],[Text],[Type],[FormatID],[Config],[DTS],[UserID])
-	select CASE when [ContentID] = @StartContentID and [Type]<20000 then [Number] else [Number] end,
-	[Text],[ContentID],[FormatID],[Config],@DTS,@UserID
- from Contents where ContentID in(Select ContentID from @Children)
--- Update the @Children with the NewConentIDs
---print 'A	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-UPDATE NN set NN.NewContentID = CC.ContentID
-From Contents CC
-Join @Children NN on NN.ContentID = CC.Type AND CC.DTS = @DTS and CC.UserID = @UserID
--- Reset the Type column in the Contents table with the Type column from the original Records.
---print 'B	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-DECLARE @SourceType INT
-Select @SourceType = Type from Contents where ContentID = @StartContentID
-if @SourceType =  0
-	BEGIN
-		UPDATE CC set CC.Type = CC2.Type, CC.DTS = CC2.DTS, CC.UserID = CC2.UserID
-		From Contents CC
-		Join @Children NN on NN.NewContentID = CC.ContentID
-		Join Contents CC2 on NN.ContentID = CC2.ContentID
-	END
-else
-	BEGIN
-UPDATE CC set CC.Type = CC2.Type
-From Contents CC
-Join @Children NN on NN.NewContentID = CC.ContentID
-Join Contents CC2 on NN.ContentID = CC2.ContentID
-	END
---print 'B1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- Contents are done
-	-- SELECT * From Contents where DTS = @DTS and UserID = @UserID
--- <<< Copy Grids >>>
-INSERT INTO [Grids]([ContentID],[Data],[Config],[DTS],[UserID])
-	SELECT NN.[NewContentID],[Data],[Config],@DTS,@UserID
-		FROM [Grids] GG Join @Children NN on GG.ContentID = NN.ContentID
--- <<< Copy Images >>>
---print 'B2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-INSERT INTO [Images]([ContentID],[ImageType],[FileName],[Data],[Config],[DTS],[UserID])
-	SELECT NN.[NewContentID],[ImageType],[FileName],[Data],[Config],@DTS,@UserID
-		FROM [Images] II Join @Children NN on II.ContentID = NN.ContentID
--- Create new item rows based upon the current item rows and the @Children table, with the NewContentIDs
---print 'B3	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-INSERT INTO [Items] ([PreviousID],[ContentID],[DTS],[UserID])
-     SELECT II.[PreviousID], -- Leave the PreviousID as is for now
-			NN.NewContentID, @DTS, @UserID
-			from @Children NN
-			join Items II on II.ContentID = NN.ContentID
--- Update the @Children with the NewItemIDs
---print 'B4	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-UPDATE NN set NN.NewItemID = II.ItemID
-From Items II
-Join @Children NN on NN.NewContentID = II.ContentID AND II.DTS = @DTS and II.UserID = @UserID
-DECLARE @NewItemID int
-SELECT @NewItemID = NewItemID
-	FROM @Children
-	WHERE ItemID = @StartItemID
---print 'B5	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-UPDATE NN SET NN.[NewFormatID] = CC.[FormatID]
-	FROM @Children NN
-	Join vefn_ChildItemsRange(@NewItemID,@NewItemID,@DestFormatID) CC
-	ON NN.NewItemID = CC.ItemID
--- The @Children table is now complete
-	--SELECT * From @Children
--- Update the PreviousID in the new Item rows, to the new ItemIDs based upon the old ItemIDs
---print 'B6	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-Update II Set II.[PreviousID] = NN.NewItemID
-from Items II
-Join @Children NN on NN.ItemID = II.PreviousID AND II.DTS = @DTS and II.UserID = @UserID
--- Get the new ItemIDs based upon the old ItemIDs
-SELECT @NewStartItemID = NewItemID from @Children where ItemID = @StartItemID
---SELECT @NewEndItemID = NewItemID from @Children where ItemID = @EndItemID
--- Set the PreviousID for the starting Item to null temporarily.
--- This will be adjusted based upon where the step is inserted.
---print 'B7	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-Update Items Set PreviousID = null where ItemID = @NewStartItemID
-if @SourceType =  0
-	BEGIN
-		UPDATE II SET II.DTS = II2.DTS, II.UserID = II2.UserID
-		From Items II
-		Join @Children NN on NN.NewItemID = II.ItemID
-		Join Items II2 on NN.ItemID = II2.ItemID
-		WHERE NN.ItemID = @StartItemID
-	END
---print 'C	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- Items are done
-	--SELECT * From Items where DTS = @DTS and UserID = @UserID
--- <<< Copy Parts >>>
-INSERT INTO [Parts] ([ContentID],[FromType],[ItemID],[DTS],[UserID])
-Select NNF.NewContentID,[FromType],NNT.NewItemID, @DTS, @UserID from Parts PP
-JOIN @Children NNF on PP.ContentID = NNF.ContentID
-JOIN @Children NNT on PP.ItemID = NNT.ItemID
---print 'D	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- Parts are done
-	-- SELECT * From Parts where DTS = @DTS and UserID = @UserID
--- <<< Copy Annotations >>>
-INSERT INTO [Annotations] ([ItemID],[TypeID],[RtfText],[SearchText],[Config],[DTS],[UserID])
-     Select NewItemID, TypeID, RtfText, SearchText, Config, @DTS, @UserID
-			from Annotations AA Join @Children NN on AA.ItemID = NN.ItemID
---print 'E	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- Annotations are done
-	-- SELECT * From Annotations where DTS = @DTS and UserID = @UserID
--- <<< Copy Documents and Entries>>>
--- logic to create Entries for Library Documents
-INSERT INTO [Entries] ([ContentID],[DocID],[DTS],[UserID])
-	SELECT NN.[NewContentID],EE.[DocID],@DTS,@UserID
-  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
-	JOIN [Documents] DD on EE.[DocID] = DD.[DocID] and Isnull(LibTitle,'') <> ''
--- Logic to create new documents for any documents used that do not have libtitles
-INSERT INTO [Documents] ([LibTitle],[DocContent],[DocAscii],[Config],[DTS],[UserID],[FileExtension])
-  OUTPUT CAST(INSERTED.[LibTitle] as INT),INSERTED.[DocID] INTO @NewDocuments
-	SELECT str(DD.[DocID]),[DocContent],[DocAscii],[Config],@DTS,@UserID,[FileExtension]
-  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
-	JOIN [Documents] DD on EE.[DocID] = DD.[DocID] and Isnull(LibTitle,'') = ''
-UPDATE DD SET LibTitle = ''
-	FROM Documents DD JOIN @NewDocuments ND on DD.[DocID] = ND.[NewDocID]
-	where DTS = @DTS and UserID = @UserID
---print 'F	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- Documents are Done
-	-- SELECT * From Documents where DTS = @DTS and UserID = @UserID
--- Logic to create entries for these newly created documents
-INSERT INTO [Entries] ([ContentID],[DocID],[DTS],[UserID])
-	SELECT NN.[NewContentID],ND.[NewDocID],@DTS,@UserID
-  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
-	JOIN @NewDocuments ND on EE.[DocID] = ND.[DocID]
--- Logic to Create DROUsages for these newly created documents
-INSERT INTO [DROUsages] ([DocID],[ROID],[Config],[DTS],[UserID],[RODbID])
- 	SELECT ND.[NewDocID],[ROID],[Config],@DTS,@UserID,[RODbID]
-  FROM [DROUsages] RR
-	JOIN @NewDocuments ND on RR.[DocID] = ND.[DocID]
-
---print 'G	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- Entries are done
-	-- SELECT * From Entries EE JOIN Documents DD on ee.DocID = DD.DocID where EE.DTS = @DTS and EE.UserID = @UserID
--- <<< Copy RoUsages >>>
-INSERT INTO [RoUsages] ([ContentID],[ROID],[Config],[DTS],[UserID],[RODbID])
-	SELECT NN.[NewContentID],CAST([ROUsageID] as nvarchar(16)),[Config],@DTS,@UserID,[RODbID]
-		FROM [RoUsages] RR Join @Children NN on RR.ContentID = NN.ContentID
--- Update content records for newly copied records to use correct RO usage ids in the RO tags
-DECLARE @RowsAffected int
-SET @RowsAffected=1
-WHILE @RowsAffected > 0
-BEGIN
-	UPDATE CC SET [TEXT] = C2.NewText
-	FROM CONTENTS CC
-	JOIN (SELECT C1.ContentID, .dbo.vefn_FixROText(C1.Text, CAST([ROID] as int), [ROUsageID]) NewText
-	FROM CONTENTS C1
-	JOIN @Children NN on C1.ContentID = NN.NewContentID
-	JOIN RoUsages RO on NN.NewContentID = RO.ContentID where Len([ROID]) < 12) C2 ON CC.ContentID = C2.ContentID
-	WHERE [TEXT] <> C2.NewText
-	SET @RowsAffected = @@RowCount
-END
--- Update grid records for newly copied records to use correct RO usage ids in the RO tags
-SET @RowsAffected=1
-WHILE @RowsAffected > 0
-BEGIN
-	UPDATE GG SET [Data] = G2.NewData
-	FROM GRIDS GG
-	JOIN (SELECT G1.ContentID, .dbo.vefn_FixROData(G1.Data, CAST([ROID] as int), [ROUsageID]) NewData
-	FROM GRIDS G1
-	JOIN @Children NN on G1.ContentID = NN.NewContentID
-	JOIN RoUsages RO on NN.NewContentID = RO.ContentID where Len([ROID]) < 12) G2 ON GG.ContentID = G2.ContentID
-	WHERE Cast([Data] as nvarchar(max)) <> cast(G2.NewData as nvarchar(max))
-	SET @RowsAffected = @@RowCount
-END
-UPDATE RON SET [ROID] = ROO.[ROID]
-	FROM RoUsages RON
-	JOIN @Children NN on RON.ContentID = NN.NewContentID
-	JOIN RoUsages ROO on CAST(RON.ROID as int) = ROO.RoUsageID
-	where Len(RON.[ROID]) < 12
---print 'H	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- RoUsages are done
-	-- SELECT * From RoUsages where DTS = @DTS and UserID = @UserID
-
--- <<< Copy Transtions >>>
--- Note that the inserted record has the 'TranType' field set to old transitionid.  This is done
--- so that the next step can replace the old transitionid with the new transitionid in the
--- content record's transition tokens.  The TranType gets reset after the content records are
--- updated.
--- Also note that the 'toid/rangeid' may need converted to newly copied ids or may not.  If it's
--- not a range, then it always is converted to new, if there is a new.  If it's a range, both
--- the toid & the rangeid must be new in order for the conversion to be correct.  You cannot
--- have part of the range pointing to the new and part of the range pointing to the original
--- locations.
-
-INSERT INTO .[dbo].[Transitions] ([FromID],[ToID],[RangeID],[IsRange],[TranType],[Config],[DTS],[UserID])
-	SELECT NNF.[NewContentID],
-		-- if both toid & range are null, use the original toid & rangeid
-		CASE WHEN NNT.[NewItemID] is null or NNR.[NewItemID] is null THEN [ToID] ELSE NNT.[NewItemID] END,
-		CASE WHEN NNT.[NewItemID] is null or NNR.[NewItemID] is null THEN [RangeID] ELSE NNR.[NewItemID] END,
-		[IsRange],[TransitionID],[Config],@DTS,@UserID
-	FROM .[dbo].[Transitions] TT
-	JOIN @Children NNF on TT.[FromID] = NNF.[ContentID]
-	LEFT JOIN @Children NNT on TT.[ToID] = NNT.[ItemID]
-	LEFT JOIN @Children NNR on TT.[RangeID] = NNR.[ItemID]
---print 'H1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- -- Update content records for newly copied records to use correct TransitionIDs in the Transition tags
-SET @RowsAffected=1
-WHILE @RowsAffected > 0
-BEGIN
-UPDATE CC SET [TEXT] = C2.NewText
-	FROM CONTENTS CC
-	JOIN (SELECT C1.ContentID, .dbo.vefn_FixTransitionTextForCopy(C1.Text, TRO.TransitionID, TRO.TranType,  TRO.[ToID], TRO.[RangeID],TR.[TransitionID], TR.[ToID], TR.[RangeID], .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)) NewText
-	FROM CONTENTS C1
-	JOIN @Children NN on C1.ContentID = NN.NewContentID
-	JOIN Transitions TR on NN.NewContentID = TR.FromID
-	JOIN Transitions TRO on TR.TranType = TRO.TransitionID) C2 ON CC.ContentID = C2.ContentID
-	WHERE [TEXT] <> C2.NewText
-	SET @RowsAffected = @@RowCount
-END
---print 'H2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
---set nocount off
--- -- Update grid records for newly copied records to use correct TransitionIDs in the Transition tags
-declare @grids table
-(
-contentid int primary key,
-data xml
-)
-insert into @grids select gg.contentid,gg.data from GRIDS GG
-	where gg.contentid in (select nn.newcontentid from
-	@Children NN
-	JOIN Transitions TR on NN.NewContentID = TR.FromID
-	JOIN Transitions TRO on TR.TranType = TRO.TransitionID)
---print 'H2.1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
---select * from @grids
-SET @RowsAffected=1
-WHILE @RowsAffected > 0
-BEGIN
-UPDATE GG SET [DATA] = G2.NewData
-	FROM @GRIDS GG
-	JOIN (SELECT G1.ContentID, .dbo.vefn_FixTransitionDataForCopy(G1.Data, TRO.TransitionID, TRO.TranType,  TRO.[ToID], TRO.[RangeID],TR.[TransitionID], TR.[ToID], TR.[RangeID], .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)) NewData
-	FROM @GRIDS G1
-	JOIN @Children NN on G1.ContentID = NN.NewContentID
-	JOIN Transitions TR on NN.NewContentID = TR.FromID
-	JOIN Transitions TRO on TR.TranType = TRO.TransitionID) G2 ON GG.ContentID = G2.ContentID
-	WHERE Cast([DATA] as nvarchar(max)) <> CAST(G2.NewData as nvarchar(max))
-	SET @RowsAffected = @@RowCount
-END
---print 'H2.2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-update GG set data = g1.data from Grids gg join @grids g1 on gg.contentid = g1.contentid
---print 'H3	' + cast(datediff(s,@dts,getdate()) as varchar(100))
---set nocount on
--- Add 'Verification Required' AnnotationType
-	DECLARE @typeID int
-	SELECT @typeID = TypeID from AnnotationTypes where Name = 'Verification Required'
-	IF(@typeID IS NULL)
-	BEGIN
-		INSERT INTO [AnnotationTypes]	([Name],[UserID])	VALUES	('Verification Required','Volian')
-		SELECT @typeID = SCOPE_IDENTITY()
-	END
-	-- Add "Verification Required" Annotation for each Transition whose transition format changes
-INSERT INTO [Annotations] ([ItemID],[TypeID],[SearchText],[UserID])
-		SELECT NN.NewItemID, @typeID,'Verify Transition Format',@UserID
-			FROM Transitions TR
-			JOIN @Children NN on TR.FromID = NN.NewContentID
-			JOIN Transitions TRO on TR.TranType = TRO.TransitionID
-			WHERE .dbo.vefn_CompareTranFormat(NN.FormatID, NN.NewFormatID, TRO.TranType) <> 0
---print 'H4	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-UPDATE TR SET TR.[TranType] = .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)
-	FROM Transitions TR
-	JOIN @Children NN on TR.FromID = NN.NewContentID
-	JOIN Transitions TRO on TR.TranType = TRO.TransitionID
---print 'H5	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--- Transitions are done
-	-- SELECT * From Transitions where DTS = @DTS and UserID = @UserID
---print 'Z	' + cast(datediff(s,@dts,getdate()) as varchar(100))
---foldouts fixing code
-if exists (select * from contents where contentid in (select newcontentid from @children) and config like '%FloatingFoldout%')
-begin
-	--insert into #mytemp
-	select cc.contentid,xsteps.value('@FloatingFoldout','int') oldfoldoutid,(select newitemid 
-	from @children 
-	where itemid = xsteps.value('@FloatingFoldout','int')) newfoldoutid,xconfig 
-	into #mytemp 
-	from (select *,cast(config as xml) xconfig from contents where contentid in (select newcontentid from @children)) cc
-	cross apply xconfig.nodes('Config/Step') tsteps(xsteps)
-	--build @cmd string
-	declare @cmd nvarchar(max)
-	declare cmds cursor for
-	select distinct 'update #mytemp set xconfig.modify(''replace value of (Config/Step/@FloatingFoldout)[1] with "'
-	 + cast(newfoldoutid as varchar(10))
-	 + '"'') where xconfig.value(''(Config/Step/@FloatingFoldout)[1]'',''int'') = '
-	 + cast(oldfoldoutid as varchar(10))
-	from #mytemp
-	--execute cursor over rows
-	open cmds
-	fetch next from cmds into @cmd
-	while @@fetch_status = 0
-	begin
-		exec sp_executesql @cmd
-		fetch next from cmds into @cmd
-	end
-	close cmds
-	deallocate cmds
-	--actually update contents
-	update cc set config = cast(xconfig as varchar(max)) from contents cc join #mytemp mt on cc.contentid = mt.contentid
-	--get rid of #mytemp
-	drop table #mytemp
-end
---end foldouts fixing code
---section start
-DECLARE @NewContentID int
-Select @NewContentID = NewContentID from @Children where ItemID = @StartItemID
-DECLARE @Config varchar(max)
-DECLARE @XConfig xml
-select @Config = config from contents where contentid = @NewContentID
-select @XConfig = cast(@Config as xml)
-if @Config like '%SectionStart%' begin
-	DECLARE @SectionStart int
-	select @SectionStart = xproc.value('@SectionStart','int') from @xconfig.nodes('Config/Procedure') tproc(xproc)
-	DECLARE @NewSectionStart int
-	select @NewSectionStart = newitemid from @children where itemid = @SectionStart
-	DECLARE @cmd2 nvarchar(max)
-	set @cmd2 = '
-		declare @XConfig xml; 
-		set @XConfig = cast(''' + @Config + ''' as xml); 
-		set @XConfig.modify(''replace value of (Config/Procedure/@SectionStart)[1] with "' + cast(@NewSectionStart as nvarchar(10)) + '"''); 
-		update contents set config = cast(@XConfig as varchar(max)) where contentid = ' + cast(@NewContentID as nvarchar(10)) + ';'
-	exec sp_executesql @cmd2
-end
---end section start
-	IF( @@TRANCOUNT > 0 ) COMMIT
-END TRY
-BEGIN CATCH -- Catch Block
-	IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level
- 	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
-	EXEC vlnErrorHandler
-END CATCH
-
-Go
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [CopyItemAndChildren] Succeeded'
-	ELSE PRINT 'Procedure Creation: [CopyItemAndChildren] Error on Creation'
-	GO
-
-/*
-==========================================================================================================
- End: C2024-004: KL - Update Copy Replace functionality, (remove ''copy of'')
-==========================================================================================================
-*/
-
-
 
 
 -----------------------------------------------------------------------------
@@ -22673,8 +22184,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '07/09/2024 9:00 AM'
-	set @RevDescription = 'C2024-004: Update Copy Replace functionality'
+	set @RevDate = '10/03/2023 11:00 AM'
+	set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs.bak

@@ -0,0 +1,92 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PROMS")]
+[assembly: AssemblyDescription("Create, Edit, and Maintain Procedures Sets.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Volian Enterprises, Inc.")]
+[assembly: AssemblyProduct("PROMS")]
+[assembly: AssemblyCopyright("Copyright © 2012. All Rights Reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2ffeb031-bf85-4153-baa2-2d4da2fd5556")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build YYMM (two digit year, two digit month)
+//      Revision DHH (day - no leading zero, two digit hour - military time
+//
+[assembly: AssemblyVersion("11.6.1205.316")]
+[assembly: AssemblyFileVersion("11.6.1205.316")]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

PROMS/VEPROMS User Interface/VEPROMS.gclicx

@@ -1,2 +0,0 @@
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -19,7 +19,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -99,7 +99,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="Csla">
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
@@ -134,7 +139,6 @@
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="UIAutomationProvider" />
     <Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
@@ -423,7 +427,6 @@
     <Compile Include="VlnWeb.Designer.cs">
       <DependentUpon>VlnWeb.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="VEPROMS.gclicx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Separator.png" />

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -99,10 +99,6 @@ namespace VEPROMS
 			MyProcedure = procedureInfo;
 			InitializeComponent();
 			this.Text = mode + " Dialog for " + procedureInfo.DisplayNumber;
-
-			//Preset path for single procedures.
-			PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
-			txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 		}
 		private void dlgExportImport_Load(object sender, EventArgs e)
 		{
@@ -176,7 +172,6 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
-				txtExport.Enabled = true;
 				txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 			}
 		}
@@ -195,8 +190,6 @@ namespace VEPROMS
 		private bool successfullExport = true;
 		private void btnDoExport_Click(object sender, EventArgs e)
 		{
-		
-
 			btnExport.Enabled = false;
 			string msg = "Finished Exporting:\n\n";
 			if (_MyMode.ToUpper().Contains("FORMAT"))
@@ -227,42 +220,6 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
-				var fileLocation = txtExport.Text;
-				if (File.Exists(fileLocation))
-					{   // C2022-029 if an existing export of the same name is found, provide option to overwrite it
-					DialogResult ovewriteEx = FlexibleMessageBox.ShowCustom(null, "There is already another export file with the same name.  You can choose to either overwrite the existing file or have the existing file renamed with the original creation date appended.\r\n\r\nSelecting 'Cancel' will cancel the export.", "What would you like to do?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
-
-					// Extract directory, filename, and extension
-					string directory = Path.GetDirectoryName(fileLocation);
-					string filename = Path.GetFileNameWithoutExtension(fileLocation);
-					string extension = Path.GetExtension(fileLocation);
-					fileLocation = $"{directory}\\{filename}{extension}";
-
-					if (ovewriteEx == DialogResult.Abort)
-					{
-						MessageBox.Show("Export has been cancelled", "You have chosen to cancel the export.", MessageBoxButtons.OK, MessageBoxIcon.Information); // C2020-042 changed mesage box title
-						btnCloseExport.Enabled = true;
-						return;
-					}
-					else if (ovewriteEx == DialogResult.Retry)
-					{
-						//Overwrite will occur, set msg.
-						msg = "The export file has been overwritten.  ";
-					}
-					else if (ovewriteEx == DialogResult.Ignore)
-					{
-						// Get the modified date of the existing file, create a datestamp for use in name, set newlocation to move to
-						DateTime modifiedDate = File.GetLastWriteTime(fileLocation);
-						string datestamp = modifiedDate.ToString("yyyyMMddHHmmss");
-						string newFileLocation = $"{directory}\\{filename}_{datestamp}{extension}";
-
-						//Move and set msg.
-						File.Move(fileLocation, newFileLocation);
-						msg = "The previous export has been renamed, the export file has been created.  ";
-					}
-
-				}
-
 				this.Cursor = Cursors.WaitCursor;
 				MyStart = DateTime.Now;
 				btnDoExport.Enabled = false;
@@ -273,7 +230,7 @@ namespace VEPROMS
 				XmlElement xe = xd.CreateElement("formats");
 				xd.DocumentElement.AppendChild(xe);
 				ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false);
-				xd.Save(fileLocation);
+				xd.Save(txtExport.Text);
 				TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
 				lblExportStatus.Text = "Export Completed in " + elapsed.ToString();
 				this.Cursor = Cursors.Default;
@@ -749,7 +706,7 @@ namespace VEPROMS
 			}
 			catch (Exception ex)
 			{
-				FlexibleMessageBox.Show(null, "The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				FlexibleMessageBox.Show("The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				_MyLog.Warn("Failure During Import", ex);
 			}
 			return false;
@@ -4216,19 +4173,7 @@ namespace VEPROMS
 							
 							if (glookFor != greplaceWith)
 							{
-								// B2024-011: For unit RO in grid, old grid data had the ROID in the #Link:ReferencedObject ending in '0000'
-								//	so when compared with the newer format "0041" it was not found and not replaced with updated rousageid
-								bool hasNewROID = (content.MyGrid.Data.Contains(glookFor));
-								if (hasNewROID)
 								content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
-								else if (!hasNewROID && glookFor.Contains("0041") && glookFor.Contains("FFFF"))
-								{
-									string newGlookFor = glookFor;
-									newGlookFor = newGlookFor.Replace("0041", "0000");
-									if (content.MyGrid.Data.Contains(newGlookFor)) 
-										content.MyGrid.Data = content.MyGrid.Data.Replace(newGlookFor, greplaceWith);
-
-								}
 							}
 						}
 					}

PROMS/VEPROMS User Interface/dlgExportImport.designer.cs

@@ -400,7 +400,6 @@ namespace VEPROMS
 			this.pnlImport.PerformLayout();
 			this.ResumeLayout(false);
 
-
 		}
 
 		#endregion

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs

@@ -57,7 +57,7 @@
 			this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(179, 111);
+			this.btnCancel.Location = new System.Drawing.Point(165, 111);
 			this.btnCancel.Name = "btnCancel";
 			this.btnCancel.Size = new System.Drawing.Size(64, 23);
 			this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +88,7 @@
 			this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
 			this.dateTimeInput1.ButtonDropDown.Visible = true;
-			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
+			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy";
 			this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
 			this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
 			this.dateTimeInput1.IsPopupCalendarOpen = false;
@@ -122,7 +122,7 @@
 			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
 			this.dateTimeInput1.Name = "dateTimeInput1";
-			this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
+			this.dateTimeInput1.Size = new System.Drawing.Size(113, 20);
 			this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
 			this.dateTimeInput1.TabIndex = 4;
@@ -133,7 +133,7 @@
 			// 
 			this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnNow.Location = new System.Drawing.Point(182, 51);
+			this.btnNow.Location = new System.Drawing.Point(149, 51);
 			this.btnNow.Name = "btnNow";
 			this.btnNow.Size = new System.Drawing.Size(49, 23);
 			this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -146,7 +146,7 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(268, 144);
+			this.ClientSize = new System.Drawing.Size(241, 144);
 			this.Controls.Add(this.btnNow);
 			this.Controls.Add(this.dateTimeInput1);
 			this.Controls.Add(this.label1);

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

@@ -32,46 +32,13 @@ namespace VEPROMS
 		{
 			string cbdt = MyProcConfig.Print_ChangeBarDate;
 			string[] tmp = cbdt.Split(' ');
-
-			if (tmp[0] == null || tmp[0] == "")  // First time date set.
-			{
-				cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss");
-				dateTimeInput1.Value = DateTime.Parse(cbdt);
-				return;
-			}
-			else
-			{
-				DateTime tmpdt = DateTime.Parse(cbdt);
-				if (tmpdt.Date == DateTime.Today) // Date has before been set.
-				{
-					TimeSpan start = TimeSpan.Parse("00:00:00");
-
-					var time = tmpdt.TimeOfDay;
-					if (start < time) // If time is greater than 12:00:00 AM
-					{
-						cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString();
-						dateTimeInput1.Value = DateTime.Parse(cbdt);
-						return;
-					}
-					else // if time is 12:00:00 AM
-					{
-						cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00";
-						dateTimeInput1.Value = DateTime.Parse(cbdt);
-						return;
-					}
-				}
-				else
-				{
-					cbdt = tmpdt.ToString();
-					dateTimeInput1.Value = DateTime.Parse(cbdt);
-					return;
-				}
-			}
+			cbdt = tmp[0] + " 00:00:00";
+			dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt);
 		}
 
 		private void btnOK_Click(object sender, EventArgs e)
 		{
-			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
+			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss");
 		}
 
 

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx

@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -91,13 +91,7 @@ namespace VEPROMS
 			get { return _DidAll; }
 			set { _DidAll = value; }
 		}
-		private int _prtSectID = -1;
-		public int PrtSectID
-		{
-			get { return _prtSectID; }
-			set { _prtSectID = value; }
-		}
-		public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
+		public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor)
 		{
 			// B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic
 			ProcedureInfo MyProcedure = myItem as ProcedureInfo;
@@ -122,7 +116,6 @@ namespace VEPROMS
 			Prefix = prefix;
 			OpenPDF = openPDF;
 			DidAll = didAll;
-			_prtSectID = PrtSectID;
 
 			InitializeComponent();
 
@@ -283,7 +276,7 @@ namespace VEPROMS
 					cachePartInfo = PartInfo.CacheList;
 				}
 
-				_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID);
+				_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary);
 
 				ProfileTimer.Pop(profileDepth);