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

Fiscal Year Multiselect #3151

Merged
merged 17 commits into from
Sep 10, 2024
Merged

Fiscal Year Multiselect #3151

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
18b58d9
- Update multi select template to allow multiple fitlers to exist on …
elipe17 Aug 19, 2024
752c40f
- Update 508
elipe17 Aug 19, 2024
1ac2269
- remove whitespace
elipe17 Aug 26, 2024
3bb86e2
- regenerate lock as test
elipe17 Aug 27, 2024
7565cbe
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Aug 27, 2024
ceb3e7a
Merge branch '3102-fy-multiselect' of https://github.com/raft-tech/TA…
elipe17 Aug 27, 2024
f2a08ba
- upgrade setuptools
elipe17 Aug 27, 2024
adeb4dd
- revewrt 508
elipe17 Aug 28, 2024
efccead
Merge branch 'develop' into 3102-fy-multiselect
elipe17 Aug 28, 2024
68719d4
- testing
elipe17 Aug 28, 2024
0da2af1
Merge branch '3102-fy-multiselect' of https://github.com/raft-tech/TA…
elipe17 Aug 28, 2024
0b656e1
- revert changes
elipe17 Aug 30, 2024
e36c8b9
Merge branch 'develop' into 3102-fy-multiselect
elipe17 Aug 30, 2024
6371649
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Sep 6, 2024
d829e00
- Updating lock file and pipfile
elipe17 Sep 6, 2024
8e8ef44
Merge branch 'develop' into 3102-fy-multiselect
ADPennington Sep 9, 2024
0ffc545
Merge branch 'develop' into 3102-fy-multiselect
elipe17 Sep 10, 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
84 changes: 42 additions & 42 deletions .circleci/build-and-test/workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
when: << pipeline.parameters.build_and_test_all >>
jobs:
elipe17 marked this conversation as resolved.
Show resolved Hide resolved
- secrets-check
- test-backend:
requires:
- secrets-check
- test-frontend:
requires:
- secrets-check
- test-e2e:
requires:
- secrets-check
# - test-backend:
# requires:
# - secrets-check
# - test-frontend:
# requires:
# - secrets-check
# - test-e2e:
# requires:
# - secrets-check

ci-build-and-test-all:
jobs:
Expand All @@ -22,46 +22,46 @@
- main
- master
- /^release.*/
- test-backend:
filters:
branches:
only:
- main
- master
- /^release.*/
requires:
- secrets-check
- test-frontend:
filters:
branches:
only:
- main
- master
- /^release.*/
requires:
- secrets-check
- test-e2e:
filters:
branches:
only:
- main
- master
- /^release.*/
requires:
- secrets-check
# - test-backend:
# filters:
# branches:
# only:
# - main
# - master
# - /^release.*/
# requires:
# - secrets-check
# - test-frontend:
# filters:
# branches:
# only:
# - main
# - master
# - /^release.*/
# requires:
# - secrets-check
# - test-e2e:
# filters:
# branches:
# only:
# - main
# - master
# - /^release.*/
# requires:
# - secrets-check

build-and-test-backend:
when: << pipeline.parameters.build_and_test_backend >>
jobs:
- secrets-check
- test-backend:
requires:
- secrets-check
# - test-backend:
# requires:
# - secrets-check

build-and-test-frontend:
when: << pipeline.parameters.build_and_test_frontend >>
jobs:
- secrets-check
- test-frontend:
requires:
- secrets-check
# - test-frontend:
# requires:
# - secrets-check
2 changes: 1 addition & 1 deletion tdrs-backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apt -y update && apt install postgresql-client-15 -y
# Install packages:
RUN apt install -y gcc graphviz graphviz-dev libpq-dev python3-dev vim
# Install pipenv
RUN pip install --upgrade pip pipenv
RUN pip install --upgrade pip pipenv setuptools
elipe17 marked this conversation as resolved.
Show resolved Hide resolved
RUN pipenv install --dev --system --deploy

# Adds our application code to the image
Expand Down
2 changes: 1 addition & 1 deletion tdrs-backend/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ openpyxl = "==3.1.2"
sendgrid = "==6.10.0"

[requires]
python_version = "3.10.8"
python_version = "3.10.8"
2 changes: 1 addition & 1 deletion tdrs-backend/Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 23 additions & 15 deletions tdrs-backend/tdpservice/search_indexes/admin/ssp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""ModelAdmin classes for parsed SSP data files."""
from .filters import CreationDateFilter, FiscalPeriodFilter, STTFilter
from .filters import CreationDateFilter, STTFilter
from .mixins import CsvExportAdminMixin, ReadOnlyAdminMixin
from tdpservice.search_indexes.admin.multiselect_filter import MultiSelectDropdownFilter


class SSP_M1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
Expand All @@ -14,9 +15,10 @@ class SSP_M1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]


Expand All @@ -31,9 +33,10 @@ class SSP_M2Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]


Expand All @@ -48,9 +51,10 @@ class SSP_M3Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]

class SSP_M4Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
Expand All @@ -64,9 +68,10 @@ class SSP_M4Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]

class SSP_M5Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
Expand All @@ -80,9 +85,10 @@ class SSP_M5Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]

class SSP_M6Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
Expand All @@ -97,9 +103,10 @@ class SSP_M6Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]

class SSP_M7Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
Expand All @@ -117,7 +124,8 @@ class SSP_M7Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]
38 changes: 23 additions & 15 deletions tdrs-backend/tdpservice/search_indexes/admin/tanf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""ModelAdmin classes for parsed TANF data files."""
from .filters import CreationDateFilter, FiscalPeriodFilter, STTFilter
from .filters import CreationDateFilter, STTFilter
from .mixins import CsvExportAdminMixin, ReadOnlyAdminMixin
from tdpservice.search_indexes.admin.multiselect_filter import MultiSelectDropdownFilter


class TANF_T1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
Expand All @@ -14,9 +15,10 @@ class TANF_T1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]


Expand All @@ -31,9 +33,10 @@ class TANF_T2Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]


Expand All @@ -48,9 +51,10 @@ class TANF_T3Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]


Expand All @@ -65,9 +69,10 @@ class TANF_T4Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]


Expand All @@ -82,9 +87,10 @@ class TANF_T5Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]


Expand All @@ -99,9 +105,10 @@ class TANF_T6Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]


Expand All @@ -120,7 +127,8 @@ class TANF_T7Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
]

list_filter = [
FiscalPeriodFilter,
CreationDateFilter,
('datafile__year', MultiSelectDropdownFilter),
('datafile__quarter', MultiSelectDropdownFilter),
('datafile__stt__name', STTFilter),
CreationDateFilter,
]
Loading
Loading