-
Notifications
You must be signed in to change notification settings - Fork 4
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
TP2000-1493 - TAP driven quota open data export #1302
Draft
dougmills-DIT
wants to merge
70
commits into
master
Choose a base branch
from
TP2000-1493_quota_open_data_export
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
finished S3 storage finished local storage updates for NamedTemporaryFile
finished S3 storage finished local storage updates for NamedTemporaryFile
…rt' into TP2000-1493_quota_open_data_export
Silly question - the initial volume column, are we pulling that from TAP or OTT? I think we should be pulling it from TAP really if we're not already |
Bumps [django](https://github.com/django/django) from 4.2.15 to 4.2.16. - [Commits](django/django@4.2.15...4.2.16) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Delete associations as well as definition * Add test * Prevent business rules from failing * Refactor if statement
* adding view and url * wip * wip - urlconf issues * Fix url args issue * adding tests * responding to CR comments --------- Co-authored-by: Edie Pearce <[email protected]>
* working through current/approved up to transaction issues * updating to use .all() on querysearch; adding actions column on QuotaDetail view * fixing broken test * adding title caption * copy changes requested by UR team * tidying up tabs/sub_quotas.jinja * alligning tab headings with tab names * fixing conditional headings * changing query to .current * fix
* Ability to edit suspension periods * Add ability to delete a suspension period * Form tests * View tests * Fix failing tests * Fix and reorder cancel button * Redesign confirm pages * PR review comments * test changes following PR review * Update get_success_url to make kwarg clearer
* Ability to edit suspension periods * Add ability to delete a suspension period * Form tests * View tests * Fix failing tests * Fix and reorder cancel button * Redesign confirm pages * PR review comments * test changes following PR review * Update get_success_url to make kwarg clearer * Get rid of +1 to prevent flaky test
* Edit capability for blocking periods * Tidy up * Disable ability to edit already started blocking periods * Form tests * View tests * Remove class from table * Tidy up breadcrumbs into one file
#1310) * moved 'remove all' button to right hand side of page and hidden this button from non-superusers * ran black linter * removed commented div tags
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.0.3 to 3.0.6. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](pallets/werkzeug@3.0.3...3.0.6) --- updated-dependencies: - dependency-name: werkzeug dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthew McKenzie <[email protected]>
* Add confirmation page to sync route * Redirect async route to create success page * Make measures a small m * WIP- Make edit process queue page * add expected measures count property to bulk editor * Create and apply bulk edit measures processing state filter * ran linter * Pull combined measure create and edit process code into a base class * Refactor confirm edit sync template to show a number of measures not their ids * Swap render for redirect in Sync done and create sync and async success views * Change processing queue url to include create * change create measures queue tab selected tab name, and page title * Update tab titles and heading semantics and add main heading * lint * forgot h2 closing tags oops * Fix broken test due to changed url * add "unknown number" to tasks with failed counts within template * Update headings from content guidance * Add edit link to the home page * Remove secondary styling on button * Refresh button to redirect to edit tab * remove create from the no bulk edit copy * Add doc strings to the sync and async confirm views * Hook up create sync to success view * Lint * Fix test to accommodate sync create redirect --------- Co-authored-by: Lauren Qurashi <[email protected]>
* Change composite key to random unique string * Undo importer change * Add test to confirm bug fix * Include wb pk in composite key * Update to zero padded wb pk * PR comment
Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](ai/nanoid@3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Test solution * Add current * re-adding old business rule check * rule check * Distinct count error * Remove some QA5 and QA6 checks for update form * Update models.py Remove comment as not confident enough to make this comment to all * Rid initial volume none scenario --------- Co-authored-by: Charles Prichard <[email protected]>
* Basic synchronous auto end measures functionality * Make it a Celery task * Add tests * Make it part of current wb * Update confirmation page and move link * Move get measures to helper and make tests robust * Update template * Use effective end date on measures * Move auto end date link as per design request * Black * final touches * Responding to PR comments * Update message for no measures found * Add extra atomic
api_query_dates = [] | ||
|
||
# collect possible query dates, but only for current and historical, not future | ||
if quota.valid_between.lower <= date.today(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
if quota.valid_between.lower <= date.today(): | |
if quota.valid_between.lower <= specified_date: |
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](pallets/jinja@3.1.4...3.1.5) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix delete association cancel button * Include unapproved measures * As at today and beyond
…1371) * updates to QA5 to prevent False positives from deleted associations * linting
finished S3 storage finished local storage updates for NamedTemporaryFile
finished S3 storage finished local storage updates for NamedTemporaryFile
…rt' into TP2000-1493_quota_open_data_export # Conflicts: # exporter/tests/test_storages.py # pyproject.toml # reference_documents/views/reference_document_version_views.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TP2000-1493 TAP driven quota open data export
Why
What
Checklist
Links to relevant material
See: Description