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.

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 Release Changes to Develop #2132

Merged
merged 9 commits into from
Feb 28, 2025
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def upgrade() -> None:
FROM transfer_comment tc
WHERE tc.transfer_id = t.transfer_id
AND tc.comment_source = 'FROM_ORG'
LIMIT 1
) AS comment,

tc.category,
Expand All @@ -98,6 +99,7 @@ def upgrade() -> None:
FROM transfer_history th
WHERE th.transfer_id = t.transfer_id
AND th.transfer_status_id = 6 -- Recorded
LIMIT 1
) AS recorded_date,
NULL AS approved_date,
t.transaction_effective_date,
Expand Down Expand Up @@ -138,6 +140,7 @@ def upgrade() -> None:
FROM initiative_agreement_history iah
WHERE iah.initiative_agreement_id = ia.initiative_agreement_id
AND iah.initiative_agreement_status_id = 3 -- Approved
LIMIT 1
) AS approved_date,
ia.transaction_effective_date,
ia.update_date,
Expand Down Expand Up @@ -173,6 +176,7 @@ def upgrade() -> None:
FROM admin_adjustment_history aah
WHERE aah.admin_adjustment_id = aa.admin_adjustment_id
AND aah.admin_adjustment_status_id = 3 -- Approved
LIMIT 1
) AS approved_date,
aa.transaction_effective_date,
aa.update_date,
Expand Down
2 changes: 1 addition & 1 deletion backend/lcfs/web/api/compliance_report/repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ async def get_compliance_report_by_id(self, report_id: int, is_model: bool = Fal
),
joinedload(ComplianceReport.history).joinedload(
ComplianceReportHistory.user_profile
),
).joinedload(UserProfile.organization),
joinedload(ComplianceReport.transaction),
)
.where(ComplianceReport.compliance_report_id == report_id)
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/BCFooter/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import typography from '@/themes/base/typography'

function Footer({
repoDetails = {
href: 'https://github.com/bcgov/lcfs/releases/tag/v0.2.0',
name: 'v0.2.0',
href: 'https://github.com/bcgov/lcfs/releases/tag/v1.0.1',
name: 'v1.0.1',
id: 'footer-about-version',
label: 'LCFS repository changelog'
},
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ const Footer = (props) => {
)
const repoDetails = useMemo(
() => ({
href: 'https://github.com/bcgov/lcfs/releases/tag/v0.2.0',
name: 'v0.2.0',
href: 'https://github.com/bcgov/lcfs/releases/tag/v1.0.1',
name: 'v1.0.1',
id: 'footer-about-version',
label: 'LCFS repository changelog'
}),
Expand Down
Loading