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

Wrap Chart Labels #603

Merged
merged 4 commits into from
May 23, 2024
Merged

Wrap Chart Labels #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b30f739
update charts to wrap label
lucasxsong May 23, 2024
a4c806f
remove first newline in split
lucasxsong May 23, 2024
11ab6fd
add formatter back
lucasxsong May 23, 2024
d56ab10
update list orgs test
lucasxsong May 23, 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
4 changes: 4 additions & 0 deletions cypress/e2e/partner-admin/default-tests/listOrgs.spec.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ describe('The partner admin user', () => {
beforeEach(() => {
cy.login(Cypress.env('partnerAdminUsername'), Cypress.env('partnerAdminPassword'));
cy.wait(0.2 * timeout);
cy.navigateTo('/');
cy.wait(0.2 * timeout);
cy.navigateTo(listOrgsUrl, { timeout: timeout });
// cy.get('button').contains('Organizations').click();
// cy.get('button').contains('List Organizations').click();
});

orgs.forEach((org) => {
Expand Down
22 changes: 14 additions & 8 deletions src/components/reports/DistributionChartFacet.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,21 @@ const distributionChartFacet = (taskId) => {
titleAnchor: 'middle',
labelColor: 'navy',
labelFontSize: 14,
labelFontStyle: 'bold',
labelAnchor: 'middle',
labelFontStyle: '',
labelAnchor: 'top',
labelAngle: 0,
labelAlign: 'left',
labelAlign: 'right',
labelOrient: 'left',
labelBaseline: 'line-bottom',
labelPadding: 0,
labelExpr:
props.facetMode.name === 'Grade'
? "join(['Grade ',if(datum.value == '0', 'K', datum.value ), ], '')"
: 'slice(datum.value, 1, datum.value.length)',
? "join(['Grade ',if(datum.value == 'Kindergarten', 'K', datum.value ), ], '')"
: 'split(slice(datum.value, 2, datum.value.length), " ")',
labelLimit: 150,
labelSeparation: 5, // Set the spacing between lines in pixels
labelSeparation: 0, // Set the spacing between lines in pixels
},
spacing: 10,
spacing: 18,
sort: 'ascending',
},

Expand Down Expand Up @@ -175,9 +177,13 @@ const distributionChartFacet = (taskId) => {
aggregate: 'count',
title: 'Count',
axis: {
orient: 'right',
labelBaseline: 'right',
titleFontSize: 14,
labelLimit: 180,
labelPadding: 8,
labelFontSize: 14,
labelColor: 'navy',
labelFontStyle: '',
format: '.0f',
},
},
Expand Down
11 changes: 6 additions & 5 deletions src/components/reports/DistributionChartSupport.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,18 @@ const distributionBySupport = computed(() => {
]
: 'ascending',
axis: {
labelAngle: 0,
labelAlign: 'right',
labelBaseline: 'line-bottom',
titleFontSize: 14,
labelLimit: 150,
labelLimit: 180,
labelPadding: 8,
labelFontSize: 14,
labelColor: 'navy',
labelFontStyle: 'bold',
labelFontStyle: '',
transform: [{ calculate: "split(datum.address, ' ')", as: 'address' }],
labelExpr:
props.facetMode.name === 'Grade'
? "join(['Grade ',if(datum.value == 'Kindergarten', 'K', datum.value ), ], '')"
: 'slice(datum.value, 1, datum.value.length)',
: 'split(slice(datum.value, 2, datum.value.length), " ")',
},
},
yOffset: {
Expand Down
Loading