Compare commits

...

22 Commits

Author SHA1 Message Date
0259d4ff1d C2025-028 Add a Quick Print Section option / B2025-032 Fix Section not Printing Applicability Properly
Added an option to quick print a section.

Fixed a bug where: If you went to a section that had Applicability and select "Print Section" for a specific unit, it would sometimes print all units.
2025-05-16 14:10:56 -04:00
f71e9938bb Merge pull request 'C2025-033 Added a new field and supporting logic to specify if a PageStyle item should be printed for the Child procedure being printed.' (#556) from DemoFormats into Development
Looks good.
Ready for QA.
2025-05-16 11:01:18 -04:00
69f8e3f4fc C2025-033 Added a new field and supporting logic to specify if a PageStyle item should be printed for the Child procedure being printed. 2025-05-16 10:52:37 -04:00
59372b23e4 Merge pull request 'B2025-028 RO Editor - Parent Child Applicability - Default Values' (#554) from B2025-028 into Development
good for testing phase
2025-05-15 10:41:40 -04:00
2970c0d7d4 B2025-028 RO Editor - Parent Child Applicability - Default Values
While working with parent/child applicability with child applicability set for a setpoint group - assign the Setpoint Values and Short Description fields to have Child values.  All child values default to their parent values as expected.  However, if you click in the Parent field for the Short Description, the Child Values for the Short Description fields incorrectly defaulted to the Parent Setpoint Value instead of keeping the parent Short Description.
2025-05-15 10:28:47 -04:00
392f1b09b2 Merge pull request 'C2025-031 Fixed typos found in Tool Tip message from previous check-in of this code change' (#553) from C2025_031_OptionsTooltips_Cleanup into Development
Change just fixes typos in tool tip messages.  No code review needed.
Ready for testing phase
2025-05-15 09:03:53 -04:00
79f66e9641 C2025-031 Fixed typos found in Tool Tip message from previous check-in of this code change 2025-05-15 09:01:43 -04:00
e90fceca86 Merge pull request 'B2025-031 Improve wording for if attempting to delete copied section' (#552) from B2025-031 into Development
good for testing phase
2025-05-15 08:40:23 -04:00
24d5cee8b4 B2025-031 Improve wording for if attempting to delete copied section
When an attempt is made to delete a section in the edit window that has been copied, the "Attempting to delete copied step" message box appears.   This message box is incorrect because you're attempting to delete the section, not a step in the section.   This only happens on a section that has been copied.
2025-05-15 07:34:19 -04:00
1ba4c4f343 Merge pull request 'B2025-028 RO Editor - Parent Child Applicability - Default Values' (#551) from B2025-028 into Development
ready for testing phase
2025-05-14 11:49:10 -04:00
700d9656b2 B2025-028 RO Editor - Parent Child Applicability - Default Values
While working with parent/child applicability with child applicability set for a setpoint group - assign the Setpoint Values and Short Description fields to have Child values.  All child values default to their parent values as expected.  However, if you click in the Parent field for the Short Description, the Child Values for the Short Description fields incorrectly defaulted to the Parent Setpoint Value instead of keeping the parent Short Description.
2025-05-14 11:42:51 -04:00
0c17d9abc2 Merge pull request 'C2025-031 - Added Tool Tip text for button on V button. Code fix for DotNetBar Visual UI rendering' (#550) from C2025_031_OptionsTooltips_Cleanup into Development
looks good. Ready for QA.
2025-05-13 16:09:26 -04:00
2c1476b74c C2025-031 - Added Tool Tip text for button on V button. Code fix for DotNetBar Visual UI rendering 2025-05-13 16:03:44 -04:00
0fa71727ac Merge pull request 'B2025-030 Show Cannot restore wording if restoring Annotation with a deleted annotation type.' (#549) from B2025-030 into Development
good for testing phase
2025-05-13 14:27:23 -04:00
20cacf26ae B2025-030 Show Cannot restore wording if restoring Annotation with a deleted annotation type. 2025-05-13 14:17:57 -04:00
1d406b0c7e Merge pull request 'C2025-032 Add check if user is sure want to paste replace section.' (#548) from C2025-032 into Development
good for testing phase
2025-05-13 10:56:51 -04:00
a099d27b86 C2025-032 Add check if user is sure want to paste replace section. 2025-05-13 08:19:23 -04:00
717251ca5e Merge pull request 'Added PROMS Demo Fromats and dded a checkbox on the Copy Formats dialog to include the PROMS Demo formats.' (#547) from DemoFormats into Development
Developer tool update and PROMS Demo formats.
Not testing required.
2025-05-06 14:43:00 -04:00
5d3bb41275 Added PROMS Demo Fromats and dded a checkbox on the Copy Formats dialog to include the PROMS Demo formats. 2025-05-06 14:41:50 -04:00
e5211fee00 Merge pull request 'F2025-012 Format changes are needed to account for ABN procedures.' (#546) from F2025-012 into Development
Format change only - per John, no review needed.

Reviewed-on: #546
2025-05-05 14:37:14 -04:00
41cb078a94 F2025-012 Format changes are needed to account for ABN procedures.
In the ERG and ABN format, Attachment Step Editor (Two Column), the following changes need made:
- add a blank line between the Initial Action Step and the following high level step
- need the ability to insert sub-steps off of the Initial Action Step
- adjust extra line spacing above Initial Action Steps
- add a step designator in the edit window to indicate an Immediate Action Step
2025-05-05 14:36:23 -04:00
0a5e4076e1 Merge pull request 'B2025-026 - AND Substeps are Printing as Sequential Substeps in the ERG format /' (#545) from B2025-026_B2025-027 into Development
good for testing
2025-05-05 08:48:11 -04:00
26 changed files with 259 additions and 91 deletions

View File

@@ -282,6 +282,10 @@
<Content Include="fmtall\NSPWGall.xml" />
<Content Include="fmtall\NSP_00all.xml" />
<Content Include="fmtall\OHLPall.xml" />
<Content Include="fmtall\PROMSDemo1all.xml" />
<Content Include="fmtall\PROMSDemo2all.xml" />
<Content Include="fmtall\PROMSDemoALRall.xml" />
<Content Include="fmtall\PROMSDemoBCKall.xml" />
<Content Include="fmtall\PROMSMan1all.xml" />
<Content Include="fmtall\PROMSMan2all.xml" />
<Content Include="fmtall\RGEall.xml" />
@@ -499,6 +503,10 @@
<Content Include="genmacall\nspsam.svg" />
<Content Include="genmacall\nspsamdev.svg" />
<Content Include="genmacall\ohlp.svg" />
<Content Include="genmacall\PROMSDemo1.svg" />
<Content Include="genmacall\PROMSDemo2.svg" />
<Content Include="genmacall\PROMSDemoALR.svg" />
<Content Include="genmacall\PROMSDemoBCK.svg" />
<Content Include="genmacall\PROMSMan1.svg" />
<Content Include="genmacall\PROMSMan2.svg" />
<Content Include="genmacall\rge.svg" />

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -35,6 +35,7 @@ namespace Formats
this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
this.labelX2 = new DevComponents.DotNetBar.LabelX();
this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
this.cbIncludeDemoFormats = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.SuspendLayout();
//
// txbxPROMSFormatsPath
@@ -131,11 +132,26 @@ namespace Formats
this.LstBxExcludeFiles.TabIndex = 6;
this.LstBxExcludeFiles.Text = "listBoxAdv1";
//
// cbIncludeDemoFormats
//
//
//
//
this.cbIncludeDemoFormats.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.cbIncludeDemoFormats.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbIncludeDemoFormats.Location = new System.Drawing.Point(43, 156);
this.cbIncludeDemoFormats.Name = "cbIncludeDemoFormats";
this.cbIncludeDemoFormats.Size = new System.Drawing.Size(160, 23);
this.cbIncludeDemoFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2010;
this.cbIncludeDemoFormats.TabIndex = 7;
this.cbIncludeDemoFormats.Text = "Include Demo Formats";
//
// frmFormatCopy
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(496, 191);
this.Controls.Add(this.cbIncludeDemoFormats);
this.Controls.Add(this.LstBxExcludeFiles);
this.Controls.Add(this.labelX2);
this.Controls.Add(this.buttonX2);
@@ -158,6 +174,7 @@ namespace Formats
private DevComponents.DotNetBar.ButtonX buttonX2;
private DevComponents.DotNetBar.LabelX labelX2;
private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeDemoFormats;
}
}

View File

@@ -96,13 +96,17 @@ namespace Formats
if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
}
public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
// Added a PROMSDemo to the list of excluded format files
public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" };
// Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the
// dialog is check
private bool ExcludeFromCopy(string fn)
{
// don't copy formats whos file name starts with..
foreach (string excludeThis in excludeThese)
if (fn.ToUpper().StartsWith(excludeThis)) return true;
if (fn.ToUpper().StartsWith(excludeThis)
&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
return false;
}
@@ -161,5 +165,5 @@ namespace Formats
Application.Exit();
}
}
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -276,8 +276,10 @@ namespace ctlXMLEditLib
bool imagechild; //whether this field is a subchild of an image
string imagename; //if subchild of image, name of image parent (for save)
string imagedate; //if this was filename, save the date/time stamp
string name; //name of element
string parenthtid; //name of parent element in hashtable for PC items
public TextBoxAttrTag(bool reqd, string ptn, RadioButton rd, bool img,
string imgname, string imgdate)
string imgname, string imgdate, string elemname)
{
this.req_msg = null;
this.required = reqd;
@@ -286,6 +288,12 @@ namespace ctlXMLEditLib
this.imagechild = img;
this.imagename = imgname;
this.imagedate = imgdate;
this.name = elemname;
if (name.Contains("_PCCHILD"))
this.parenthtid = name.Substring(0, name.IndexOf("_PCCHILD"));
else
this.parenthtid = null;
}
public void SetPattern(string pattern) {this.pattern = pattern;}
public void SetRequired(bool req) {this.required = req;}
@@ -298,6 +306,10 @@ namespace ctlXMLEditLib
public string GetImageName { get {return imagename;}}
public string GetImageDate { get {return imagedate;}}
public void SetImageDate(string imgdate) {this.imagedate = imgdate;}
public string GetName { get { return name; } }
public void SetName(string elemname) { this.name = elemname; }
public string GetParentHTId { get { return parenthtid; } }
public void SetParentHTId(string id) { this.parenthtid = id; }
}
public ctlXMLEdit(VlnXmlElement myelem, XmlSchema myschema, ArrayList reqfields, ArrayList fldsWithApplic, string [] pckids)
@@ -928,7 +940,7 @@ namespace ctlXMLEditLib
// initialization.
if (mytextbox.Tag == null)
{
TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null);
TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null, mytextbox.Name);
mytextbox.Tag = (object) tag;
}
return getannot;
@@ -1136,6 +1148,7 @@ namespace ctlXMLEditLib
mytextbox = new TextBox();
mytextbox.Location = new Point(screenx+indent, screeny);
string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
mytextbox.Name = tFieldName;
myHT.Add(tFieldName, mytextbox);
tabindx++;
Controls.Add(mytextbox);
@@ -1192,14 +1205,39 @@ namespace ctlXMLEditLib
// C2021-026 Event handler for Parent/Child child textbox
// if the textbox text is same as parent, then or nothing is entered in the textbox
// then use the parent value and set the text color to gray
// B2025-028 RO Editor - Parent Child Applicability - Default Values
// Were always setting to the Group parent value instead of individual parent values
// When leaving the textbox
private void txtBox_Leave(object sender, EventArgs e)
{
TextBox tb = sender as TextBox;
string dfTxt = "";
string parName = pcGrpBox.Name.Substring(5);
object o = myHT[parName];
if (o != null)
dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
try
{
string parentid = ((TextBoxAttrTag)tb.Tag).GetParentHTId;
if (!string.IsNullOrEmpty(parentid))
{
object o = myHT[parentid];
if (o != null)
dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
}
else
{
string parName = pcGrpBox.Name.Substring(5);
object o = myHT[parName];
if (o != null)
dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
}
}
catch
{
string parName = pcGrpBox.Name.Substring(5);
object o = myHT[parName];
if (o != null)
dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
}
if (dosaveflag) mysavexml = true;
if (tb.Text.Length == 0 || tb.Text == dfTxt)
{

View File

@@ -418,7 +418,12 @@ namespace VEPROMS
//txbPDFLocation.Text = _PDFPath;
BuildPDFFileName();
ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
// C2025-033 set which Child procedure is being printed used for PageStyle items
VlnSvgPageHelper.PrintingChild = SelectedSlave;
if (SelectedSlave > 0)
{
pc.SelectedSlave = SelectedSlave;
}
if (pc != null)
{
//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config

View File

@@ -1099,7 +1099,7 @@ namespace VEPROMS
this.btnReset.Location = new System.Drawing.Point(194, 492);
this.btnReset.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnReset.Name = "btnReset";
this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReset.Size = new System.Drawing.Size(79, 19);
this.superTooltip1.SetSuperTooltip(this.btnReset, new DevComponents.DotNetBar.SuperTooltipInfo("Default Settings", "", "This will reset saved user settings back to the Proms system default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(140, 95)));
this.btnReset.TabIndex = 3;

View File

@@ -47,13 +47,13 @@ namespace VEPROMS
this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer();
this.labelItem8 = new DevComponents.DotNetBar.LabelItem();
this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer();
this.btnOptions = new DevComponents.DotNetBar.ButtonItem();
this.btnExit = new DevComponents.DotNetBar.ButtonItem();
this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
this.galleryGroup1 = new DevComponents.DotNetBar.GalleryGroup();
this.galleryGroup2 = new DevComponents.DotNetBar.GalleryGroup();
this.galleryGroup3 = new DevComponents.DotNetBar.GalleryGroup();
@@ -208,13 +208,13 @@ namespace VEPROMS
this.btnHelp.KeyTips = "?";
this.btnHelp.Name = "btnHelp";
this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.btnHelpManual,
this.btnShortCuts,
this.btnHelpVWeb,
this.btnSendErrorLog,
this.btnShowErrFld,
this.btnShowPrtFld,
this.btnHelpAbout});
this.btnHelpManual,
this.btnShortCuts,
this.btnHelpVWeb,
this.btnSendErrorLog,
this.btnShowErrFld,
this.btnShowPrtFld,
this.btnHelpAbout});
this.btnHelp.Text = "Help";
//
// btnHelpManual
@@ -249,23 +249,19 @@ namespace VEPROMS
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 Log Folder";
this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
//
// btnShowPrtFld
//
//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
//
this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
this.btnShowPrtFld.Name = "btnShowPrtFld";
this.btnShowPrtFld.Text = "Open Default Print Folder";
this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
//
//
//
// btnHelpAbout
//
this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
@@ -303,6 +299,10 @@ namespace VEPROMS
this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.itemContainer2,
this.itemContainer5});
//
//
//
this.itemContainer1.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
@@ -320,6 +320,10 @@ namespace VEPROMS
this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.itemContainer3,
this.icRecentDocs});
//
//
//
this.itemContainer2.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
@@ -340,6 +344,10 @@ namespace VEPROMS
this.btnOpen,
this.btnPrepare,
this.btnAdmin});
//
//
//
this.itemContainer3.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
@@ -363,7 +371,6 @@ namespace VEPROMS
this.btnOpen.SubItemsExpandWidth = 24;
this.btnOpen.Text = "&Open...";
this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
//
// btnPrepare
//
@@ -382,16 +389,8 @@ namespace VEPROMS
this.btnAdmin.CanCustomize = false;
this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin;
this.btnAdmin.Name = "btnAdmin";
//this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
//this.btnUpdateFormats});
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
//
//
@@ -404,6 +403,10 @@ namespace VEPROMS
this.icRecentDocs.Name = "icRecentDocs";
this.icRecentDocs.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.labelItem8});
//
//
//
this.icRecentDocs.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
@@ -432,6 +435,10 @@ namespace VEPROMS
this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.btnOptions,
this.btnExit});
//
//
//
this.itemContainer5.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
@@ -444,6 +451,7 @@ namespace VEPROMS
this.btnOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnOptions.Image")));
this.btnOptions.Name = "btnOptions";
this.btnOptions.SubItemsExpandWidth = 24;
this.superTooltip1.SetSuperTooltip(this.btnOptions, new DevComponents.DotNetBar.SuperTooltipInfo("Options", "", "Set User-Based PROMS Editing Preferences", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.btnOptions.Text = "Opt&ions";
this.btnOptions.Click += new System.EventHandler(this.btnOptions_Click);
//
@@ -454,6 +462,7 @@ namespace VEPROMS
this.btnExit.Image = ((System.Drawing.Image)(resources.GetObject("btnExit.Image")));
this.btnExit.Name = "btnExit";
this.btnExit.SubItemsExpandWidth = 24;
this.superTooltip1.SetSuperTooltip(this.btnExit, new DevComponents.DotNetBar.SuperTooltipInfo("Exit", "", "Close and Exit PROMS", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.btnExit.Text = "E&xit";
this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
//
@@ -461,6 +470,12 @@ namespace VEPROMS
//
this.qatCustomizeItem1.Name = "qatCustomizeItem1";
//
// btnUpdateFormats
//
this.btnUpdateFormats.Name = "btnUpdateFormats";
this.btnUpdateFormats.Text = "Update Formats";
this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
//
// galleryGroup1
//
this.galleryGroup1.Name = "galleryGroup1";
@@ -535,7 +550,7 @@ namespace VEPROMS
//
this.txtSearch.Dock = System.Windows.Forms.DockStyle.Right;
this.txtSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.txtSearch.Location = new System.Drawing.Point(820, 0);
this.txtSearch.Location = new System.Drawing.Point(810, 0);
this.txtSearch.Multiline = true;
this.txtSearch.Name = "txtSearch";
this.txtSearch.Size = new System.Drawing.Size(100, 25);
@@ -544,7 +559,7 @@ namespace VEPROMS
// btnPrevious
//
this.btnPrevious.Dock = System.Windows.Forms.DockStyle.Right;
this.btnPrevious.Location = new System.Drawing.Point(920, 0);
this.btnPrevious.Location = new System.Drawing.Point(910, 0);
this.btnPrevious.Name = "btnPrevious";
this.btnPrevious.Size = new System.Drawing.Size(23, 25);
this.btnPrevious.TabIndex = 1;
@@ -554,7 +569,7 @@ namespace VEPROMS
// btnPrint1
//
this.btnPrint1.Dock = System.Windows.Forms.DockStyle.Right;
this.btnPrint1.Location = new System.Drawing.Point(943, 0);
this.btnPrint1.Location = new System.Drawing.Point(933, 0);
this.btnPrint1.Name = "btnPrint1";
this.btnPrint1.Size = new System.Drawing.Size(23, 25);
this.btnPrint1.TabIndex = 2;
@@ -566,7 +581,7 @@ namespace VEPROMS
this.cbScrunch.Checked = true;
this.cbScrunch.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbScrunch.Dock = System.Windows.Forms.DockStyle.Right;
this.cbScrunch.Location = new System.Drawing.Point(966, 0);
this.cbScrunch.Location = new System.Drawing.Point(956, 0);
this.cbScrunch.Name = "cbScrunch";
this.cbScrunch.Size = new System.Drawing.Size(24, 25);
this.cbScrunch.TabIndex = 3;
@@ -575,7 +590,7 @@ namespace VEPROMS
// btnNext
//
this.btnNext.Dock = System.Windows.Forms.DockStyle.Right;
this.btnNext.Location = new System.Drawing.Point(990, 0);
this.btnNext.Location = new System.Drawing.Point(980, 0);
this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(23, 25);
this.btnNext.TabIndex = 4;
@@ -586,7 +601,7 @@ namespace VEPROMS
//
this.cmbFont.Dock = System.Windows.Forms.DockStyle.Right;
this.cmbFont.FormattingEnabled = true;
this.cmbFont.Location = new System.Drawing.Point(1013, 0);
this.cmbFont.Location = new System.Drawing.Point(1003, 0);
this.cmbFont.Name = "cmbFont";
this.cmbFont.Size = new System.Drawing.Size(172, 23);
this.cmbFont.TabIndex = 0;
@@ -596,9 +611,10 @@ namespace VEPROMS
//
this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.lblDummy.Location = new System.Drawing.Point(1013, 0);
this.lblDummy.Location = new System.Drawing.Point(1175, 0);
this.lblDummy.Name = "lblDummy";
this.lblDummy.Size = new System.Drawing.Size(10, 25);
this.lblDummy.TabIndex = 5;
this.lblDummy.Visible = false;
//
// labelItem10
@@ -734,8 +750,9 @@ namespace VEPROMS
// ctrlAnnotationDetails
//
this.ctrlAnnotationDetails.AnnotationDirty = false;
this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" +
"ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n";
this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 " +
"Microsoft Sans Serif;}}\r\n{\\*\\generator Riched20 10.0.26100}\\viewkind4\\uc1 \r\n\\par" +
"d\\f0\\fs20\\par\r\n}\r\n";
this.ctrlAnnotationDetails.Annotations = null;
this.ctrlAnnotationDetails.AnnotationText = "";
this.ctrlAnnotationDetails.ClientProcess = null;
@@ -806,6 +823,7 @@ namespace VEPROMS
// tv
//
this.tv.AllowDrop = true;
this.tv.DelProcReason = null;
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.HideSelection = false;
@@ -926,7 +944,7 @@ namespace VEPROMS
this.displayTags.Dock = System.Windows.Forms.DockStyle.Fill;
this.displayTags.IsVisible = false;
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.MyEditItem = null;
this.displayTags.Name = "displayTags";
@@ -1111,8 +1129,8 @@ namespace VEPROMS
this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
this.displayRO.Location = new System.Drawing.Point(1, 1);
this.displayRO.Margin = new System.Windows.Forms.Padding(4);
this.displayRO.MyDvi = null;
this.displayRO.MyROFST = null;
//this.displayRO.MyROFSTLookup = null;
this.displayRO.MyRTB = null;
this.displayRO.Name = "displayRO";
this.displayRO.ProgressBar = null;
@@ -1126,6 +1144,7 @@ namespace VEPROMS
this.tc.ChgId = null;
this.tc.Dock = System.Windows.Forms.DockStyle.Fill;
this.tc.ForeColor = System.Drawing.SystemColors.ControlText;
this.tc.LastSelectedDisplayTabItem = null;
this.tc.Location = new System.Drawing.Point(334, 57);
this.tc.Margin = new System.Windows.Forms.Padding(4);
this.tc.MyAnnotationDetails = null;
@@ -1373,6 +1392,7 @@ namespace VEPROMS
// displaySearch1
//
this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill;
this.displaySearch1.LastSearchWasAnnotations = false;
this.displaySearch1.LoadingList = false;
this.displaySearch1.Location = new System.Drawing.Point(1, 1);
this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -1382,6 +1402,7 @@ namespace VEPROMS
this.displaySearch1.ProgressBar = null;
this.displaySearch1.ReportTitle = null;
this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.displaySearch1.SearchIncTransII = null;
this.displaySearch1.SearchResults = null;
this.displaySearch1.SearchString = null;
this.displaySearch1.Size = new System.Drawing.Size(314, 462);

View File

@@ -533,6 +533,7 @@ namespace VEPROMS
tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
tv.PrintSection += new vlnTreeViewEvent(tv_PrintSection);
tv.QPrintSection += new vlnTreeViewEvent(tv_QPrintSection);
tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
@@ -1213,7 +1214,19 @@ namespace VEPROMS
}
void tv_PrintSection(object sender, vlnTreeEventArgs args) // Quick Print right click menu on Procedure name.
//Print Section
//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
{
@@ -1225,7 +1238,9 @@ namespace VEPROMS
tc.SaveCurrentEditItem(si2.MyProcedure);
//B2025-032 Fix Section not Printing Applicability Properly
si2.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
{
@@ -1233,8 +1248,14 @@ namespace VEPROMS
prnDlg.SelectedSlave = args.UnitIndex;
prnDlg.MySessionInfo = MySessionInfo;
prnDlg.SetupForProcedure(); // Setup filename
prnDlg.ShowDialog(this); // Create Print report
if (quickprint)
prnDlg.QPCreatePDF(); // Create Print report
else
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;
}
}
@@ -2167,13 +2188,13 @@ namespace VEPROMS
btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
btnAdmin.SubItems.Add(btnAdministrativeTools);
this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnUserControlOfFormats, new SuperTooltipInfo("User Control Of Formats", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", null, null, null, null, eTooltipColor.Gray));
// C2025-031 added tool tip messages
this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray));
// remove commented out line below when User Control of Formats code is deleted
//this.superTooltip1.SetSuperTooltip(btnUserControlOfFormats, new SuperTooltipInfo("User Control Of Formats", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", "", "WARNING this will \nREMOVE ALL PROMS USERS and Reset to the\nOriginal Volian Defaults", null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstration Tools Window", null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", "", "Install New Formats \n or Re-Install Formats", null, null, eTooltipColor.Gray));
try
{
@@ -2196,6 +2217,9 @@ namespace VEPROMS
}
ctrlAnnotationDetails.MyUserInfo = MyUserInfo;
// re-set to old RTF initialization to older RFT string
ctrlAnnotationDetails.AnnotationRTFText= "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft Sans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n";
DisplayRO.MyUserInfo = MyUserInfo; // set the user's security information in the properties RO panel
StepTabRibbon.MyUserInfo = MyUserInfo; // set the user's security information in the ribbon
DisplayTransition.MyUserInfo = MyUserInfo; // set the user's security information in the Transition panel

View File

@@ -172,16 +172,16 @@
</data>
<data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
</value>
</data>
<data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
</value>
</data>
<data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -339,6 +339,9 @@
HM29CO23pWh3l/Bz4QZPYlnkk5YA/gbYS8m5Qty18AAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>240, 17</value>
</metadata>
<data name="btnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -389,9 +392,6 @@
2AlZGRmMVIjXgI7OLub6xkaVtLS0ovT09IjCwkIWdDUgDAAMn43RSw4q2AAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>240, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>651, 17</value>
</metadata>

View File

@@ -244,6 +244,16 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _TrimEnding, "@TrimEnding");
}
}
// C2025-033 to specify to print pagestyle item for a specific Child procedure
private LazyLoad<int?> _ChildNum;
public int? ChildNum
{
get
{
return (LazyLoad(ref _ChildNum, "@ChildNum"));
}
}
#endregion
#region Override ToString
public override string ToString()

