B2025-038-Copy-a-step-between-two-screens

ready for testing

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

@@ -201,6 +201,3 @@ namespace VEPROMS
     }
 }
 
-
-
-

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1486,9 +1486,11 @@ namespace VEPROMS
 			// and if they are not the same, use the CurrentItem from the main frmVEPROMS.
 			ProcedureInfo piThis = null;
 			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
-
 			ProcedureInfo pi = args.Proc as ProcedureInfo;
-			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
+			if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+			{
+				if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
+			}
 
 			// Check if Procedure Info is null
 			if (pi == null) return;
@@ -1530,8 +1532,11 @@ namespace VEPROMS
 			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
 
 			ProcedureInfo pi = args.Proc as ProcedureInfo;
-			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
 
+			if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+			{
+				if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
+			}
 			// Check if Procedure Info is null
 			if (pi == null) return;
 

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -618,6 +618,15 @@ namespace Volian.Controls.Library
 		}
 		private int _MyLastFormatID = -1;
 		private StepRTB _MyStepRTB;
+		private static int _OringFlg; 
+		public static int OringFlg
+		{
+			get { return _OringFlg; }
+			set
+			{
+				_OringFlg = value;
+			}
+		}
 		public StepRTB MyStepRTB
 		{
 			get { return _MyStepRTB; }
@@ -4096,6 +4105,7 @@ namespace Volian.Controls.Library
 
 		public void DoCopyStep()
 		{
+			MyEditItem.SaveCurrentAndContents(); // B2025-038 copy step and text to another procedure in another screen.
 			// highlight selected step(s) and prompt to see if selection is what user wants:
 			if (MyFlexGrid != null) MyEditItem.IdentifyMe(true);
 			MyEditItem.IdentifyChildren(true);
@@ -4143,16 +4153,22 @@ namespace Volian.Controls.Library
 
 		private void btnPdfCreate_Click(object sender, EventArgs e)
 		{
+				// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+			_OringFlg = 0;
+			DevComponents.DotNetBar.eEventSource oring = ((DevComponents.DotNetBar.Events.EventSourceArgs)e).Source;
+			if (oring == eEventSource.Keyboard)
+				_OringFlg = 1;
+
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 0);
+			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
 		}
 
 		private void btnPdfQuickCreate_Click(object sender, EventArgs e)
 		{
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 1);
+			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
 		}
 
 		private void btnCASCreate_Click(object sender, EventArgs e)
@@ -4814,9 +4830,10 @@ namespace Volian.Controls.Library
 	public class StepTabRibbonEventArgs : EventArgs
 	{
 		public StepTabRibbonEventArgs() { ; }
-		public StepTabRibbonEventArgs(ItemInfo proc)
+		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
 		{
 			_Proc = proc;
+			OringFlg = oringFlg;
 		}
 		private ItemInfo _Proc;
 
@@ -4825,6 +4842,13 @@ namespace Volian.Controls.Library
 			get { return _Proc; }
 			set { _Proc = value; }
 		}
+			// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+		private int _OringFlg;
+		public int OringFlg
+		{
+			get { return _OringFlg; }
+			set { _OringFlg = value; }
+		}
 	}
 	public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);