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

feat: integrate CSV upload for reports and EU Data Report #1138

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft

feat: integrate CSV upload for reports and EU Data Report #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c4c8e74
initial implementation of EU data report and upload feature
nboyse Jan 25, 2024
b7d92a4
stylistic changes and fixing export/other reports
nboyse Jan 25, 2024
5ff48fa
adjust margins, add new url pattern for current page
nboyse Jan 25, 2024
fc5ea76
add pandas as a package
nboyse Jan 25, 2024
43af513
add correct version of panads
nboyse Jan 25, 2024
3cea25a
wip: integrate ag grid
nboyse Jan 30, 2024
e172c1c
feat: successful integration of ag grid
nboyse Jan 30, 2024
ae0b387
fixing broken reports as a result of this data
nboyse Jan 30, 2024
0150189
adjust jinja2 template
nboyse Jan 30, 2024
88fa9cd
fix csf header
nboyse Jan 31, 2024
afb59d1
fix uat error
nboyse Jan 31, 2024
e65b3fe
attempt to get icons working
nboyse Feb 6, 2024
f89f4ce
Working ag grid export
nboyse Feb 6, 2024
6a30a74
remove usage of current_page_data and use ag grid pagination
nboyse Feb 6, 2024
2dd9524
add unit test for eu data
nboyse Feb 6, 2024
ff1965d
commit before attempting to resolve inline issues
nboyse Feb 15, 2024
81153ad
resolve inline issue
nboyse Feb 15, 2024
740623b
finally got icons working
nboyse Feb 19, 2024
4284530
cleanup
nboyse Feb 19, 2024
7c18b59
remove changes to application.js
nboyse Feb 19, 2024
8ec2c79
cleanup and catch EUDataModel has not been migrated
nboyse Feb 20, 2024
cff4599
integrate the csv grid api
nboyse Feb 20, 2024
245dd75
feat: change ordering, format fields correctly etc
nboyse Feb 22, 2024
febbbd4
reordering and renaming of columns
nboyse Feb 22, 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
8 changes: 8 additions & 0 deletions common/static/common/js/ag-grid-community.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions common/static/common/js/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { initCopyToNextDuties } from './copyDuties';
import { initAll } from 'govuk-frontend';
import initCheckboxes from './checkboxes';
import initConditionalMeasureConditions from './conditionalMeasureConditions';
import initFilterDisabledToggleForComCode from './conditionalDisablingFilters'
import initFilterDisabledToggleForComCode from './conditionalDisablingFilters';
import initOpenCloseAccordionSection from './openCloseAccordion';
import initTapDebounce from './buttonDebounce';
import { setupQuotaOriginFormset } from './components/QuotaOriginFormset/index';
Expand All @@ -30,4 +30,4 @@ initAutocompleteProgressiveEnhancement();
initFilterDisabledToggleForComCode();
initOpenCloseAccordionSection();
initTapDebounce();
setupQuotaOriginFormset();
setupQuotaOriginFormset();
2 changes: 1 addition & 1 deletion common/static/common/scss/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ button.no-background {

.float-elements-right {
float: right;
}
}
2 changes: 1 addition & 1 deletion common/static/common/scss/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ $govuk-image-url-function: frontend-image-url;
@import "quota-definitions";
@import "commodities";
@import "utils";
@import "environment";
@import "environment";
Loading