Compare commits

...

15 Commits

Author SHA1 Message Date
jjenko dd1a8dea33 F2024-010 - Added a Landscaped Word section type to all of the Vogtle Units 3 & 4 formats 2024-02-05 08:59:23 -05:00
jjenko 8496d70756 Merge pull request 'U2024-003-Help-Menu-Additions' (#218) from U2024-003 into Development
This is good for testing.
2024-01-31 13:38:25 -05:00
plarsen 9beeee2aac U2024-003-Help-Menu-Additions 2024-01-31 09:18:22 -05:00
jjenko 1c6ac4ac6a Merge pull request 'F2024-005' (#216) from F2024-005 into Development
format files look good
2024-01-29 16:04:38 -05:00
plarsen a8a654e168 F2024-005-Comanche-Peaks-Arial 2024-01-29 15:25:55 -05:00
plarsen 2439524413 F2024-005-Comanche-Peaks-Arial 2024-01-28 17:53:19 -05:00
Chris Glavan 1f125619f3 Merge pull request 'B2024-004 In the RO Editor, fixed the issue for when Child values have a length of zero, the parent value will now be displayed (as gray text) in the Child field. Also, when generating a RO.FST file, it will use the Parent value when the Child value …' (#215) from B2024-004 into Development
Merging into Development after successful code review
2024-01-26 10:41:36 -05:00
jjenko 5be9daa019 B2024-004 In the RO Editor, fixed the issue for when Child values have a length of zero, the parent value will now be displayed (as gray text) in the Child field. Also, when generating a RO.FST file, it will use the Parent value when the Child value length is zero. 2024-01-25 11:15:10 -05:00
jjenko 50e0fcb2b4 Merge pull request 'Format update fix. Needed to remove an invalid character at the beginning of the ComPeakFlexall.xml file. Note that the character was not visible in the editor but you could right arrow past it.' (#214) from GeneralDebugging into Development
Fixed the ComPeakFlexall.xml format file. there was an invalid (and invisible) character at the beginning of the file that needed to be removed for PROMS to be able to load it.

This will enable the testing of the previous Commanche Peak format check-in.
2024-01-24 16:48:58 -05:00
jjenko 4a3d32960f Format update fix. Needed to remove an invalid character at the beginning of the ComPeakFlexall.xml file. Note that the character was not visible in the editor but you could right arrow past it. 2024-01-24 16:44:55 -05:00
Chris Glavan 414c2239ee Merge pull request '~Modified font to use Arial' (#213) from B2023-114_PLarsen into Development
Merging into Development.  No code review needed due to format change
2024-01-24 13:52:10 -05:00
Chris Glavan f71bd0da19 ~Modified font to use Arial 2024-01-24 13:51:19 -05:00
djankowski 9b59810c89 Merge pull request 'F2024-006 Fixed pagination logic to that step text at the bottom of an Alarm Point page does not print on top of the bottom continue message' (#210) from Vogtle3&4 into Development
Merging F2024-006 into development after successful code review.
2024-01-24 08:40:57 -05:00
jjenko d59ef9118f Merge pull request 'B2024-001: Out of memory crash on update of ROs when RO has '>' or '<' and RO in table, when done from ribbon or admin tools' (#209) from GenWork into Development
Review successful. Good to merge into Development.
2024-01-24 08:05:05 -05:00
Kathy Ruffing 3b3a542b24 B2024-001: Out of memory crash on update of ROs when RO has '>' or '<' and RO in table, when done from ribbon or admin tools 2024-01-24 06:57:46 -05:00
26 changed files with 80 additions and 10 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -746,7 +746,7 @@ namespace RODBInterface
string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
//applicValues += ",";
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
if (cn == null)
if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
else
{
@@ -473,7 +473,7 @@ namespace ctlXMLEditLib
nd = node.SelectSingleNode(str);
// if not found with just the string, search the tree.
if (nd==null)nd = node.SelectSingleNode("*/"+str);
if (nd == null)
if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
else
{
@@ -44,8 +44,16 @@ using System.Runtime.InteropServices;
// Revision DHH (day - no leading zero, two digit hour - military time
//
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
[assembly: AssemblyVersion("2.1.2311.3014")]
[assembly: AssemblyFileVersion("2.1.2311.3014")]
[assembly: AssemblyVersion("2.1.2402.508")]
[assembly: AssemblyFileVersion("2.1.2402.508")]
+29 -5
View File
@@ -36,6 +36,8 @@ namespace VEPROMS
this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem();
this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem();
this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem();
this.btnShowErrFld = new DevComponents.DotNetBar.ButtonItem();
this.btnShowPrtFld = new DevComponents.DotNetBar.ButtonItem();
this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem();
this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton();
this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
@@ -206,11 +208,13 @@ namespace VEPROMS
this.btnHelp.KeyTips = "?";
this.btnHelp.Name = "btnHelp";
this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.btnHelpManual,
this.btnShortCuts,
this.btnHelpVWeb,
this.btnSendErrorLog,
this.btnHelpAbout});
this.btnHelpManual,
this.btnShortCuts,
this.btnHelpVWeb,
this.btnSendErrorLog,
this.btnShowErrFld,
this.btnShowPrtFld,
this.btnHelpAbout}); ;
this.btnHelp.Text = "Help";
//
// btnHelpManual
@@ -244,6 +248,24 @@ namespace VEPROMS
this.btnSendErrorLog.Text = "Send Error Log";
this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
//
// btnShowErrFld
//
//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
this.btnShowErrFld.Name = "btnShowErrFld";
this.btnShowErrFld.Text = "Open Log Folder";
this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
//
// btnShowPrtFld
//
//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
this.btnShowPrtFld.Name = "btnShowPrtFld";
this.btnShowPrtFld.Text = "Open Default Print Folder";
this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
//
//
//
// btnHelpAbout
//
this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
@@ -1733,6 +1755,8 @@ namespace VEPROMS
private DevComponents.DotNetBar.TabItem infotabFoldoutMaint;
private Volian.Controls.Library.DisplayFoldoutMaint displayFoldoutMaint;
private DevComponents.DotNetBar.ButtonItem btnSendErrorLog;
private DevComponents.DotNetBar.ButtonItem btnShowErrFld;
private DevComponents.DotNetBar.ButtonItem btnShowPrtFld;
private DevComponents.DotNetBar.TabControlPanel tabControlPanel3;
private DevComponents.DotNetBar.TabItem toosTabReports;
private Volian.Controls.Library.DisplayReports displayReports;
@@ -21,6 +21,7 @@ using DescriptiveEnum;
using Volian.Base.Library;
using Volian.Print.Library;
using JR.Utils.GUI.Forms;
using System.Diagnostics;
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
@@ -4932,6 +4933,26 @@ namespace VEPROMS
}
}
private void btnShowErrFld_Click(object sender, EventArgs e)
{
string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
path = path + @"\Documents\VEPROMS";
if (Directory.Exists(path))
{
Process.Start("explorer.exe", path);
}
}
private void btnShowPrtFld_Click(object sender, EventArgs e)
{
string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
path = path + @"\AppData\Local\Temp\VEPROMS";
if (Directory.Exists(path))
{
Process.Start("explorer.exe", path);
}
}
private void btnHelpManual_Click(object sender, EventArgs e)
{
// C2019-024 Display the PROMS User Manual when user click on the option in the Help drop down menu
@@ -170,6 +170,18 @@
rkJggg==
</value>
</data>
<data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
</value>
</data>
<data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
</value>
</data>
<data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -1533,9 +1533,13 @@ namespace VEPROMS.CSLA.Library
return myGrp;
}
// B2024-001: Loading of Ros was getting called over and over when ROs are in tables. Added
// a flag to only process once until completed, 'currentlyLoading'.
static bool currentlyLoading = false;
private void Load(int rofstID)
{
if (currentlyLoading) return; // B2024-001: don't load if in process of loading
currentlyLoading = true;
_dicRoCounts = new Dictionary<int, int>();
DateTime dtStart = DateTime.Now;
@@ -1631,6 +1635,7 @@ namespace VEPROMS.CSLA.Library
}
catch { }
}
currentlyLoading = false; // B2024-001: done loading
}
private void LoadChild(int rofstID, int dbiID, ROFSTLookup.rochild child)