Compare commits

..

26 Commits

Author SHA1 Message Date
a2aaba7886 F2023-102 allow sub-steps in Notes and Caution 2023-07-25 15:54:45 -04:00
2c3cf7f163 Merge pull request 'F2023-100 F2023-101 Vogtle Alarms' (#40) from F2023-100_F2023-101 into Development
Merging F2023-100 and F2023-101 into development. No testing is require since formats are under development.
2023-07-25 09:02:58 -04:00
afb9e2a162 F2023-100 F2023-101 Vogtle Alarms
~ alignment of "Description" label in Alarm Point Table
~ Revmove section number/title from Word Front Matter section  style
2023-07-25 08:51:11 -04:00
9feb073c07 Merge pull request '~Added "Effective Date" to PSI and cover page. Removed "Document Number" from PSI' (#38) from F2023-083 into Development
Merged into Development (no code review needed)
2023-07-20 16:22:16 -04:00
cb7a549a6f ~Added "Effective Date" to PSI and cover page. Removed "Document Number" from PSI 2023-07-20 16:19:55 -04:00
42483033d5 Merge pull request '~Added "Effective Date" to PSI and cover page. Removed "Document Number" from PSI' (#37) from F2023-083 into Development
Merged into Development (no code review needed)
2023-07-20 16:12:55 -04:00
a26f9dd89c ~Added "Effective Date" to PSI and cover page
~Removed "Document Number" from PSI
2023-07-20 16:11:07 -04:00
01b79bf2a3 Merge pull request 'F2023-098: Continued. Readd ProcAppl = true' (#35) from F2023-098Continued into Development
Reviewed-on: #35
2023-07-20 09:28:00 -04:00
ebc194331f F2023-098: Continued. Readd Proc_Appl = true 2023-07-20 09:20:29 -04:00
5f8011d4e0 Merge pull request '~Fixed DocStyle indexes since we added new pagestyle references' (#33) from F2023-083 into Development
Merged into Development (no code review needed)
2023-07-19 16:20:01 -04:00
5fff20b107 ~Fixed DocStyle indexes since we added new pagestyle references 2023-07-19 16:18:25 -04:00
7535c36cad Merge pull request '~Changed display name of PSI window from "VS Summer" to "Vogtle"' (#31) from F2023-083 into Development
Merged into Development (no code review needed)
2023-07-19 15:39:24 -04:00
74d4c80a4f ~Changed display name of PSI window from "VS Summer" to "Vogtle" 2023-07-19 15:38:18 -04:00
6768468a60 Merge pull request '~Adjustments made to the format files for UI puroses' (#30) from F2023-083 into Development
Merged into Development (no code review needed)
2023-07-19 15:34:52 -04:00
9243b011fd ~Adjustments made to the format files for UI puroses 2023-07-19 15:33:12 -04:00
7f401d74ba Merge pull request 'F2023-083: Copied 2 column format PSI changes into alarm format' (#28) from F2023-083 into Development
Merging into Development (no code review needed)
2023-07-19 14:36:09 -04:00
d9092f4f18 Fixed merge conflict 2023-07-19 14:34:15 -04:00
71a4350259 Fixing merge conflict 2023-07-19 14:27:46 -04:00
a7aed0ddf3 ~Copied 2 column format PSI data into alarm format 2023-07-19 14:03:11 -04:00
16876375df Merge pull request 'F2023-083' (#24) from F2023-083 into Development
Merging into Development (no code review needed)
2023-07-19 13:01:32 -04:00
deeb7ff3fa Merge pull request 'F2023-098: Vogtle 3/4 Alarm - add proc applicability. Code change also' (#23) from F2023-098 into Development
Merging changes into Development after successful code review
2023-07-19 12:51:05 -04:00
a8d13bb998 ~Added PSI information to coverpage and modified PSI dialog box with corresponding fields
~Added second Cover Page pagestyle to support differences in PSI for Unit 3 and Unit 4
2023-07-19 12:43:59 -04:00
411445901e F2023-098: Vogtle 3/4 Alarm - add proc applicability. Code change also 2023-07-19 10:24:27 -04:00
ceda31c80e ~Added table to printed cover page 2023-07-18 12:05:18 -04:00
db7775fbae Merge pull request 'F2023-089, F2023-090 - Vogtle 3&4 Alarms' (#21) from VogtleAlarms into Development
Merging F2023-089 and F2023-090 into development.  No testing is required since formats are currently under development.
2023-07-14 10:42:37 -04:00
9d6df6c80b Merge pull request 'F2023-078 - Alarm Point table in Editor' (#19) from VogtleAlarms into Development
Ready for merge into Development
2023-07-13 11:08:23 -04:00
8 changed files with 10 additions and 5 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -147,7 +147,8 @@ namespace Formats
}
Properties.Settings.Default.FormatPath = txbxPROMSFormatsPath.Text.Substring(0,txbxPROMSFormatsPath.Text.Length-1); // save the copy format path minus the ending backslash
Properties.Settings.Default.Save();
if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes)Application.Exit();
//if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes)
Application.Exit();
}
private void buttonX2_Click(object sender, EventArgs e)

Binary file not shown.

Binary file not shown.

View File

@ -44,8 +44,10 @@ 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.2306.2214")]
[assembly: AssemblyFileVersion("2.1.2306.2214")]
[assembly: AssemblyVersion("2.1.2307.2515")]
[assembly: AssemblyFileVersion("2.1.2307.2515")]

View File

@ -528,9 +528,11 @@ namespace VEPROMS.CSLA.Library
string mstr = (MyConfig as DocVersionConfig).Unit_ProcedureNumber;
string[] units = mstr.Split(",".ToCharArray());
string[] fromdata = fromunitdes.Split(",".ToCharArray());
// SelectedSlave is > 0 if a unit has been selected, for example from print or approve. It represents that index into the list of units.
if (DocVersionConfig.SelectedSlave > 0)
// F2023-098: depending on where this is called from & how data is set, the DocVersionConfig.SelectedSlave may be 0, but the
// procInfoSelectedChildToPrint will always have the correct value, i.e. 0 if not printing & the selected slave from the print selection.
// Check for procInfoSelectedChildToPrint > 0 also:
if (DocVersionConfig.SelectedSlave > 0 || procInfoSelectedChildToPrint > 0)
{
prefix = units[0].Replace("#", "");
if (str.ToUpper().IndexOf(@"<U-") > -1) return prefix + Regex.Replace(str, @"\<[uU]-[a-zA-Z]+\>", fromunitdes);