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

date picker component: Updated function to accept more date formats #1040

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

date picker component: Updated function to accept more date formats #1040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 61 additions & 7 deletions src/moj/components/date-picker/date-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,17 @@ function Datepicker($module, config = {}) {
"December",
];

this.monthLabelsShort = [
"Jan","Feb","Mar","Apr",
"May","Jun","Jul","Aug",
"Sep","Oct","Nov","Dec",
];
this.monthLabelsWelsh = [
"Ionawr","Chwefror","Mawrth","Ebrill",
"Mai","Mehefin","Gorffennaf","Awst",
"Medi","Hydref","Tachwedd","Rhagfyr",
];

this.currentDate = new Date();
this.currentDate.setHours(0, 0, 0, 0);
this.calendarDays = [];
Expand Down Expand Up @@ -469,16 +480,59 @@ Datepicker.prototype.formattedDateFromString = function (
dateString,
fallback = new Date(),
) {
let year;
let month;
let day;
let formattedDate = null;
// Accepts d/m/yyyy and dd/mm/yyyy
const dateFormatPattern = /(\d{1,2})([-/,. ])(\d{1,2})\2(\d{4})/;

if (!dateFormatPattern.test(dateString)) return fallback;
// Accepts d/m/yyyy and dd/mm/yyyy and dd/mm/yy
const dateFormatPattern = /(\d{1,2})(?:[-/,. ]{1,})(\d{1,2})(?:[-/,. ]{1,})(\d{2,4})/;
// Accepts yyyy-mm-dd only
const dateFormatPatternInternational = /(\d{4})(-)(\d{2})\2(\d{2})/;
// Accepts 29th February 1980 & 29 Feb 80 & 29 Chwefror 1980 (Welsh)
const dateFormatPatternMonthNames = /(\d{1,2})(?:|st|nd|rd|th|af|il|ydd|ed|fed|eg|ain)(?:[-/,. ]{1,})(Jan(?:uary)?|Feb(?:ruary)?|Mar(?:ch)?|Apr(?:il)?|May|Jun(?:e)?|Jul(?:y)?|Aug(?:ust)?|Sep(?:tember)?|Oct(?:ober)?|(?:Nov|Dec)(?:ember)?|Ionawr|Chwefror|Mawrth|Ebrill|Mai|Mehefin|Gorffennaf|Awst|Medi|Hydref|Tachwedd|Rhagfyr)(?:[-/,.' ]{1,})(\d{2,4})/i;
// Accepts February 29th, 1980 & Feb 29, 80 & Chwefror 29ain, 1980 (Welsh)
const dateFormatPatternMonthNamesMDY = /(Jan(?:uary)?|Feb(?:ruary)?|Mar(?:ch)?|Apr(?:il)?|May|Jun(?:e)?|Jul(?:y)?|Aug(?:ust)?|Sep(?:tember)?|Oct(?:ober)?|(?:Nov|Dec)(?:ember)?|Ionawr|Chwefror|Mawrth|Ebrill|Mai|Mehefin|Gorffennaf|Awst|Medi|Hydref|Tachwedd|Rhagfyr)(?:[-/,. ]{1,})(\d{1,2})(?:|st|nd|rd|th|af|il|ydd|ed|fed|eg|ain)(?:[-/,.' ]{1,})(\d{2,4})/i;

if (dateFormatPatternInternational.test(dateString)) {
let dateArray = dateString.match(dateFormatPatternInternational);
year = dateArray[1];
month = dateArray[3];
day = dateArray[4];
} else if (dateFormatPatternMonthNames.test(dateString)) {
let dateArray = dateString.match(dateFormatPatternMonthNames);
day = dateArray[1];
month = dateArray[2];
year = dateArray[3];
} else if (dateFormatPatternMonthNamesMDY.test(dateString)) {
let dateArray = dateString.match(dateFormatPatternMonthNamesMDY);
month = dateArray[1];
day = dateArray[2];
year = dateArray[3];
} else if (dateFormatPattern.test(dateString)) {
let dateArray = dateString.match(dateFormatPattern);
day = dateArray[1];
month = dateArray[2];
year = dateArray[3];
} else {
return fallback;
}

if (!day || !month || !year) {
return fallback;
}

const match = dateString.match(dateFormatPattern);
const day = match[1];
const month = match[3];
const year = match[4];
// Deal with 2-digit years, range from 1970 to 2069
if (year.length == 2 && Number(year)>=70) {
year = "19"+year;
} else if (year.length == 2) {
year = "20"+year;
}

// Convert word months into number months
if (this.monthLabels.includes(month)) month = this.monthLabels.indexOf(month)+1;
if (this.monthLabelsShort.includes(month)) month = this.monthLabelsShort.indexOf(month)+1;
if (this.monthLabelsWelsh.includes(month)) month = this.monthLabelsWelsh.indexOf(month)+1;

formattedDate = new Date(`${year}-${month}-${day}`);
if (formattedDate instanceof Date && !isNaN(formattedDate)) {
Expand Down
Loading