C2024-001 Quick-Print-in-ribbon

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -21,7 +21,6 @@ using DescriptiveEnum;
 using Volian.Base.Library;
 using Volian.Print.Library;
 using JR.Utils.GUI.Forms;
-using System.Diagnostics;
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
 
@@ -88,6 +87,8 @@ namespace VEPROMS
 					// multiple events because the print dialog will be displayed for each time the event was added.
 					_SelectedStepTabPanel.MyStepTabRibbon.PrintRequest -= new StepTabRibbonEvent(MyStepTabRibbon_PrintRequest);
 					_SelectedStepTabPanel.MyStepTabRibbon.PrintRequest += new StepTabRibbonEvent(MyStepTabRibbon_PrintRequest);
+					_SelectedStepTabPanel.MyStepTabRibbon.QPrintRequest -= new StepTabRibbonEvent(MyStepTabRibbon_QPrintRequest);
+					_SelectedStepTabPanel.MyStepTabRibbon.QPrintRequest += new StepTabRibbonEvent(MyStepTabRibbon_QPrintRequest);
 					_SelectedStepTabPanel.MyStepTabRibbon.ProgressBar = bottomProgBar;
 					_SelectedStepTabPanel.MyStepTabRibbon.ContActionSummaryRequest -= MyStepTabRibbon_ContActionSummaryRequest;
 					_SelectedStepTabPanel.MyStepTabRibbon.ContActionSummaryRequest += MyStepTabRibbon_ContActionSummaryRequest;
@@ -1409,13 +1410,50 @@ namespace VEPROMS
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
 
-			DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
+			using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
-			prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
+			{
-			prnDlg.MySessionInfo = MySessionInfo;
+				prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
-			prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
+				prnDlg.MySessionInfo = MySessionInfo;
+				prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
+
+				//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
+				pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+			}
+		}
+
+		void MyStepTabRibbon_QPrintRequest(object sender, StepTabRibbonEventArgs args)
+		{
+			// Fix for B2013-173:
+			// if the user did the print by using the shortcut keys 'Ctrl-P' the arguments sent in
+			// is the first opened procedure rather than the active procedure.  So check for this
+			// 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;
+
+			// Check if Procedure Info is null
+			if (pi == null) return;
+
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
-			pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+			pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
+
+
+
+			using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
+			{
+				prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
+				prnDlg.MySessionInfo = MySessionInfo;
+				prnDlg.SetupForProcedure();  // Setup filename
+											 //prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
+				prnDlg.QPCreatePDF();  // Create Print report
+
+				//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
+				pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+			}
+
 		}
 
 		void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args)
@@ -4897,26 +4935,11 @@ namespace VEPROMS
 				_MyLog.Error(str, ex);
 			}
 		}
+	}
 
-        private void btnShowErrFld_Click(object sender, EventArgs e)
+	#region (Lock stuff / used for multi-user support)
-        {
-			string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-			path = path + @"\Documents\VEPROMS";
-			if (Directory.Exists(path))
-			{
-				Process.Start("explorer.exe", path);
-			}
-		}
 
