Bug fixes for worklist and OHIF viewer. Trying to get tabbed worklist/viewer working

This commit is contained in:
Erik Ziegler 2015-10-13 21:18:40 +02:00
parent a538b5f07d
commit 9803046f2d
8 changed files with 41 additions and 52 deletions

View File

@ -32,3 +32,4 @@ arsnebula:reactive-promise
promise promise
stylus stylus
fortawesome:fontawesome fortawesome:fontawesome
random

View File

@ -28,7 +28,7 @@ Router.route('/viewer/:_id', {
Session.set('studies', studies); Session.set('studies', studies);
//Session.set(activeTabId, studies); //Session.set(activeTabId, studies);
//Session.set('showContentInTab', true); //Session.set('showContentInTab', true);
self.render('viewer'); //self.render('viewer');
}); });
} }
}); });

View File

@ -10,3 +10,6 @@
-moz-user-select: none -moz-user-select: none
-ms-user-select: none -ms-user-select: none
user-select: none user-select: none
.studyBrowser
width: auto

View File

@ -26,6 +26,5 @@
</div> </div>
</div> </div>
</nav> </nav>
{{> yield}} {{> yield}}
</template> </template>

View File

@ -1,15 +1,17 @@
<template name="worklist"> <template name="worklist">
<div class="tabbable"> <div class="tabbable">
<ul id="tabs" class="nav nav-tabs" style="width:100%;"> <ul id="tabs" class="nav nav-tabs">
<li class="active"> <li class="active">
<a id="tabList" data-toggle="tab">Study List</a> <a data-toggle="tab">Study List</a>
</li> </li>
</ul> </ul>
<div id="tabs-content" class="tab-content"> <div id="tabs-content" class="tab-content">
<div id="contentList" class="tab-pane active"> <div id="contentList" class="tab-pane active">
<div class="container">
{{> worklistSearch }} {{> worklistSearch }}
{{> worklistResult }} {{> worklistResult }}
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>

View File

@ -72,7 +72,7 @@ function addNewTab (data) {
} }
function insertContent() { function insertContent() {
console.log('Include imageViewer template');
//Include imageViewer template //Include imageViewer template
UI.insert( UI.render( Template.viewer ), $( '#'+contentID ).get(0) ); UI.insert( UI.render( Template.viewer ), $( '#'+contentID ).get(0) );
} }

View File

@ -1,16 +1,3 @@
html, body
height: 100%
margin: 0
padding: 0
background-color: white
color: black
div
margin: 0
padding: 0
/***********************************************/ /***********************************************/
/* CSS3 Close button */ /* CSS3 Close button */
/***********************************************/ /***********************************************/
@ -30,21 +17,5 @@ div
margin-left: 5px margin-left: 5px
font-weight: bold font-weight: bold
.tabbable #tabs
cursor: pointer
position: absolute
top:0
left:0
bottom: 0
right: 0
width: 100%
height: 100%
color: black
.tab-content
position: absolute
top: 42px
left: 0
right: 0
bottom: 3px
width: 100% width: 100%

View File

@ -1,5 +1,18 @@
Template.worklistStudy.events({ Template.worklistStudy.events({
'click': function (){ 'click': function (){
Router.go('viewer', {_id: this.studyInstanceUid}); Router.go('viewer', {_id: this.studyInstanceUid});
Session.set('openNewTabEvent', self);
var studyInstanceUid = this.studyInstanceUid;
Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
//console.log(study);
sortStudy(study);
var studies = [study];
Session.set('studies', studies);
Session.set(activeTabId, studies);
Session.set('showContentInTab', true);
self.render('viewer');
});
} }
}); });