Development #600

2025-08-15T08:36:40-04:00

djankowski commented

2025-08-15 08:36:40 -04:00

Merging dev into master after successful testing.

djankowski added 71 commits 2025-08-15 08:36:41 -04:00

C2025-024 Electronic Procedures - Phase 2 (PROMS XML output) 92522b1229

Initial check-in / adding ui options / base for export

C2025-024 Electronic Procedures - Phase 2 (PROMS XML output) ec8e4c36a4

RO image resolution for Annotations

C2025-027-AnnotationsTypeSelect e08b5cde69

C2025-024 Electronic Procedures Phase 2 - XML Export 00283b4f28

Export code cleanup and initial set RO Location code

C2025-024 Electronic Procedures Phase 2 - XML Export ec25f6426a

Export code cleanup and initial set RO Location code

C2025-027-AnnotationsTypeSelect f6e25fd966

C2025-027-AnnotationsTypeSelect c98299d916

C2025-024 Electronic Procedures Phase 2 - XML Export b9fc9748c7

set RO Location code for pre-existing RO usages

C2025-023 - Electronic Procedures - Modifications to PROMS 2784b57a05

Working on multiunit for DB Sequence

C2025-027-AnnotationsTypeSelect 7a0f56cad8

C2025-024 Electronic Procedures Phase 2 - XML Export 0bf9025c0d

Multi-unit

C2025-024 Electronic Procedures Phase 2 - XML Export 4c4f4d52d2

Code refactor and added comment

C2025-024 Electronic Procedures Phase 2 - XML Export d7f83fa4d4

Export Cleanup

C2025-024 Electronic Procedures Phase 2 - XML Export 0577acad93

Removed unnecessary usings

C2025-024 Electronic Procedures Phase 2 - XML Export ecb9a805e5

UI / menu filtering for EP only procedures

C2025-027-AnnotationsTypeSelect 6f04d0bf07

Merge remote-tracking branch 'origin/Development' into C2025-027-AnnotationsTypeSelect 025fa57e24

C2025-024 Electronic Procedures Phase 2 - XML Export 20c31153de

Multi-Unit RO Resolution

C2025-024 Electronic Procedures Phase 2 - XML Export 8c32d18aec

Multi-Unit RO Resolution

C2025-027-AnnotationsTypeSelect 99445406fc

B2025-039 Needed to include the Blue color to the RTF color table for formats that use a proportional font. 4def73d738

