Compare commits

...

6 Commits

4 changed files with 12 additions and 4 deletions

View File

@@ -2628,7 +2628,6 @@ namespace ROEditor
success = ctlXMLEdit2.SaveData(); success = ctlXMLEdit2.SaveData();
if (!success) if (!success)
{ {
MessageBox.Show("Save Failed");
return false; return false;
} }
VlnXmlElement myro; VlnXmlElement myro;
@@ -2744,7 +2743,6 @@ namespace ROEditor
if (!success) if (!success)
{ {
tbtnRestore.Enabled = false; // old data may not be around tbtnRestore.Enabled = false; // old data may not be around
MessageBox.Show("Save Failed");
return; return;
} }

View File

@@ -772,6 +772,7 @@ namespace ctlXMLEditLib
dosaveflag = false; dosaveflag = false;
return (true); return (true);
} }
MessageBox.Show("Save Failed");
return (false); return (false);
} }

View File

@@ -587,6 +587,13 @@ namespace Volian.Controls.Library
if (forceReload || RoTreeNeedsReloaded || tvROFST.Nodes == null || tvROFST.Nodes.Count <= 0) if (forceReload || RoTreeNeedsReloaded || tvROFST.Nodes == null || tvROFST.Nodes.Count <= 0)
{ {
//B2025-008
//in cases where a RO table is clicked on
//it will refresh the list
//temp store what the ROID was before the list refreshes
//so can go to it after the refresh
string tmpROID = CurROLink?.ROID;
ROFSTLookup.rodbi[] dbs = MyROFSTLookup.GetRODatabaseList(true); ROFSTLookup.rodbi[] dbs = MyROFSTLookup.GetRODatabaseList(true);
// B2022-123: RO Tab Treeview not showing correct RO values when switching between procedures. // B2022-123: RO Tab Treeview not showing correct RO values when switching between procedures.
@@ -609,6 +616,8 @@ namespace Volian.Controls.Library
_currDocVersionID = null; _currDocVersionID = null;
if(_docVersionInfo != null) _currDocVersionID = (int?)_docVersionInfo.VersionID; if(_docVersionInfo != null) _currDocVersionID = (int?)_docVersionInfo.VersionID;
if (tmpROID != null) ExpandNode(ROFSTLookup.FormatRoidKey(tmpROID, true));
} }
var unitInfoNode = tvROFST.Nodes.Cast<TreeNode>().Where(x => x.Text == "Unit Information").FirstOrDefault(); var unitInfoNode = tvROFST.Nodes.Cast<TreeNode>().Where(x => x.Text == "Unit Information").FirstOrDefault();

View File

@@ -409,7 +409,7 @@ namespace Volian.Print.Library
else if (cai.Type > 20099) // B2020-054: Always put out 'Equation' (removed checking for null text) else if (cai.Type > 20099) // B2020-054: Always put out 'Equation' (removed checking for null text)
txt = "Equation"; txt = "Equation";
else else
txt = ItemInfo.ConvertToDisplayText(cai.Text); txt = ItemInfo.ConvertToDisplayText(cai.Text).Replace("Go to \u25cf", "Go to ?");
if (MyProc.MyDocVersion.MultiUnitCount > 1) if (MyProc.MyDocVersion.MultiUnitCount > 1)
{ {
System.Xml.XmlNode nd; System.Xml.XmlNode nd;
@@ -1570,7 +1570,7 @@ namespace Volian.Print.Library
else if (cai.Type > 20099) else if (cai.Type > 20099)
txt = "Equation"; txt = "Equation";
else else
txt = ItemInfo.ConvertToDisplayText(cai.Text); txt = ItemInfo.ConvertToDisplayText(cai.Text).Replace("Go to \u25cf", "Go to ?");
// Add Parent/Child information if applicable // Add Parent/Child information if applicable
// We were doing this for the Chronology report so I added the same logic here for the Summary report // We were doing this for the Chronology report so I added the same logic here for the Summary report
if (MyProc.MyDocVersion.MultiUnitCount > 1) if (MyProc.MyDocVersion.MultiUnitCount > 1)