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.

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

ARE-96 add hide old exclusion dates #121

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
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
25 changes: 25 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ sonar_scanner: &sonar_scanner
commands:
- sonar-scanner -Dproject.settings=./sonar-project.properties

ui_integration_tests: &ui_integration_tests
pull: if-not-exists
image: node:14
environment:
NOTIFY_STUB: true
commands:
- yarn run test:ui-integration

acceptance_tests: &acceptance_tests
pull: if-not-exists
image: mcr.microsoft.com/playwright:v1.12.3-focal
Expand Down Expand Up @@ -104,6 +112,14 @@ steps:
- master
event: push

- name: ui_integration_tests_deploy
<<: *ui_integration_tests
when:
branch:
include:
- master
event: push

- name: build_image
image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind
commands:
Expand Down Expand Up @@ -189,6 +205,15 @@ steps:
- feature/*
event: pull_request

- name: ui_integration_tests_branch
<<: *ui_integration_tests
when:
branch:
include:
- master
- feature/*
event: pull_request

- name: build_acceptance_branch
pull: if-not-exists
image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind
Expand Down
13 changes: 10 additions & 3 deletions apps/are_form/behaviours/referencelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,17 @@ module.exports = superclass => class ReferenceList extends superclass {
json['reference-appeal-list'] = appealStages;
json['reference-appeal-list-count'] = appealStages.length;
} else if (req.url === '/exclusiondates') {
json['reference-exclusiondate-list-england-and-wales'] = engWalExcludedDates.excludedDates;
json['reference-exclusiondate-list-scotland'] = scotlandExcludedDates.excludedDates;
json['reference-exclusiondate-list-northern-ireland'] = niExcludedDates.excludedDates;
json['exclusion-date-range'] = engWalExcludedDates.getExcludedDateRange();


json['reference-exclusiondate-list-england-and-wales-recent-dates'] = engWalExcludedDates.getRecentDates();
json['reference-exclusiondate-list-england-and-wales-older-dates'] = engWalExcludedDates.getOldDates();

json['reference-exclusiondate-list-scotland-recent-dates'] = scotlandExcludedDates.getRecentDates();
json['reference-exclusiondate-list-scotland-older-dates'] = scotlandExcludedDates.getOldDates();

json['reference-exclusiondate-list-northern-ireland-recent-dates'] = niExcludedDates.getRecentDates();
json['reference-exclusiondate-list-northern-ireland-older-dates'] = niExcludedDates.getOldDates();
}
return callback(err, json);
});
Expand Down
Loading