Fixing radio CSS issues and moving viewStudies to ohif:study-list package

This commit is contained in:
Bruno Alves de Faria 2017-03-27 08:28:21 -03:00
parent dc405e53da
commit bc533c14ad
5 changed files with 23 additions and 21 deletions

View File

@ -5,9 +5,7 @@
cursor: pointer cursor: pointer
input input
height: 0 display: none
width: 0
visibility: hidden
span span
padding-left: 23px padding-left: 23px

View File

@ -33,22 +33,6 @@ const getAssociationAssessment = () => {
return assessment; return assessment;
}; };
/**
* Loads multiple unassociated studies in the Viewer
*/
const viewStudies = () => {
OHIF.log.info('viewStudies');
const selectedStudies = OHIF.studylist.getSelectedStudies();
if (!selectedStudies || !selectedStudies.length) {
return;
}
const studyInstanceUids = selectedStudies.map(study => study.studyInstanceUid).join(';');
Router.go('viewerStudies', { studyInstanceUids });
};
/** /**
* Removes all present study / timepoint associations from the Clinical Trial * Removes all present study / timepoint associations from the Clinical Trial
*/ */
@ -86,7 +70,7 @@ const removeTimepointAssociations = event => {
Meteor.startup(() => { Meteor.startup(() => {
OHIF.studylist.dropdown.setItems([{ OHIF.studylist.dropdown.setItems([{
action: viewStudies, action: OHIF.studylist.viewStudies,
text: 'View', text: 'View',
separatorAfter: true separatorAfter: true
}, { }, {

View File

@ -9,3 +9,4 @@ import './retrieveStudiesMetadata.js';
import './retrieveStudyMetadata.js'; import './retrieveStudyMetadata.js';
import './studylist.js'; import './studylist.js';
import './viewSeriesDetails.js'; import './viewSeriesDetails.js';
import './viewStudies.js';

View File

@ -0,0 +1,18 @@
import { OHIF } from 'meteor/ohif:core';
import { Router } from 'meteor/iron:router';
/**
* Loads multiple unassociated studies in the Viewer
*/
OHIF.studylist.viewStudies = () => {
OHIF.log.info('viewStudies');
const selectedStudies = OHIF.studylist.getSelectedStudies();
if (!selectedStudies || !selectedStudies.length) {
return;
}
const studyInstanceUids = selectedStudies.map(study => study.studyInstanceUid).join(';');
Router.go('viewerStudies', { studyInstanceUids });
};

View File

@ -489,7 +489,8 @@ const setDisplaySet = (data, displaySetInstanceUid, templateData) => {
// If we didn't find anything, stop here // If we didn't find anything, stop here
if (!data.displaySet) { if (!data.displaySet) {
throw new OHIFError('Display set not found in specified study!'); data.displaySet = study.displaySets[0];
// throw new OHIFError('Display set not found in specified study!');
} }
// Otherwise, load pass the data object into loadSeriesIntoViewport // Otherwise, load pass the data object into loadSeriesIntoViewport