Move towards NPM for Cornerstone dependencies

This commit is contained in:
Erik Ziegler committed 2017-06-15 09:18:54 +02:00
1 parent 6c98c6a589
commit ddef3c4710
59 files changed
+2435 -29162

No files matched your search

@@ -138,8 +138,8 @@ function search() {
patientId: getFilter($('input#patientId').val()),
accessionNumber: getFilter($('input#accessionNumber').val()),
studyDescription: getFilter($('input#studyDescription').val()),
studyDateFrom: studyDateFrom,
studyDateTo: studyDateTo,
studyDateFrom,
studyDateTo,
modalitiesInStudy: $('input#modality').val() ? $('input#modality').val() : ''
};
@@ -161,6 +161,7 @@ function search() {
Session.set('showLoadingText', false);
if (!studies) {
OHIF.log.warn('No studies found');
return;
}
@@ -1,6 +1,6 @@
import { Template } from 'meteor/templating';
import { Blaze } from 'meteor/blaze';
import * as Hammer from 'hammerjs';
import Hammer from 'hammerjs';
import { OHIF } from 'meteor/ohif:core';
// Clear all selected studies
@@ -33,6 +33,17 @@ OHIF.studylist.retrieveStudyMetadata = studyInstanceUid => {
Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
console.timeEnd('retrieveStudyMetadata');
if (error) {
OHIF.log.error(error);
reject(error);
return;
}
if (!study) {
reject(`GetStudyMetadata: No study data returned from server: ${studyInstanceUid}`);
return;
}
if (window.HipaaLogger && Meteor.user && Meteor.user()) {
window.HipaaLogger.logEvent({
eventType: 'viewed',
@@ -45,16 +56,6 @@ OHIF.studylist.retrieveStudyMetadata = studyInstanceUid => {
});
}
if (error) {
OHIF.log.warn(error);
reject(error);
return;
}
if (!study) {
throw new Meteor.Error('GetStudyMetadata', 'No study data returned from server');
}
// Once the data was retrieved, the series are sorted by series and instance number
OHIF.viewerbase.sortStudy(study);