Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev <> Main Merge - Release 11.0 (Consults) #1202

Merged
merged 96 commits into from
Oct 29, 2024
Merged

Dev <> Main Merge - Release 11.0 (Consults) #1202

merged 96 commits into from
Oct 29, 2024

Conversation

Aman-Hundal
Copy link
Contributor

No description provided.

milosdes and others added 30 commits May 30, 2024 14:02
@milosdes
redlining.js changes from branch dev-AHMD-2646
47619a3
@Aman-Hundal
manually added dev-ahmd-2646 consult code to test-marshal
5946da5
@Aman-Hundal
removed duplicate imports/definitions of function
a2e30c3
@JieunSon96
Changed filenames by appending incrementing numbers to duplicates
90421e0
@Aman-Hundal
Bug fixes for page mapping of consult bodies +vlaidation of consult b…
957de09 
…ody package creation
@JieunSon96
Merge pull request #1002 from bcgov/foimod-3165
7b3f2aa 
[FOIMOD-3165] 2 Attachments With Identical Names Attached to An Email Cause an Upload Error
@aparna-aot
FOIMOD-3073 - Fees - Remaining Balance Check
a9de02d 
Added new table - PDFStitchJobAttributes
Updates in notification manager
Added new frontend modal before response package download
@aparna-aot
Removed debug codes and updated changes from code review
e9dbd91
@aparna-aot
Merge branch 'test-marshal' into dev-AS-FOIMOD-3073
b5044b9
@aparna-aot
Merge pull request #1009 from bcgov/dev-AS-FOIMOD-3073
b535339 
FOIMOD-3073 - Fees - Remaining Balance Check
@aparna-aot
Merge issue -fix
d32f10f
@aparna-aot
Merge pull request #1010 from bcgov/dev-AS-FOIMOD-3073
de5c6ae 
Merge issue -fix
@aparna-aot
Fetching & displaying balance due amount added
daa67b7
@aparna-aot
Merge pull request #1011 from bcgov/dev-AS-FOIMOD-3073
d7324d4 
Fetching & displaying balance due amount added
@aparna-aot
Fix error with object
1c0ea5b
@aparna-aot
Merge pull request #1012 from bcgov/dev-AS-FOIMOD-3073
8078a86 
Fix error with object
@aparna-aot
String value conversion
b107a92
@aparna-aot
Merge pull request #1014 from bcgov/dev-AS-FOIMOD-3073
60dfb3b 
String value conversion
@aparna-aot
Debug code fixes
3683264
@aparna-aot
Merge pull request #1015 from bcgov/dev-AS-FOIMOD-3073
348fc7c 
Debug code fixes
@Aman-Hundal
merged recent test-marshal changes
b3b97eb
@Aman-Hundal
Merge pull request #1001 from bcgov/test-marshal-AHMD-2646
451d01c 
Ticket 2646. Consults
@aparna-aot
Missing field added in summary
495b25b
@aparna-aot
Merge pull request #1016 from bcgov/dev-AS-FOIMOD-3073
cfdb9fa 
Missing field added in summary
@aparna-aot
Issue fixed in migration script
bf94401
@aparna-aot
Merge pull request #1017 from bcgov/dev-AS-FOIMOD-3073
c5ef38e 
Issue fixed in migration script
@Aman-Hundal
small bug fixes added to this logic with Aparna to adjust redline cre…
d1147aa 
…ation
@aparna-aot
Merge pull request #1023 from bcgov/test-marshal-AH-3073
6825e49 
Ticket 3073: triggerdownloadredline bug fixes
@Aman-Hundal
adjusted modal for consult to account for include redlines feature
bcc1f7e
@nkan-aot2
turn on sourcemap in test-marshal for debug
40f4c5c
Aman-Hundal and others added 21 commits October 16, 2024 10:30
@Aman-Hundal
adjustments to consults
4186ccf
@Aman-Hundal
adjusted consults logic back to test-marshal / original code
1c04c01
@Aman-Hundal
re-added new oipc logic to consults
4076e86
@richard-aot
remove pages from other division
99d932a
@richard-aot
bug fix
bb7528f
@richard-aot
fix page stamp issue
11007c2
@Aman-Hundal
code clean
b9bb65c
@Aman-Hundal
Consults + NR/DUPE client watermark fix
d125a46
@Aman-Hundal
final consult changes
758d02b
@Aman-Hundal
final redline changes for consults with new oipc logic
2043295
@Aman-Hundal
small code clean (spaces)
a6112ed
@Aman-Hundal
Merge pull request #1193 from bcgov/test-marshal-RQ-FOIMOD-2646
fd14749 
Ticket 2646 (consults): Test-Marshal <> Main Merge Oct 21 2021
@Aman-Hundal
bug fix test-marshal for consults merge made on oct 21
a48d2c8
@Aman-Hundal
Merge pull request #1194 from bcgov/test-marshal-AH-RQ-FOIMOD-2646
de3abac 
Ticket 2646: bug fix test-marshal for consults merge made on oct 21
@Aman-Hundal
small wording/messaging changes realted to consults + addedd missed f…
2eaecbf 
…ee-overriding changes(ticket 3073) when main was merged to test-marshal
@Aman-Hundal
Merge pull request #1196 from bcgov/test-marshal-AH-FOIMOD-3246
3b93f34 
Ticket 2646/3246 - Release 11.0 / Consults Observation Fixes
@Aman-Hundal
observation fixes for 11.0 (adjusted LSB in docreivewer enums + added…
e2974de 
… disabled option or create consult button
@Aman-Hundal
Merge pull request #1197 from bcgov/test-marshal-AH-FOIMOD-3246
907bc46 
Ticket 2646/3246 - Release 11.0 / Consults Observation Fixes 2
@Aman-Hundal
Merge pull request #1198 from bcgov/test-marshal
47d2c25 
Test Marshal <> Dev Merge - Release 11.0 (Consults)
@Aman-Hundal
small bug fix for scenario 3 observation fixes
53b7185
@Aman-Hundal
Merge pull request #1201 from bcgov/dev-AH-FOIMOD-3246
4258626 
Ticket 2646/3246 - Release 11.0 / Consults Observation Fixes 2
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
15.8% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

@Aman-Hundal Aman-Hundal merged commit 8567f52 into main Oct 29, 2024
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richard-aot richard-aot richard-aot approved these changes

@aparna-aot aparna-aot Awaiting requested review from aparna-aot

@nkan-aot2 nkan-aot2 Awaiting requested review from nkan-aot2

@JieunSon96 JieunSon96 Awaiting requested review from JieunSon96

@abin-aot abin-aot Awaiting requested review from abin-aot

@milosdes milosdes Awaiting requested review from milosdes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Aman-Hundal @richard-aot @milosdes @JieunSon96 @aparna-aot @nkan-aot2 @abin-aot