Development #196
Binary file not shown.
@ -1091,6 +1091,11 @@ namespace VEPROMS
|
|||||||
DoCreatePDF();
|
DoCreatePDF();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void QPCreatePDF()
|
||||||
|
{
|
||||||
|
DoCreatePDF();
|
||||||
|
}
|
||||||
|
|
||||||
private void DoCreatePDF()
|
private void DoCreatePDF()
|
||||||
{
|
{
|
||||||
if (_AllProcedures)
|
if (_AllProcedures)
|
||||||
|
61
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
generated
61
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
generated
@ -36,6 +36,7 @@ namespace VEPROMS
|
|||||||
this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem();
|
this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem();
|
this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem();
|
this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem();
|
||||||
|
this.btnShowErrFld = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem();
|
this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton();
|
this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton();
|
||||||
this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
|
this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
|
||||||
@ -46,13 +47,13 @@ namespace VEPROMS
|
|||||||
this.btnPrint = new DevComponents.DotNetBar.ButtonItem();
|
this.btnPrint = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
|
this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
|
this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
|
|
||||||
this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer();
|
this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer();
|
||||||
this.labelItem8 = new DevComponents.DotNetBar.LabelItem();
|
this.labelItem8 = new DevComponents.DotNetBar.LabelItem();
|
||||||
this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer();
|
this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer();
|
||||||
this.btnOptions = new DevComponents.DotNetBar.ButtonItem();
|
this.btnOptions = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnExit = new DevComponents.DotNetBar.ButtonItem();
|
this.btnExit = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
|
this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
|
||||||
|
this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.galleryGroup1 = new DevComponents.DotNetBar.GalleryGroup();
|
this.galleryGroup1 = new DevComponents.DotNetBar.GalleryGroup();
|
||||||
this.galleryGroup2 = new DevComponents.DotNetBar.GalleryGroup();
|
this.galleryGroup2 = new DevComponents.DotNetBar.GalleryGroup();
|
||||||
this.galleryGroup3 = new DevComponents.DotNetBar.GalleryGroup();
|
this.galleryGroup3 = new DevComponents.DotNetBar.GalleryGroup();
|
||||||
@ -210,8 +211,10 @@ namespace VEPROMS
|
|||||||
this.btnShortCuts,
|
this.btnShortCuts,
|
||||||
this.btnHelpVWeb,
|
this.btnHelpVWeb,
|
||||||
this.btnSendErrorLog,
|
this.btnSendErrorLog,
|
||||||
|
this.btnShowErrFld,
|
||||||
this.btnHelpAbout});
|
this.btnHelpAbout});
|
||||||
this.btnHelp.Text = "Help";
|
this.btnHelp.Text = "Help";
|
||||||
|
this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
|
||||||
//
|
//
|
||||||
// btnHelpManual
|
// btnHelpManual
|
||||||
//
|
//
|
||||||
@ -244,6 +247,14 @@ namespace VEPROMS
|
|||||||
this.btnSendErrorLog.Text = "Send Error Log";
|
this.btnSendErrorLog.Text = "Send Error Log";
|
||||||
this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
|
this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
|
||||||
//
|
//
|
||||||
|
// btnShowErrFld
|
||||||
|
//
|
||||||
|
//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
|
||||||
|
this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
|
||||||
|
this.btnShowErrFld.Name = "btnShowErrFld";
|
||||||
|
this.btnShowErrFld.Text = "Open Error Folder";
|
||||||
|
this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
|
||||||
|
//
|
||||||
// btnHelpAbout
|
// btnHelpAbout
|
||||||
//
|
//
|
||||||
this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
||||||
@ -284,6 +295,10 @@ namespace VEPROMS
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
|
this.itemContainer1.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
this.itemContainer1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.itemContainer1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
//
|
//
|
||||||
// itemContainer2
|
// itemContainer2
|
||||||
@ -301,6 +316,10 @@ namespace VEPROMS
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
|
this.itemContainer2.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
this.itemContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.itemContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
//
|
//
|
||||||
// itemContainer3
|
// itemContainer3
|
||||||
@ -322,6 +341,10 @@ namespace VEPROMS
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
|
this.itemContainer3.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
this.itemContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.itemContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
//
|
//
|
||||||
// btnNew
|
// btnNew
|
||||||
@ -370,16 +393,8 @@ namespace VEPROMS
|
|||||||
this.btnAdmin.CanCustomize = false;
|
this.btnAdmin.CanCustomize = false;
|
||||||
this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin;
|
this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin;
|
||||||
this.btnAdmin.Name = "btnAdmin";
|
this.btnAdmin.Name = "btnAdmin";
|
||||||
//this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
|
|
||||||
//this.btnUpdateFormats});
|
|
||||||
this.btnAdmin.Text = "A&dministration";
|
this.btnAdmin.Text = "A&dministration";
|
||||||
//
|
//
|
||||||
// btnUpdateFormats
|
|
||||||
//
|
|
||||||
this.btnUpdateFormats.Name = "btnUpdateFormats";
|
|
||||||
this.btnUpdateFormats.Text = "Update Formats";
|
|
||||||
this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
|
|
||||||
//
|
|
||||||
// icRecentDocs
|
// icRecentDocs
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
@ -395,6 +410,10 @@ namespace VEPROMS
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
|
this.icRecentDocs.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
this.icRecentDocs.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.icRecentDocs.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
//
|
//
|
||||||
// labelItem8
|
// labelItem8
|
||||||
@ -423,6 +442,10 @@ namespace VEPROMS
|
|||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
|
this.itemContainer5.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
this.itemContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.itemContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
//
|
//
|
||||||
// btnOptions
|
// btnOptions
|
||||||
@ -449,6 +472,12 @@ namespace VEPROMS
|
|||||||
//
|
//
|
||||||
this.qatCustomizeItem1.Name = "qatCustomizeItem1";
|
this.qatCustomizeItem1.Name = "qatCustomizeItem1";
|
||||||
//
|
//
|
||||||
|
// btnUpdateFormats
|
||||||
|
//
|
||||||
|
this.btnUpdateFormats.Name = "btnUpdateFormats";
|
||||||
|
this.btnUpdateFormats.Text = "Update Formats";
|
||||||
|
this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
|
||||||
|
//
|
||||||
// galleryGroup1
|
// galleryGroup1
|
||||||
//
|
//
|
||||||
this.galleryGroup1.Name = "galleryGroup1";
|
this.galleryGroup1.Name = "galleryGroup1";
|
||||||
@ -712,8 +741,9 @@ namespace VEPROMS
|
|||||||
// ctrlAnnotationDetails
|
// ctrlAnnotationDetails
|
||||||
//
|
//
|
||||||
this.ctrlAnnotationDetails.AnnotationDirty = false;
|
this.ctrlAnnotationDetails.AnnotationDirty = false;
|
||||||
this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" +
|
this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 " +
|
||||||
"ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n";
|
"Microsoft Sans Serif;}}\r\n{\\*\\generator Riched20 10.0.22621}\\viewkind4\\uc1 \r\n\\par" +
|
||||||
|
"d\\f0\\fs20\\par\r\n}\r\n";
|
||||||
this.ctrlAnnotationDetails.Annotations = null;
|
this.ctrlAnnotationDetails.Annotations = null;
|
||||||
this.ctrlAnnotationDetails.AnnotationText = "";
|
this.ctrlAnnotationDetails.AnnotationText = "";
|
||||||
this.ctrlAnnotationDetails.ClientProcess = null;
|
this.ctrlAnnotationDetails.ClientProcess = null;
|
||||||
@ -784,6 +814,7 @@ namespace VEPROMS
|
|||||||
// tv
|
// tv
|
||||||
//
|
//
|
||||||
this.tv.AllowDrop = true;
|
this.tv.AllowDrop = true;
|
||||||
|
this.tv.DelProcReason = null;
|
||||||
this.tv.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.tv.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
this.tv.HideSelection = false;
|
this.tv.HideSelection = false;
|
||||||
@ -904,7 +935,7 @@ namespace VEPROMS
|
|||||||
this.displayTags.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.displayTags.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.displayTags.IsVisible = false;
|
this.displayTags.IsVisible = false;
|
||||||
this.displayTags.Location = new System.Drawing.Point(0, 0);
|
this.displayTags.Location = new System.Drawing.Point(0, 0);
|
||||||
this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
this.displayTags.Margin = new System.Windows.Forms.Padding(2);
|
||||||
this.displayTags.MinimumSize = new System.Drawing.Size(100, 630);
|
this.displayTags.MinimumSize = new System.Drawing.Size(100, 630);
|
||||||
this.displayTags.MyEditItem = null;
|
this.displayTags.MyEditItem = null;
|
||||||
this.displayTags.Name = "displayTags";
|
this.displayTags.Name = "displayTags";
|
||||||
@ -1089,8 +1120,8 @@ namespace VEPROMS
|
|||||||
this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.displayRO.Location = new System.Drawing.Point(1, 1);
|
this.displayRO.Location = new System.Drawing.Point(1, 1);
|
||||||
this.displayRO.Margin = new System.Windows.Forms.Padding(4);
|
this.displayRO.Margin = new System.Windows.Forms.Padding(4);
|
||||||
|
this.displayRO.MyDvi = null;
|
||||||
this.displayRO.MyROFST = null;
|
this.displayRO.MyROFST = null;
|
||||||
//this.displayRO.MyROFSTLookup = null;
|
|
||||||
this.displayRO.MyRTB = null;
|
this.displayRO.MyRTB = null;
|
||||||
this.displayRO.Name = "displayRO";
|
this.displayRO.Name = "displayRO";
|
||||||
this.displayRO.ProgressBar = null;
|
this.displayRO.ProgressBar = null;
|
||||||
@ -1104,6 +1135,7 @@ namespace VEPROMS
|
|||||||
this.tc.ChgId = null;
|
this.tc.ChgId = null;
|
||||||
this.tc.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.tc.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.tc.ForeColor = System.Drawing.SystemColors.ControlText;
|
this.tc.ForeColor = System.Drawing.SystemColors.ControlText;
|
||||||
|
this.tc.LastSelectedDisplayTabItem = null;
|
||||||
this.tc.Location = new System.Drawing.Point(334, 57);
|
this.tc.Location = new System.Drawing.Point(334, 57);
|
||||||
this.tc.Margin = new System.Windows.Forms.Padding(4);
|
this.tc.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.tc.MyAnnotationDetails = null;
|
this.tc.MyAnnotationDetails = null;
|
||||||
@ -1351,6 +1383,7 @@ namespace VEPROMS
|
|||||||
// displaySearch1
|
// displaySearch1
|
||||||
//
|
//
|
||||||
this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.displaySearch1.LastSearchWasAnnotations = false;
|
||||||
this.displaySearch1.LoadingList = false;
|
this.displaySearch1.LoadingList = false;
|
||||||
this.displaySearch1.Location = new System.Drawing.Point(1, 1);
|
this.displaySearch1.Location = new System.Drawing.Point(1, 1);
|
||||||
this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||||
@ -1360,6 +1393,7 @@ namespace VEPROMS
|
|||||||
this.displaySearch1.ProgressBar = null;
|
this.displaySearch1.ProgressBar = null;
|
||||||
this.displaySearch1.ReportTitle = null;
|
this.displaySearch1.ReportTitle = null;
|
||||||
this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
|
this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
|
||||||
|
this.displaySearch1.SearchIncTransII = null;
|
||||||
this.displaySearch1.SearchResults = null;
|
this.displaySearch1.SearchResults = null;
|
||||||
this.displaySearch1.SearchString = null;
|
this.displaySearch1.SearchString = null;
|
||||||
this.displaySearch1.Size = new System.Drawing.Size(314, 462);
|
this.displaySearch1.Size = new System.Drawing.Size(314, 462);
|
||||||
@ -1736,6 +1770,7 @@ namespace VEPROMS
|
|||||||
private DevComponents.DotNetBar.TabControlPanel tabControlPanel3;
|
private DevComponents.DotNetBar.TabControlPanel tabControlPanel3;
|
||||||
private DevComponents.DotNetBar.TabItem toosTabReports;
|
private DevComponents.DotNetBar.TabItem toosTabReports;
|
||||||
private Volian.Controls.Library.DisplayReports displayReports;
|
private Volian.Controls.Library.DisplayReports displayReports;
|
||||||
|
private DevComponents.DotNetBar.ButtonItem btnShowErrFld;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ using DescriptiveEnum;
|
|||||||
using Volian.Base.Library;
|
using Volian.Base.Library;
|
||||||
using Volian.Print.Library;
|
using Volian.Print.Library;
|
||||||
using JR.Utils.GUI.Forms;
|
using JR.Utils.GUI.Forms;
|
||||||
|
using System.Diagnostics;
|
||||||
|
|
||||||
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
|
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
|
||||||
|
|
||||||
@ -512,6 +513,7 @@ namespace VEPROMS
|
|||||||
ItemInfo.ItemDeleted += new ItemInfoEvent(RefreshDisplayHistory);
|
ItemInfo.ItemDeleted += new ItemInfoEvent(RefreshDisplayHistory);
|
||||||
|
|
||||||
tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
|
tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
|
||||||
|
tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
|
||||||
tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
|
tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
|
||||||
tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
|
tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
|
||||||
tv.ApproveAllProcedures += new vlnTreeViewEvent(tv_ApproveAllProcedures);
|
tv.ApproveAllProcedures += new vlnTreeViewEvent(tv_ApproveAllProcedures);
|
||||||
@ -1152,6 +1154,40 @@ namespace VEPROMS
|
|||||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void tv_QPrintProcedure(object sender, vlnTreeEventArgs args) // Quick Print
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
|
||||||
|
if (pi == null) return;
|
||||||
|
|
||||||
|
tc.SaveCurrentEditItem(pi);
|
||||||
|
|
||||||
|
pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||||
|
|
||||||
|
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
|
||||||
|
{
|
||||||
|
prnDlg.SelectedSlave = args.UnitIndex;
|
||||||
|
prnDlg.MySessionInfo = MySessionInfo;
|
||||||
|
prnDlg.SetupForProcedure(); // Setup filename
|
||||||
|
prnDlg.QPCreatePDF(); // Create Print report
|
||||||
|
|
||||||
|
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch(Exception ex)
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.AppendLine("Could not create PDF Print");
|
||||||
|
sb.AppendLine();
|
||||||
|
MessageBox.Show(sb.ToString(), "Error when creating PDF Print", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
|
|
||||||
|
_MyLog.Warn("Failed to create PDF print", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
void tv_CreateContinuousActionSummary(object sender, vlnTreeEventArgs args)
|
void tv_CreateContinuousActionSummary(object sender, vlnTreeEventArgs args)
|
||||||
{
|
{
|
||||||
DialogResult dr = System.Windows.Forms.DialogResult.Yes;
|
DialogResult dr = System.Windows.Forms.DialogResult.Yes;
|
||||||
@ -4861,6 +4897,21 @@ namespace VEPROMS
|
|||||||
_MyLog.Error(str, ex);
|
_MyLog.Error(str, ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void btnShowErrFld_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#region (Lock stuff / used for multi-user support)
|
#region (Lock stuff / used for multi-user support)
|
||||||
|
@ -188,6 +188,11 @@
|
|||||||
llg/yF+gIjK+CZq8XgAAAABJRU5ErkJggg==
|
llg/yF+gIjK+CZq8XgAAAABJRU5ErkJggg==
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</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">
|
<data name="office2007StartButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
R0lGODlhGwAVAIcAANmsrP7+/tqtrdmrq9Wjo9uwsNmtrf79/dSgoP/+/tShodalpdqsrN20tN64uNqv
|
R0lGODlhGwAVAIcAANmsrP7+/tqtrdmrq9Wjo9uwsNmtrf79/dSgoP/+/tShodalpdqsrN20tN64uNqv
|
||||||
@ -450,7 +455,7 @@
|
|||||||
<value>164, 17</value>
|
<value>164, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>64</value>
|
<value>25</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
|
@ -1458,6 +1458,14 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return LazyLoad(ref _NoBlankLastNoteCautionWarn, "@NoBlankLastNoteCautionWarn");
|
return LazyLoad(ref _NoBlankLastNoteCautionWarn, "@NoBlankLastNoteCautionWarn");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private LazyLoad<bool> _NoteCautionCenterOneAllTypes; // F2023-126: Vogtle Alarms - center single line caution/note if more than one type exist off step
|
||||||
|
public bool NoteCautionCenterOneAllTypes
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return LazyLoad(ref _NoteCautionCenterOneAllTypes, "@NoteCautionCenterOneAllTypes");
|
||||||
|
}
|
||||||
|
}
|
||||||
private LazyLoad<bool> _ChkBoxToGeneratePointListText; // C2021-063 Barakah Alarm: check box to generate Alarm Point List Text
|
private LazyLoad<bool> _ChkBoxToGeneratePointListText; // C2021-063 Barakah Alarm: check box to generate Alarm Point List Text
|
||||||
public bool ChkBoxToGeneratePointListText
|
public bool ChkBoxToGeneratePointListText
|
||||||
{
|
{
|
||||||
|
@ -501,6 +501,11 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
if (PrintProcedure != null) PrintProcedure(sender, args);
|
if (PrintProcedure != null) PrintProcedure(sender, args);
|
||||||
}
|
}
|
||||||
|
public event vlnTreeViewEvent QPrintProcedure;
|
||||||
|
private void OnQPrintProcedure(object sender, vlnTreeEventArgs args)
|
||||||
|
{
|
||||||
|
if (QPrintProcedure != null) QPrintProcedure(sender, args);
|
||||||
|
}
|
||||||
public event vlnTreeViewEvent PrintAllProcedures;
|
public event vlnTreeViewEvent PrintAllProcedures;
|
||||||
private void OnPrintAllProcedures(object sender, vlnTreeEventArgs args)
|
private void OnPrintAllProcedures(object sender, vlnTreeEventArgs args)
|
||||||
{
|
{
|
||||||
@ -831,6 +836,7 @@ namespace Volian.Controls.Library
|
|||||||
MenuItem micas = new MenuItem("Create Continuous Action Summary");
|
MenuItem micas = new MenuItem("Create Continuous Action Summary");
|
||||||
MenuItem mitcas = new MenuItem("Create Time Critical Action Summary"); //F2022-024 added menu option
|
MenuItem mitcas = new MenuItem("Create Time Critical Action Summary"); //F2022-024 added menu option
|
||||||
MenuItem mip = new MenuItem("Print");
|
MenuItem mip = new MenuItem("Print");
|
||||||
|
MenuItem miqp = new MenuItem("Quick Print");
|
||||||
MenuItem mia = new MenuItem("Approve");
|
MenuItem mia = new MenuItem("Approve");
|
||||||
int k = 0;
|
int k = 0;
|
||||||
foreach (string s in pri.MyDocVersion.UnitNames)
|
foreach (string s in pri.MyDocVersion.UnitNames)
|
||||||
@ -841,6 +847,9 @@ namespace Volian.Controls.Library
|
|||||||
MenuItem mp = mip.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
MenuItem mp = mip.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
||||||
mp.Enabled = procAppl;
|
mp.Enabled = procAppl;
|
||||||
mp.Tag = k;
|
mp.Tag = k;
|
||||||
|
MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
||||||
|
mqp.Enabled = procAppl;
|
||||||
|
mqp.Tag = k;
|
||||||
MenuItem ma = mia.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
MenuItem ma = mia.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
||||||
ma.Enabled = procAppl;
|
ma.Enabled = procAppl;
|
||||||
ma.Tag = k;
|
ma.Tag = k;
|
||||||
@ -854,6 +863,7 @@ namespace Volian.Controls.Library
|
|||||||
cm.MenuItems.Add(micas);
|
cm.MenuItems.Add(micas);
|
||||||
cm.MenuItems.Add(mitcas);
|
cm.MenuItems.Add(mitcas);
|
||||||
cm.MenuItems.Add(mip);
|
cm.MenuItems.Add(mip);
|
||||||
|
cm.MenuItems.Add(miqp);
|
||||||
AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
|
AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
|
||||||
cm.MenuItems.Add(mia);
|
cm.MenuItems.Add(mia);
|
||||||
AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
|
AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
|
||||||
@ -863,6 +873,8 @@ namespace Volian.Controls.Library
|
|||||||
cm.MenuItems.Add("Create Continuous Action Summary", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Create Continuous Action Summary", new EventHandler(mi_Click));
|
||||||
cm.MenuItems.Add("Create Time Critical Action Summary", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Create Time Critical Action Summary", new EventHandler(mi_Click));
|
||||||
cm.MenuItems.Add("Print", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Print", new EventHandler(mi_Click));
|
||||||
|
cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click));
|
||||||
|
//MenuItem miqp = new MenuItem("Print");
|
||||||
AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
|
AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
|
||||||
cm.MenuItems.Add("Approve", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Approve", new EventHandler(mi_Click));
|
||||||
//_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true));
|
//_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true));
|
||||||
@ -877,19 +889,24 @@ namespace Volian.Controls.Library
|
|||||||
if (pri.MyDocVersion.MultiUnitCount > 1)
|
if (pri.MyDocVersion.MultiUnitCount > 1)
|
||||||
{
|
{
|
||||||
MenuItem mip = new MenuItem("Print");
|
MenuItem mip = new MenuItem("Print");
|
||||||
|
MenuItem miqp = new MenuItem("Quick Print");
|
||||||
int k = 0;
|
int k = 0;
|
||||||
foreach (string s in pri.MyDocVersion.UnitNames)
|
foreach (string s in pri.MyDocVersion.UnitNames)
|
||||||
{
|
{
|
||||||
k++;
|
k++;
|
||||||
MenuItem mp = mip.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
MenuItem mp = mip.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
||||||
mp.Tag = k;
|
mp.Tag = k;
|
||||||
|
MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
||||||
|
mqp.Tag = k;
|
||||||
}
|
}
|
||||||
cm.MenuItems.Add(mip);
|
cm.MenuItems.Add(mip);
|
||||||
|
cm.MenuItems.Add(miqp);
|
||||||
AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
|
AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cm.MenuItems.Add("Print", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Print", new EventHandler(mi_Click));
|
||||||
|
cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click));
|
||||||
AddApprovedRevisions(cm.MenuItems, pri);
|
AddApprovedRevisions(cm.MenuItems, pri);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1727,6 +1744,9 @@ namespace Volian.Controls.Library
|
|||||||
case "Print":
|
case "Print":
|
||||||
OnPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
|
OnPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
|
||||||
break;
|
break;
|
||||||
|
case "Quick Print":
|
||||||
|
OnQPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
|
||||||
|
break;
|
||||||
case "Print All Procedures for":
|
case "Print All Procedures for":
|
||||||
OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0,mi.Text,(int)mi.Tag));
|
OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0,mi.Text,(int)mi.Tag));
|
||||||
break;
|
break;
|
||||||
@ -1967,6 +1987,9 @@ namespace Volian.Controls.Library
|
|||||||
case "Print":
|
case "Print":
|
||||||
OnPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
|
OnPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
|
||||||
break;
|
break;
|
||||||
|
case "Quick Print":
|
||||||
|
OnQPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
|
||||||
|
break;
|
||||||
case "Print All Procedures":
|
case "Print All Procedures":
|
||||||
OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
|
OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
|
||||||
break;
|
break;
|
||||||
|
@ -682,12 +682,35 @@ namespace Volian.Print.Library
|
|||||||
// Console.WriteLine("To {0}.{1} Page: {2}",LastWordSection.DisplayNumber,LastWordSection.DisplayText,_PageCountOfWordSection);
|
// Console.WriteLine("To {0}.{1} Page: {2}",LastWordSection.DisplayNumber,LastWordSection.DisplayText,_PageCountOfWordSection);
|
||||||
// PreviousWordSection = LastWordSection;
|
// PreviousWordSection = LastWordSection;
|
||||||
//}
|
//}
|
||||||
private PdfContentByte OpenDoc(string outputFileName, iTextSharp.text.Rectangle rect)
|
private PdfContentByte OpenDoc(ref string outputFileName, iTextSharp.text.Rectangle rect)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
PdfWriter writer = null;
|
PdfWriter writer = null;
|
||||||
iTextSharp.text.Document document = new iTextSharp.text.Document(rect);
|
iTextSharp.text.Document document = new iTextSharp.text.Document(rect);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (File.Exists(outputFileName))
|
||||||
|
{
|
||||||
|
String tmpExt = System.IO.Path.GetExtension(outputFileName);
|
||||||
|
String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName);
|
||||||
|
String tmpFN = System.IO.Path.GetFileName(outputFileName);
|
||||||
|
String tmpFNNoExt = System.IO.Path.GetFileNameWithoutExtension(outputFileName);
|
||||||
|
|
||||||
|
var files = new HashSet<string>(Directory.GetFiles(tmpPTH, "*.pdf"));
|
||||||
|
//string baseName = Path.Combine(scpath, "Screenshot_");
|
||||||
|
string filename;
|
||||||
|
int i = 0;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
filename = tmpPTH + @"\" + tmpFNNoExt + "_" + ++i + ".pdf";
|
||||||
|
} while (files.Contains(filename));
|
||||||
|
|
||||||
|
outputFileName = filename;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create));
|
writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create));
|
||||||
// PDFA1B does not allow layers, so this is disabled for now
|
// PDFA1B does not allow layers, so this is disabled for now
|
||||||
// If enabled, CreateLayers will need to be skipped.
|
// If enabled, CreateLayers will need to be skipped.
|
||||||
@ -721,6 +744,21 @@ namespace Volian.Print.Library
|
|||||||
MyContentByte = writer.DirectContent;
|
MyContentByte = writer.DirectContent;
|
||||||
return MyContentByte;
|
return MyContentByte;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.AppendLine("Error occured when creating Print PDF");
|
||||||
|
sb.AppendLine();
|
||||||
|
sb.AppendLine(outputFileName + ".");
|
||||||
|
sb.AppendLine();
|
||||||
|
sb.AppendLine("If it is open, close and retry.");
|
||||||
|
MessageBox.Show(sb.ToString(), "Error Creating PDF", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
|
//MessageBox.Show("Could not create " + outputFileName + ". If it is open, close and retry.", "Error on CreatePdf");
|
||||||
|
return MyContentByte = null;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
//private string CreateFileName(string procNumber, string sectNumber, string sectTitle)
|
//private string CreateFileName(string procNumber, string sectNumber, string sectTitle)
|
||||||
//{
|
//{
|
||||||
// return FixFileName(procNumber + "_" + ((sectNumber ?? "") != "" ? sectNumber : sectTitle));
|
// return FixFileName(procNumber + "_" + ((sectNumber ?? "") != "" ? sectNumber : sectTitle));
|
||||||
@ -871,7 +909,7 @@ namespace Volian.Print.Library
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PdfContentByte cb = OpenDoc(outputFileName, rct);
|
PdfContentByte cb = OpenDoc(ref outputFileName, rct);
|
||||||
if (cb == null)
|
if (cb == null)
|
||||||
{
|
{
|
||||||
ProfileTimer.Pop(profileDepth);
|
ProfileTimer.Pop(profileDepth);
|
||||||
@ -2298,7 +2336,7 @@ namespace Volian.Print.Library
|
|||||||
else SupInfoPdfPage.Clear();
|
else SupInfoPdfPage.Clear();
|
||||||
string SupInfoPdfName = Volian.Base.Library.VlnSettings.TemporaryFolder + @"\SupInfo" + vlnParagraph.MyItemInfo.ItemID.ToString() + @".pdf";
|
string SupInfoPdfName = Volian.Base.Library.VlnSettings.TemporaryFolder + @"\SupInfo" + vlnParagraph.MyItemInfo.ItemID.ToString() + @".pdf";
|
||||||
iTextSharp.text.Rectangle pageSize = PDFPageSize.UsePaperSize(MyItem.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize); // C2020-002 paper size is now set in the format files
|
iTextSharp.text.Rectangle pageSize = PDFPageSize.UsePaperSize(MyItem.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize); // C2020-002 paper size is now set in the format files
|
||||||
PdfContentByte cb = OpenDoc(SupInfoPdfName, pageSize);
|
PdfContentByte cb = OpenDoc(ref SupInfoPdfName, pageSize);
|
||||||
if (cb == null) return;
|
if (cb == null) return;
|
||||||
VlnSvgPageHelper myPageHelper = new VlnSvgPageHelper(vlnParagraph.MyItemInfo as SectionInfo, this, null, 0);
|
VlnSvgPageHelper myPageHelper = new VlnSvgPageHelper(vlnParagraph.MyItemInfo as SectionInfo, this, null, 0);
|
||||||
cb.PdfWriter.PageEvent = myPageHelper;
|
cb.PdfWriter.PageEvent = myPageHelper;
|
||||||
@ -2960,3 +2998,4 @@ namespace Volian.Print.Library
|
|||||||
// }
|
// }
|
||||||
//}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1046,8 +1046,9 @@ namespace Volian.Print.Library
|
|||||||
|
|
||||||
// Calvert Alarms have a special case, center text if the next/previous is not the same type of caution or note.
|
// Calvert Alarms have a special case, center text if the next/previous is not the same type of caution or note.
|
||||||
// Calvert Alarms have a note1 that is a warning. if a regular note preceeded it, this regular note was not centered.
|
// Calvert Alarms have a note1 that is a warning. if a regular note preceeded it, this regular note was not centered.
|
||||||
|
// F2023-126: Vogtle Alarms - center single line caution/note if more than one type exist off step, added the check for NoteCautionCenterOneAllTypes
|
||||||
bool doAlign = false;
|
bool doAlign = false;
|
||||||
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && (MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.IsNote1))
|
if ((MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert || MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoteCautionCenterOneAllTypes) && (MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.IsNote1))
|
||||||
{
|
{
|
||||||
bool diffAsPrev = MyItemInfo.MyPrevious == null || (MyItemInfo.MyPrevious != null && MyItemInfo.MyContent.Type != MyItemInfo.MyPrevious.MyContent.Type);
|
bool diffAsPrev = MyItemInfo.MyPrevious == null || (MyItemInfo.MyPrevious != null && MyItemInfo.MyContent.Type != MyItemInfo.MyPrevious.MyContent.Type);
|
||||||
bool diffAsNext = MyItemInfo.NextItem == null || (MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type);
|
bool diffAsNext = MyItemInfo.NextItem == null || (MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user