View File

@@ -897,11 +897,7 @@ namespace Volian.Controls.Library
// B2023-072: Don't crash if annotation type was deleted for the restore annotation
if (ai == null)
{
AnnotationTypeInfo ati = AnnotationTypeInfo.Get(aai.TypeID);
if (ati == null)
{
FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
OnAnnotationRestored(ai, ai.MyItem);

View File

@@ -97,21 +97,6 @@ namespace Volian.Controls.Library
set { if (Visible != value) Visible = value; }
}
/// <summary>
/// Expose text properties for height and widht to handle selecting RO Image Types.
/// </summary>
public string TbFSwd
{
get {return tbFSWd.Text;}
set { tbFSWd.Text = value; tbFSWd.Refresh(); } // trBarFS.Value = Convert.ToInt32(value);
}
public string TbFSht
{
get { return tbFSHt.Text; }
set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
}
#endregion
#region Constructor
public DisplayTags()
@@ -172,6 +157,18 @@ namespace Volian.Controls.Library
tbFSWd.SelectionLength = 0;
tbFSWd.SelectionStart = tbFSWd.TextLength; // position to the end of the Width text box
}
/// <summary>
/// Update text properties for height and width for new RO Image Types.
/// </summary>
public void SetNewImageHeightAndWidth(int height, int width)
{
tbFSHt.Text = height.ToString();
tbFSWd.Text = width.ToString();
tbFSWd.Refresh();
tbFSHt.Refresh();
_origFigureSizeWidth = width;
_origFigureSizeRatio = (float)height / (float)width;
}
public void ToggleChangeBar() // for use with shortcut keystoke <ALT><F2>
{
if (rbChgBarOff.Checked)

View File

@@ -340,9 +340,8 @@ namespace Volian.Controls.Library
this.Height = MyPictureBox.Height + 10;
if (_displayTags != null)
{
_displayTags._origFigureSizeWidth = wd;
_displayTags.TbFSwd = wd.ToString();
_displayTags.TbFSht = ht.ToString();
// Set the Height and Width on the step properties page for the new image
_displayTags.SetNewImageHeightAndWidth(ht, wd);
}
}

