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

LT-337: Allow study association for a single selected study, and make association modal text easier to read

Browse Source
This commit is contained in:
Erik Ziegler 2016-11-19 17:21:16 +01:00
parent 68ebe59737
commit 47e52e46a3
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.html
View File

@ -2,9 +2,9 @@
<div id="studyAssociationTable"> <div id="studyAssociationTable">
<div id="associationInstructions" class="row"> <div id="associationInstructions" class="row">
<div class="col-md-12"> <div class="col-md-12">
<h4>Instructions</h4> <h5>Instructions</h5>
<p>Select the studies you would like to associate to a time point. Only one follow-up time point can be associated at the same time.</p> <p>Select the studies you would like to associate to a time point. Only one follow-up time point can be associated at the same time.</p>
<p>We have automatically retrieved all studies within 14 days (<strong>{{formatDA this.earliestDate}}</strong> to <strong>{{formatDA latestDate}}</strong>) of your selected studies, in case you forgot to select a study.</p> <p>We have automatically retrieved all studies within 14 days ({{formatDA this.earliestDate}} to {{formatDA latestDate}}) of your selected studies, in case you forgot to select a study.</p>
</div> </div>
</div> </div>

17
Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.styl
View File

@ -6,7 +6,7 @@ $tableHeaderHeight = 50px
$bodyCellHeight = 30px $bodyCellHeight = 30px
#studyAssociationTable #studyAssociationTable
color: #fff; color: #fff
.header .header
text-align: center text-align: center
@ -26,7 +26,7 @@ $bodyCellHeight = 30px
left: 0 left: 0
width: 100% width: 100%
z-index: 1 z-index: 1
border-bottom: solid 1px; border-bottom: solid 1px
theme('border-bottom-color', '$largeNumbersColor') theme('border-bottom-color', '$largeNumbersColor')
table table
@ -36,9 +36,11 @@ $bodyCellHeight = 30px
thead thead
tr tr
th th
padding: 0 padding-bottom: 5px
border-bottom: solid 1px #6fbde2 border-bottom: solid 1px #6fbde2
height: $tableHeaderHeight height: $tableHeaderHeight
font-weight: normal
tbody tbody
tr tr
padding: 5px padding: 5px
@ -54,13 +56,16 @@ $bodyCellHeight = 30px
color: $tableTextPrimaryColor color: $tableTextPrimaryColor
border-top: 1px solid #436270 border-top: 1px solid #436270
border-bottom: 1px solid #436270 border-bottom: 1px solid #436270
vertical-align: middle; vertical-align: middle
transition(all 0.1s ease) transition(all 0.1s ease)
p p
margin: 0; margin: 0
&.timepointOptions &.timepointOptions
label
font-weight: 200
input input
margin: 0 3px margin: 0 3px
@ -108,7 +113,7 @@ $bodyCellHeight = 30px
padding-left: 20px padding-left: 20px
display: inline-block display: inline-block
position: relative position: relative
line-height: initial; line-height: initial
&.disabled &.disabled
opacity: 0.2 opacity: 0.2

3
Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js
View File

@ -13,6 +13,7 @@ function getAssociationAssessment() {
selected: 0, selected: 0,
associated: 0 associated: 0
}; };
// check if timepointApi is available // check if timepointApi is available
const timepointApi = StudyList.timepointApi; const timepointApi = StudyList.timepointApi;
if (timepointApi) { if (timepointApi) {
@ -43,7 +44,7 @@ Template.longitudinalStudyListContextMenu.helpers({
const assessment = getAssociationAssessment(); const assessment = getAssociationAssessment();
// if (assessment.selected < 1 || assessment.associated > 0) { // if (assessment.selected < 1 || assessment.associated > 0) {
// TODO: REMOVE - Temporary for RSNA // TODO: REMOVE - Temporary for RSNA
if (assessment.selected < 2) { if (assessment.selected < 1) {
classList += disabledClass; classList += disabledClass;
} }