7090 Commits

Author SHA1 Message Date
59372b23e4 Merge pull request 'B2025-028 RO Editor - Parent Child Applicability - Default Values' (#554) from B2025-028 into Development
good for testing phase
2025-05-15 10:41:40 -04:00
2970c0d7d4 B2025-028 RO Editor - Parent Child Applicability - Default Values
While working with parent/child applicability with child applicability set for a setpoint group - assign the Setpoint Values and Short Description fields to have Child values.  All child values default to their parent values as expected.  However, if you click in the Parent field for the Short Description, the Child Values for the Short Description fields incorrectly defaulted to the Parent Setpoint Value instead of keeping the parent Short Description.
2025-05-15 10:28:47 -04:00
392f1b09b2 Merge pull request 'C2025-031 Fixed typos found in Tool Tip message from previous check-in of this code change' (#553) from C2025_031_OptionsTooltips_Cleanup into Development
Change just fixes typos in tool tip messages.  No code review needed.
Ready for testing phase
2025-05-15 09:03:53 -04:00
79f66e9641 C2025-031 Fixed typos found in Tool Tip message from previous check-in of this code change 2025-05-15 09:01:43 -04:00
e90fceca86 Merge pull request 'B2025-031 Improve wording for if attempting to delete copied section' (#552) from B2025-031 into Development
good for testing phase
2025-05-15 08:40:23 -04:00
24d5cee8b4 B2025-031 Improve wording for if attempting to delete copied section
When an attempt is made to delete a section in the edit window that has been copied, the "Attempting to delete copied step" message box appears.   This message box is incorrect because you're attempting to delete the section, not a step in the section.   This only happens on a section that has been copied.
2025-05-15 07:34:19 -04:00
1ba4c4f343 Merge pull request 'B2025-028 RO Editor - Parent Child Applicability - Default Values' (#551) from B2025-028 into Development
ready for testing phase
2025-05-14 11:49:10 -04:00
700d9656b2 B2025-028 RO Editor - Parent Child Applicability - Default Values
While working with parent/child applicability with child applicability set for a setpoint group - assign the Setpoint Values and Short Description fields to have Child values.  All child values default to their parent values as expected.  However, if you click in the Parent field for the Short Description, the Child Values for the Short Description fields incorrectly defaulted to the Parent Setpoint Value instead of keeping the parent Short Description.
2025-05-14 11:42:51 -04:00
0c17d9abc2 Merge pull request 'C2025-031 - Added Tool Tip text for button on V button. Code fix for DotNetBar Visual UI rendering' (#550) from C2025_031_OptionsTooltips_Cleanup into Development
looks good. Ready for QA.
2025-05-13 16:09:26 -04:00
2c1476b74c C2025-031 - Added Tool Tip text for button on V button. Code fix for DotNetBar Visual UI rendering 2025-05-13 16:03:44 -04:00
0fa71727ac Merge pull request 'B2025-030 Show Cannot restore wording if restoring Annotation with a deleted annotation type.' (#549) from B2025-030 into Development
good for testing phase
2025-05-13 14:27:23 -04:00
20cacf26ae B2025-030 Show Cannot restore wording if restoring Annotation with a deleted annotation type. 2025-05-13 14:17:57 -04:00
1d406b0c7e Merge pull request 'C2025-032 Add check if user is sure want to paste replace section.' (#548) from C2025-032 into Development
good for testing phase
2025-05-13 10:56:51 -04:00
a099d27b86 C2025-032 Add check if user is sure want to paste replace section. 2025-05-13 08:19:23 -04:00
717251ca5e Merge pull request 'Added PROMS Demo Fromats and dded a checkbox on the Copy Formats dialog to include the PROMS Demo formats.' (#547) from DemoFormats into Development
Developer tool update and PROMS Demo formats.
Not testing required.
2025-05-06 14:43:00 -04:00
5d3bb41275 Added PROMS Demo Fromats and dded a checkbox on the Copy Formats dialog to include the PROMS Demo formats. 2025-05-06 14:41:50 -04:00
e5211fee00 Merge pull request 'F2025-012 Format changes are needed to account for ABN procedures.' (#546) from F2025-012 into Development
Format change only - per John, no review needed.

Reviewed-on: #546
2025-05-05 14:37:14 -04:00
41cb078a94 F2025-012 Format changes are needed to account for ABN procedures.
In the ERG and ABN format, Attachment Step Editor (Two Column), the following changes need made:
- add a blank line between the Initial Action Step and the following high level step
- need the ability to insert sub-steps off of the Initial Action Step
- adjust extra line spacing above Initial Action Steps
- add a step designator in the edit window to indicate an Immediate Action Step
2025-05-05 14:36:23 -04:00
0a5e4076e1 Merge pull request 'B2025-026 - AND Substeps are Printing as Sequential Substeps in the ERG format /' (#545) from B2025-026_B2025-027 into Development
good for testing
2025-05-05 08:48:11 -04:00
c3534e21fa B2025-026 - AND Substeps are Printing as Sequential Substeps in the ERG format /
B2025-027 - Bottom Continue message now appears due to the AND step type being now sequential and step compression being shut off
2025-05-05 08:31:21 -04:00
06159c6b68 Merge pull request 'F2025-011 Format changes are needed to account for ABN procedures.' (#542) from F2025-011 into Development
good for testing phase
2025-04-30 09:55:55 -04:00
22c14d169b F2025-011 Format changes are needed to account for ABN procedures.
Adjustments to PSI location and Abnormal Procedure Steps Sections
2025-04-30 09:50:09 -04:00
db09db3cd0 Merge pull request 'F2025-011 Format changes are needed to account for ABN procedures.' (#541) from F2025-011 into Development
ready for testing phase
2025-04-28 13:33:44 -04:00
ba8a8b8673 F2025-011 Format changes are needed to account for ABN procedures. 2025-04-28 12:08:10 -04:00
6f354bfeee Merge pull request 'B2025-010 - Adjusted the positioning of the procedure title in the Catawba Deviation Format so that it is centered' (#539) from B2025-010 into Development
Format only change.  Ready for testing
2025-04-11 09:14:38 -04:00
818d764b3d B2025-010 - Adjusted the positioning of the procedure title in the Catawba Deviation Format so that it is centered 2025-04-11 09:11:02 -04:00
689ea71846 Merge pull request 'B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2' (#538) from B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2 into Development
good for testing phase
2025-04-07 14:05:24 -04:00
66295594e9 B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2 2025-04-07 13:46:28 -04:00
042b80b9f4 Merge pull request 'B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search' (#537) from B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search into Development
Good for testing phase
2025-04-07 10:59:46 -04:00
c4da241516 B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search 2025-04-07 10:48:40 -04:00
74ccbfa760 B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search 2025-04-04 13:13:28 -04:00
46d8838d0e B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search 2025-04-04 10:48:48 -04:00
94d2c32025 Merge pull request 'Added the format file used for the pre-tend ACME data which is used when updating the PROMS User Manual' (#536) from ACME_formats into Development
format used internally when working on the PROMS User Manual
2025-04-04 10:40:40 -04:00
64124cc0f7 Added the format file used for the pre-tend ACME data which is used when updating the PROMS User Manual 2025-04-04 10:38:26 -04:00
24c5bc5097 B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search 2025-04-03 18:01:13 -04:00
1ffde5de50 B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search 2025-04-03 14:20:21 -04:00
3828da2f8f Merge pull request 'C2024-041-Disable-UCF-(User-Control-of-Format)-options-3' (#534) from C2024-041-Disable-UCF-(User-Control-of-Format)-options-3 into Development
good for testing phase
2025-03-24 08:15:21 -04:00
1554d3cc33 C2024-041-Disable-UCF-(User-Control-of-Format)-options-3 2025-03-23 19:35:06 -04:00
d808b306b6 Merge pull request 'C2024-041-Disable-UCF-(User-Control-of-Format)-options-2' (#533) from C2024-041-Disable-UCF-(User-Control-of-Format)-options-2 into Development
good for testing phase
2025-03-21 08:18:08 -04:00
45aeb808fa C2024-041-Disable-UCF-(User-Control-of-Format)-options-2 2025-03-20 17:06:28 -04:00
74f9fc0c18 Merge pull request 'F2025-004 Customer requested the addition of a Two Column Attachment section type' (#531) from F2025-004_Ginna into Development
Format only change.  Good for testing phase
2025-03-06 16:15:32 -05:00
c2c90a2c2e F2025-004 Customer requested the addition of a Two Column Attachment section type 2025-03-06 16:13:52 -05:00
05ab077dda Merge pull request 'B2025-017-Print-Section-Sub-Section-v2' (#529) from B2025-017-Print-Section-Sub-Section-v2 into Development
good for testing phase
2025-02-28 08:16:52 -05:00
1ae422c74e B2025-017-Print-Section-Sub-Section-v2 2025-02-27 19:16:47 -05:00
5da62c3a5d Merge pull request 'Updated the developer tool that copied the format files to the FMTall an GENMACall folders. Added a list box to show what format files will not be copied.' (#528) from DeveloperToolUpdate into Development
This is an update to a tool that the developers use and is not released to the customers.
No testing required,
2025-02-27 11:21:53 -05:00
86a98118fb Updated the developer tool that copied the format files to the FMTall an GENMACall folders. Added a list box to show what format files will not be copied. 2025-02-27 11:20:31 -05:00
6a51208a13 Merge pull request 'B2025-020 Fixed NULL reference error while running the Refresh Transitions administrator tool.' (#527) from B2025-020_UpdateTransitions into Development
Looks good.
Ready for QA.
2025-02-26 11:48:06 -05:00
0749f5e724 B2025-020 Fixed NULL reference error while running the Refresh Transitions administrator tool. 2025-02-26 11:07:17 -05:00
f65644f553 Merge pull request 'B2025-018 PROMS - Issues with folder order in tree view.' (#526) from B2025-018 into Development
good for testing phase
2025-02-21 16:05:19 -05:00
dc74da6e86 B2025-018 PROMS - Issues with folder order in tree view. 2025-02-21 15:52:16 -05:00