othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(study-list): Change convertStringToStudyDate to use moment to fix study date issues

Browse Source
This commit is contained in:
João Vinagre 2018-10-01 07:18:27 -03:00 committed by Erik Ziegler
parent 89d97a7a3a
commit fa73fedb73
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
View File

@ -100,17 +100,6 @@ function replaceUndefinedColumnValue(text) {
}
}
/**
* Convert string to study date
*/
function convertStringToStudyDate(dateStr) {
const y = dateStr.substring(0, 4);
const m = dateStr.substring(4, 6);
const d = dateStr.substring(6, 8);
const newDateStr = m + '/' + d + '/' + y;
return new Date(newDateStr);
}
/**
* Runs a search for studies matching the studylist query parameters
* Inserts the identified studies into the Studies Collection
@ -168,12 +157,10 @@ function search() {
}
// Search the rest of the parameters that aren't done via the server call
if ((new Date(studyDateFrom).setHours(0, 0, 0, 0) <= studyDate || !studyDateFrom ) &&
(studyDate <= new Date(studyDateTo).setHours(0, 0, 0, 0) || !studyDateTo || studyDateTo === '')) {
if ((moment(studyDateFrom, "MM/DD/YYYY").isBefore(moment(studyDate, "YYYYMMDD")) || !studyDateFrom ) &&
(moment(studyDate, "YYYYMMDD").isBefore(moment(studyDateTo, "MM/DD/YYYY")) || !studyDateTo || studyDateTo === '')) {
// Convert numberOfStudyRelatedInstance string into integer
study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : undefined;
// Insert any matching studies into the Studies Collection
OHIF.studylist.collections.Studies.insert(study);
}