From dd6d76dff7f567752f6c367b661fa58e164f5568 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 4 Jun 2015 11:25:58 +0000 Subject: [PATCH] Fix page number transition if on first page --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 2 +- PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 2 +- PROMS/Volian.Print.Library/PromsPrinter.cs | 2 +- PROMS/Volian.Print.Library/vlnParagraph.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 27428cd5..0cba51ec 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -929,7 +929,7 @@ namespace VEPROMS.CSLA.Library // dialog box that shows the step that causes the problem & a manual change will be necessary. // This is a rare occurence so it was decided that the amount of coding effort to fix this // would be so much in comparison to having the user fix manually (RHM/KBR Feb 2014). - private int _PageNumber = 0; + private int _PageNumber = -1; public int PageNumber { get { return _PageNumber; } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 62cab0f9..5462a5b9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1098,7 +1098,7 @@ namespace VEPROMS.CSLA.Library //At some point, add a property off a section 'IsFoldout' and use the next two lines: //if ((myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts && mySection.MyContent.Number.ToUpper() == "FOLDOUT") //|| (myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.AlternateFloatingFoldout && mySection.MyContent.Text.ToUpper().Contains("FOLDOUT"))) - if (tb._ToItem.PageNumber != 0 && (tb._FromItem.PageNumber != 0 || tb._FromItem.ActiveSection.MyContent.Number.ToUpper() == "FOLDOUT")) + if (tb._ToItem.PageNumber != -1 && (tb._FromItem.PageNumber != -1 || tb._FromItem.ActiveSection.MyContent.Number.ToUpper() == "FOLDOUT")) { int pgoffset = tb._ToItem.PageNumber - tb._FromItem.PageNumber; tb._ToItem.PageNumberUsed = tb._ToItem.PageNumber; diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index f5835460..84a3ee56 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -850,7 +850,7 @@ namespace Volian.Print.Library } public void CreateWordDocPdf(PdfContentByte cb, SectionInfo mySection) { - if (mySection.PageNumber == 0) // If page num transition goes to a section, need the pagenumber of section. + if (mySection.PageNumber == -1) // If page num transition goes to a section, need the pagenumber of section. mySection.PageNumber = _MyHelper.CurrentPageNumber; int profileDepth = ProfileTimer.Push(">>>> CreateWordDocPdf"); _MyHelper.MySection = mySection; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index db457437..672f0987 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -467,7 +467,7 @@ namespace Volian.Print.Library pagenumTran = MyPageHelper.CurrentPageNumberNoFoldouts; else pagenumTran = MyPageHelper.CurrentPageNumber; - if (MyItemInfo.PageNumber == 0) MyItemInfo.PageNumber = pagenumTran; + if (MyItemInfo.PageNumber == -1) MyItemInfo.PageNumber = pagenumTran; else if (MyItemInfo.PageNumberUsed != 0 && MyItemInfo.PageNumberUsed != pagenumTran) { if (PromsPrinter.TransPageNumProblems == null) PromsPrinter.TransPageNumProblems = new List();