Compare commits
14 Commits
C2015-028
...
F2025-024_
Author | SHA1 | Date | |
---|---|---|---|
dd5c709709 | |||
618247f4d5 | |||
abcf035143 | |||
0b015233a9 | |||
44d85b842c | |||
470f4a770b | |||
808a1ba0ea | |||
04cef606fc | |||
1ef6a1d0e4 | |||
b163a3a7b9 | |||
e7f7f28ff1 | |||
b9c17fd360 | |||
c7534a985a | |||
081373fc0d |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -284,6 +284,15 @@ namespace VEPROMS
|
|||||||
cachePartInfo = PartInfo.CacheList;
|
cachePartInfo = PartInfo.CacheList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//B2025-048 Problem with Printing CAS Steps
|
||||||
|
// skip doing section titles if printing CAS or CTAS
|
||||||
|
// - was causing it to
|
||||||
|
// skip/overwrite data
|
||||||
|
if (OnlyShowContinuousActionSummary)
|
||||||
|
{ MyPromsPrinter.PromsPrinterPrintType = PromsPrinterPrintType.CAS_Only; }
|
||||||
|
if (OnlyShowTimeCriticalActionSummary)
|
||||||
|
{ MyPromsPrinter.PromsPrinterPrintType = PromsPrinterPrintType.TCAS_only; }
|
||||||
|
|
||||||
_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID);
|
_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID);
|
||||||
|
|
||||||
ProfileTimer.Pop(profileDepth);
|
ProfileTimer.Pop(profileDepth);
|
||||||
|
@@ -1325,12 +1325,17 @@ namespace VEPROMS
|
|||||||
prnDlg.SetupForProcedure(); // Setup filename
|
prnDlg.SetupForProcedure(); // Setup filename
|
||||||
|
|
||||||
if (quickprint)
|
if (quickprint)
|
||||||
|
{
|
||||||
|
prnDlg.OverwritePDF = false; // turn off overwriting of PDFs B2025-051
|
||||||
prnDlg.QPCreatePDF(); // Create Print report
|
prnDlg.QPCreatePDF(); // Create Print report
|
||||||
else
|
}
|
||||||
prnDlg.ShowDialog(this); // Create Print report
|
else
|
||||||
|
{
|
||||||
|
prnDlg.ShowDialog(this); // Create Print report
|
||||||
|
}
|
||||||
|
|
||||||
//B2025-032 Fix Section not Printing Applicability Properly
|
//B2025-032 Fix Section not Printing Applicability Properly
|
||||||
si2.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
si2.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1802,14 +1807,15 @@ namespace VEPROMS
|
|||||||
// Deactivate previous procedure tab state by user
|
// Deactivate previous procedure tab state by user
|
||||||
VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
|
VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
|
||||||
// Save current procedure tab state
|
// Save current procedure tab state
|
||||||
foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
|
|
||||||
|
//B2024-082 Remember Tabs Not opening in correct order
|
||||||
|
foreach (DisplayTabItem dti in tc.MyBar.Items)
|
||||||
{
|
{
|
||||||
cnt++;
|
cnt++;
|
||||||
DisplayTabID = pgTab.Key;
|
DisplayTabID = dti.MyKey;
|
||||||
TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
|
TabItemID = dti.MyItemInfo.ItemID;
|
||||||
DisplayTabName = pgTab.Value.ToString();
|
DisplayTabName = dti.ToString();
|
||||||
//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
|
Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
|
||||||
VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2508,6 +2514,7 @@ namespace VEPROMS
|
|||||||
{
|
{
|
||||||
SelectedStepTabPanel.Select();
|
SelectedStepTabPanel.Select();
|
||||||
dlgFindReplace.MyEditItem = tc.MyEditItem;
|
dlgFindReplace.MyEditItem = tc.MyEditItem;
|
||||||
|
SpellChecker.MyEditItem = tc.MyEditItem; //B2025-043 Remember Tabs is not setting the EditItem for the active window causing a PROMS crash when Spell Check
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -603,7 +603,8 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
ItemInfo myItemInfo = myItemInfo2;
|
ItemInfo myItemInfo = myItemInfo2;
|
||||||
|
|
||||||
if (myItemInfo.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion
|
//B2025-046 Remember Tabs failing when swapping versions of PROMS
|
||||||
|
if (myItemInfo?.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion
|
||||||
{
|
{
|
||||||
FlexibleMessageBox.Show(this, "Possible disconnected item", "Item Not Found");
|
FlexibleMessageBox.Show(this, "Possible disconnected item", "Item Not Found");
|
||||||
return null;
|
return null;
|
||||||
|
@@ -85,6 +85,14 @@ namespace Volian.Print.Library
|
|||||||
ProgressSetup,
|
ProgressSetup,
|
||||||
LoadVlnParagraph
|
LoadVlnParagraph
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//B2025-048 Problem with Printing CAS Steps
|
||||||
|
public enum PromsPrinterPrintType
|
||||||
|
{
|
||||||
|
Normal,
|
||||||
|
CAS_Only,
|
||||||
|
TCAS_only
|
||||||
|
}
|
||||||
public class PromsPrinter
|
public class PromsPrinter
|
||||||
{
|
{
|
||||||
public bool NeedSupInfoBreak = false;
|
public bool NeedSupInfoBreak = false;
|
||||||
@@ -331,6 +339,12 @@ namespace Volian.Print.Library
|
|||||||
get { return _MergedPdf; }
|
get { return _MergedPdf; }
|
||||||
set { _MergedPdf = value; }
|
set { _MergedPdf = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//B2025-048 Problem with Printing CAS Steps
|
||||||
|
// default to Normal
|
||||||
|
// will skip certain logic if CAS Only or CTS Only
|
||||||
|
public PromsPrinterPrintType PromsPrinterPrintType { get; set; } = PromsPrinterPrintType.Normal;
|
||||||
|
|
||||||
public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite,
|
public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite,
|
||||||
ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
|
ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
|
||||||
{
|
{
|
||||||
@@ -1266,7 +1280,7 @@ namespace Volian.Print.Library
|
|||||||
set { _MyTimeCriticalActSummary = value; }
|
set { _MyTimeCriticalActSummary = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CreateWordDocPdf(PdfContentByte cb, SectionInfo mySection)
|
public void CreateWordDocPdf(PdfContentByte cb, SectionInfo mySection)
|
||||||
{
|
{
|
||||||
if (mySection.PageNumber == -1) // 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.
|
||||||
{
|
{
|
||||||
|
@@ -2159,7 +2159,10 @@ namespace Volian.Print.Library
|
|||||||
}
|
}
|
||||||
// If "doSectionTitleContinued" is true then print the section title with "(Continued)" appended to it
|
// If "doSectionTitleContinued" is true then print the section title with "(Continued)" appended to it
|
||||||
// format must have ContinueSectinHeader format flag set to true
|
// format must have ContinueSectinHeader format flag set to true
|
||||||
if (doSectionTitleContinued)
|
//B2025-048 Problem with Printing CAS Steps
|
||||||
|
// skip this if printing CAS or CTAS - was causing it to
|
||||||
|
// skip/overwrite data
|
||||||
|
if (doSectionTitleContinued && MyPromsPrinter.PromsPrinterPrintType == PromsPrinterPrintType.Normal)
|
||||||
{
|
{
|
||||||
vlnParagraph sectContPara;
|
vlnParagraph sectContPara;
|
||||||
string contMsg = (MyItemInfo.ActiveSection != null) ? MyItemInfo.ActiveSection.MyDocStyle.Continue.SectionTitle.AppendToTitle : ""; // C2018-003 fixed use of getting the active section
|
string contMsg = (MyItemInfo.ActiveSection != null) ? MyItemInfo.ActiveSection.MyDocStyle.Continue.SectionTitle.AppendToTitle : ""; // C2018-003 fixed use of getting the active section
|
||||||
|
Reference in New Issue
Block a user