-        private void btnHelp_Click(object sender, EventArgs e)
+	public class TabItemsToClose : Stack<DisplayTabItem>
-        {
-
-        }
-    }
-
-    #region (Lock stuff / used for multi-user support)
-
-    public class TabItemsToClose : Stack<DisplayTabItem>
 	{
 		public void PushDTI(DisplayTabItem dti)
 		{

PROMS/VEPROMS User Interface/frmVEPROMS.resx

@@ -188,11 +188,6 @@
         llg/yF+gIjK+CZq8XgAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-    </value>
-  </data> 
   <data name="office2007StartButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhGwAVAIcAANmsrP7+/tqtrdmrq9Wjo9uwsNmtrf79/dSgoP/+/tShodalpdqsrN20tN64uNqv
@@ -455,7 +450,7 @@
     <value>164, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>64</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1029,10 +1029,23 @@ namespace Volian.Controls.Library
 		//		OpenEnhancedDocument(this, args);
 		//}
 		public event StepTabRibbonEvent PrintRequest;
-		private void OnPrintRequest(StepTabRibbonEventArgs args)
+		public event StepTabRibbonEvent QPrintRequest;
+		private void OnPrintRequest(StepTabRibbonEventArgs args, int prttyp = 0)
 		{
-			if (PrintRequest != null)
+			if (PrintRequest != null) {
-				PrintRequest(this, args);
+				if (prttyp == 0)
+				{
+					PrintRequest(this, args);
+				}
+			}
+
+			if (QPrintRequest != null)
+			{
+				if (prttyp == 1)
+				{
+					QPrintRequest(this, args);
+				}
+			}
 		}
 		public event StepTabRibbonEvent ContActionSummaryRequest;
 		private void OnContActionSummaryRequest(StepTabRibbonEventArgs args)
@@ -1947,7 +1960,7 @@ namespace Volian.Controls.Library
 				rtabChgId.Visible = MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds;
 		}
 
-#region submenu for printing child procedures
+		#region submenu for printing child procedures
 		// C2020-013 add unit (child) submenu to create PDF and create CAS buttons
 		private void miMultiUnit_Click(object sender, EventArgs e)
 		{
@@ -1956,12 +1969,16 @@ namespace Volian.Controls.Library
 			DevComponents.DotNetBar.ButtonItem mip = mi.Parent as DevComponents.DotNetBar.ButtonItem;
 			int selectedChild = (int)mi.Tag;
 			if (selectedChild == 0) return; // unit (child) not selected
+
 			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = (int) mi.Tag;
 			switch (mip.Text)
 			{
 				case "Create":
 					btnPdfCreate_Click(sender, e);
 					break;
+				case "Quick\r\nPrint":
+					btnPdfQuickCreate_Click(sender, e);
+					break;
 				case "Cont. Act\r\nSummary":
 					btnCASCreate_Click(sender, e);
 					break;
@@ -1973,6 +1990,9 @@ namespace Volian.Controls.Library
 			btnPdfCreate.SubItems.Clear();
 			btnPdfCreate.Tag = null;
 			btnPdfCreate.Click -= new System.EventHandler(btnPdfCreate_Click);
+			btnPdfQuickCreate.SubItems.Clear();
+			btnPdfQuickCreate.Tag = null;
+			btnPdfQuickCreate.Click -= new System.EventHandler(btnPdfQuickCreate_Click);
 			btnCASCreate.SubItems.Clear();
 			btnCASCreate.Tag = null;
 			btnCASCreate.Click -= new System.EventHandler(btnCASCreate_Click);
@@ -1990,12 +2010,16 @@ namespace Volian.Controls.Library
 				btnPdfCreate.SubItems.Add(btn);
 				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
 				btn.Enabled = procAppl;
+				btnPdfQuickCreate.SubItems.Add(btn);
+				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
+				btn.Enabled = procAppl;
 				btnReviewCreatePDF.SubItems.Add(btn);
 				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
 				btn.Enabled = procAppl;
 				btnCASCreate.SubItems.Add(btn);
 			}
 			btnPdfCreate.AutoExpandOnClick = true;
+			btnPdfQuickCreate.AutoExpandOnClick = true;
 			btnReviewCreatePDF.AutoExpandOnClick = true;
 			btnCASCreate.AutoExpandOnClick = true;
 		}
@@ -4086,7 +4110,14 @@ namespace Volian.Controls.Library
 		{
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure));
+			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 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);
 		}
 
 		private void btnCASCreate_Click(object sender, EventArgs e)

PROMS/Volian.Controls.Library/StepTabRibbon.resx

@@ -165,6 +165,50 @@
   <metadata name="superTooltipRibbon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <data name="btnPdfQuickCreate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
   <data name="btnDelelete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6