Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

B2022-088: Find Doc Ro button not working in Word Sections

Browse Source 
B2022-089: Updating RO Crashes
This commit is contained in:
Jake
2022-08-08 10:04:21 +00:00
parent b6d69fbd4c
commit f8269a7ac6
13 changed files with 271 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
View File

@@ -735,12 +735,12 @@ namespace VEPROMS
// This is master/slave & a slave has been selected for printing (SelectedSlave > 0)
if (SelectedSlave > 0)
{
bool includeProc = MyProcedure.ApplInclude(SelectedSlave); // C2021-027: Procedure level PC/PC
bool includeProc = MyProcedure.ApplInclude(SelectedSlave); // C2021-027: Procedure level PC/PC?
if (!includeProc) VlnSvgPageHelper.CountInApplProcs++; // B2021-127: BNPPalr - Auto set of serial #
if (includeProc)
{
MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = SelectedSlave;
SetupForProcedure();
SetupForProcedure();?
//B2022-030 moved the watermark stuff after SetupForProcedure so that DisplayNumber is properly resolved and the proper unit watermark is found
// also moved the setting of override watermark to after SetUnitWatermark so that it truely overrrides
frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator watermark // C2021-062 save the entered Rev Number to all of the procedures that are being printed
@@ -984,6 +984,11 @@ namespace VEPROMS
//if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0}", MyProcedure.SearchDVPath.Replace("\a"," | "));
//if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0} | {1}", MyProcedure.DisplayNumber, MyProcedure.DisplayText);
// B2022-088: Find Doc Ro button not working in Word Sections
// Initialize Print Cache
MSWordToPDF.RoPrintCache = new Dictionary<string, ROFSTLookup.rochild>();
// RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered.
ProfileTimer.Pop(profileDepth2);
// B2016-249 Output Procedure to folder associated with Parent Child
@@ -1000,6 +1005,13 @@ namespace VEPROMS
frmStatus.ShowDialog();
ProfileTimer.Pop(profileDepth3);
}
// B2022-088: Find Doc Ro button not working in Word Sections
// Cleanup Print Cache
MSWordToPDF.RoPrintCache.Clear();
MSWordToPDF.RoPrintCache = null;
MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
this.Close();
ShowDebugFiles();

13
PROMS/VEPROMS User Interface/dlgExportImport.cs
View File

@@ -4086,16 +4086,19 @@ namespace VEPROMS
//}
_DidConvertROsToText |= true;
}
private bool _DidProcessROs = false; // B2017-076 flag that ROs where processed
private void AddROUsages(Content content, XmlNode xn)
{
AddROUsages(content, xn, false);
}
// part of bug fix B2017-060 added the isGrid parameter
private void AddROUsages(Content content, XmlNode xn, bool isGrid)
{
if (_ImportingApprovedExportFile) return; //B2020-095 the links are already removed from the import file
_DidProcessROs = false;
if (_ConvertROsToTextDuringImport)
ConvertImportProcedureROsToText(content, xn);
else
@@ -4113,7 +4116,15 @@ namespace VEPROMS
ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
string roval = lookup.GetRoValue(roid);
// B2022-088: Find Doc Ro button not working in Word Sections
string roidBase = string.Empty;
string roidExt = string.Empty;
string roid16 = ROFSTLookup.FormatRoidKey(roid, ref roidBase, ref roidExt, true);
ROFSTLookup.rochild roc = lookup.GetRoChild(roid16);
string roval = roc.value;
//string roval = (roc.ID < 0 || string.IsNullOrEmpty(roc.value)) ? "?" : roc.value;
if (roval == "?")
{