Compare commits

..
154 Commits
Author SHA1 Message Date
djankowski 8473cbb53f Merge pull request 'Development' (#840) from Development into master
Reviewed-on: #840
2026-11-13 15:34:14 -05:00
jjenko 81e9ceb784 Merge pull request 'B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step' (#838) from B2026-088 into Development
good for testing phase
2026-11-11 15:21:05 -05:00
mschill 1d51080765 B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step 2026-11-11 15:11:59 -05:00
jjenko df2934a654 Merge pull request 'F2026-029 Comanche Peak ERG and ABN format, The End Of Section was added back to the Abnormal Procedure Steps Two Column section style.' (#837) from F2026-029_ComanchePeak_ABN_Format into Development
Format only change.  Good for testing
2026-11-09 11:11:31 -05:00
jjenko 71a4aa313d F2026-029 Comanche Peak ERG and ABN format, The End Of Section was added back to the Abnormal Procedure Steps Two Column section style. 2026-11-09 11:12:16 -05:00
mschill f860ba367d Merge pull request 'B2026-093 Fixed a null reference error that happened when opening an alarm point page for the first time' (#836) from B2026-093_Vogtle_Alarms into Development
Looks good. Ready for QA.
2026-11-05 15:29:28 -05:00
jjenko 382b8d7434 B2026-093 Fixed a null reference error that happened when opening an alarm point page for the first time 2026-11-05 15:27:37 -05:00
jjenko 44bddbc95d Merge pull request 'F2026-027 In the Comanche Peak ERG and ABN format, removed the End of Section messages from the Abnormal section styles and move the bottom continue message up so that it does not run into the section number below it.' (#835) from F2026-027_ComPeak into Development
format only change.
Good for testing
2026-11-05 14:48:33 -05:00
jjenko eb246b1dbe F2026-027 In the Comanche Peak ERG and ABN format, removed the End of Section messages from the Abnormal section styles and move the bottom continue message up so that it does not run into the section number below it. 2026-11-05 14:50:20 -05:00
jjenko 93c6d32110 Merge pull request 'B2026-082 Fix Load Global Search' (#834) from B2026-082 into Development
good for testing
2026-11-03 08:36:22 -05:00
mschill 1a81c17ccd B2026-082 Fix Load Global Search 2026-11-03 08:13:56 -05:00
jjenko 9078e99741 Merge pull request 'B2026-090 Populate Step Properties Panel when PROMS restores saved display tabs' (#833) from B2026-090 into Development
good for testing phase
2026-10-29 14:15:03 -04:00
mschill bbaea7ab67 B2026-090 Populate Step Properties Panel when PROMS restores saved display tabs 2026-10-29 14:08:56 -04:00
jjenko dc22ff6e3b Merge pull request 'B2026-086 Have Shortcut Keys for adding an RNO auto-work instead of having to press a button after shortcut key' (#832) from B2026-086 into Development
good for testing phase
2026-10-26 08:41:17 -04:00
mschill 72359319a4 B2026-086 Have Shortcut Keys for adding an RNO auto-work instead of having to press a button after shortcut key 2026-10-23 14:41:29 -04:00
jjenko f663e4f956 Merge pull request 'B2026-091 RO Editor - Change Default Prefix to take existing prefixes into account for Setpoint/Graphics DBs' (#831) from B2026-091 into Development
good for testing
2026-10-22 09:25:45 -04:00
mschill 87e163af15 B2026-091 RO Editor - Change Default Prefix to take existing prefixes into account for Setpoint/Graphics DBs 2026-10-22 07:30:36 -04:00
jjenko cb5bb715cf Merge pull request 'B2026-085 Disable Symbols when leave a TextBox' (#830) from B2026-085 into Development
good for testing phase
2026-10-20 10:54:10 -04:00
mschill 3929c5c36f B2026-085 Disable Symbols when leave a TextBox 2026-10-20 10:24:23 -04:00
djankowski b3270e411a Merge pull request 'Development' (#803) from Development into master
Merging changes from dev into master after successful testing.
2026-08-12 09:56:29 -04:00
djankowski 4c155e0e63 Merge pull request 'Development' (#779) from Development into master
Merging changes from development into master after successful testing.
2026-06-18 15:09:37 -04:00
djankowski 8388cd59a8 Merge pull request 'Development' (#776) from Development into master
Merging from dev into master after successful testing.
2026-06-04 09:12:30 -04:00
djankowski 5a09069b08 Merge pull request 'Development' (#774) from Development into master
Merging dev into master after successful testing
2026-05-28 08:47:08 -04:00
djankowski 9e10948e59 Merge pull request 'Development' (#770) from Development into master
Merging development into master after successful testing.
2026-05-15 10:06:27 -04:00
djankowski f8663e038f Merge pull request 'Development' (#752) from Development into master
Merging from dev into master after successful testing.
2026-04-01 10:21:52 -04:00
djankowski 124cfb14ab Merge pull request 'Development' (#749) from Development into master
Merging from dev into Master after successful testing.
2026-03-27 10:50:22 -04:00
djankowski 4852b7c2c0 Merge pull request 'Development' (#735) from Development into master
Merging changes from dev into master after successful testing.
2026-03-12 15:17:28 -04:00
djankowski dd4b08ec2b Merge pull request 'Development' (#732) from Development into master
Merging changes from dev into master after successful testing.
2026-03-11 11:09:47 -04:00
djankowski 6aef00ffc6 Merge pull request 'Development' (#708) from Development into master
Merging dev into master after successful testing.
2026-02-09 08:26:02 -05:00
djankowski 76eb6fca13 Merge pull request 'Development' (#706) from Development into master
Merging dev into master after successful testing.
2026-02-06 09:37:35 -05:00
djankowski 892b84690e Merge pull request 'Development' (#698) from Development into master
Merging dev into master after successful testing.
2026-01-29 08:46:50 -05:00
djankowski b0bfb4d3f6 Merge pull request 'Development' (#690) from Development into master
Merging Development into master after successful testing.
2026-01-22 08:17:16 -05:00
djankowski af1a05ff40 Merge pull request 'Development' (#681) from Development into master
Merging C2025-043 from dev into master after successful testing.
2026-01-13 16:35:02 -05:00
djankowski de89200eae Merge pull request 'Development' (#678) from Development into master
Merging dev into master after successful testing.
2026-01-05 08:22:25 -05:00
djankowski 7009ca78f2 Merge pull request 'Development' (#675) from Development into master
Merging dev into master after successful testing.
2025-12-18 08:34:38 -05:00
djankowski 03c58b7ae3 Merge pull request 'Development' (#672) from Development into master
Merging changes from dev into Master after successful testing
2025-12-11 08:44:58 -05:00
djankowski c9166f6f92 Merge pull request 'Development' (#669) from Development into master
Merging all changes from dev into master after successful testing.
2025-12-05 11:50:16 -05:00
djankowski 343d6a8c9a Merge pull request 'Development' (#650) from Development into master
Merging from dev into master after successful testing.
2025-11-06 09:23:19 -05:00
djankowski 8c5c7a5d93 Merge pull request 'Development' (#634) from Development into master
Merging dev into master after successful testing.
2025-10-09 12:50:13 -04:00
djankowski 864ec2709c Merge pull request 'Development' (#620) from Development into master
Merging Dev into master after successful testing.
2025-09-24 08:25:00 -04:00
djankowski 4b1ca8d7bf Merge pull request 'Development' (#612) from Development into master
Merging data into master after successful testing
2025-09-11 12:13:22 -04:00
djankowski 3b73d54ea2 Merge pull request 'Development' (#600) from Development into master
Merging dev into master after successful testing.
2025-08-15 08:37:48 -04:00
djankowski 2ca433c83f Merge pull request 'Development' (#576) from Development into master
Merging Dev into Master after successful testing.
2025-07-28 08:20:18 -04:00
djankowski 0b40569727 Merge pull request 'Development' (#570) from Development into master
Reviewed-on: #570
2025-06-23 14:58:28 -04:00
djankowski afb0247d87 Merge pull request 'Development' (#559) from Development into master
Merging changes from dev into master after successful testing.
2025-05-20 13:24:21 -04:00
djankowski bce8461a7e Merge pull request 'Development' (#555) from Development into master
Merging all changes from dev into master after successful testing.
2025-05-15 15:01:00 -04:00
djankowski 9d5cc43d71 Merge pull request 'Development' (#543) from Development into master
Merging dev into master after successful testing.
2025-05-01 11:25:49 -04:00
djankowski bc1370ab29 Merge pull request 'Development' (#540) from Development into master
Merging changes from Development into master after successful testing.
2025-04-23 15:13:56 -04:00
djankowski eaf2b14cfc Merge pull request 'Development' (#535) from Development into master
Merging all changes from development into master after successful testing.
2025-03-26 09:25:11 -04:00
djankowski 1cf7d81aa5 Merge pull request 'Development' (#530) from Development into master
Merging all changes through B2025-017 from dev into master after successful testing.
2025-03-04 10:24:28 -05:00
djankowski f11a9536f0 Merge pull request 'Development' (#524) from Development into master
Merging all changes through B2025-015 from development into master after successful testing.
2025-02-20 15:33:44 -05:00
djankowski c7bdcf0104 Merge pull request 'Development' (#516) from Development into master
Merging changes from development into master after successful testing
2025-02-11 15:25:38 -05:00
djankowski df026499d5 Merge pull request 'Development' (#512) from Development into master
Merging all changes from development into master after successful testing.
2025-02-10 09:20:43 -05:00
djankowski a3aa4157b8 Merge pull request 'Development' (#508) from Development into master
Merging all changes through B2025-012 from development into master after successful testing.
2025-02-05 10:50:35 -05:00
djankowski 8f3268e1bc Merge pull request 'Development' (#504) from Development into master
Merging all changes from development into master after successful testing.
2025-01-30 15:55:02 -05:00
djankowski 5721d440e9 Merge branch 'master' of https://git.volian.com/Volian/SourceCode 2025-01-21 10:42:15 -05:00
djankowski 505c396283 Merge pull request 'Development' (#489) from Development into master
Merging from development into master after successful testing.
2025-01-21 10:41:15 -05:00
djankowski 643e6bc94f Merge pull request 'Development' (#486) from Development into master
Merging all items through B2025-003 from development in master after successful testing.
2025-01-09 15:02:16 -05:00
djankowski 76502e6d97 Merge pull request 'Development' (#481) from Development into master
Merging all changes through F2024-087 after successful testing.
2024-12-11 11:52:34 -05:00
djankowski 851a0b3810 Merge pull request 'Development' (#464) from Development into master
Merging all items through B2024-092 from development into master after successful testing.
2024-11-11 11:39:01 -05:00
djankowski fd8dbb4c8b Merge pull request 'Development' (#454) from Development into master
Merging all changes from development into master after successful testing.
2024-11-01 14:18:00 -04:00
djankowski 4ffd994c5e Merge pull request 'Development' (#450) from Development into master
Merging all development items into master after successful testing.
2024-10-31 09:11:59 -04:00
djankowski a34828113a Merge pull request 'Development' (#416) from Development into master
Merging C2017-031 and B2024-075 from development into master after successful testing.
2024-10-03 12:08:30 -04:00
djankowski 461329468c Merge pull request 'Development' (#413) from Development into master
Merging F2023-136 and F2024-074 in master after successful testing
2024-09-27 14:27:22 -04:00
djankowski 35de5df04d Merge pull request 'Development' (#410) from Development into master
Merging all items through B2024-03 from development into master after successful testing.
2024-09-17 12:03:23 -04:00
djankowski 4f0548fd60 Merge pull request 'Development' (#402) from Development into master
Merging C2021-034 and B2024-065 into master after successful testing.
2024-09-06 09:56:37 -04:00
djankowski 5c1d96cc51 Merge pull request 'Development' (#399) from Development into master
Merging all fixes through B2024-063 from development into master after successful testing.
2024-08-27 15:58:15 -04:00
djankowski 57049c0c52 Merge pull request 'Development' (#392) from Development into master
Merging B2024-059 and B2024-058 from development into master after successful testing.
2024-08-15 14:55:27 -04:00
djankowski 31326e1c91 Merge pull request 'Development' (#389) from Development into master
Merging all changes through F2024-069 from development into master after successful testing.
2024-08-09 13:06:40 -04:00
djankowski 3c60994a0a Merge pull request 'Development' (#373) from Development into master
Merging all changes through B2024-053 from development into master after successful testing.
2024-08-01 08:37:23 -04:00
djankowski 773cc42346 Merge pull request 'Development' (#362) from Development into master
Merging B2024-046 and B2024-047 from development into master after successful testing.
2024-07-25 10:44:42 -04:00
djankowski f46a1f39dc Merge pull request 'Development' (#359) from Development into master
Merging B2024-042 from development into master after successful testing.
2024-07-22 11:14:19 -04:00
djankowski b7175bf77f Merge pull request 'Development' (#357) from Development into master
Merging C2024-005 from development into master after successful testing.
2024-07-18 15:41:20 -04:00
djankowski ec22232aa8 Merge pull request 'Development' (#356) from Development into master
Merging all items through B2024-041 from development into master after successful testing.
2024-07-18 09:51:54 -04:00
djankowski f303cd2236 Merge pull request 'Development' (#348) from Development into master
Merging F2024-065 and F2024-066 from development into master after successful testing.
2024-07-03 10:45:41 -04:00
djankowski f40cef4416 Merge pull request 'Development' (#346) from Development into master
Merging F2024-064 from development into master after successful testing.
2024-07-01 11:54:15 -04:00
djankowski fbca97d38d Merge pull request 'Development' (#344) from Development into master
Merging C2024-013 from development into master after successful testing.
2024-06-25 15:55:32 -04:00
djankowski 28bd2cba5c Merge pull request 'Development' (#342) from Development into master
Merging C2022-029 from development into master after successful testing.
2024-06-20 11:36:59 -04:00
djankowski 4b35f73bbf Merge pull request 'Development' (#340) from Development into master
Merging C2024-004 from development into master after successful testing.
2024-06-19 16:23:23 -04:00
djankowski f4706eb126 Merge pull request 'Development' (#338) from Development into master
Merging C2019-047 from development into master after successful testing.
2024-06-17 08:38:34 -04:00
djankowski 21bcb90558 Merge pull request 'Development' (#335) from Development into master
Merging B2024-036 and F2024-063 from development into master after successful testing.
2024-06-06 14:51:13 -04:00
djankowski ae48ac0cae Merge pull request 'Development' (#332) from Development into master
Merging changes through B2024-035 from development into master after successful testing.
2024-05-30 08:08:28 -04:00
djankowski cb4979d5bc Merge pull request 'Development' (#327) from Development into master
Merging F2024-061 from development into master after successful testing.
2024-05-20 14:11:12 -04:00
djankowski 7d3ae74e1f Merge pull request 'Development' (#325) from Development into master
Merging F2024-060 from development into master after successful testing.
2024-05-16 15:32:13 -04:00
djankowski 9d680aa500 Merge pull request 'Development' (#323) from Development into master
Merging C2024-001 from development into master after successful testing.
2024-05-16 14:17:17 -04:00
djankowski 0d50b1c2fe Merge pull request 'Development' (#321) from Development into master
Merging all items through B2024-030 from development into master after successful testing.
2024-05-15 08:33:58 -04:00
djankowski 75e034863f Merge pull request 'Development' (#315) from Development into master
Merging all changes through B2024-026 from development into master after successful testing.
2024-05-09 14:01:48 -04:00
jjenko 3b42de1571 Merge pull request 'F2024-059_Callaway' (#311) from F2024-059_Callaway into master
Format only changes
2024-05-07 16:00:36 -04:00
djankowski 668472286e Merge pull request 'Development' (#307) from Development into master
Merging all changes through C2023-006 into master after successful testing.
2024-04-26 09:21:44 -04:00
djankowski e00d34c99d Merge pull request 'Development' (#300) from Development into master
Merging C2024-008 and C2024-007 from development into master after successful testing.
2024-04-17 14:57:22 -04:00
djankowski 9fb496dfb3 Merge pull request 'Development' (#297) from Development into master
Merging F2024-053 from development into master after successful testing.
2024-04-11 09:23:34 -04:00
djankowski f4eaa4a3ef Merge pull request 'Development' (#295) from Development into master
Merging F2024-052 from development into master after successful testing.
2024-04-08 11:11:43 -04:00
djankowski 5d50ed6bdf Merge pull request 'Development' (#292) from Development into master
Merging F2024-051, B2024-021, F2024-049, F2024-050 and F2024-045 after successful testing.
2024-04-05 10:54:57 -04:00
djankowski d7ace4eaf9 Merge pull request 'Development' (#287) from Development into master
Merging F2024-047, F2024-048, B2024-017 and B2024-019 from development into master after successful testing.
2024-04-04 11:36:56 -04:00
djankowski 16a4d335ea Merge pull request 'Development' (#282) from Development into master
Merging all items through B2024-018 from development into master after successful testing.
2024-03-27 13:39:46 -04:00
djankowski ba69bb0772 Merge pull request 'Development' (#275) from Development into master
Merging F2024-037 and CSLA updates into master after successful testing.
2024-03-20 16:07:27 -04:00
djankowski 455940caa2 Merge pull request 'Development' (#271) from Development into master
Merging F2024-040 into master after successful testing.
2024-03-18 10:00:30 -04:00
djankowski 439344757e Merge pull request 'Development' (#269) from Development into master
Merging F2024-044, F2024-043, and F2024-019 in master after successful testing.
2024-03-15 09:33:57 -04:00
djankowski ad912691c9 Merge pull request 'Development' (#265) from Development into master
Merging 	F2024-016, 	F2024-032, 	B2024-013, 	F2024-025,	F2024-027 & F2024-028 into master after successful testing.
2024-03-12 14:01:12 -04:00
djankowski 237144aff6 Merge pull request 'Development' (#259) from Development into master
Merging B2024-014 from development into master after successful testing.
2024-03-04 15:02:18 -05:00
djankowski 810332d558 Merge pull request 'Development' (#256) from Development into master
Merging F2024-020 from development into master.  No testing required since formats are under development.
2024-02-29 13:23:48 -05:00
djankowski f8431d0ba1 Merge pull request 'Development' (#252) from Development into master
Merging F2024-022 from development into master.  No testing required since formats are under development.
2024-02-29 09:23:51 -05:00
djankowski 57c3bfa16a Merge pull request 'Development' (#250) from Development into master
Merging C2023-003 and F2024-026 into master after successful testing.
2024-02-28 11:56:15 -05:00
djankowski 61f1077608 Merge pull request 'Development' (#248) from Development into master
Merging F2024-029, B2024-009, F2024-023, B2024-011, B2024-012 and F2024-017 from development into master after successful testing.
2024-02-27 14:21:22 -05:00
djankowski 8877e968b9 Merge pull request 'Development' (#239) from Development into master
Merging F2024-018, B2024-008, B2024-007, and F2024-015 from development into master after successful testing.
2024-02-22 08:22:26 -05:00
djankowski 4575c90bee Merge pull request 'Development' (#233) from Development into master
Merging updated formats from development into master after successful testing.
2024-02-14 16:07:57 -05:00
djankowski 21279a87ae Merge pull request 'Development' (#231) from Development into master
Merging B2024-006 from development into master after successful testing.
2024-02-14 08:19:09 -05:00
djankowski 3d5ad4a17e Merge pull request 'Development' (#229) from Development into master
Merging C2024-002 and F2024-013 from development into master after successful testing.
2024-02-09 11:30:41 -05:00
djankowski 9bb7b044a8 Merge pull request 'Development' (#226) from Development into master
Merging F2024-010, 	F2024-011, 	F2024-008, 	B2024-002, 	F2024-012  and B2024-005 from development into master after successful testing.
2024-02-08 11:38:49 -05:00
djankowski dc8f2f7561 Merge pull request 'Development' (#219) from Development into master
Merging C2022-009 into master after successful testing.
2024-02-02 13:53:22 -05:00
djankowski 829dbf84da Merge pull request 'Development' (#217) from Development into master
Merging F2024-005 and B2024-004 from development into master after successful testing
2024-01-31 08:34:00 -05:00
djankowski 7b156c17f8 Merge pull request 'Development' (#212) from Development into master
Merging all changes up through F2024-006 from development into master after successful testing.
2024-01-24 11:30:40 -05:00
djankowski cbf7cbc164 Merge pull request 'Development' (#198) from Development into master
Merging F2024-002 and F2023-112 from development into master.  No testing required since formats are under development.
2024-01-08 15:24:15 -05:00
djankowski b04faa816e Merge pull request 'Development' (#196) from Development into master
Merging F2023-126, F2024-001, C2022-009, C2023-024 and C2023-023 from development into Master after successful testing.
2024-01-03 10:54:22 -05:00
djankowski 517ebe2902 Merge pull request 'Development' (#189) from Development into master
Initial check-in of Vogtle Background formats.  No testing required since formats are under development.
2023-12-15 15:48:55 -05:00
djankowski 03d0d314e3 Merge pull request 'Development' (#187) from Development into master
Merging B2023-115 from development into master after successful testing.
2023-12-12 15:31:06 -05:00
djankowski 3e804c5cce Merge pull request 'Development' (#185) from Development into master
Merging F2023-133 into from development into master. No testing required since formats are under development.
2023-12-11 10:08:22 -05:00
djankowski ee2b8b538e Merge pull request 'Development' (#183) from Development into master
Merging PROMSFixes from development into master after minor changes to UpdateFormatList.
2023-12-08 14:51:21 -05:00
djankowski fdfd34fe92 Merge pull request 'Development' (#181) from Development into master
Merging F2023-151 from development into master.  No testing required since formats are under development.
2023-12-07 15:55:16 -05:00
djankowski 2d6fb6523b Merge pull request 'Development' (#179) from Development into master
Merging F2023-133 from development into master.  No testing required since formats are under development.
2023-12-07 11:44:31 -05:00
djankowski 3084bf3982 Merge pull request 'Development' (#177) from Development into master
Merging B2023-115 and F2023-150 from development into master.  No testing required since formats are under development.
2023-12-06 09:08:18 -05:00
djankowski 5ba51e8392 Merge pull request 'Development' (#174) from Development into master
Merging F2023-149 from development into master.  No testing required since formats are under development.
2023-12-05 16:30:39 -05:00
djankowski fb5eb43e34 Merge pull request 'Development' (#172) from Development into master
Merging F2023-124 from development into master.  No testing required since formats are under development.
2023-12-04 11:22:59 -05:00
djankowski b154056276 Merge pull request 'Development' (#170) from Development into master
Merging F2023-119 from development into master.  No testing required since formats are under development.
2023-12-01 15:36:22 -05:00
djankowski c67b8f9ca1 Merge pull request 'Development' (#168) from Development into master
Merging F2023-146 from development to master.  No testing required since formats are under development.
2023-12-01 10:02:50 -05:00
djankowski 95e4181360 Merge pull request 'Development' (#166) from Development into master
Merging F2023-148, F2023-148, and B2023-120 from development into Master. No testing required since formats are under development.
2023-11-30 14:38:49 -05:00
djankowski 32dffbe56b Merge pull request 'Development' (#162) from Development into master
Merging B2023-116, B2023-117, and F2023-143 from development to master after successful testing.
2023-11-29 15:58:44 -05:00
jjenko 6b3c8d373b Merge pull request 'F2023-143_Vogtle3&4_Alrm_Footer' (#159) from F2023-143_Vogtle3&4_Alrm_Footer into master
Format only change.
Vogtle 3&4 formats under development. This change will be tested as data in entered into PROMS by Volian
2023-11-27 16:23:44 -05:00
djankowski db29107f47 Merge pull request 'Development' (#156) from Development into master
Merging F2023-142 and B2022-046 in from development to master after successful testing.
2023-11-14 08:45:47 -05:00
djankowski 355537f2ab Merge pull request 'Development' (#153) from Development into master
Merging F2023-140, F2023-123, B2023-007, B2023-108, F2023-139, F2023-138 and B2023-103
2023-11-09 10:33:40 -05:00
djankowski 0729ef0c21 Merge pull request 'Development' (#147) from Development into master
Merging F2023-139 from development into master after successful testing.
2023-10-26 10:10:33 -04:00
djankowski 6fe82bfd0f Merge pull request 'Development' (#145) from Development into master
Merging F2023-138 from development into master after successful testing.
2023-10-25 14:40:15 -04:00
djankowski 39bf072363 Merge pull request 'Development' (#142) from Development into master
Merging B2023-103 from development into master after successful testing.
2023-10-23 15:28:31 -04:00
djankowski da7c384fd8 Merge pull request 'Development' (#139) from Development into master
Merging C2023-017, C2023-019, B2023-104, B2023-101 and B2023-102 from development into master after successful testing.
2023-10-18 10:37:59 -04:00
djankowski 95130fd9a0 Merge pull request 'Development' (#133) from Development into master
Merging C2023-018 from development into master after successful testing.
2023-10-11 09:26:45 -04:00
djankowski 978e2344a3 Merge pull request 'Development' (#131) from Development into master
Merging C2023-016 and C2023-017 from development into master after successful testing.
2023-10-06 10:56:34 -04:00
djankowski c9bf45602c Merge pull request 'Development' (#128) from Development into master
Merging F2023-137 and B2023-100 from development into master. F2023-137 does not require testing since formats are under development. B2023-100 tested successfully.
2023-10-02 11:52:22 -04:00
djankowski aa160b2036 Merge pull request 'Development' (#124) from Development into master
Merging B2023-099 from development into master after successful testing.
2023-09-28 15:58:27 -04:00
djankowski f82b32d351 Merge pull request 'Development' (#122) from Development into master
Merging B2023-097 and B2023-098 from development into master after successful testing.
2023-09-26 14:58:05 -04:00
djankowski e519dc9a57 Merge pull request 'Development' (#120) from Development into master
Merging B2023-094 from development into master after successful testing.
2023-09-22 13:24:17 -04:00
djankowski f020c37db9 Merge pull request 'Development' (#118) from Development into master
Merged B2023-096 from development into master after successful testing.
2023-09-15 11:50:57 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
10 changed files with 270 additions and 167 deletions

No files matched your search

Binary file not shown.
@@ -127,12 +127,13 @@ namespace ROEditor
private string origPrefix; private string origPrefix;
private string origValue; private string origValue;
private int dbtype; private int dbtype;
private bool IsNewGroup = false;
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
/// </summary> /// </summary>
private System.ComponentModel.Container components = null; private System.ComponentModel.Container components = null;
public GroupDefFrm(VlnXmlElement pelem, RODB rodb, string gpname,int idbtype) public GroupDefFrm(VlnXmlElement pelem, RODB rodb, string gpname,int idbtype, bool newgrp = false)
{ {
myrodb = rodb; myrodb = rodb;
elem = pelem; elem = pelem;
@@ -143,7 +144,8 @@ namespace ROEditor
// //
InitializeComponent(); InitializeComponent();
FillInData(); FillInData();
} IsNewGroup = newgrp;
}
private string CvtUserFldToFld(string fldname) private string CvtUserFldToFld(string fldname)
{ {
@@ -655,10 +657,11 @@ namespace ROEditor
tmpn.FirstChild.Value = tmpstr2; //tmpn.FirstChild.Value.Replace(CvtUserFldToFld(origGroup), this.tbGroup.Text); tmpn.FirstChild.Value = tmpstr2; //tmpn.FirstChild.Value.Replace(CvtUserFldToFld(origGroup), this.tbGroup.Text);
modified=true; modified=true;
} }
if ((elem.HasAttribute("AccPageIDPrefix")&&this.tbPrefix.Text != origPrefix) || this.tbPrefix.Modified==true) if ((elem.HasAttribute("AccPageIDPrefix")&&(tbPrefix.Text != origPrefix || IsNewGroup)) || tbPrefix.Modified)
{ {
elem.SetAttribute("AccPageIDPrefix",this.tbPrefix.Text); elem.SetAttribute("AccPageIDPrefix",this.tbPrefix.Text);
modified=true; modified=true;
IsNewGroup = false;
if (myrodb.IsDuplicateAccPagePrefix(elem, tbPrefix.Text)) if (myrodb.IsDuplicateAccPagePrefix(elem, tbPrefix.Text))
{ {
@@ -666,7 +669,8 @@ namespace ROEditor
elem.SetAttribute("AccPageIDPrefix", origPrefix); elem.SetAttribute("AccPageIDPrefix", origPrefix);
modified = false; modified = false;
MessageBox.Show($"The Prefix field used for the \"Accessory Pages Access\" values should be unique. The fields used in these values can be found under \"Properties\" of an RO Group. If these are not unique, you may have trouble utilizing these ROs within Word Sections in PROMS. Cannot save.", "Problem saving data"); MessageBox.Show($"The Prefix field used for the \"Accessory Pages Access\" values should be unique. The fields used in these values can be found under \"Properties\" of an RO Group. If these are not unique, you may have trouble utilizing these ROs within Word Sections in PROMS. Cannot save.", "Problem saving data");
return; DialogResult = DialogResult.Cancel;
return;
} }
} }
bool success=true; bool success=true;
@@ -44,9 +44,7 @@
*********************************************************************************************/ *********************************************************************************************/
using System; using System;
using System.Drawing;
using System.Collections; using System.Collections;
using System.ComponentModel;
using System.Windows.Forms; using System.Windows.Forms;
using System.Xml; using System.Xml;
using System.Text; using System.Text;
@@ -282,148 +280,176 @@ namespace ROEditor
} }
private void btnContinue_Click(object sender, System.EventArgs e) private void btnContinue_Click(object sender, System.EventArgs e)
{ {
bool success; bool success;
if (this.tbGroup.Text == null || this.tbGroup.Text == "") if (this.tbGroup.Text == null || this.tbGroup.Text == "")
{ {
MessageBox.Show("Need to specify group name."); MessageBox.Show("Need to specify group name.");
return; return;
} }
// if this was already saved, i.e. user hit continue button already, // if this was already saved, i.e. user hit continue button already,
// just return; // just return;
if (this.tbGroup.Text == lastSavedGroup) if (this.tbGroup.Text == lastSavedGroup)
{ {
this.Close(); this.Close();
return; return;
} }
lastSavedGroup = this.tbGroup.Text; lastSavedGroup = this.tbGroup.Text;
int dbtype=-1; int dbtype = -1;
if (this.rbbtnGraphics.Checked == true) dbtype = 1; if (this.rbbtnGraphics.Checked == true) dbtype = 1;
else if (this.rbbtnSetpoint.Checked == true) dbtype = 2; else if (this.rbbtnSetpoint.Checked == true) dbtype = 2;
else if (this.rbbtnUserDef.Checked == true) dbtype = 3; else if (this.rbbtnUserDef.Checked == true) dbtype = 3;
if (dbtype<0) if (dbtype < 0)
{ {
MessageBox.Show("Need to define type of group."); MessageBox.Show("Need to define type of group.");
return; return;
} }
Cursor.Current = Cursors.WaitCursor; Cursor.Current = Cursors.WaitCursor;
// make a new table with the next table name id // make a new table with the next table name id
tbname = myrodb.RODB_GetNextGroupTable(); tbname = myrodb.RODB_GetNextGroupTable();
if (tbname == null) if (tbname == null)
{ {
Cursor.Current = Cursors.Default; Cursor.Current = Cursors.Default;
return; return;
} }
toprecid = myrodb.RODB_AddNewTable(tbname, this.tbGroup.Text); toprecid = myrodb.RODB_AddNewTable(tbname, this.tbGroup.Text);
if (toprecid == null) if (toprecid == null)
{ {
Cursor.Current = Cursors.Default; Cursor.Current = Cursors.Default;
return; return;
} }
// for the given type, copy over the required fields. // for the given type, copy over the required fields.
success = myrodb.RODB_CopyFieldDefs("ROMaster",tbname,dbtype); success = myrodb.RODB_CopyFieldDefs("ROMaster", tbname, dbtype);
if (success == false) if (success == false)
{ {
Cursor.Current = Cursors.Default; Cursor.Current = Cursors.Default;
return; return;
} }
// create top level group node with input name. // create top level group node with input name.
nelem = (VlnXmlElement) elem.OwnerDocument.CreateElement("vlnGroup"); nelem = (VlnXmlElement)elem.OwnerDocument.CreateElement("vlnGroup");
nelem.InnerText = CvtUserFldToFld(this.tbGroup.Text); nelem.InnerText = CvtUserFldToFld(this.tbGroup.Text);
nelem.SetAttribute("Table",tbname); nelem.SetAttribute("Table", tbname);
nelem.SetAttribute("ParentID", "00000000"); nelem.SetAttribute("ParentID", "00000000");
string nrecid = myrodb.RODB_GetNextRecId(tbname); string nrecid = myrodb.RODB_GetNextRecId(tbname);
nelem.SetAttribute("RecID", nrecid); nelem.SetAttribute("RecID", nrecid);
elem.AppendChild((XmlNode) nelem); elem.AppendChild((XmlNode)nelem);
success = myrodb.RODB_InsertGroup(nelem); success = myrodb.RODB_InsertGroup(nelem);
Cursor.Current = Cursors.Default; Cursor.Current = Cursors.Default;
if (success == false) return; if (success == false) return;
nelem.SetAttribute("TreeNotData", "True"); nelem.SetAttribute("TreeNotData", "True");
nelem.SetAttribute("MenuTitle", this.tbGroup.Text); nelem.SetAttribute("MenuTitle", this.tbGroup.Text);
nelem.SetAttribute("MasterRecID",toprecid); nelem.SetAttribute("MasterRecID", toprecid);
nelem.SetAttribute("HasChild", "False"); nelem.SetAttribute("HasChild", "False");
// if this is a setpoint db or image db, get fields and find those fields needed // if this is a setpoint db or image db, get fields and find those fields needed
// to define ro & group. This is hardcoded, yuk. // to define ro & group. This is hardcoded, yuk.
if(dbtype == 1 || dbtype == 2) if (dbtype == 1 || dbtype == 2)
{ {
ArrayList FieldList = myrodb.RODB_GetFields(nelem, (uint) RecordType.Schema); ArrayList FieldList = myrodb.RODB_GetFields(nelem, (uint)RecordType.Schema);
string[] fldlist=null, grplist=null; string[] fldlist = null, grplist = null;
ROField rof; ROField rof;
string curfld; string curfld;
StringBuilder Inuse = new StringBuilder(); StringBuilder Inuse = new StringBuilder();
// Get list of inuse fields for the rro. // Get list of inuse fields for the rro.
if (dbtype == 1) if (dbtype == 1)
fldlist = new string[] {"Name", "Image ID", "Image"}; fldlist = new string[] { "Name", "Image ID", "Image" };
else else
fldlist = new string[] {"Setpoint ID", "Setpoint Value", "Associated System Component", "Applicability", "Revision", "Short Description", fldlist = new string[] {"Setpoint ID", "Setpoint Value", "Associated System Component", "Applicability", "Revision", "Short Description",
"Description", "Key Assumptions", "Basis", "References"}; "Description", "Key Assumptions", "Basis", "References"};
for (int i=0; i< fldlist.Length; i++) for (int i = 0; i < fldlist.Length; i++)
{ {
curfld = fldlist[i]; curfld = fldlist[i];
for (int j=0; j<FieldList.Count; j++) for (int j = 0; j < FieldList.Count; j++)
{ {
rof = (ROField) FieldList[j]; rof = (ROField)FieldList[j];
if (rof.GetFieldname == curfld) if (rof.GetFieldname == curfld)
{ {
if (i==fldlist.Length-1) // last one don't add ' ' if (i == fldlist.Length - 1) // last one don't add ' '
Inuse.Append(rof.GetRecID); Inuse.Append(rof.GetRecID);
else else
Inuse.Append(rof.GetRecID+" "); Inuse.Append(rof.GetRecID + " ");
break; break;
} }
} }
} }
nelem.SetAttribute("FieldsInUse", Inuse.ToString()); nelem.SetAttribute("FieldsInUse", Inuse.ToString());
// Get list of group inuse fields. // Get list of group inuse fields.
Inuse.Remove(0,Inuse.Length); Inuse.Remove(0, Inuse.Length);
if (dbtype == 1) if (dbtype == 1)
grplist = new string[] {"Group"}; grplist = new string[] { "Group" };
else else
grplist = new string[] {"Parameter"}; grplist = new string[] { "Parameter" };
for (int i=0; i< grplist.Length; i++) for (int i = 0; i < grplist.Length; i++)
{ {
curfld = grplist[i]; curfld = grplist[i];
for (int j=0; j<FieldList.Count; j++) for (int j = 0; j < FieldList.Count; j++)
{ {
rof = (ROField) FieldList[j]; rof = (ROField)FieldList[j];
if (rof.GetFieldname == curfld) if (rof.GetFieldname == curfld)
{ {
if (i == grplist.Length-1) // last, don't add ' ' if (i == grplist.Length - 1) // last, don't add ' '
Inuse.Append(rof.GetRecID); Inuse.Append(rof.GetRecID);
else else
Inuse.Append(rof.GetRecID+" "); Inuse.Append(rof.GetRecID + " ");
break; break;
} }
} }
} }
nelem.SetAttribute("GroupFieldsInUse", Inuse.ToString()); nelem.SetAttribute("GroupFieldsInUse", Inuse.ToString());
if (dbtype == 2) // Setpoint string defaultPfix = "UD";
{ if (dbtype == 2) // Setpoint
nelem.SetAttribute("RetVal","<Setpoint__Value>"); {
nelem.SetAttribute("MenuItem","<Setpoint__Value,5,17> <Short__Description>"); nelem.SetAttribute("RetVal", "<Setpoint__Value>");
nelem.SetAttribute("GroupMenuItem","<Parameter>"); nelem.SetAttribute("MenuItem", "<Setpoint__Value,5,17> <Short__Description>");
nelem.SetAttribute("AccPageIDPrefix","SP2"); nelem.SetAttribute("GroupMenuItem", "<Parameter>");
nelem.SetAttribute("AccPageID","<Setpoint__ID>"); defaultPfix = "SP";
} nelem.SetAttribute("AccPageIDPrefix", "SP2");
else if (dbtype == 1) // image nelem.SetAttribute("AccPageID", "<Setpoint__ID>");
{ }
nelem.SetAttribute("RetVal","<Image>"); else if (dbtype == 1) // image
nelem.SetAttribute("MenuItem","<Name>"); {
nelem.SetAttribute("GroupMenuItem","<Group>"); nelem.SetAttribute("RetVal", "<Image>");
nelem.SetAttribute("AccPageIDPrefix","IG2"); nelem.SetAttribute("MenuItem", "<Name>");
nelem.SetAttribute("AccPageID","<Image__ID>"); nelem.SetAttribute("GroupMenuItem", "<Group>");
} defaultPfix = "IG";
success = myrodb.RODB_WriteRO(nelem); nelem.SetAttribute("AccPageIDPrefix", "IG2");
if (success == false) return; nelem.SetAttribute("AccPageID", "<Image__ID>");
} }
//B2026-091 RO Editor - Change Default Prefix to take existing prefixes into account for Setpoint/Graphics DBs
//if duplicate prefix - then change it so it will be unique
int x = 2;
while (nelem.HasAttribute("AccPageIDPrefix") && myrodb.IsDuplicateAccPagePrefix(nelem, nelem.GetAttribute("AccPageIDPrefix")))
{
nelem.SetAttribute("AccPageIDPrefix", $"{defaultPfix}{x}");
x++;
}
success = myrodb.RODB_WriteRO(nelem);
if (success == false) return;
}
// now let the user specify the group name, etc to define the group. // now let the user specify the group name, etc to define the group.
GroupDefFrm grdef = new GroupDefFrm(nelem,myrodb,nelem.InnerText,dbtype); DialogResult dlgrslt = DialogResult.OK;
grdef.ShowDialog(); using (GroupDefFrm grdef = new GroupDefFrm(nelem, myrodb, nelem.InnerText, dbtype, true))
} {
private void txtBox_KeyDown(object sender, KeyEventArgs e) dlgrslt = grdef.ShowDialog();
}
//If New Group and prefix would not be unique, remove the group
//needed because groups get autoadded with defaults
//before user has a chance to enter things like Acc Page Prefix
if (dlgrslt == DialogResult.Cancel)
{
XmlNode pn = nelem.ParentNode;
XmlNode nd = (XmlNode)nelem;
myrodb.RODB_DeleteGroup(nd, null, null);
pn.RemoveChild(nelem);
DialogResult = DialogResult.Cancel;
Close();
}
}
private void txtBox_KeyDown(object sender, KeyEventArgs e)
{ {
if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text)) if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
{ {
@@ -2117,7 +2117,9 @@ namespace RODBInterface
if (retele != null && tbl != ro.GetAttribute("Table") && retele.GetAttribute("AccPageIDPrefix").ToLower() == pfix.ToLower()) if (retele != null && tbl != ro.GetAttribute("Table") && retele.GetAttribute("AccPageIDPrefix").ToLower() == pfix.ToLower())
{ {
return true; //another table contains the prefix - return true DBE.CommandDispose();
DBE.ReaderClose();
return true; //another table contains the prefix - return true
} }
} }
} }
@@ -1220,6 +1220,11 @@ namespace ctlXMLEditLib
mytextbox.Enter += new System.EventHandler(this.txtBox_Enter); mytextbox.Enter += new System.EventHandler(this.txtBox_Enter);
mytextbox.Leave += new System.EventHandler(this.txtBox_Leave); mytextbox.Leave += new System.EventHandler(this.txtBox_Leave);
} }
else
{
//B2026-085 Disable Symbols when leave a TextBox
mytextbox.Leave += txtBox_Leave_DisableSymbols;
}
string labelAnnot; string labelAnnot;
bool imgchld = false; bool imgchld = false;
@@ -1311,7 +1316,12 @@ namespace ctlXMLEditLib
tb.Text = dfTxt; tb.Text = dfTxt;
tb.ForeColor = SystemColors.GrayText; tb.ForeColor = SystemColors.GrayText;
} }
}
txtBox_Leave_DisableSymbols(sender, e);
}
//B2026-085 Disable Symbols when leave a TextBox
private void txtBox_Leave_DisableSymbols(object sender, EventArgs e) => OnEnableDisableSymbolsBtn(new ctlXMLEditEventArgs(DisplaySymBolBtn:false));
// C2021-026 Event handler for Parent/Child child textbox // C2021-026 Event handler for Parent/Child child textbox
// If the textbox is set to gray, then we are using the parent value // If the textbox is set to gray, then we are using the parent value
+24 -12
View File
@@ -1499,7 +1499,7 @@ namespace VEPROMS
} }
} }
} }
else if (tc.MyEditItem != null && displayRO.MyROFST != null && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].ROFstID != displayRO.MyROFST.ROFstID) else if (displayRO.MyROFST != null && tc?.MyEditItem?.MyItemInfo?.MyDocVersion?.DocVersionAssociations != null && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations.Count > 0 && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].ROFstID != displayRO.MyROFST.ROFstID)
{ {
SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
} }
@@ -2426,9 +2426,10 @@ namespace VEPROMS
// when Word procedure tabs are restored. // when Word procedure tabs are restored.
// C2026-053 leaving this flag in her for now should we decide to trouble-shoot reopening of Word tabs later on. // C2026-053 leaving this flag in her for now should we decide to trouble-shoot reopening of Word tabs later on.
tc.LoadingSavedProcTabs = true; // we check for this flag in DSOTabPanel.cs when opening Word sections tc.LoadingSavedProcTabs = true; // we check for this flag in DSOTabPanel.cs when opening Word sections
EditItem LastEditItem = null; //to hold last edit item. Needed in case last tab is a Word Section
foreach (DataRow TabState in DisPlayTabState.Rows) foreach (DataRow TabState in DisPlayTabState.Rows)
{ {
int _ItemID = (int)TabState["ItemID"]; int _ItemID = (int)TabState["ItemID"];
ItemInfo _Procedure = ItemInfo.Get(_ItemID); ItemInfo _Procedure = ItemInfo.Get(_ItemID);
// C2026-053 Open procedure tab but only if it's NOT a Word section // C2026-053 Open procedure tab but only if it's NOT a Word section
// Needed to disable opening saved Word sections - at least for now. // Needed to disable opening saved Word sections - at least for now.
@@ -2439,18 +2440,29 @@ namespace VEPROMS
// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work. // SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel; SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
//CSM B2024-090 - if last displaytab item, LastEditItem = tc.MyEditItem; //set last tab index
//select the steptab panel for it if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
//and set the EditItem for Find/Replace
//otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
{ {
SelectedStepTabPanel.Select(); SelectedStepTabPanel.Select();
dlgFindReplace.MyEditItem = tc.MyEditItem; }
SpellChecker.MyEditItem = tc.MyEditItem; //B2025-043 Remember Tabs is not setting the EditItem for the active window causing a PROMS crash when Spell Check }
} //CSM B2024-090 - if last displaytab item,
} //select the steptab panel for it
tc.LoadingSavedProcTabs = false; //and set the EditItem for Find/Replace
//otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
if (LastEditItem != null)
{
dlgFindReplace.MyEditItem = LastEditItem;
SpellChecker.MyEditItem = LastEditItem; //B2025-043 Remember Tabs is not setting the EditItem for the active window causing a PROMS crash when Spell Check
//B2026-090 Populate Step Properties Panel when PROMS restores saved display tabs
LastEditItem.MyStepPanel.BringToFront();
LastEditItem.MyStepPanel.Select();
Application.DoEvents();
tc_ItemSelectedChanged(this, new ItemSelectedChangedEventArgs(tc.MyEditItem));
}
tc.LoadingSavedProcTabs = false;
} }
} }
} }
@@ -2153,7 +2153,28 @@ namespace VEPROMS.CSLA.Library
return GetNext(); return GetNext();
} }
} }
private static void ResetOrdinal(int itemID)
//B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step
public void ResetOrdinalandPrevious(ItemInfo prevItm)
{
MyPrevious = prevItm;
_Ordinal = null;
_TagsSetup = false;
ConvertListToDictionary();
if (_CacheByPrimaryKey.ContainsKey(ItemID.ToString()))
{
ItemInfo[] items = _CacheByPrimaryKey[ItemID.ToString()].ToArray();
foreach (ItemInfo item in items)
{
item.MyPrevious = prevItm;
item._Ordinal = null;
item._TagsSetup = false;
}
}
OnOrdinalChange(ItemID); // After _Ordinal reset trigger event
}
private static void ResetOrdinal(int itemID)
{ {
ConvertListToDictionary(); ConvertListToDictionary();
string key = itemID.ToString(); string key = itemID.ToString();
@@ -3192,7 +3192,7 @@ namespace Volian.Controls.Library
{ {
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText); int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
ItemInfo ii = ItemInfo.Get(itemID); ItemInfo ii = ItemInfo.Get(itemID);
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText; if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
SearchResults.AddItemInfo(ii); SearchResults.AddItemInfo(ii);
} }
lbSrchResults.DataSource = SearchResults; lbSrchResults.DataSource = SearchResults;
@@ -3214,7 +3214,7 @@ namespace Volian.Controls.Library
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText); int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
ItemInfo ii = ItemInfo.Get(itemID); ItemInfo ii = ItemInfo.Get(itemID);
// B2020-107: The following was needed to set the Step Path result type for annotations // B2020-107: The following was needed to set the Step Path result type for annotations
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0)
{ {
ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText; ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
ii.SearchAnnotationID = ii.ItemAnnotations[0].AnnotationID; ii.SearchAnnotationID = ii.ItemAnnotations[0].AnnotationID;
@@ -3245,7 +3245,7 @@ namespace Volian.Controls.Library
{ {
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText); int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
ItemInfo ii = ItemInfo.Get(itemID); ItemInfo ii = ItemInfo.Get(itemID);
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText; if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
SearchResults.AddItemInfo(ii); SearchResults.AddItemInfo(ii);
} }
lbSrchResultsIncTrans.DataSource = SearchResults; lbSrchResultsIncTrans.DataSource = SearchResults;
+16 -2
View File
@@ -1259,7 +1259,20 @@ namespace Volian.Controls.Library
default: // Need debug default: // Need debug
break; break;
} }
if (updateStatus)
//B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step
EditItem tmp = this;
while (tmp.MyNextEditItem != null)
{
ItemInfo prevIInfo = tmp.MyItemInfo;
tmp = tmp.MyNextEditItem;
tmp.MyItemInfo.ResetOrdinalandPrevious(prevIInfo);
tmp.RefreshOrdinal();
}
Application.DoEvents();
if (updateStatus)
MyStepPanel.SelectedEditItem = newEditItem;//Update Screen MyStepPanel.SelectedEditItem = newEditItem;//Update Screen
} }
protected static int _WatchThis = 1; protected static int _WatchThis = 1;
@@ -3663,6 +3676,8 @@ namespace Volian.Controls.Library
TabLeft = 20; TabLeft = 20;
if (!itemInfo.IsStep) // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure if (!itemInfo.IsStep) // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
SetupHeader(itemInfo); SetupHeader(itemInfo);
//B2026-093 move the setting of MyStepPanel to fix null reference error when the Alarm Point Table is first setup for the editor view
MyStepPanel = myStepPanel;
SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set) SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set)
this.Paint -= new PaintEventHandler(EditItem_Paint); this.Paint -= new PaintEventHandler(EditItem_Paint);
this.Paint += new PaintEventHandler(EditItem_Paint); this.Paint += new PaintEventHandler(EditItem_Paint);
@@ -3707,7 +3722,6 @@ namespace Volian.Controls.Library
if (myStepPanel.MyFont != null) ContentFont = TabFont = myStepPanel.MyFont; if (myStepPanel.MyFont != null) ContentFont = TabFont = myStepPanel.MyFont;
} }
if (expand) ShowExpanded(); if (expand) ShowExpanded();
MyStepPanel = myStepPanel;
if (itemInfo != null && !myStepPanel._LookupEditItems.ContainsKey(itemInfo.ItemID)) myStepPanel._LookupEditItems.Add(itemInfo.ItemID, this); if (itemInfo != null && !myStepPanel._LookupEditItems.ContainsKey(itemInfo.ItemID)) myStepPanel._LookupEditItems.Add(itemInfo.ItemID, this);
_MyChildRelation = myChildRelation; _MyChildRelation = myChildRelation;
if (myParentEditItem != null) RNOLevel = myParentEditItem.RNOLevel; if (myParentEditItem != null) RNOLevel = myParentEditItem.RNOLevel;
+17 -3
View File
@@ -3512,10 +3512,24 @@ namespace Volian.Controls.Library
} }
break; break;
case "InsRNO": case "InsRNO":
displayMenu = ((actable & E_AccStep.AddingRNO) > 0) && btnCMInsRNO.Enabled; //B2026-086 Have Shortcut Keys for adding a RNO auto-work instead of having to press a button after shortcut key
displayMenu = false;
LetUserKnowIfTheyCannotAdd(actable, E_AccStep.AddingRNO,"RNO"); // B2018-014 Inform user that they cannot add the specified step type LetUserKnowIfTheyCannotAdd(actable, E_AccStep.AddingRNO,"RNO"); // B2018-014 Inform user that they cannot add the specified step type
_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMInsRNO);
break; if (((actable & E_AccStep.AddingRNO) > 0) && btnCMInsRNO.Enabled)
{
try
{
btnCMInsRNO.SubItems["cmbtnRNOType"].RaiseClick();
}
catch
{
_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMInsRNO);
displayMenu = true;
}
}
break;
case "InsSubStps": case "InsSubStps":
displayMenu = ((actable & E_AccStep.AddingSub) > 0) && btnCMInsSubStps.Enabled; displayMenu = ((actable & E_AccStep.AddingSub) > 0) && btnCMInsSubStps.Enabled;
LetUserKnowIfTheyCannotAdd(actable, E_AccStep.AddingSub,"Sub-step"); // B2018-014 Inform user that they cannot add the specified step type LetUserKnowIfTheyCannotAdd(actable, E_AccStep.AddingSub,"Sub-step"); // B2018-014 Inform user that they cannot add the specified step type