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

Merge to Master: LCSD-7540, 7304, 6363, 7524, 6492, 6596 (Updating 6363) #4342

Merged
merged 7 commits into from
Dec 19, 2024
Merged

Merge to Master: LCSD-7540, 7304, 6363, 7524, 6492, 6596 (Updating 6363) #4342

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a7389b6
Revert "LCSD-7008" (#4334)
simranjeetgit Dec 11, 2024
42c10f1
LCSD-6492 Tied House Exemption label text change (#4337)
JSuiBCGov Dec 16, 2024
d47fc1c
LCSD-6596 update error message for policy document (#4338)
JSuiBCGov Dec 17, 2024
092bc1f
LCSD-7524, 7304, 6363: Update SEP banner formatting, Add 'Outdoor Eve…
vijaivir Dec 18, 2024
c2d6c0c
LCSD-7540: Increase text size and add margin to 'Print Page' on SEP S…
vijaivir Dec 18, 2024
463365b
LCSD-6363: Added validation for Denied event status (#4341)
vijaivir Dec 19, 2024
39c3395
Merge branch 'master' into develop
vijaivir Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cllc-public-app/Controllers/SpecialEventsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,7 +1761,7 @@ public IActionResult GetPolicePendingReview([FromQuery] int pageIndex = 0, [From
}

// Application Status == Pending Review && Police Decision == Under Review
var result = GetPagedSepSummaries($"_adoxio_policejurisdictionid_value eq {userAccount._adoxioPolicejurisdictionidValue} and adoxio_policeapproval eq {(int?)ApproverStatus.PendingReview} and statuscode ne {(int?)EventStatus.Cancelled}", pageIndex, pageSize, sort, sortdir);
var result = GetPagedSepSummaries($"_adoxio_policejurisdictionid_value eq {userAccount._adoxioPolicejurisdictionidValue} and adoxio_policeapproval eq {(int?)ApproverStatus.PendingReview} and statuscode ne {(int?)EventStatus.Cancelled} and statuscode ne {(int?)EventStatus.Denied}", pageIndex, pageSize, sort, sortdir);

return new JsonResult(result);

Expand Down
Loading