diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 78fa1929..3f4efc2c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -836,6 +836,8 @@ namespace VEPROMS.CSLA.Library bool imageROTokenReplaced = false; string[] vals = val.Split("\n".ToCharArray()); ROImageInfo roImage = ROImageInfo.GetByROFstID_FileName(rofst.ROFstID, vals[0]); + if (roImage == null) + roImage = rofst.GetROImageByFilename(vals[0],sect);// need code to go and get an ROImaage if it exists if (roImage != null) { ROImageFile roImageFile = new ROImageFile(roImage); diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index 7992eb41..bd8121e1 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -729,6 +729,7 @@ namespace Volian.Controls.Library fname += string.Format(".{0}", MyROFST.MyRODb.RODbConfig.GetDefaultGraphicExtension()); } if (tmp == null) tmp = ROImageInfo.GetByROFstID_FileName(MyROFST.ROFstID, fname); + if (tmp == null) tmp = MyROFST.GetROImageByFilename(fname, null); if (tmp !=null) { ROImageConfig rc = new ROImageConfig(tmp); diff --git a/PROMS/Volian.Print.Library/CompleteRORpt.cs b/PROMS/Volian.Print.Library/CompleteRORpt.cs index 05673c42..83e202a7 100644 --- a/PROMS/Volian.Print.Library/CompleteRORpt.cs +++ b/PROMS/Volian.Print.Library/CompleteRORpt.cs @@ -219,6 +219,7 @@ namespace Volian.Print.Library public void AddImage(string filename) { ROImageInfo roImage = ROImageInfo.GetByROFstID_FileName(_ROFstID, filename); + if (roImage == null) roImage = ROFstInfo.Get(_ROFstID).GetROImageByFilename(filename, null); PdfPCell spaceCell = new PdfPCell(); spaceCell.BorderColor = Color.WHITE; datatable.AddCell(spaceCell);