Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Volian:3ad6dea425ca3779a6a884dc1e2c56e4582bf48b
Branches Tags
Volian:master Volian:Development Volian:B2025-041-Set-Quick-Print-overwrite-pdf-to-false Volian:B2025-042 Volian:C2025-048-Set-Quick-Print-overwrite-pdf-to-false Volian:B2025-037 Volian:C2025-045 Volian:C2025-049-update_StandardHyphens_AdminTools Volian:C2025-015_ViewMultipleApprovedPDFsOfSameName Volian:B2025-038-Copy-a-step-between-two-screens Volian:C2025-024 Volian:B2025-036-SplitScreen-Print-Error Volian:C2025-039_allowStepTransToAllWordProc Volian:C2025-047-cleanup Volian:C2025-047-AnnotationsTypeSelectChanges Volian:C2025-047-AnnotationsTypeSelectChanges-5 Volian:SQL_Optimization_7_31_2025 Volian:C2025-027-AnnotationsTypeSelect-3 Volian:C2025-027-AnnotationsTypeSelect-2 Volian:C2025-027-AnnotationsTypeSelect Volian:C2025-044 Volian:DEV_Proj_File_Dependency_Update Volian:B2025-039_PropFontColorRplWrds Volian:General_Debugging Volian:C2025-038_EventCalls Volian:F2025-016 Volian:B2025-035-Hold-Procedure-Set-Bug Volian:C2025-023 Volian:C2025-036_CleanupTabCode Volian:B2025-034-Add-error-message-documents-2 Volian:B2025-034-Add-error-message-documents Volian:F2025-015_SharonHarris Volian:B2025-024-Document-Unit-Print Volian:C2025-021 Volian:C2025-023-New-EP-Format-File Volian:F2024-089_BNPP_LOGO Volian:C2025-013 Volian:C2025-028_B2025-032 Volian:DemoFormats Volian:B2025-028 Volian:C2025_031_OptionsTooltips_Cleanup Volian:B2025-031 Volian:B2025-030 Volian:C2025-032 Volian:F2025-012 Volian:B2025-026_B2025-027 Volian:C2025-027-Develop-a-way-to-filter-annotations-so-the-user-can-view-only-the-types-they-want-to-see-EP Volian:F2025-011 Volian:B2025-010 Volian:B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2 Volian:B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search Volian:ACME_formats Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options-3 Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options-2 Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options Volian:F2025-004_Ginna Volian:B2025-017-Print-Section-Sub-Section-v2 Volian:DeveloperToolUpdate Volian:B2025-020_UpdateTransitions Volian:B2025-018 Volian:C2025-019 Volian:B2025-015 Volian:C2025-014_PDF_Step_BckMrk_Zoom Volian:B2025-019 Volian:C2024-038_v2 Volian:F2025-002_Farley Volian:B2025-016 Volian:C2024-038 Volian:OrgDotNetBar Volian:B2025-013 Volian:B2025-011-Global-search-is-not-finding-question-marks Volian:DotNetBar_net4.8.1 Volian:CLSA481Build Volian:B2025-014 Volian:B2025-012 Volian:C2025-011 Volian:F2025-001_BNPP Volian:C2019-025_Ability-to-Toggle-Replace-Words-3 Volian:C2025-005 Volian:C2019-025_Ability-to-Toggle-Replace-Words-2 Volian:C2019-025_Ability-to-Toggle-Replace-Words Volian:B2025-005 Volian:C2025-008 Volian:B2025-008 Volian:B2025-007 Volian:C2025-007 Volian:B2025-009 Volian:B2025-004_v2 Volian:B2025-004 Volian:C2025-006_B2025-006 Volian:C2025-003 Volian:B2025-003 Volian:C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-6 Volian:F2024-074-Farley_TOC Volian:C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS Volian:B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty Volian:B2024-062_EmptyProcedure Volian:B2024-068-VCS-Deviation-Format Volian:C2024-005 Volian:C2024-016-Write-Info-to-Results-Window-Delete-Annotations Volian:B2024-046-Set-Default-Tab-In-Admin-Tools Volian:C2024-005-Annotations-Cleanup Volian:B2024-041 Volian:C2024-004_fix Volian:C2021-059 Volian:B2024-032-Fix-Quick-Print
...
compare: Volian:B2024-032-Fix-Quick-Print
Branches Tags
Volian:master Volian:Development Volian:B2025-041-Set-Quick-Print-overwrite-pdf-to-false Volian:B2025-042 Volian:C2025-048-Set-Quick-Print-overwrite-pdf-to-false Volian:B2025-037 Volian:C2025-045 Volian:C2025-049-update_StandardHyphens_AdminTools Volian:C2025-015_ViewMultipleApprovedPDFsOfSameName Volian:B2025-038-Copy-a-step-between-two-screens Volian:C2025-024 Volian:B2025-036-SplitScreen-Print-Error Volian:C2025-039_allowStepTransToAllWordProc Volian:C2025-047-cleanup Volian:C2025-047-AnnotationsTypeSelectChanges Volian:C2025-047-AnnotationsTypeSelectChanges-5 Volian:SQL_Optimization_7_31_2025 Volian:C2025-027-AnnotationsTypeSelect-3 Volian:C2025-027-AnnotationsTypeSelect-2 Volian:C2025-027-AnnotationsTypeSelect Volian:C2025-044 Volian:DEV_Proj_File_Dependency_Update Volian:B2025-039_PropFontColorRplWrds Volian:General_Debugging Volian:C2025-038_EventCalls Volian:F2025-016 Volian:B2025-035-Hold-Procedure-Set-Bug Volian:C2025-023 Volian:C2025-036_CleanupTabCode Volian:B2025-034-Add-error-message-documents-2 Volian:B2025-034-Add-error-message-documents Volian:F2025-015_SharonHarris Volian:B2025-024-Document-Unit-Print Volian:C2025-021 Volian:C2025-023-New-EP-Format-File Volian:F2024-089_BNPP_LOGO Volian:C2025-013 Volian:C2025-028_B2025-032 Volian:DemoFormats Volian:B2025-028 Volian:C2025_031_OptionsTooltips_Cleanup Volian:B2025-031 Volian:B2025-030 Volian:C2025-032 Volian:F2025-012 Volian:B2025-026_B2025-027 Volian:C2025-027-Develop-a-way-to-filter-annotations-so-the-user-can-view-only-the-types-they-want-to-see-EP Volian:F2025-011 Volian:B2025-010 Volian:B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2 Volian:B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search Volian:ACME_formats Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options-3 Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options-2 Volian:C2024-041-Disable-UCF-(User-Control-of-Format)-options Volian:F2025-004_Ginna Volian:B2025-017-Print-Section-Sub-Section-v2 Volian:DeveloperToolUpdate Volian:B2025-020_UpdateTransitions Volian:B2025-018 Volian:C2025-019 Volian:B2025-015 Volian:C2025-014_PDF_Step_BckMrk_Zoom Volian:B2025-019 Volian:C2024-038_v2 Volian:F2025-002_Farley Volian:B2025-016 Volian:C2024-038 Volian:OrgDotNetBar Volian:B2025-013 Volian:B2025-011-Global-search-is-not-finding-question-marks Volian:DotNetBar_net4.8.1 Volian:CLSA481Build Volian:B2025-014 Volian:B2025-012 Volian:C2025-011 Volian:F2025-001_BNPP Volian:C2019-025_Ability-to-Toggle-Replace-Words-3 Volian:C2025-005 Volian:C2019-025_Ability-to-Toggle-Replace-Words-2 Volian:C2019-025_Ability-to-Toggle-Replace-Words Volian:B2025-005 Volian:C2025-008 Volian:B2025-008 Volian:B2025-007 Volian:C2025-007 Volian:B2025-009 Volian:B2025-004_v2 Volian:B2025-004 Volian:C2025-006_B2025-006 Volian:C2025-003 Volian:B2025-003 Volian:C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-6 Volian:F2024-074-Farley_TOC Volian:C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS Volian:B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty Volian:B2024-062_EmptyProcedure Volian:B2024-068-VCS-Deviation-Format Volian:C2024-005 Volian:C2024-016-Write-Info-to-Results-Window-Delete-Annotations Volian:B2024-046-Set-Default-Tab-In-Admin-Tools Volian:C2024-005-Annotations-Cleanup Volian:B2024-041 Volian:C2024-004_fix Volian:C2021-059 Volian:B2024-032-Fix-Quick-Print

