C2025-023 Bringing branch up to date to resolve merge conflicts

This commit is contained in:
2025-06-20 14:33:58 -04:00
parent c45dbf1dac
commit a55ce75e2e
58 changed files with 1360 additions and 688 deletions

View File

@@ -395,8 +395,11 @@ namespace VEPROMS
// this will display the generated Continuous Action Summary in MS Word (starting a new instance of MS Word outside of PROMS)
if (MyPromsPrinter.MyContActSummary != null)
{
string instructions = "The Continuous Action Summary will be opened in MS Word.\n\nYou can make modifications and copy it into a PROMS Word section.";
MessageBox.Show(instructions, "Continuous Action Summary");
//C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
using (dlgMSWordMessage msg = new dlgMSWordMessage("Continuous Action"))
{
if (msg.ShouldDisplay()) msg.ShowDialog();
}
// The ContActSummaryDelay is a switch that can be added to the PROMS.exe shortcut
// ex: VEPROMS.EXE /ContActSummaryDelay=2.5 will delay it 2 1/2 seconds
@@ -410,8 +413,11 @@ namespace VEPROMS
// F2022-024 this will display the generated Time Critical Action Summary in MS Word (starting a new instance of MS Word outside of PROMS)
if (MyPromsPrinter.MyTimeCriticalActSummary != null)
{
string instructions = "The Time Critical Action Summary will be opened in MS Word.\n\nYou can make modifications and copy it into a PROMS Word section.";
MessageBox.Show(instructions, "Time Critical Action Summary");
//C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
using (dlgMSWordMessage msg = new dlgMSWordMessage("Time Critical Action"))
{
if (msg.ShouldDisplay()) msg.ShowDialog();
}
// The ContActSummaryDelay is a switch that can be added to the PROMS.exe shortcut
// ex: VEPROMS.EXE /ContActSummaryDelay=2.5 will delay it 2 1/2 seconds