Merge pull request 'B2025-039 Needed to include the Blue color to the RTF color table for formats that use a proportional font.' (#577 ) from B2025-039_PropFontColorRplWrds into Development 94f0795247

Looks Good.

Ready for QA Testing.

C2025-027-AnnotationsTypeSelect d3888e3c32

DEV_Proj_File_Dependency_Update d701935ddf

Visual Studio 2022 changed the default build order --- this will alow rebuild all in VS2022

Merge pull request 'DEV_Proj_File_Dependency_Update' (#578 ) from DEV_Proj_File_Dependency_Update into Development db20385a6d

Good to use. - no testing required this update is for developers only.

C2025-044 Update PROMS Fixes to be SQL 2016 compatible 09d3995e6c

Merge pull request 'C2025-044 Update PROMS Fixes to be SQL 2016 compatible' (#579 ) from C2025-044 into Development 1588dabcbe

good for testing phase

C2025-027-AnnotationsTypeSelect 1ebf67233b

C2025-027-AnnotationsTypeSelect 655592186b

Merge pull request 'C2025-027-AnnotationsTypeSelect' (#574 ) from C2025-027-AnnotationsTypeSelect into Development 453dce9520

good for the testing phase

C2025-027-AnnotationsTypeSelect-2 449bb2522b

C2025-027-AnnotationsTypeSelect-2 e31e0b6680

C2025-027-AnnotationsTypeSelect-2 009243b091

Merge pull request 'C2025-027-AnnotationsTypeSelect-2' (#580 ) from C2025-027-AnnotationsTypeSelect-2 into Development a3aa9747b8

good for testing phase

C2025-024 Electronic Procedures Phase 2 - XML Export 44025c3978

Multi-Unit Resolution, and Fix RO Annotation resolution in Text

C2025-027-AnnotationsTypeSelect-3 25bfbeb8d6

Merge pull request 'C2025-027-AnnotationsTypeSelect-3' (#581 ) from C2025-027-AnnotationsTypeSelect-3 into Development 4001abff02

good for testing phase

SQL optimization to used AnnotationTypeSelections Index 81a23305ba

Merge pull request 'SQL optimization to use AnnotationTypeSelections Index' (#582 ) from SQL_Optimization_7_31_2025 into Development 019aefbc61

good for testing phase

C2025-047-AnnotationsTypeSelectChanges a7c7744ff3

C2025-047-AnnotationsTypeSelectChanges 6e20774edf

Merge pull request 'C2025-047-AnnotationsTypeSelectChanges' (#583 ) from C2025-047-AnnotationsTypeSelectChanges into Development 2131efb522

good for testing phase

C2025-024 Electronic Procedures Phase 2 - XML Export 28c681a562

Enhanced Doc Links

C2025-047-cleanup 371d117746

Merge pull request 'C2025-047-cleanup' (#585 ) from C2025-047-cleanup into Development d561c579e0

good for testing

C2025-039 Per the customer’s request, adjusted the “{Proc Num} (Procedure Number Only)" transition type in the Beaver Valley formats so that a procedure that contains only Word sections can be referenced. e2a276085b

Merge pull request 'C2025-039 Per the customer’s request, adjusted the “{Proc Num} (Procedure Number Only)" transition type in the Beaver Valley formats so that a procedure that contains only Word sections can be referenced.' (#586 ) from C2025-039_allowStepTransToAllWordProc into Development 3e7eb09758

format only change - ready for testing

B2025-036-SplitScreen-Print-Error 22de686a44

B2025-036-SplitScreen-Print-Error ad0d091b49

Merge pull request 'B2025-036-SplitScreen-Print-Error' (#587 ) from B2025-036-SplitScreen-Print-Error into Development 1bc421ac6d

ready for testing

C2025-024 Electronic Procedures - Phase 2 (PROMS XML output) b5a9462e95

Fix Regular Expression RO Resolution for when multi ROs  and multi-unit

C2025-024 58cc75ef71

Fix merge conflict

Merge branch 'Development' into C2025-024 3d7528e069

Merge pull request 'C2025-024' (#590 ) from C2025-024 into Development a584c0751e

good for testing phase

B2025-038-Copy-a-step-between-two-screens 14bc171246

Merge pull request 'B2025-038-Copy-a-step-between-two-screens' (#591 ) from B2025-038-Copy-a-step-between-two-screens into Development 7b3f78f745

ready for testing phase

C2025-015 Added logic to make approved PDF names unique to allow procedures from different sets or different revs of the same procedure to be opened (viewed) at the same time. 41e969f79e

Merge pull request 'C2025-015 Added logic to make approved PDF names unique to allow procedures from different sets or different revs of the same procedure to be opened (viewed) at the same time.' (#592 ) from C2025-015_ViewMultipleApprovedPDFsOfSameName into Development a7396e3c4a

Reviewed-on: #592
Reviewed-by: Matthew Schill <mschill@volian.com>
Reviewed-by: Paul Larsen <plarsen@volian.com> merge after successful code review.

C2025-049 Added a check and fix for a different hyphen character that is in Vogtle’s 3 & 4 procedures, introduced by automatic importing and copy/paste from Word documents. 50688d7d8a

Merge pull request 'C2025-049 Added a check and fix for a different hyphen character that is in Vogtle’s 3 & 4 procedures, introduced by automatic importing and copy/paste from Word documents.' (#593 ) from C2025-049-update_StandardHyphens_AdminTools into Development 46fe124fe1

Looks good. Ready for QA testing.

C2025-048-Set-Quick-Print-overwrite-pdf-to-false dba1f4e71c

C2025-045 Improve Performance loading procedures with Alarms. 2c973fb0be

Merge remote-tracking branch 'origin/Development' into C2025-048-Set-Quick-Print-overwrite-pdf-to-false 1009ca5111

Merge pull request 'C2025-045 Improve Performance loading procedures with Alarms.' (#594 ) from C2025-045 into Development 0fe84ca17c

good for testing phase

Merge pull request 'C2025-048-Set-Quick-Print-overwrite-pdf-to-false' (#596 ) from C2025-048-Set-Quick-Print-overwrite-pdf-to-false into Development 11ba9ea418

good for testing phase

B2025-037 When Export an Approved procedure with multi-unit and ROs with Parent Child, it exports as the default text and not the specific unit text. 7879391de0

Merge pull request 'B2025-037 When Export an Approved procedure with multi-unit and ROs with Parent Child, it exports as the default text and not the specific unit text.' (#597 ) from B2025-037 into Development adf1120436

good for testing phase

B2025-042 RO Editor FST Export ParentChild whitespace ca0ae279e0

Merge pull request 'B2025-042 RO Editor FST Export ParentChild whitespace' (#598 ) from B2025-042 into Development 2e5ad53c6a

good for testing phase

B2025-041-Set-Quick-Print-overwrite-pdf-to-false 3bd7001106

Merge pull request 'B2025-041-Set-Quick-Print-overwrite-pdf-to-false' (#599 ) from B2025-041-Set-Quick-Print-overwrite-pdf-to-false into Development e8327316dd

good for testing phase

djankowski merged commit 3b73d54ea2 into master

2025-08-15 08:37:49 -04:00

djankowski referenced this issue from a commit

2025-08-15 08:37:50 -04:00

Merge pull request 'Development' (#600) from Development into master

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Volian/SourceCode#600