fix daterange presets

This commit is contained in:
dannyrb 2020-05-12 00:14:09 -04:00 committed by James A. Petts
parent 8f284aafac
commit 92923789e5
2 changed files with 7 additions and 5 deletions

View File

@ -62,8 +62,8 @@ const DateRange = props => {
className={`m-0 py-2 px-3 bg-primary-main border-0 rounded text-white text-base transition duration-300 hover:opacity-80`}
onClick={() =>
onChange({
startDate: start,
endDate: end,
startDate: start ? start.format('YYYYMMDD') : undefined,
endDate: end ? end.format('YYYYMMDD') : undefined,
preset: true,
})
}

View File

@ -56,11 +56,13 @@ function StudyListContainer({ history, data: studies }) {
// TODO: nesting/recursion?
// TODO: modalities array
if (key === 'studyDate') {
console.log(currValue)
if (defaultValue.startDate !== currValue.startDate) {
if (
currValue.startDate &&
defaultValue.startDate !== currValue.startDate
) {
queryString.startDate = currValue.startDate;
}
if (defaultValue.endDate !== currValue.endDate) {
if (currValue.endDate && defaultValue.endDate !== currValue.endDate) {
queryString.endDate = currValue.endDate;
}
} else if (currValue !== defaultValue) {