222 Commits
3ad6dea425 ... B2024-032-

Author SHA1 Message Date
Paul Larsen
df9736f0fd B2024-032-Fix-Quick-Print 2024-05-12 17:22:00 -04:00
Paul Larsen
b085a727f0 Merge pull request 'B2024-031Fix for Transitions hyperlinks in PDFs' (#317) from B2024-031_PDF_HyperLinks_Fix into Development 
Reviewed-on: #317
 2024-05-10 07:46:43 -04:00
John Jenko
e548e1da63 B2024-031Fix for Transitions hyperlinks in PDFs 2024-05-09 16:47:52 -04:00
John Jenko
c320634d3d Merge pull request 'C2024-010' (#316) from C2024-010 into Development 
OK to generate test executable
 2024-05-09 15:25:55 -04:00
Paul Larsen
af889a8818 C2024-010 Add quick print to tabstepribbonReview 2024-05-09 14:10:16 -04:00
Paul Larsen
c265975cbe C2024-010 Add quick print to tabstepribbonReview 2024-05-08 17:32:06 -04:00
John Jenko
a41a398e7e Merge pull request 'B2024-026: page number transitions duplicate page number' (#314) from B2024-026 into Development 
ready to build for testing
 2024-05-08 13:53:13 -04:00
Kathy Ruffing
5edaf30601 B2024-026: page number transitions duplicate page number 2024-05-08 12:07:11 -04:00
Paul Larsen
df0c5259c0 Merge pull request 'C2024-007 When link information is created in a PDF during print, the link information includes the PDF file name of where the link is referencing. Logic was added to include any file prefix or suffix to the PDF file name that is saved in the link info…' (#313) from PDFLinks_Fix into Development 
Reviewed-on: #313
 2024-05-08 09:49:17 -04:00
John Jenko
10c25dbe44 C2024-007 When link information is created in a PDF during print, the link information includes the PDF file name of where the link is referencing. Logic was added to include any file prefix or suffix to the PDF file name that is saved in the link information so the Adobe can locate the file and open it when the use clicks on the link in the PDF. 2024-05-08 09:00:58 -04:00
John Jenko
2df37533a8 Merge pull request 'F2024-059 Customer requested an Asterisk Single Spaced List sub-step type. This was added to all Calaway formats' (#312) from F2024-059_Callaway into Development 
format only changes
 2024-05-07 16:07:55 -04:00
John Jenko
6392ee3f0f F2024-059 Customer requested an Asterisk Single Spaced List sub-step type. This was added to all Calaway formats 2024-05-07 16:00:36 -04:00
John Jenko
96ddce8b73 Merge pull request 'B2024-029 A newer version of Component One Flex Grid caused issues when creating a new table in PROMS. We are reverting back to the prior version of Flex Grid.' (#310) from GeneralDebugging into Development 
no code review needed. Testing Source Control Document will satisfy QA.
 2024-05-07 14:34:49 -04:00
John Jenko
c88caefe5d B2024-029 A newer version of Component One Flex Grid caused issues when creating a new table in PROMS. We are reverting back to the prior version of Flex Grid. 2024-05-07 14:32:57 -04:00
Paul Larsen
eb26b7a123 Merge pull request 'B2024-025 Older Parent/Child procedure sets use applicability tokens that do not include the “U-“ prefix.' (#309) from B2024-025_ApplicabilityTokens into Development 
Reviewed-on: #309
 2024-05-06 15:02:56 -04:00
John Jenko
c865b67398 B2024-025 Older Parent/Child procedure sets use applicability tokens that do not include the “U-“ prefix. 2024-05-06 13:49:03 -04:00
John Jenko
89814777b4 Merge pull request 'F2024-057 F2024-058 bullet symbom in ERG note, Allow the insert of sub-steps in Notes and Cautions' (#308) from GeneralDebugging into Development 
format only change.
 2024-04-26 16:21:23 -04:00
John Jenko
de7e2d5f2a F2024-057 F2024-058 bullet symbom in ERG note, Allow the insert of sub-steps in Notes and Cautions 2024-04-26 16:18:51 -04:00
Paul Larsen
f51866236f Merge pull request 'B2024-024 - Fixes issue when creating an Approved procedure import file (from Versions context menu) from a non-Parent/Child procedure set.' (#306) from GeneralDebugging into Development 
Reviewed-on: #306
 2024-04-26 10:08:30 -04:00
John Jenko
a9eec83382 B2024-024 - Fixes issue when creating an Approved procedure import file (from Versions context menu) from a non-Parent/Child procedure set. 2024-04-25 16:32:20 -04:00
John Jenko
fd5739bbcd Merge pull request 'C2023-006 Add time / eidt time to showing change bars.' (#305) from C2023-006 into Development 
code review successful. OK to create test exe's
 2024-04-24 14:06:47 -04:00
Paul Larsen
076e0bfe8e C2023-006 Add time / eidt time to showing change bars. 2024-04-24 13:41:15 -04:00
John Jenko
07d10c571b Merge pull request 'F2024-056 Centered the AND and OR separators in the PROMS User Manual single column format.' (#304) from GeneralDebugging into Development 
format only change
 2024-04-24 11:16:17 -04:00
John Jenko
20cbff0255 F2024-056 Centered the AND and OR separators in the PROMS User Manual single column format. 2024-04-24 11:15:31 -04:00
John Jenko
b643f7fdf8 Merge pull request 'F2024-054 F2024-055 Added a Dashed Double Spaced List and a Dashed Explicit OR sub-step type, Added "NO" to be underlined in ReplaceWords' (#303) from Vogtle3&4 into Development 
format only changes.
 2024-04-22 15:47:03 -04:00
John Jenko
0607fcf261 F2024-054 F2024-055 Added a Dashed Double Spaced List and a Dashed Explicit OR sub-step type, Added "NO" to be underlined in ReplaceWords 2024-04-22 15:43:31 -04:00
John Jenko
1289e52600 Merge pull request 'C2017-033 Remove text inserted for new step from V button' (#302) from C2017-033 into Development 
ready to build for testing
 2024-04-19 09:39:47 -04:00
Paul Larsen
fccc47483f C2017-033 Remove text inserted for new step from V button 2024-04-19 09:29:36 -04:00
John Jenko
5ffd99bd0e Merge pull request 'B2023-025: AER Ro table displays too far to left' (#301) from B2023-025 into Development 
Ok to build test exe
 2024-04-18 08:42:37 -04:00
Kathy Ruffing
dffea37fad B2023-025: AER Ro table displays too far to left 2024-04-18 08:36:51 -04:00
John Jenko
811076d432 Merge pull request 'C2024-008 -Created a PROMS executable use .Net version 4.8.1' (#299) from dotnet4_8_1 into Development 
just build settings - no code review needed.
 2024-04-16 14:18:45 -04:00
John Jenko
1bdfb7d1e3 C2024-008 -Created a PROMS executable use .Net version 4.8.1 
B2020-106 - Fixed insert of new symbols.
 2024-04-16 14:16:40 -04:00
John Jenko
4a3ca1c074 Merge pull request 'C2024-007: Proms form font combo box debug mode displayed by command line arg in debug mode' (#298) from GenWork into Development 
Ok to generate exes for testing
 2024-04-16 08:40:07 -04:00
Kathy Ruffing
9d50f55f71 C2024-007: Proms form font combo box debug mode displayed by command line arg in debug mode 2024-04-16 08:13:33 -04:00
Kathy Ruffing
b8e8e80acb Merge pull request 'F2024-053: Robinson foldouts printing on Purpose & Attachment sections' (#296) from F2024-053 into Development 
Formats: no review needed
 2024-04-10 07:14:02 -04:00
Kathy Ruffing
c77320d4e7 F2024-053: Robinson foldouts printing on Purpose & Attachment sections 2024-04-10 07:05:50 -04:00
John Jenko
59bc3141e8 Merge pull request 'removed AssemblyInfo.cs from Git cached' (#294) from GeneralDebugging into Development 
no testing needed.
 2024-04-05 14:49:59 -04:00
John Jenko
dc73cc3a50 removed AssemblyInfo.cs from Git cached 2024-04-05 14:47:56 -04:00
John Jenko
1433f14a0b Merge pull request 'F2024-052 - Beaver Valley Two Column Format. Allow Notes and Cautions off of sub-steps.' (#293) from F2024-052_BeaverValley into Development 
Format only change
 2024-04-05 12:18:41 -04:00
John Jenko
6e3fc49517 F2024-052 - Beaver Valley Two Column Format. Allow Notes and Cautions off of sub-steps. 2024-04-05 12:17:14 -04:00
John Jenko
d0f7da7ef6 Merge pull request 'F2024-051 Generic EOP Format, page width of Attachment section' (#291) from F2024-051_GenericEOPFmt into Development 
format only change
 2024-04-05 09:48:27 -04:00
John Jenko
b0776fb8b7 F2024-051 Generic EOP Format, page width of Attachment section 2024-04-05 09:43:15 -04:00
John Jenko
cae3e2323d Merge pull request 'B2024-021' (#290) from B2024-021 into Development 
Code change looks good
 2024-04-04 16:34:56 -04:00
Paul Larsen
ce8497e61f Merge pull request 'F2024-049 F2024-050 Generic EOP Format updates' (#289) from F2024-049_050_ERGFormat into Development 
Reviewed-on: #289
 2024-04-04 16:12:00 -04:00
Paul Larsen
72eaac478f B2024-021 2024-04-04 15:45:44 -04:00
John Jenko
776d9891d9 F2024-049 F2024-050 Generic EOP Format updates 2024-04-04 15:36:15 -04:00
Kathy Ruffing
6e37911462 Merge pull request 'F2024-045: BGE format - note/sub-step table overwrites note line' (#288) from F2024-045 into Development 
F2024-045: Calvert Format (BGEOI & BGESTP) – printed Note’s sub-step table extends beyond Note/Caution line
 2024-04-04 11:46:13 -04:00
Kathy Ruffing
d2cad3a9f7 F2024-045: BGE format - note/sub-step table overwrites note line 2024-04-04 11:42:39 -04:00
Paul Larsen
3f94097f73 Merge pull request 'B2024-019 - BNPP - Allow the use to select a sub-step that has a bullet instead of a number/letter step tab, when using the {Step Text} transitions. Also don’t show any Tables in the tree view to select the step to link to.' (#286) from B2024-019_BNPP_StepTextTransition into Development 
Reviewed-on: #286
 2024-04-01 14:48:28 -04:00
John Jenko
e45422755f B2024-019 - BNPP - Allow the use to select a sub-step that has a bullet instead of a number/letter step tab, when using the {Step Text} transitions. Also don’t show any Tables in the tree view to select the step to link to. 2024-04-01 14:32:26 -04:00
John Jenko
09b5cb4be4 Merge pull request 'B2024-017-Fix-BNPP-Table-Arrows' (#285) from B2024-017 into Development 
changes look good and ready for testing
 2024-03-28 11:22:35 -04:00
Paul Larsen
50f18ff803 B2024-017-fix-BNPP-Table-Arrows 2024-03-28 10:50:41 -04:00
Kathy Ruffing
6c733d54fc Merge pull request 'F2024-048 - Robinson requested that we use a hard space in the page number part of transitions that include page numbers. Made this change generic because it doen't make sence to break a page number on to the next line all by itstelf.' (#284) from F2024-048-HardSpaceInTransPageNum into Development 
Code review completed successfully
 2024-03-28 09:29:44 -04:00
Paul Larsen
64bdb9fb76 B2024-017-Fix-BNPP-Table-Arrows 2024-03-28 09:03:03 -04:00
John Jenko
389a3013b5 F2024-048 - Robinson requested that we use a hard space in the page number part of transitions that include page numbers. Made this change generic because it doen't make sence to break a page number on to the next line all by itstelf. 2024-03-27 16:12:00 -04:00
Paul Larsen
21c2012c15 Merge pull request 'F2024-047 - Added (to all BNPP formats) a transition type that can be used to referenced procedure steps containing standard step text.' (#283) from F2024-047_BNPP_Transition_To_Text into Development 
Reviewed-on: #283
 2024-03-27 14:48:45 -04:00
John Jenko
e309c4a814 F2024-047 - Added (to all BNPP formats) a transition type that can be used to referenced procedure steps containing standard step text. 2024-03-27 14:29:09 -04:00
John Jenko
95a39e5a12 Merge pull request 'B2024-018: enhanced linking with subsections' (#281) from B2024-018 into Development 
code review successful. OK to test.
 2024-03-27 10:39:42 -04:00
Kathy Ruffing
2c587dd848 B2024-018: enhanced linking with subsections 2024-03-27 10:06:37 -04:00
John Jenko
07f67414a9 Merge pull request 'F2024-021 -Adjusted the page margins in the Vogtle 2 column format' (#280) from Vogtle3&4 into Development 
Format only change.
 2024-03-27 09:57:22 -04:00
John Jenko
da4cbfd112 F2024-021 -Adjusted the page margins in the Vogtle 2 column format 2024-03-27 09:50:33 -04:00
Paul Larsen
e392c1fcc7 Merge pull request 'F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears.' (#279) from F2024-030_Vogtle3_4_PCTrans into Development 
Reviewed-on: #279
 2024-03-25 10:51:09 -04:00
John Jenko
eeacf9b969 F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears. 2024-03-25 09:15:07 -04:00
John Jenko
cf13e2f7d5 Merge pull request 'F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step.' (#278) from F2024-046-RobinsonTransition into Development 
Format only change.
 2024-03-22 15:23:11 -04:00
John Jenko
5db530f4e8 F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step. 2024-03-22 15:22:28 -04:00
John Jenko
d42e8115ec Merge pull request 'B2023-110-Symbols-in-tables' (#277) from B2023-110 into Development 
changes are good for testing.
 2024-03-22 15:19:38 -04:00
Paul Larsen
4f68414a8a B2023-110-Symbols-in-tables 2024-03-22 12:56:36 -04:00
Paul Larsen
9fd9eac16a Merge pull request 'B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel' (#276) from GeneralDebugging into Development 
Reviewed-on: #276
 2024-03-22 10:10:21 -04:00
John Jenko
c4e3ba10c6 B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel 2024-03-22 09:19:59 -04:00
John Jenko
3c632d4abc Merge pull request 'Fixing CSLA references' (#274) from GeneralDebugging into Development 
fixing build errors
 2024-03-20 14:12:13 -04:00
John Jenko
ccb2bab805 Fixing CSLA references 2024-03-20 14:11:56 -04:00
Paul Larsen
a5a0d389e2 Merge pull request 'F2024-037 Adjustments made for single column sections of the Vogtle Units 3 & 4, including length of un-numbered HLS, resetting the sub-step numbering when staring under an un-numbered HLS, removed “Two Column” from the section type name Purpose an…' (#273) from Vogtle3&4 into Development 
Reviewed-on: #273
 2024-03-19 16:23:41 -04:00
John Jenko
97dbfad875 F2024-037 Adjustments made for single column sections of the Vogtle Units 3 & 4, including length of un-numbered HLS, resetting the sub-step numbering when staring under an un-numbered HLS, removed “Two Column” from the section type name Purpose and Symptoms Step Editor 2024-03-19 15:30:57 -04:00
Chris Glavan
51ef1d127d Merge pull request 'CSLA_version_upgrade' (#272) from CSLA_version_upgrade into Development 
Merging into Development.

**NOTE**
Developers will need to update their 3rd Party Library repository to ensure that they have the latest CSLA version.  Review the Git documentation in Confluence for instructions on cloning the repository.
 2024-03-19 12:01:54 -04:00
Chris Glavan
31301c4717 ~Added CSLA v3.8.4 library 2024-03-19 11:21:21 -04:00
Chris Glavan
b01a9edc1e ~Upgraded CSLA library to v3.0.5 2024-03-18 11:42:04 -04:00
John Jenko
ac1041fa10 Merge pull request 'F2024-040 Fixed the Single Spaced Paragraph sub-step type and removed the duplicated one.' (#270) from Vogtle3&4 into Development 
format only changes
 2024-03-15 10:09:59 -04:00
John Jenko
f7a692248e F2024-044 Underline the Note tabs in the Commanche Peak ERG format. 2024-03-15 10:07:10 -04:00
John Jenko
49500f0926 Merge pull request 'F2024-044 Underline the Note tabs in the Commanche Peak ERG format.' (#268) from F2023-044_ComanchePeakNoteTab into Development 
format only change
 2024-03-14 14:01:06 -04:00
John Jenko
77cf0f09b4 F2024-044 Underline the Note tabs in the Commanche Peak ERG format. 2024-03-14 14:00:57 -04:00
Kathy Ruffing
4292581840 Merge pull request 'F2024-043 Corrected box around second level continuous action sub-step.' (#267) from Vogtle3&4 into Development 
Code review completed successfully.
 2024-03-14 06:49:06 -04:00
John Jenko
d9018c44e7 F2024-043 Corrected box around second level continuous action sub-step. 2024-03-13 16:32:27 -04:00
John Jenko
490c61c225 Merge pull request 'F2024-019 Put box around Continuous Action Sub-Step tab.' (#266) from Vogtle3&4 into Development 
format only changes
 2024-03-13 08:37:06 -04:00
John Jenko
021bcb3c65 F2024-019 Put box around Continuous Action Sub-Step tab. 2024-03-13 08:36:48 -04:00
John Jenko
8e433cc28e Merge pull request 'F2024-016 Remove column headers from Attachment – Word Section.' (#264) from Vogtle3&4 into Development 
Format only change
 2024-03-12 10:22:12 -04:00
John Jenko
33972bed19 F2024-016 Remove column headers from Attachment – Word Section. 2024-03-12 10:21:57 -04:00
Kathy Ruffing
ed65bded13 Merge pull request 'F2024-032: Robinson page number transitions in format' (#263) from F2024-032 into Development 
Robinson Format (CPL & CPLA) – add section number/title page number transition support
 2024-03-07 10:19:25 -05:00
Kathy Ruffing
c5e145e4f6 F2024-032: Robinson page number transitions in format 2024-03-07 10:16:39 -05:00
Paul Larsen
2c4a8a79ee Merge pull request 'F2024-027 & F2024-028 - Top continue message logic for Vogtle Units3&4 local Alarms Attachment sections' (#262) from Vogtle3&4 into Development 
Reviewed-on: #262
 2024-03-06 14:22:51 -05:00
John Jenko
42180012fe F2024-027 & F2024-028 - Top continue message logic for Vogtle Units3&4 local Alarms Attachment sections 2024-03-06 13:57:38 -05:00
John Jenko
00268c8fac Merge pull request 'Vogtle3&4' (#261) from Vogtle3&4 into Development 
Format only change
 2024-03-05 11:23:06 -05:00
John Jenko
eabfcf7b82 F2024-025 - Added a new Front Matter section that include the end message “END OF PROCEDURE TEXT”. 2024-03-05 11:23:26 -05:00
John Jenko
264b444464 Merge branch 'Development' into Vogtle3&4 2024-03-05 11:04:36 -05:00
Kathy Ruffing
b1efb03958 Merge pull request 'B2024-013 - Fixed issue where hard returns are replaced with semi-colons in section titles in Automatic Table of Contents and will use the hard return when printing the section title for Vogtle’s Units 3 & 4 formats.' (#257) from Vogtle3&4 into Development 
Code review completed successfully
 2024-03-05 10:59:07 -05:00
John Jenko
821ce21e24 Merge branch 'Development' into Vogtle3&4 2024-03-05 09:14:58 -05:00
Chris Glavan
02b0fa9b6d Merge pull request '~Added bolding to HLS in the AER and RNO' (#260) from F2024-034 into Development 
Merging into Development.  No code review needed due to formats being under development.
 2024-03-05 08:58:20 -05:00
Chris Glavan
315a897444 ~Added bolding to HLS in the AER and RNO 2024-03-05 08:57:08 -05:00
John Jenko
820f82e977 Merge branch 'Development' into Vogtle3&4 2024-03-04 14:10:08 -05:00
John Jenko
126eff7614 Merge pull request 'B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list' (#258) from B2024-014_Westinghouse_BulletStep into Development 
format only change
 2024-03-04 14:04:36 -05:00
John Jenko
82eeaeb351 B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list 2024-03-04 14:04:22 -05:00
John Jenko
78f83eb2a5 B2024-013 - Fixed issue where hard returns are replaced with semi-colons in section titles in Automatic Table of Contents and will use the hard return when printing the section title for Vogtle’s Units 3 & 4 formats. 2024-03-04 10:40:10 -05:00
Chris Glavan
e38a706931 Merge pull request '~Removed previous edits and added "Dashed Equipment List" type' (#255) from F2024-020 into Development 
Merged into Development.  No code review needed since formats are under development.
 2024-02-29 11:25:30 -05:00
Chris Glavan
8a8507395f ~Removed previous edits and added "Dashed Equipment List" type 2024-02-29 11:25:52 -05:00
Chris Glavan
e0faa6403f Merge pull request 'F2024-020' (#254) from F2024-020 into Development 
Merging into Development.  No code review needed since formats are under development.
 2024-02-29 10:43:51 -05:00
Chris Glavan
88391824eb ~Re-committing after merge conflict 2024-02-29 10:43:05 -05:00
Chris Glavan
b6f1c9cdb5 ~Added a Dashed Single Spaced List to the VEGP2 format 2024-02-29 10:35:53 -05:00
Chris Glavan
3a44d4cd0e Merge pull request '~Added the word "Step" after "Go To" and to the Through and And transition types.' (#251) from F2024-022 into Development 
Merging into Development.  No code review needed since formats are under development.
 2024-02-29 09:00:35 -05:00
Chris Glavan
e6f9ae3623 ~Added the word "Step" after "Go To" and to the Through and And transition types. 2024-02-29 08:59:45 -05:00
John Jenko
8fa08b09fa Merge pull request 'C2024-003-Print-Sub-Section' (#241) from C2024-003 into Development 
ready to build and test
 2024-02-28 10:46:06 -05:00
Paul Larsen
578b8842f7 C2024-003-print-sub-section 2024-02-28 09:16:47 -05:00
John Jenko
1db167e5ca Merge pull request 'F2024-026 - Added a transition type that is just a section number in parentheses in the Vogtle Alarms format.' (#249) from Vogtle3&4 into Development 
format only change
 2024-02-27 15:22:15 -05:00
John Jenko
78020ca40a F2024-026 - Added a transition type that is just a section number in parentheses in the Vogtle Alarms format. 2024-02-27 15:22:29 -05:00
Paul Larsen
fcaa0ce41d C2024-003-print-sub-section 2024-02-27 12:02:21 -05:00
John Jenko
6fed25bbfa Merge pull request 'F2024-029 Add a bottom continue message in the Attachment – Step Editor section type in the Vogtle Alarms format.' (#247) from GeneralDebugging into Development 
Format change
 2024-02-27 10:54:33 -05:00
John Jenko
eee137a324 F2024-029 Add a bottom continue message in the Attachment – Step Editor section type in the Vogtle Alarms format. 2024-02-27 10:54:39 -05:00
Paul Larsen
3710e871a9 Merge remote-tracking branch 'origin/Development' into C2024-003 2024-02-27 10:31:20 -05:00
Kathy Ruffing
b3c6ce633d Merge pull request 'B2024-009: Front Matter Notes & Cautions not in global search for step types' (#246) from B2024-009 into Development 
Reviewed-on: #246
 2024-02-27 10:22:39 -05:00
Paul Larsen
15048a317f Merge remote-tracking branch 'origin/Development' into C2024-003 2024-02-27 09:11:59 -05:00
Chris Glavan
527422876a Merge pull request '~Fixed box location around high level continuous action step number' (#245) from B2024-010 into Development 
Merging into Development.  No code review needed for format change.
 2024-02-27 09:07:18 -05:00
Chris Glavan
11f307ec0d ~Fixed box location around high level continuous action step number 2024-02-27 09:02:10 -05:00
Kathy Ruffing
77706f22e4 B2024-009: Front Matter Notes & Cautions not in global search for step types 2024-02-27 07:13:00 -05:00
Paul Larsen
9e56422df8 C2024-003-print-sub-section 2024-02-26 23:00:29 -05:00
Paul Larsen
092ed83ca4 C2024-003-print-sub-section 2024-02-26 16:06:04 -05:00
Paul Larsen
6078d30a94 Revert "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" 
This reverts commit 82fa4f1e74.
 2024-02-26 15:08:52 -05:00
Paul Larsen
9804cf0fce C2024-003-print-sub-section 2024-02-26 12:48:54 -05:00
John Jenko
faed1cdfd6 Merge pull request 'F2024-023 - Shortened the section title length in the Vogtle Alarms format.' (#244) from Vogtle3&4 into Development 
format only change
 2024-02-26 11:43:31 -05:00
John Jenko
7d5997cd43 F2024-023 - Shortened the section title length in the Vogtle Alarms format. 2024-02-26 11:43:45 -05:00
Paul Larsen
72457d956e C2024-003-print-sub-section 2024-02-26 10:04:57 -05:00
John Jenko
d55df8beb0 Merge pull request 'B2024-011: Import of unit information ROs not importing correctly' (#243) from B2024-011 into Development 
Code change looks good and is ready for testing
 2024-02-26 09:00:31 -05:00
Kathy Ruffing
b2d238f8e1 B2024-011: Import of unit information ROs not importing correctly 2024-02-26 08:19:49 -05:00
Paul Larsen
837978da92 C2024-003-print-sub-sections 2024-02-25 21:40:27 -05:00
John Jenko
2005eab8cb Merge pull request 'B2024-012' (#242) from Vogtle3&4 into Development 
format only change
 2024-02-23 14:22:29 -05:00
John Jenko
f3b5b425c0 B2024-012 
Set AllUnits format flag to True so that RO value unit of measures are always displayed when more than on with the same unit of measure is in the same line of text.
 2024-02-23 14:21:03 -05:00
Paul Larsen
dcfdf5f852 C2024-003-Print-Sub-Section 2024-02-22 16:54:56 -05:00
John Jenko
77d31a4a99 Merge pull request 'F2024-017 - Corrected the Open Bullet List - Double Spaced so that there is only one blank line between items. This was corrected in all of the Beaver Valley formats.' (#240) from F2024-017_BeaverValley into Development 
format only changes
 2024-02-22 14:10:50 -05:00
John Jenko
b09c6d654c F2024-017 - Corrected the Open Bullet List - Double Spaced so that there is only one blank line between items. This was corrected in all of the Beaver Valley formats. 2024-02-22 14:06:13 -05:00
John Jenko
5a1116f359 Merge pull request 'F2024-018 - Adjust ReplaceWords in the Vogtle Alarm format so that that works “Shutdown:” and “Start:” are not bolded.' (#238) from Vogtle3&4 into Development 
Format only change.
 2024-02-21 10:57:38 -05:00
John Jenko
e171aa66fe F2024-018 - Adjust ReplaceWords in the Vogtle Alarm format so that that works “Shutdown:” and “Start:” are not bolded. 2024-02-21 10:57:37 -05:00
Chris Glavan
8883ac6358 Merge pull request '~Addressed out-of-memory exception being thrown when right-clicking on a procedure with previous revisions' (#237) from B2024-008 into Development 
Merging into Development.  No code review needed since part of joint developer effort.
 2024-02-19 12:15:54 -05:00
Chris Glavan
92345f8f91 ~Addressed out-of-memory exception being thrown when right-clicking on a procedure with previous revisions 2024-02-19 12:09:09 -05:00
Chris Glavan
85f683371c Merge pull request 'F2024-015' (#236) from F2024-015 into Development 
Merging into Development.  No code review needed due to formats in development.
 2024-02-19 10:43:07 -05:00
Chris Glavan
79f6a0eeb9 ~Adjusted width of High-level RNO in 2-column format 2024-02-19 10:43:40 -05:00
Chris Glavan
19aed4e5ac ~Adjusted width of High-level RNO in 2-column format 2024-02-19 10:35:40 -05:00
Paul Larsen
719d2b5d90 Merge pull request 'B2024-007 - Added missing settings to Beaver Valley’s Transition “{Proc Num} (Procedure Number Only)” to fix a null reference error' (#234) from B2024-007_BeaverValley_Transition into Development 
Reviewed-on: #234
 2024-02-16 10:57:31 -05:00
John Jenko
e83648ec38 B2024-007 - Added missing settings to Beaver Valley’s Transition “{Proc Num} (Procedure Number Only)” to fix a null reference error 2024-02-15 14:24:50 -05:00
John Jenko
03f7847484 Merge pull request 'F2024-014 - In all of the Comanche Peak formats, the Table step type was set to Arial 11' (#232) from F2024-014_ComPeak_Table_Font into Development 
format only changes
 2024-02-14 15:52:23 -05:00
John Jenko
fd24f57de3 F2024-014 - In all of the Comanche Peak formats, the Table step type was set to Arial 11 2024-02-14 15:50:55 -05:00
Paul Larsen
dff3f46ad9 Merge pull request 'B2024-006 - Improved memory management when performing the Refresh Transitions Amin Tool by encasing the getting of content information in Using statements. Same change was done for the method used by the Update RO Values Amin tool.' (#230) from B2024-006_AdminTool_Memory_mangement into Development 
Reviewed-on: #230
 2024-02-09 15:52:56 -05:00
John Jenko
afad3365bd B2024-006 - Improved memory management when performing the Refresh Transitions Amin Tool by encasing the getting of content information in Using statements. Same change was done for the method used by the Update RO Values Amin tool. 2024-02-09 14:30:11 -05:00
John Jenko
98d94baa03 Merge pull request 'C2024-002' (#228) from C2024-002 into Development 
code looks good test
 2024-02-09 09:32:48 -05:00
Paul Larsen
67f965d8dd Merge remote-tracking branch 'origin/Development' into C2024-002 2024-02-09 09:10:38 -05:00
Paul Larsen
1d0642a05a C2024-002-Print-Sections 2024-02-09 09:09:12 -05:00
John Jenko
a132d3de22 Merge pull request 'F2024-013 - The end message for Attachment and Procedure Step sections is now bolded and have a dash before and after the end message' (#227) from GeneralDebugging into Development 
format only changes for Vogtle Units 3 & 4
 2024-02-08 15:30:09 -05:00
John Jenko
a3c14cb999 F2024-013 - The end message for Attachment and Procedure Step sections is now bolded and have a dash before and after the end message 2024-02-08 15:27:53 -05:00
Kathy Ruffing
b94fb7988d Merge pull request 'B2024-005: Vogtle Alarm pagination' (#225) from B2024-005 into Development 
Reviewed-on: #225
 2024-02-08 08:56:58 -05:00
Kathy Ruffing
8903d2a53e B2024-005: Vogtle Alarm pagination 2024-02-08 06:50:10 -05:00
Kathy Ruffing
cec3b70fbf Merge pull request 'F2024-012 - Adjusted the Cover Page title spacing in all of the Vogtle Units 3 & 4 formats' (#224) from Vogtle3&4 into Development 
Code change reviewed successfully.
 2024-02-07 09:17:54 -05:00
John Jenko
fa10fe4190 F2024-012 - Adjusted the Cover Page title spacing in all of the Vogtle Units 3 & 4 formats 2024-02-06 16:30:35 -05:00
John Jenko
0a327a3d81 Merge pull request 'B2024-002: save step before update ROs from Step Ribbon' (#223) from B2024-002 into Development 
Code changes are good. OK to test.
 2024-02-06 11:55:48 -05:00
Kathy Ruffing
41abad1ad9 B2024-002: save step before update ROs from Step Ribbon 2024-02-06 11:47:49 -05:00
Paul Larsen
ce68bb9c42 C2024-002-Print-Sections 2024-02-06 11:30:55 -05:00
Kathy Ruffing
1ca341670e Merge pull request 'F2024-008 - Updated transition definitions to title case section numbers, section titles, and procedure titles. Also surround section titles with parenthesis.' (#222) from Vogtle3&4 into Development 
Reviewed-on: #222
 2024-02-06 08:58:08 -05:00
Paul Larsen
7b16478417 C2024-002-Print-Sections 2024-02-06 07:26:58 -05:00
John Jenko
06013afc8b F2024-008 - Updated transition definitions to title case section numbers, section titles, and procedure titles. Also surround section titles with parenthesis. 2024-02-05 15:43:54 -05:00
Paul Larsen
b0479c6334 C2024-002-Print-Sections 2024-02-05 14:42:30 -05:00
John Jenko
5112c7caff Merge pull request 'F2024-011 - Adjusted the Cover Page title length in all of the Vogtle Units 3 & 4 formats' (#221) from Vogtle3&4 into Development 
Format only change
 2024-02-05 09:41:36 -05:00
John Jenko
de8249b584 F2024-011 - Adjusted the Cover Page title length in all of the Vogtle Units 3 & 4 formats 2024-02-05 09:39:11 -05:00
John Jenko
3116729507 Merge pull request 'F2024-010 - Added a Landscaped Word section type to all of the Vogtle Units 3 & 4 formats' (#220) from Vogtle3&4 into Development 
Format only update
 2024-02-05 09:00:06 -05:00
John Jenko
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
Paul Larsen
54441eee06 C2024-002-Print-Sections 2024-02-02 16:02:38 -05:00
John Jenko
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
Paul Larsen
9beeee2aac U2024-003-Help-Menu-Additions 2024-01-31 09:18:22 -05:00
John Jenko
1c6ac4ac6a Merge pull request 'F2024-005' (#216) from F2024-005 into Development 
format files look good
 2024-01-29 16:04:38 -05:00
Paul Larsen
a8a654e168 F2024-005-Comanche-Peaks-Arial 2024-01-29 15:25:55 -05:00
Paul Larsen
2439524413 F2024-005-Comanche-Peaks-Arial 2024-01-28 17:53:19 -05:00
Paul Larsen
293224275d C2024-002-Print_section 2024-01-26 11:06:26 -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
Paul Larsen
9a546064cf C2024-002-Print-Section 2024-01-26 09:26:42 -05:00
John Jenko
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
Paul Larsen
d6cb841d46 C2024-002-Print-Section 2024-01-25 11:05:04 -05:00
Paul Larsen
0095b2883b C2024-002-Print-Section 2024-01-25 09:18:48 -05:00
John Jenko
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
John Jenko
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
Devin Jankowski
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
John Jenko
82fa4f1e74 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 2024-01-24 08:10:21 -05:00
John Jenko
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
Kathy Ruffing
d6f1f5fb0c Merge pull request 'F2023-112 Continuation of the initial check-in for the Vogtle Units 3 & 4 Background Document formats. Also tweaked TOC page num position in all VEGP formats.' (#206) from Vogtle3&4 into Development 
Reviewed-on: #206
 2024-01-17 08:47:06 -05:00
John Jenko
a2ec9162be F2023-112 Continuation of the initial check-in for the Vogtle Units 3 & 4 Background Document formats. Also tweaked TOC page num position in all VEGP formats. 2024-01-16 15:20:39 -05:00
John Jenko
e2f9dbf1e2 Merge pull request 'F2024-004 Added a Flex Deviation format per Beaver Valley’s request.' (#205) from F2024-004_BeaverVallyFlexDev into Development 
Format only change.
 2024-01-12 10:46:14 -05:00
John Jenko
3d6cbd9a6b F2024-004 Added a Flex Deviation format per Beaver Valley’s request. 2024-01-12 10:43:37 -05:00
John Jenko
35e4826dc4 Merge pull request 'B2023-114E' (#200) from B2023-114E-Comanche-Peaks-Arial into Development 
format changes look good. Ready to be tested
 2024-01-12 09:33:20 -05:00
Paul Larsen
5b985a3cbe B2023-114E-Comanche-Peaks-Arial 2024-01-12 09:12:38 -05:00
John Jenko
1be087a279 Merge pull request 'C2024-001-Quick-Print-In-ribbon' (#204) from C2024-001-Quick-Print-In-ribbon into Development 
code looked good.
 2024-01-11 14:25:53 -05:00
Paul Larsen
4afac4b3df Merge branch 'Development' into C2024-001-Quick-Print-In-ribbon 2024-01-11 12:42:06 -05:00
Paul Larsen
473a170983 Merge remote-tracking branch 'origin/Development' into C2024-001-Quick-Print-In-ribbon 2024-01-11 10:33:12 -05:00
Paul Larsen
87c4d13abe C2024-001-Quick-Print-In-Ribbon 2024-01-11 08:58:35 -05:00
Kathy Ruffing
e1972763ae Merge pull request 'Vogtle3&4' (#201) from Vogtle3&4 into Development 
Code Review completed successfully.
 2024-01-11 06:30:22 -05:00
Paul Larsen
f09a29318c B2023-114E-Comanche-Peaks-Arial 2024-01-10 18:01:11 -05:00
Paul Larsen
aa28de4ba8 C2024-001 Quick-Print-in-ribbon 2024-01-10 14:28:47 -05:00
John Jenko
8e4c42ac05 F2023-112 - adjust length of text next to purpose in background format, other format adjustments and cleanup 2024-01-10 12:17:53 -05:00
Paul Larsen
0a1c588625 B2023-114E 2024-01-09 20:24:01 -05:00
John Jenko
a6e85a6cda Merge pull request 'B2022-134: update ros crash when ro has '<' or '>' and ro is used in table' (#199) from GenWork into Development 
code was successfully reviewed.
 2024-01-09 12:00:00 -05:00
Kathy Ruffing
077564cd3e B2022-134: update ros crash when ro has '<' or '>' and ro is used in table 2024-01-09 10:43:27 -05:00
John Jenko
b8807f2289 Merge branch 'Development' into Vogtle3&4 2024-01-08 15:50:08 -05:00
John Jenko
71cef595ca F2023-112 format setting to remove -B from background proc num (used in title box) 2024-01-08 15:46:05 -05:00
Chris Glavan
eb00324edf Merge pull request 'Vogtle3&4' (#197) from Vogtle3&4 into Development 
Merging into Development after successful code review.
 2024-01-08 14:47:51 -05:00
John Jenko
f0670905b3 F2024-002 Fix the line spacing for the Attachment – Step Editor section type to restore the blank lines between sub-steps. 2024-01-05 15:47:34 -05:00
John Jenko
e53cc2ab71 F2023-112 -adjusted step widths 2024-01-05 15:03:54 -05:00
John Jenko
f02ca8bd86 F2023-112 Format Flag foruse of width override 2024-01-05 11:09:24 -05:00
John Jenko
27bbbdc9df Merge branch 'Development' into Vogtle3&4 2024-01-03 17:44:14 -05:00
John Jenko
bda5a54754 F2023-112 added format flag for full section number in step tab - for background format 2024-01-03 17:43:38 -05:00
John Jenko
935e666b7f Merge pull request 'F2023-126: center single line caution/note when more than 1 Vogtle Alarms' (#195) from GenWork into Development 
Code looks good. ready for testing.
 2024-01-03 09:38:50 -05:00
Kathy Ruffing
b1043cfec1 F2023-126: center single line caution/note when more than 1 Vogtle Alarms 2024-01-03 09:27:13 -05:00
John Jenko
ad64675119 Merge pull request 'F2024-001 Added an “Attachment – Step Editor” section type to the Vogtle Alarms format' (#194) from Vogtle3&4 into Development 
format only changes given to me from Jeff.
 2024-01-02 14:04:23 -05:00
John Jenko
e670b3776b F2024-001 Added an “Attachment – Step Editor” section type to the Vogtle Alarms format 2024-01-02 14:03:16 -05:00
Chris Glavan
10c4974cdf Merge pull request 'C2022-009 New link to Error folder' (#193) from C2022-009 into Development 
Merging into Development after successful code review.
 2024-01-02 11:07:28 -05:00
Paul Larsen
b6cbb97d7d C2022-009 New link to Error folder 2023-12-27 20:51:32 -05:00
Chris Glavan
c25421ceb6 Merge pull request 'C2023-024 Fix Duplicate Print Issue' (#192) from C2023-024B into Development 
Merging into Development after successful code review.
 2023-12-27 16:01:15 -05:00
Paul Larsen
041e28b61b C2023-024 Fix Duplicate Print Issue 2023-12-27 11:45:43 -05:00
165 changed files with 2500 additions and 18513 deletions
Expand all files Collapse all files

2
PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj
View File

@@ -27,7 +27,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>

4
PROMS/AdjustBuildRevision/Program.cs
View File

@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
{ {
// Allow for setting build revision on either proms or the roeditor: // Allow for setting build revision on either proms or the roeditor:
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ")) if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")"); outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
else else
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")"); outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
// if (outline != line) // if (outline != line)
// { // {
// Console.WriteLine("Before: '{0}'", line); // Console.WriteLine("Before: '{0}'", line);

2
PROMS/AdjustBuildRevision/app.config
View File

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

2
PROMS/Baseline/App.config
View File

@@ -6,7 +6,7 @@
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
</startup> </startup>
<userSettings> <userSettings>
<Baseline.Properties.Settings> <Baseline.Properties.Settings>

2
PROMS/Baseline/Baseline.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Baseline</RootNamespace> <RootNamespace>Baseline</RootNamespace>
<AssemblyName>Baseline</AssemblyName> <AssemblyName>Baseline</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SccProjectName> <SccProjectName>
</SccProjectName> </SccProjectName>

2
PROMS/DropDownPanel/DropDownPanel.csproj
View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>

2
PROMS/FlexableMessageBox/FlexableMessageBox.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FlexableMessageBox</RootNamespace> <RootNamespace>FlexableMessageBox</RootNamespace>
<AssemblyName>FlexableMessageBox</AssemblyName> <AssemblyName>FlexableMessageBox</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<SccProjectName> <SccProjectName>

4
PROMS/Formats/Formats.csproj
View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>
@@ -126,6 +126,7 @@
<Content Include="fmtall\BVPSAOPall.xml" /> <Content Include="fmtall\BVPSAOPall.xml" />
<Content Include="fmtall\BVPSAtchall.xml" /> <Content Include="fmtall\BVPSAtchall.xml" />
<Content Include="fmtall\BVPSBCKall.xml" /> <Content Include="fmtall\BVPSBCKall.xml" />
<Content Include="fmtall\BVPSFlexDEVall.xml" />
<Content Include="fmtall\BVPSDEVall.xml" /> <Content Include="fmtall\BVPSDEVall.xml" />
<Content Include="fmtall\BVPSNIBCKall.xml" /> <Content Include="fmtall\BVPSNIBCKall.xml" />
<Content Include="fmtall\BVPSSAMGall.xml" /> <Content Include="fmtall\BVPSSAMGall.xml" />
@@ -405,6 +406,7 @@
<Content Include="genmacall\BVPSAOP.svg" /> <Content Include="genmacall\BVPSAOP.svg" />
<Content Include="genmacall\BVPSAtch.svg" /> <Content Include="genmacall\BVPSAtch.svg" />
<Content Include="genmacall\BVPSbck.svg" /> <Content Include="genmacall\BVPSbck.svg" />
<Content Include="genmacall\BVPSFlexdev.svg" />
<Content Include="genmacall\BVPSdev.svg" /> <Content Include="genmacall\BVPSdev.svg" />
<Content Include="genmacall\BVPSNIBCK.svg" /> <Content Include="genmacall\BVPSNIBCK.svg" />
<Content Include="genmacall\BVPSSAMG.svg" /> <Content Include="genmacall\BVPSSAMG.svg" />

2
PROMS/Formats/app.config
View File

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

BIN
PROMS/Formats/fmtall/BASEall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BGEOIall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BGESTPall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BNPP1Newall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BNPP1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BNPP2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BNPPalrall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BNPPbckall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BNPPsamall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPS1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPS2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSAOPall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSAtchall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSBCKall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSDEVall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSFlexDEVall.xml Normal file
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSNIBCKall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSSAMGBCKall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSSAMGDEVall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BVPSSAMGall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CAL1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CAL2_00all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CAL2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CALBCKall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CALFSGBCKall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CALOTOall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CALSAMall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CPDEVall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CPFDEVall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CPFDataall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CPLAall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CPLall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CPSAMGDEVall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/CPSAMGDataall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/ComPeakFlex11all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/ComPeakFlexall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/GENall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/PROMSMan1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/TUECABNall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/TUECDEVall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/TUECSAMG1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/TUECSAMGall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/TUECall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGP1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGP2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGPAlrall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGPBckStpsall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGPBckall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wst1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wst2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wstalrall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wstbckall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wstdcsall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wstsamall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/BVPSFlexdev.svg Normal file
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/CPFData.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/CPSAMGData.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/CPSAMGdev.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/ComPeakFlex.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/ComPeakFlex11.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/ComPeakSAMG.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/VEGP1.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/VEGP2.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/VEGPAlr.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/VEGPBck.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/cpdev.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/cpfdev.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/tuec.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/tuecdev.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/tuecsamg.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/tuecsamg1.svg
View File

Binary file not shown.

2
PROMS/LBWordLibrary/LBWordLibrary.csproj
View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>

2
PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj
View File

@@ -33,7 +33,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
</assemblyBinding></runtime></configuration> </assemblyBinding></runtime></configuration>

6
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs
View File

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
// Build YYMM (two digit year, two digit month) // Build YYMM (two digit year, two digit month)
// Revision DHH (day - no leading zero, two digit hour - military time // Revision DHH (day - no leading zero, two digit hour - military time
// //
[assembly: AssemblyVersion("2.2.2306.2212")] [assembly: AssemblyVersion("2.3.2404.1611")]
[assembly: AssemblyFileVersion("2.2.2306.2212")] [assembly: AssemblyFileVersion("2.3.2404.1611")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the
@@ -89,6 +89,8 @@ using System.Runtime.CompilerServices;

2
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj
View File

@@ -44,7 +44,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
</assemblyBinding></runtime> </assemblyBinding></runtime>
<appSettings> <appSettings>

2
PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj
View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj
View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>

2
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj
View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs
View File

@@ -746,7 +746,7 @@ namespace RODBInterface
string csufx = string.Format("_PCCHILD{0}", pcChildIdx); string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
//applicValues += ","; //applicValues += ",";
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx); 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 applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
else else
{ {

2
PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj
View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj
View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj
View File

@@ -51,7 +51,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

2
PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj
View File

@@ -46,7 +46,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj
View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs
View File

@@ -473,7 +473,7 @@ namespace ctlXMLEditLib
nd = node.SelectSingleNode(str); nd = node.SelectSingleNode(str);
// if not found with just the string, search the tree. // if not found with just the string, search the tree.
if (nd==null)nd = node.SelectSingleNode("*/"+str); 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 GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
else else
{ {

2
PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj
View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

2
PROMS/RoAccessToSql/App.config
View File

@@ -60,6 +60,6 @@
</logger> </logger>
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
</startup> </startup>
</configuration> </configuration>

2
PROMS/RoAccessToSql/RoAccessToSql.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RoAccessToSql</RootNamespace> <RootNamespace>RoAccessToSql</RootNamespace>
<AssemblyName>RoAccessToSql</AssemblyName> <AssemblyName>RoAccessToSql</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<SccProjectName> <SccProjectName>

2
PROMS/TablePicker/TablePicker.csproj
View File

@@ -33,7 +33,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

Some files were not shown because too many files have changed in this diff Show More