Compare commits
No commits in common. "df97a6dd011e94103070aee0809660a471d1ea0e" and "f71e9938bbe9a5f5b6d7289f60c8d688438f62c6" have entirely different histories.
df97a6dd01
...
f71e9938bb
@ -533,7 +533,6 @@ namespace VEPROMS
|
|||||||
|
|
||||||
tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
|
tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
|
||||||
tv.PrintSection += new vlnTreeViewEvent(tv_PrintSection);
|
tv.PrintSection += new vlnTreeViewEvent(tv_PrintSection);
|
||||||
tv.QPrintSection += new vlnTreeViewEvent(tv_QPrintSection);
|
|
||||||
tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
|
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);
|
||||||
@ -1214,19 +1213,7 @@ namespace VEPROMS
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Print Section
|
void tv_PrintSection(object sender, vlnTreeEventArgs args) // Quick Print right click menu on Procedure name.
|
||||||
//C2025-028 Add a Quick Print Section option
|
|
||||||
|
|
||||||
void tv_PrintSection(object sender, vlnTreeEventArgs args)
|
|
||||||
{
|
|
||||||
PrintSection(sender, args, false);
|
|
||||||
}
|
|
||||||
void tv_QPrintSection(object sender, vlnTreeEventArgs args)
|
|
||||||
{
|
|
||||||
PrintSection(sender, args, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void PrintSection(object sender, vlnTreeEventArgs args, bool quickprint)
|
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -1238,9 +1225,7 @@ namespace VEPROMS
|
|||||||
|
|
||||||
tc.SaveCurrentEditItem(si2.MyProcedure);
|
tc.SaveCurrentEditItem(si2.MyProcedure);
|
||||||
|
|
||||||
//B2025-032 Fix Section not Printing Applicability Properly
|
|
||||||
si2.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
si2.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||||
si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
|
||||||
|
|
||||||
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
|
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
|
||||||
{
|
{
|
||||||
@ -1248,14 +1233,8 @@ namespace VEPROMS
|
|||||||
prnDlg.SelectedSlave = args.UnitIndex;
|
prnDlg.SelectedSlave = args.UnitIndex;
|
||||||
prnDlg.MySessionInfo = MySessionInfo;
|
prnDlg.MySessionInfo = MySessionInfo;
|
||||||
prnDlg.SetupForProcedure(); // Setup filename
|
prnDlg.SetupForProcedure(); // Setup filename
|
||||||
|
|
||||||
if (quickprint)
|
|
||||||
prnDlg.QPCreatePDF(); // Create Print report
|
|
||||||
else
|
|
||||||
prnDlg.ShowDialog(this); // Create Print report
|
prnDlg.ShowDialog(this); // Create Print report
|
||||||
|
|
||||||
//B2025-032 Fix Section not Printing Applicability Properly
|
|
||||||
si2.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
|
||||||
si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -528,11 +528,6 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
if (PrintSection != null) PrintSection(sender, args);
|
if (PrintSection != null) PrintSection(sender, args);
|
||||||
}
|
}
|
||||||
public event vlnTreeViewEvent QPrintSection;
|
|
||||||
private void OnQPrintSection(object sender, vlnTreeEventArgs args)
|
|
||||||
{
|
|
||||||
if (QPrintSection != null) QPrintSection(sender, args);
|
|
||||||
}
|
|
||||||
public event vlnTreeViewEvent PrintAllProcedures;
|
public event vlnTreeViewEvent PrintAllProcedures;
|
||||||
private void OnPrintAllProcedures(object sender, vlnTreeEventArgs args)
|
private void OnPrintAllProcedures(object sender, vlnTreeEventArgs args)
|
||||||
{
|
{
|
||||||
@ -999,26 +994,11 @@ namespace Volian.Controls.Library
|
|||||||
mp.Tag = k;
|
mp.Tag = k;
|
||||||
}
|
}
|
||||||
cm.MenuItems.Add(mps);
|
cm.MenuItems.Add(mps);
|
||||||
|
|
||||||
//C2025-028 Add a Quick Print Section option
|
|
||||||
MenuItem mps_qp = new MenuItem("Quick Print Section");
|
|
||||||
int k_qp = 0;
|
|
||||||
foreach (string s in si2.MyDocVersion.UnitNames)
|
|
||||||
{
|
|
||||||
k_qp++;
|
|
||||||
MenuItem mp_qp = mps_qp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
|
||||||
mp_qp.Tag = k_qp;
|
|
||||||
}
|
|
||||||
cm.MenuItems.Add(mps_qp);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!si2.IsSubsection)
|
if(!si2.IsSubsection) cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
||||||
{
|
|
||||||
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
|
||||||
cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1084,7 +1064,6 @@ namespace Volian.Controls.Library
|
|||||||
if (i.HasWordContent)
|
if (i.HasWordContent)
|
||||||
{
|
{
|
||||||
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
||||||
cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
@ -1888,9 +1867,6 @@ namespace Volian.Controls.Library
|
|||||||
case "Print Section":
|
case "Print Section":
|
||||||
OnPrintSection(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
|
OnPrintSection(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
|
||||||
break;
|
break;
|
||||||
case "Quick Print Section":
|
|
||||||
OnQPrintSection(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;
|
||||||
@ -2038,10 +2014,6 @@ namespace Volian.Controls.Library
|
|||||||
VETreeNode tn2 = SelectedNode as VETreeNode;
|
VETreeNode tn2 = SelectedNode as VETreeNode;
|
||||||
OnPrintSection(this, new vlnTreeEventArgs(tn2 as VETreeNode, null, 0));
|
OnPrintSection(this, new vlnTreeEventArgs(tn2 as VETreeNode, null, 0));
|
||||||
break;
|
break;
|
||||||
case "Quick Print Section":
|
|
||||||
VETreeNode tn2qp = SelectedNode as VETreeNode;
|
|
||||||
OnQPrintSection(this, new vlnTreeEventArgs(tn2qp as VETreeNode, null, 0));
|
|
||||||
break;
|
|
||||||
case "Open":
|
case "Open":
|
||||||
OpenNode();
|
OpenNode();
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user