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)
|
||||||
|
3093
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
generated
3093
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@ -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);
|
||||||
@ -1151,7 +1153,41 @@ 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,11 +4897,26 @@ namespace VEPROMS
|
|||||||
_MyLog.Error(str, ex);
|
_MyLog.Error(str, ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#region (Lock stuff / used for multi-user support)
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public class TabItemsToClose : Stack<DisplayTabItem>
|
private void btnHelp_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#region (Lock stuff / used for multi-user support)
|
||||||
|
|
||||||
|
public class TabItemsToClose : Stack<DisplayTabItem>
|
||||||
{
|
{
|
||||||
public void PushDTI(DisplayTabItem dti)
|
public void PushDTI(DisplayTabItem dti)
|
||||||
{
|
{
|
||||||
|
@ -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;
|
||||||
@ -853,7 +862,8 @@ 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;
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -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