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

CDPS-217 - changes to the release date labels #199

Merged
merged 5 commits into from
Jun 20, 2023
Merged

CDPS-217 - changes to the release date labels #199

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
305778f
CDPS-217 - changed the release date labels
jamesgrant-moj Jun 20, 2023
c5d4dff
Merge branch 'main' into CDPS-217-change-release-date-labels
jamesgrant-moj Jun 20, 2023
6103057
Merge branch 'main' into CDPS-217-change-release-date-labels
jamesgrant-moj Jun 20, 2023
a1b165a
CDPS-217 - added a space before brackets
jamesgrant-moj Jun 20, 2023
ae05c70
Merge branch 'CDPS-217-change-release-date-labels' of github.com:mini…
jamesgrant-moj Jun 20, 2023
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: 4 additions & 4 deletions server/data/localMockData/offencesPageMock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ export const OffencesPageMockSentences = {
dates: [
{
key: {
text: 'Conditional release',
text: 'Conditional release date(CRD)',
},
value: {
text: '29 January 2076',
Expand All @@ -485,7 +485,7 @@ export const OffencesPageMockSentences = {
},
{
key: {
text: 'Parole eligibility',
text: 'Parole eligibility date(PED)',
},
value: {
text: '12 December 2021',
Expand Down Expand Up @@ -1017,7 +1017,7 @@ export const GetReleaseDates = {
dates: [
{
key: {
text: 'Conditional release',
text: 'Conditional release date(CRD)',
},
value: {
text: '29 January 2076',
Expand All @@ -1033,7 +1033,7 @@ export const GetReleaseDates = {
},
{
key: {
text: 'Parole eligibility',
text: 'Parole eligibility date(PED)',
},
value: {
text: '12 December 2021',
Expand Down
6 changes: 3 additions & 3 deletions server/services/offencesPageService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ export default class OffencesPageService {
? [
{
key: {
text: 'Conditional release',
text: 'Conditional release date(CRD)',
},
value: {
text: formatDate(conditionalRelease, 'long'),
Expand Down Expand Up @@ -504,7 +504,7 @@ export default class OffencesPageService {
? [
{
key: {
text: 'Parole eligibility',
text: 'Parole eligibility date(PED)',
},
value: {
text: formatDate(sentenceDetails.paroleEligibilityDate, 'long'),
Expand All @@ -516,7 +516,7 @@ export default class OffencesPageService {
? [
{
key: {
text: 'Home detention curfew',
text: 'Home detention curfew eligibility date(HDCED)',
},
value: {
text: formatDate(sentenceDetails.homeDetentionCurfewEligibilityDate, 'long'),
Expand Down