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

B2022-098: ROs not being resolved in Word Sections

Browse Source
This commit is contained in:
Jake
2022-08-16 15:02:30 +00:00
parent 9bdaebadfc
commit ac8e8432b7
10 changed files with 913 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
View File

@@ -530,21 +530,26 @@ namespace VEPROMS.CSLA.Library
private static List<string> GetROIDsFromLookup(ROFstInfo rofst, List<string> ChangedFiles, DocVersionInfo docver)
{
List<string> roids = new List<string>();
ROFSTLookup myLookup = new ROFSTLookup(rofst.ROFstID, docver);
// B2022-026 RO Memory Reduction code - get only the Image type of ROs
ROFSTLookup.rochild[] children = myLookup.GetRoChildrenByType(E_ROValueType.Image);
if (children != null && children.Length > 0)
// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
// B2022-098: [JPR] ROs not being resolved in Word Sections
if(rofst != null && ChangedFiles != null && ChangedFiles.Count > 0)
{
for (int i = 0; i < children.Length; i++)
{
string filename = children[i].value;
filename = filename.Substring(0, filename.IndexOf('\n'));
ROFSTLookup myLookup = new ROFSTLookup(rofst.ROFstID, docver);
// B2022-026 RO Memory Reduction code - get only the Image type of ROs
ROFSTLookup.rochild[] children = myLookup.GetRoChildrenByType(E_ROValueType.Image);
if (ChangedFiles.Contains(filename))
if (children != null && children.Length > 0)
{
for (int i = 0; i < children.Length; i++)
{
roids.Add(children[i].roid);
string filename = children[i].value;
filename = filename.Substring(0, filename.IndexOf('\n'));
if (ChangedFiles.Contains(filename))
{
roids.Add(children[i].roid);
}
}
}
}
@@ -600,11 +605,14 @@ namespace VEPROMS.CSLA.Library
{
Dictionary<string, int> myRoImagesList = new Dictionary<string, int>();
foreach (ROImageInfo myROImage in myROImages)
if (myROImages != null)
{
myRoImagesList.Add(ROImageKey(myROImage.FileName, myROImage.DTS), myROImage.ImageID);
foreach (ROImageInfo myROImage in myROImages)
{
myRoImagesList.Add(ROImageKey(myROImage.FileName, myROImage.DTS), myROImage.ImageID);
}
}
return myRoImagesList;
}
@@ -616,12 +624,18 @@ namespace VEPROMS.CSLA.Library
private static string buildImageIDString(List<int> myROImageIDs)
{
StringBuilder sb = new StringBuilder();
string sep = "";
foreach (int imageID in myROImageIDs)
// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
// B2022-098: [JPR] ROs not being resolved in Word Sections
if (myROImageIDs != null)
{
sb.Append(sep + imageID.ToString());
sep = ",";
string sep = string.Empty;
foreach (int imageID in myROImageIDs)
{
sb.Append(sep + imageID.ToString());
sep = ",";
}
}
return sb.ToString();