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

[MPDX-8227] Show multiple 14 month partner currency tables #1076

Merged
merged 15 commits into from
Sep 19, 2024
Merged

[MPDX-8227] Show multiple 14 month partner currency tables #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a27026b
Clean up types
canac Sep 13, 2024
fc8c24f
Render cached data while loading
canac Sep 13, 2024
3dc88d5
Support multiple currency tables
canac Sep 13, 2024
235534c
Improve print styles
canac Sep 13, 2024
8ba1736
Use existing total calculation
canac Sep 13, 2024
18217ac
Stop merging contacts from different currency groups
canac Sep 16, 2024
6eb86ad
Use the partner currency amount in calculations
canac Sep 16, 2024
ff41216
Make months a required non-nullable attribute
canac Sep 16, 2024
26f94cd
Fix and cleanup tests
canac Sep 16, 2024
d378e0a
Move currency generation code to a custom hook
canac Sep 16, 2024
4200688
Add some useCsvData tests
canac Sep 16, 2024
a66c399
Round pledge amount and set to 0 if missing
canac Sep 16, 2024
196a60a
Add the currency symbol to the CSV export
canac Sep 17, 2024
70f8b88
Fix failing tests
canac Sep 17, 2024
9edb045
Change date formatting
canac Sep 17, 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 pages/api/Schema/reports/fourteenMonth/datahandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const mapFourteenMonthReport = (
salaryCurrency: data.attributes.salary_currency,
currencyGroups: Object.entries(data.attributes.currency_groups).map(
([currency, currencyGroup]) => ({
currency,
currency: currency.toUpperCase(),
totals: {
year: Number(
isSalaryType
Expand Down
2 changes: 1 addition & 1 deletion pages/api/Schema/reports/fourteenMonth/fourteenMonth.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type FourteenMonthReportContact {
total: Float!
average: Float!
minimum: Float!
months: [FourteenMonthReportContactMonths!]
months: [FourteenMonthReportContactMonths!]!
wrandall22 marked this conversation as resolved.
Show resolved Hide resolved
accountNumbers: [String!]!
lateBy30Days: Boolean!
lateBy60Days: Boolean!
Expand Down
2 changes: 2 additions & 0 deletions src/components/Constants/LoadConstants.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ query LoadConstants {
# value
# }
pledgeCurrency {
id
codeSymbolString
name
code
symbol
}
pledgeFrequency {
id
Expand Down
8 changes: 3 additions & 5 deletions src/components/Dashboard/DonationHistories/DonationHistories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,9 @@ const DonationHistories = ({
offset={0}
angle={-90}
>
{
t('Amount ({{ currencyCode }})', {
currencyCode,
}) as string
}
{t('Amount ({{ currencyCode }})', {
currencyCode,
})}
</Text>
}
/>
Expand Down
Loading
Loading