From 848251eba9ec30742c896cb77730993644e342d8 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 8 Jun 2016 17:33:43 +0200 Subject: [PATCH] More cleanup for the study list --- LesionTracker/client/routes.js | 15 +--------- .../components/activeEntry/activeEntry.js | 4 +-- .../components/lesionTracker/lesionTracker.js | 30 +++++-------------- .../lesionTracker/lesionTracker.styl | 13 ++++++-- .../userAccountMenu/userAccountMenu.js | 6 ---- .../worklistResult/worklistResult.html | 2 +- .../worklistResult/worklistResult.js | 4 +++ .../worklistToolbar/worklistToolbar.html | 2 +- .../worklistToolbar/worklistToolbar.styl | 5 +++- 9 files changed, 30 insertions(+), 51 deletions(-) diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js index 4c5f51ec7..b91ebf3ec 100644 --- a/LesionTracker/client/routes.js +++ b/LesionTracker/client/routes.js @@ -40,20 +40,7 @@ Router.route('/', function() { if (verifyEmail && Meteor.user().emails && !Meteor.user().emails[0].verified) { this.render('emailVerification', routerOptions); } else { - this.render('lesionTracker', routerOptions); - } - - } else { - this.render('entrySignIn', routerOptions); - } -}); - -Router.route('/worklist', function() { - // Check user is logged in - if (Meteor.user() && Meteor.userId()) { - if (verifyEmail && Meteor.user().emails && !Meteor.user().emails[0].verified) { - this.render('emailVerification', routerOptions); - } else { + Session.set('activeContentId', 'worklistTab'); this.render('lesionTracker', routerOptions); } diff --git a/Packages/lesiontracker/client/components/activeEntry/activeEntry.js b/Packages/lesiontracker/client/components/activeEntry/activeEntry.js index 21e509c4d..e50ef5630 100644 --- a/Packages/lesiontracker/client/components/activeEntry/activeEntry.js +++ b/Packages/lesiontracker/client/components/activeEntry/activeEntry.js @@ -7,10 +7,10 @@ Meteor.startup(function() { }, signIn: { displayFullName: true, - destination: '/worklist' + destination: '/' }, signUp: { - destination: '/worklist' + destination: '/' }, themeColors: { primary: '' diff --git a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js index 4cdf5c09c..93cc12358 100644 --- a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js +++ b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js @@ -3,20 +3,8 @@ // use this to repopulate the variable ViewerData = Session.get('ViewerData') || {}; -Template.lesionTracker.onCreated(function() { - // showViewer to go to viewer from audit - this.showWorklistMenu = new ReactiveVar(true); - // Get url and check worklist - var currentRoute = Router.current(); - if (!currentRoute || !currentRoute.route) { - return; - } - - var currentPath = currentRoute.route.path(this); - if (currentPath === '/' || currentPath === '/worklist') { - this.showWorklistMenu.set(false); - } -}); +var worklistContentId = 'worklistTab'; +var viewerContentId = 'viewerTab'; Template.lesionTracker.onRendered(function() { var templateData = Template.currentData(); @@ -38,8 +26,6 @@ Template.lesionTracker.onRendered(function() { Template.lesionTracker.events({ 'click .js-toggle-studyList': function() { var contentId = Session.get('activeContentId'); - var worklistContentId = 'worklistTab'; - var viewerContentId = 'viewerTab'; if (contentId !== worklistContentId) { switchToTab(worklistContentId); @@ -52,18 +38,16 @@ Template.lesionTracker.events({ Session.set('defaultSignInMessage', 'Tumor tracking in your browser.'); Template.lesionTracker.helpers({ - showWorklistMenu: function() { - return Template.instance().showWorklistMenu.get(); - }, studyListToggleText: function() { var contentId = Session.get('activeContentId'); - if (!contentId) { + + // If the Viewer has not been opened yet, 'Back to viewer' should + // not be displayed + var viewerContentExists = !!Object.keys(ViewerData).length; + if (!viewerContentExists) { return; } - var worklistContentId = 'worklistTab'; - var viewerContentId = 'viewerTab'; - if (contentId === worklistContentId) { return 'Back to viewer'; } else if (contentId === viewerContentId) { diff --git a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl index b1468ad8d..b485769b3 100644 --- a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl +++ b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl @@ -1,5 +1,7 @@ @import "{design}/app" +$expandedHeight = 160px + .topBar height: $topBarHeight color: $textPrimaryColor @@ -11,6 +13,7 @@ display: inline-block img.logoImage + display: inline-block height: 100% max-height: 50px margin: 0 5px @@ -42,11 +45,15 @@ &.studyList background-color: rgba(21, 25, 30, 0.7) - height: 160px + height: $expandedHeight .brandSection - margin-top: 50px - margin-left: 50px + width: 80% + padding-left: 50px + line-height: $expandedHeight + + img.logoImage + margin: 5px 5px 15px 5px .logoText font-size: 30px diff --git a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js index 2c71c0632..be3a8965f 100644 --- a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js +++ b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js @@ -21,12 +21,6 @@ Template.userAccountMenu.helpers({ } return !!Meteor.user().emails[0].verified; - }, - showWorklistMenu: function() { - var currentPath = Router.current().route.path(this); - if (currentPath !== '/' && currentPath !== '/worklist') { - return true; - } } }); diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.html b/Packages/worklist/client/components/worklistResult/worklistResult.html index 3392b4da8..03c2a11f9 100644 --- a/Packages/worklist/client/components/worklistResult/worklistResult.html +++ b/Packages/worklist/client/components/worklistResult/worklistResult.html @@ -4,7 +4,7 @@ Study list
- 85 + {{numberOfStudies}}
{{>worklistToolbar}} diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.js b/Packages/worklist/client/components/worklistResult/worklistResult.js index adeca1376..08af66c6b 100644 --- a/Packages/worklist/client/components/worklistResult/worklistResult.js +++ b/Packages/worklist/client/components/worklistResult/worklistResult.js @@ -24,6 +24,10 @@ Template.worklistResult.helpers({ }); }, + numberOfStudies: function() { + return WorklistStudies.find().count(); + }, + showLoadingText: function() { return Session.get('searchResults').showLoadingText; }, diff --git a/Packages/worklist/client/components/worklistToolbar/worklistToolbar.html b/Packages/worklist/client/components/worklistToolbar/worklistToolbar.html index 9f36fc19b..78f070c6b 100644 --- a/Packages/worklist/client/components/worklistToolbar/worklistToolbar.html +++ b/Packages/worklist/client/components/worklistToolbar/worklistToolbar.html @@ -5,7 +5,7 @@ - +
{{/if }} diff --git a/Packages/worklist/client/components/worklistToolbar/worklistToolbar.styl b/Packages/worklist/client/components/worklistToolbar/worklistToolbar.styl index f72f3b898..9f552c0f9 100644 --- a/Packages/worklist/client/components/worklistToolbar/worklistToolbar.styl +++ b/Packages/worklist/client/components/worklistToolbar/worklistToolbar.styl @@ -9,13 +9,16 @@ font-weight: 300 cursor: pointer + * + pointer-events: none + &:hover color: $hoverColor &:active color: $activeColor - .inputfile + input width: 0.1px; height: 0.1px opacity: 0