Commit Graph

6370 Commits

Author SHA1 Message Date
djankowski 5a4ec3b6b1 Merge pull request 'Development' (#117) from Development into master
Merging F2023-135 and B2023-093 from development into master after successful testing.
2023-09-14 15:58:52 -04:00
Kathy Ruffing 65c874508e Merge pull request 'F2023-135: Farley FSG - override width of unnumbered HLS' (#115) from FarleyWork into Development
No review required format only
2023-09-14 09:18:23 -04:00
Kathy Ruffing 830c84a62e F2023-135: Farley FSG - override width of unnumbered HLS 2023-09-14 09:11:36 -04:00
Chris Glavan 8b666ed287 Merge pull request 'B2023-093 Convert PROMS Word sections to the DOCX format if needed before Editing or Printing' (#114) from SaveWordSection_PDF_Security into Development
Merging into Development after successful code review
2023-09-13 16:32:24 -04:00
jjenko 6d5d87f04d B2023-093 added a Try Catch to the Convert method per suggestion from review 2023-09-13 16:27:13 -04:00
jjenko ef3efe2380 B2023-093 Convert PROMS Word sections to the DOCX format if needed before Editing or Printing 2023-09-13 14:27:38 -04:00
djankowski 2602d6c9d2 Merge pull request 'Development' (#113) from Development into master
Merging C2023-015 from development into master.
2023-09-12 09:23:57 -04:00
jjenko a923a597f3 Merge pull request 'C2023-015: Pagination on sub-step (currently only for Vogtle 3_4)' (#112) from VogtleWork into Development
Reviewed and approved the code for allowing page breaks at the sub-step level for the Vogtle Unit 3  & 4 Alarms.
2023-09-12 08:48:44 -04:00
Kathy Ruffing e4af381d0c C2023-015: Pagination on sub-step (currently only for Vogtle 3_4) 2023-09-12 06:56:48 -04:00
djankowski ff403583d7 Merge pull request 'Development' (#111) from Development into master
Merging B2023-091 and B2023-078 from development into master.
2023-08-30 16:07:17 -04:00
jjenko 350b943066 Merge pull request 'B2023-091: Vogtle Alarms pagination fix' (#109) from VogtleWork into Development
passed the code review
2023-08-30 14:09:40 -04:00
djankowski 1cf3a52afa Merge pull request 'B2023-078 When using the split screen PROMS was crashing when the user closed a procedure tab on the other split screen side which didn’t have the current editing focus. PROMS was trying to reposition to the procedure tab that had editing focus, we…' (#110) from B2023-078 into Development
Merging B2023-078 into Development.
2023-08-30 13:26:14 -04:00
jjenko 10821a478b B2023-078 When using the split screen PROMS was crashing when the user closed a procedure tab on the other split screen side which didn’t have the current editing focus. PROMS was trying to reposition to the procedure tab that had editing focus, we were not taking into account that saved currently active procedure tab could be in a different split screen. 2023-08-30 10:55:07 -04:00
Kathy Ruffing 3a6b1adc47 B2023-091: Vogtle Alarms pagination fix 2023-08-30 10:22:49 -04:00
djankowski c5577cc2bd Merge pull request 'Development' (#108) from Development into master
Merging F2023-134 from development into master.  No testing required since formats are under development.
2023-08-24 15:01:12 -04:00
jjenko ad476d8de4 Merge pull request 'F2023-134' (#107) from F2023-134_dontUnderlineAfterUnderbar into Development
format only change.
2023-08-24 14:59:31 -04:00
jjenko a472169c9d F2023-134
Turned off the format flag that was underlining text after an underbar when printing a RO return value
2023-08-24 14:56:37 -04:00
djankowski 78be6e5dc1 Merge pull request 'Development' (#106) from Development into master
Merging GitAutomation from Development into Master.
2023-08-24 09:13:06 -04:00
Chris Glavan dcc49a10e5 Merge pull request '~Added script to update local repository branches with remote repository branches' (#105) from GitAutomation into Development
Merging into development
2023-08-24 09:07:14 -04:00
Chris Glavan 3ea3c32d06 ~Added script to update local repository branches with remote repository branches 2023-08-24 09:05:40 -04:00
djankowski b954a41375 Merge pull request 'Development' (#104) from Development into master
Merging B2023-089 and F2023-131 from Development into Master.  No testing required since formats are under development.
2023-08-24 09:05:31 -04:00
jjenko 25d500c44e Merge pull request 'B2023-089: Search results – reselection of search results step that was deleted causes unexpected results when redisplayed in editor.' (#103) from GenWork into Development
Looks good. The new logic will now handle if the step that is trying to be opened was deleted.
2023-08-24 08:51:13 -04:00
Kathy Ruffing 7312330448 B2023-089: Search results – reselection of search results step that was deleted causes unexpected results when redisplayed in editor. 2023-08-24 06:46:20 -04:00
jjenko 0fa0213eac Merge pull request 'F2023-131 change font of generic EOP format to Arial' (#102) from F2023-131_ERGsFont into Development
Format only changes
2023-08-23 14:16:02 -04:00
jjenko 314356de36 F2023-131 change font of generic EOP format to Arial 2023-08-23 14:14:13 -04:00
djankowski 0100a11cfe Merge pull request 'Development' (#101) from Development into master
Merging F2023-125 from development into master.  No testing required since formats are under development.
2023-08-23 08:19:00 -04:00
Chris Glavan c9b0590be4 Merge pull request 'F2023-125' (#100) from F2023-125 into Development
Merging into Development.  No code review needed since formats are under development.
2023-08-22 16:39:05 -04:00
Chris Glavan e8029abdcb F2023-125
~Added FOLDOUT to the top of the page right-justified.
~Added section text to the top center of the page.
~Added "Indented Paragraph" step type with proper formatting.
2023-08-22 16:38:07 -04:00
Chris Glavan 7eaa14d196 F2023-125:
~Added FOLDOUT to the top of the page an right-justified it.
~Added section level text to the top middle of the page.
~Added "Indented Paragraph" step type with proper formatting
2023-08-22 16:33:16 -04:00
djankowski 04cf2e8534 Merge pull request 'Development' (#99) from Development into master
Merging F2023-130 from Development into Master. No testing required since formats are under development.
2023-08-22 15:04:22 -04:00
jjenko bc11b2118f Merge pull request 'F2023-130 Vogtle ReplaceWords - don't bold \Check' (#98) from VogtleAlarms into Development
format only change.
2023-08-22 14:12:46 -04:00
jjenko ba5e76edae F2023-130 Vogtle ReplaceWords - don't bold \Check 2023-08-22 14:09:59 -04:00
djankowski be00724818 Merge pull request 'Development' (#97) from Development into master
Merging B2023-088 from development into master.  No testing required since formats are under development.
2023-08-22 10:52:09 -04:00
jjenko 47c7af2918 Merge pull request 'VogtleWork' (#96) from VogtleWork into Development
Reviewed the code changes for the pagination logic.
Changes are isolated for Alarm Point procedures and controlled by a format flag and is used in the Vogtle Units 3 & 4 Alarm format.
Changes look good.
2023-08-22 10:48:29 -04:00
Kathy Ruffing d0b22aca17 B2023-088: Vogtle 3 & 4 Alarm pagination. Improved pagination for alarms: various alarms were not keeping bullet items together; Caution/Notes not always paginating as best as could be, should start at top of page if this keeps a lot of sub-step together. Put the code changes for pagination.cs & vlnParagraph.cs within a format flag ‘AlarmPagination’ 2023-08-22 09:05:05 -04:00
djankowski 274d93c61a Merge pull request 'Development' (#94) from Development into master
Merging F2023-122 from development into master.  No testing required since formats are under development.
2023-08-22 08:53:57 -04:00
Kathy Ruffing 707136d2fc B2023-088: Vogtle Alarm pagination issues 2023-08-22 08:46:07 -04:00
Chris Glavan 3e567a192c Merge pull request 'F2023-122: Corrected wording of the bottom continued message' (#93) from F2023-122 into Development
Merging into Development.  No code review required since formats are under development.
2023-08-22 08:44:33 -04:00
Chris Glavan d12733bd48 F2023-122: Corrected wording of the bottom continued message 2023-08-22 08:43:56 -04:00
djankowski 7dc4c30436 Merge pull request 'Development' (#92) from Development into master
Merging F2023-127 from development into master.  No testing required since formats are under development.
2023-08-22 08:33:56 -04:00
Chris Glavan d0ddbce414 Merge pull request 'F2023-127' (#91) from F2023-127 into Development
Merging into Development.  No code review needed since formats are under development.
2023-08-21 16:23:50 -04:00
Chris Glavan 19cec83ce4 F2023-127: Adjusted top margin for deleted procedures. **NOTE** - User must uncheck box to use Word margins in order for this to be in effect. 2023-08-21 16:22:42 -04:00
Chris Glavan ac8f56c85e F2023-127: Adjusted top margin for deleted procedures. **NOTE** - User must uncheck box to use Word margins in order for this to be in effect. 2023-08-21 16:21:19 -04:00
Chris Glavan c16cbd0978 F2023-127: Adjusted top margin for deleted procedures. **NOTE** - User must uncheck box to use Word margins in order for this to be in effect. 2023-08-21 16:17:37 -04:00
djankowski 028ef4bc31 Merge pull request 'Development' (#89) from Development into master
Merging F2023-128 and F2023-129 from development into master.  No testing required since formats are under development.
2023-08-21 11:46:01 -04:00
jjenko fcc9e1f99f Merge pull request 'VogtleAlarms' (#88) from VogtleAlarms into Development
format only changes.
2023-08-21 11:42:23 -04:00
jjenko 754e41645f F2023-128 don't bold /Block 2023-08-21 10:29:30 -04:00
jjenko 821859d2a7 F2023-129 lowercase "place" will now be bolded via ReplaceWords 2023-08-21 09:40:07 -04:00
djankowski 42124d65c7 Merge pull request 'Development' (#87) from Development into master
Merging F2023-118,  F2023-120 and F2023-121 from development into master.  No testing required since formats are under development.
2023-08-16 10:13:52 -04:00
Chris Glavan a363e2b12b Merge pull request 'F2023-121' (#86) from F2023-121 into Development
Merging into Development.  No code review needed since formats are under development.
2023-08-15 11:28:45 -04:00