View File

@@ -3588,7 +3588,9 @@ namespace Volian.Controls.Library
if (tmp.MyDisplayTabControl.MyCopyStep != null &&
tmp.MyDisplayTabControl.MyCopyStep.ItemID == MyEditItem.MyItemInfo.ItemID)
{
if (FlexibleMessageBox.Show("Are you sure?\n\nIf you delete this step you will not able to paste it.\nYou should paste it before you delete it.", "Attempting to delete copied step.", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
//B2025-031 - Improve wording for if attempting to delete copied section
string stype = MyEditItem.MyItemInfo.IsSection ? "section" : "step";
if (FlexibleMessageBox.Show($"Are you sure?\n\nIf you delete this {stype} you will not able to paste it.\nYou should paste it before you delete it.", $"Attempting to delete copied {stype}.", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
clearCopyStep = true;
}

View File

@@ -528,6 +528,11 @@ namespace Volian.Controls.Library
{
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;
private void OnPrintAllProcedures(object sender, vlnTreeEventArgs args)
{
@@ -994,11 +999,26 @@ namespace Volian.Controls.Library
mp.Tag = k;
}
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
{
if(!si2.IsSubsection) cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
if (!si2.IsSubsection)
{
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
}
}
}
}
@@ -1064,6 +1084,7 @@ namespace Volian.Controls.Library
if (i.HasWordContent)
{
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
}
}
#endregion
@@ -1867,6 +1888,9 @@ namespace Volian.Controls.Library
case "Print Section":
OnPrintSection(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
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":
OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0,mi.Text,(int)mi.Tag));
break;
@@ -2014,6 +2038,10 @@ namespace Volian.Controls.Library
VETreeNode tn2 = SelectedNode as VETreeNode;
OnPrintSection(this, new vlnTreeEventArgs(tn2 as VETreeNode, null, 0));
break;
case "Quick Print Section":
VETreeNode tn2qp = SelectedNode as VETreeNode;
OnQPrintSection(this, new vlnTreeEventArgs(tn2qp as VETreeNode, null, 0));
break;
case "Open":
OpenNode();
break;
@@ -2074,7 +2102,6 @@ namespace Volian.Controls.Library
case "Paste Procedure After":
case "Paste Section":
case "Paste Section Before":
case "Replace Existing Section":
case "Paste Section After":
case "Paste Step":
case "Paste Step Before":
@@ -2083,8 +2110,18 @@ namespace Volian.Controls.Library
case "Paste Subsection":
tv_NodePaste(mi.Text);
break;
case "Replace Existing Section":
//C2025-032 - Add check if user is sure want to paste replace section
DialogResult ovewriteExPS = FlexibleMessageBox.Show("This will overwrite the selected section with the one you copied, would you like to overwrite it?\r\n\r\nSelecting 'Cancel' will cancel the paste action.", "Overwrite the section?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
if (ovewriteExPS == DialogResult.Cancel) break;
else
{
tv_NodePaste(mi.Text);
break;
}
case "Replace Existing Procedure":
DialogResult ovewriteEx = FlexibleMessageBox.Show("This will overwrite the selected procedure with then one you copied, would you like to overwrite it?\r\n\r\nSelecting 'Cancel' will cancel the paste action.", "Overwrite the procedure?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
DialogResult ovewriteEx = FlexibleMessageBox.Show("This will overwrite the selected procedure with the one you copied, would you like to overwrite it?\r\n\r\nSelecting 'Cancel' will cancel the paste action.", "Overwrite the procedure?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
if (ovewriteEx == DialogResult.Cancel) break;
else

View File

@@ -252,6 +252,14 @@ namespace Volian.Print.Library
get { return _CountInApplProcs; }
set { _CountInApplProcs = value; }
}
// C2025-033 Child (slave) being printed
private static int _PrintingChild = 0;
public static int PrintingChild
{
get { return _PrintingChild; }
set { _PrintingChild = value; }
}
//private bool _AddBlankPagesForDuplexPrinting = false;
//public bool AddBlankPagesForDuplexPrinting // Tells us if a the option to add a blank page is turn on (for procedures with duplex foldouts)
//{
@@ -1363,6 +1371,8 @@ i = 0;
foreach (VEPROMS.CSLA.Library.PageItem pageItem in pageStyle.PageItems)
{
if (pageItem.Token == null) continue; // can be null if token is dependent on PSI lookup!
// 2024-089 selectively print pagestyle item base on Child Procedure being printed
if (PrintingChild > 0 && pageItem.ChildNum > 0 && pageItem.ChildNum != PrintingChild) continue; // C2025-033 item should not be printed for this child
DidHLSText = false; // reset to false for this group of tokens.
//if (pageItem.Token.Contains("HLSTEXT"))
// Console.WriteLine("{0} - PageList Token", pageItem.Token);