From 9803046f2d44177d02a8c1411a3ecf57bf95f9e8 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Tue, 13 Oct 2015 21:18:40 +0200
Subject: [PATCH] Bug fixes for worklist and OHIF viewer. Trying to get tabbed
 worklist/viewer working

---
 LesionTracker/.meteor/packages                |  1 +
 LesionTracker/client/route.js                 |  2 +-
 .../client/components/viewer/viewer.styl      |  5 +-
 .../components/basic/layout/layout.html       |  1 -
 Packages/worklist/components/worklist.html    | 10 ++--
 Packages/worklist/components/worklist.js      |  4 +-
 Packages/worklist/components/worklist.styl    | 57 +++++--------------
 .../components/worklistStudy/worklistStudy.js | 13 +++++
 8 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages
index 779a670d2..a4945a06f 100644
--- a/LesionTracker/.meteor/packages
+++ b/LesionTracker/.meteor/packages
@@ -32,3 +32,4 @@ arsnebula:reactive-promise
 promise
 stylus
 fortawesome:fontawesome
+random
diff --git a/LesionTracker/client/route.js b/LesionTracker/client/route.js
index f8a6ced20..5829f0c51 100644
--- a/LesionTracker/client/route.js
+++ b/LesionTracker/client/route.js
@@ -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');
     });
   }
 });
\ No newline at end of file
diff --git a/OHIFViewer/client/components/viewer/viewer.styl b/OHIFViewer/client/components/viewer/viewer.styl
index c72e28c25..39408f942 100644
--- a/OHIFViewer/client/components/viewer/viewer.styl
+++ b/OHIFViewer/client/components/viewer/viewer.styl
@@ -9,4 +9,7 @@
   -khtml-user-select: none
   -moz-user-select: none
   -ms-user-select: none
-  user-select: none
\ No newline at end of file
+  user-select: none
+  
+.studyBrowser
+  width: auto
\ No newline at end of file
diff --git a/Packages/viewerbase/components/basic/layout/layout.html b/Packages/viewerbase/components/basic/layout/layout.html
index 186f53b63..228930a27 100644
--- a/Packages/viewerbase/components/basic/layout/layout.html
+++ b/Packages/viewerbase/components/basic/layout/layout.html
@@ -26,6 +26,5 @@
             </div>
         </div>
     </nav>
-
     {{> yield}}
 </template>
\ No newline at end of file
diff --git a/Packages/worklist/components/worklist.html b/Packages/worklist/components/worklist.html
index a2992764f..0ffc0cc81 100644
--- a/Packages/worklist/components/worklist.html
+++ b/Packages/worklist/components/worklist.html
@@ -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>
diff --git a/Packages/worklist/components/worklist.js b/Packages/worklist/components/worklist.js
index ffdf852c7..da038100e 100644
--- a/Packages/worklist/components/worklist.js
+++ b/Packages/worklist/components/worklist.js
@@ -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) );
 }
diff --git a/Packages/worklist/components/worklist.styl b/Packages/worklist/components/worklist.styl
index eaae0592b..985a7ca66 100644
--- a/Packages/worklist/components/worklist.styl
+++ b/Packages/worklist/components/worklist.styl
@@ -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%
\ No newline at end of file
diff --git a/Packages/worklist/components/worklistStudy/worklistStudy.js b/Packages/worklist/components/worklistStudy/worklistStudy.js
index 389460128..244c56faa 100644
--- a/Packages/worklist/components/worklistStudy/worklistStudy.js
+++ b/Packages/worklist/components/worklistStudy/worklistStudy.js
@@ -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');
+        });
     }
 });
\ No newline at end of file