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
stylus
fortawesome:fontawesome
random

View File

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

View File

@ -9,4 +9,7 @@
-khtml-user-select: none
-moz-user-select: none
-ms-user-select: none
user-select: none
user-select: none
.studyBrowser
width: auto

View File

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

View File

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

View File

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

View File

@ -1,50 +1,21 @@
html, body
height: 100%
margin: 0
padding: 0
background-color: white
color: black
div
margin: 0
padding: 0
/***********************************************/
/* CSS3 Close button */
/***********************************************/
.btnClose
top: 0
right: 0
bottom: 0
width: 20px
height: 20px
text-decoration: none
border: none
background-color: #fcfcfc
-moz-border-radius: 10px
-webkit-border-radius: 10px
border-radius: 10px
margin-left: 5px
font-weight: bold
.tabbable
cursor: pointer
position: absolute
top:0
left:0
top: 0
right: 0
bottom: 0
right: 0
width: 100%
height: 100%
color: black
.tab-content
position: absolute
top: 42px
left: 0
right: 0
bottom: 3px
width: 20px
height: 20px
text-decoration: none
border: none
background-color: #fcfcfc
-moz-border-radius: 10px
-webkit-border-radius: 10px
border-radius: 10px
margin-left: 5px
font-weight: bold
#tabs
width: 100%

View File

@ -1,5 +1,18 @@
Template.worklistStudy.events({
'click': function (){
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');
});
}
});