From 91abaf8a602c32f1d7bc91f84c97ad56413f0be3 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Mon, 6 Mar 2017 10:08:46 -0300 Subject: [PATCH] Removing serverInformationModal from DOM --- LesionTracker/client/components/app/app.html | 1 - LesionTracker/client/routes.js | 23 ++++++------ .../components/ohifViewer/ohifViewer.html | 3 +- .../components/ohifViewer/ohifViewer.js | 5 +++ .../components/base/section/section.html | 6 ++-- .../client/components/base/section/section.js | 17 +-------- .../bootstrap/dialog/bootstrap.styl | 2 ++ .../components/bootstrap/dialog/simple.html | 1 + Packages/ohif-core/client/lib/blaze.js | 11 ++++++ Packages/ohif-core/package.js | 1 + .../client/components/index.js | 1 - .../trialOptionsModal/irRCDescription.html | 2 +- .../trialOptionsModal/recistDescription.html | 2 +- .../trialOptionsModal/trialOptionsModal.html | 15 ++++---- .../trialOptionsModal/trialOptionsModal.styl | 3 -- .../serverInformationForm.js | 2 +- .../serverInformationModal.html | 35 ++++++------------- .../serverInformationModal.js | 7 ++-- .../userAccountMenu/userAccountMenu.js | 21 ++++++----- 19 files changed, 72 insertions(+), 86 deletions(-) create mode 100644 Packages/ohif-core/client/components/bootstrap/dialog/bootstrap.styl delete mode 100644 Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.styl diff --git a/LesionTracker/client/components/app/app.html b/LesionTracker/client/components/app/app.html index 9a3c18afb..96d4da791 100644 --- a/LesionTracker/client/components/app/app.html +++ b/LesionTracker/client/components/app/app.html @@ -28,7 +28,6 @@
- {{>serverInformationModal}} {{>lastLoginModal}} {{>progressDialog}} {{>viewSeriesDetailsModal}} diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js index c505cff73..bb63ffeea 100644 --- a/LesionTracker/client/routes.js +++ b/LesionTracker/client/routes.js @@ -1,10 +1,12 @@ +import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { Router } from 'meteor/iron:router'; +import { OHIF } from 'meteor/ohif:core'; Session.setDefault('ViewerData', {}); // verifyEmail controls whether emailVerification template will be rendered or not -var verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false; +const verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false; Router.configure({ layoutTemplate: 'layout', @@ -13,34 +15,29 @@ Router.configure({ Router.onBeforeAction('loading'); -var data = { +const data = { additionalTemplates: [ - 'serverInformationModal', 'lastLoginModal', 'viewSeriesDetailsModal' ] }; -var routerOptions = { - data: data -}; +const routerOptions = { data }; Router.route('/', 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 { + } else { const contentId = Session.get('activeContentId'); - if(!contentId) { + if (!contentId) { Session.set('activeContentId', 'studylistTab'); } + this.render('app', routerOptions); } - - } - else { + } else { this.render('entrySignIn', routerOptions); } }); @@ -49,7 +46,7 @@ Router.route('/viewer/timepoints/:_id', { layoutTemplate: 'layout', name: 'viewer', onBeforeAction: function() { - var timepointId = this.params._id; + const timepointId = this.params._id; this.render('app', routerOptions); OHIF.lesiontracker.openNewTabWithTimepoint(timepointId); diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.html b/OHIFViewer/client/components/ohifViewer/ohifViewer.html index a03dfc013..e18bab2d1 100644 --- a/OHIFViewer/client/components/ohifViewer/ohifViewer.html +++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.html @@ -24,7 +24,7 @@ - \ No newline at end of file + diff --git a/Packages/ohif-lesiontracker/client/components/trialOptionsModal/recistDescription.html b/Packages/ohif-lesiontracker/client/components/trialOptionsModal/recistDescription.html index 425ad597b..51f001ae0 100644 --- a/Packages/ohif-lesiontracker/client/components/trialOptionsModal/recistDescription.html +++ b/Packages/ohif-lesiontracker/client/components/trialOptionsModal/recistDescription.html @@ -11,4 +11,4 @@
  • Target lesions must have measurements (cannot be assessed as CR, UN/NE, EX)
    • - \ No newline at end of file + diff --git a/Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.html b/Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.html index 2759b17e4..285a3d9a6 100644 --- a/Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.html +++ b/Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.html @@ -1,17 +1,16 @@ diff --git a/Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.styl b/Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.styl deleted file mode 100644 index 39d3bbede..000000000 --- a/Packages/ohif-lesiontracker/client/components/trialOptionsModal/trialOptionsModal.styl +++ /dev/null @@ -1,3 +0,0 @@ -#trialOptionsModal - .panel - background-color: transparent diff --git a/Packages/ohif-study-list/client/components/serverInformation/serverInformationForm/serverInformationForm.js b/Packages/ohif-study-list/client/components/serverInformation/serverInformationForm/serverInformationForm.js index 982fdc176..d7dd00cbe 100644 --- a/Packages/ohif-study-list/client/components/serverInformation/serverInformationForm/serverInformationForm.js +++ b/Packages/ohif-study-list/client/components/serverInformation/serverInformationForm/serverInformationForm.js @@ -34,7 +34,7 @@ Template.serverInformationForm.onCreated(() => { Template.serverInformationForm.onRendered(() => { const instance = Template.instance(); - instance.data.$form = instance.$('form:first'); + instance.data.$form = instance.$('form').first(); instance.data.form = instance.data.$form.data('component'); // Handle the server type diff --git a/Packages/ohif-study-list/client/components/serverInformation/serverInformationModal/serverInformationModal.html b/Packages/ohif-study-list/client/components/serverInformation/serverInformationModal/serverInformationModal.html index 414b90b32..a0533adae 100644 --- a/Packages/ohif-study-list/client/components/serverInformation/serverInformationModal/serverInformationModal.html +++ b/Packages/ohif-study-list/client/components/serverInformation/serverInformationModal/serverInformationModal.html @@ -1,27 +1,12 @@ diff --git a/Packages/ohif-study-list/client/components/serverInformation/serverInformationModal/serverInformationModal.js b/Packages/ohif-study-list/client/components/serverInformation/serverInformationModal/serverInformationModal.js index 44e7493a6..e46d2c5f5 100644 --- a/Packages/ohif-study-list/client/components/serverInformation/serverInformationModal/serverInformationModal.js +++ b/Packages/ohif-study-list/client/components/serverInformation/serverInformationModal/serverInformationModal.js @@ -1,5 +1,8 @@ +import { Template } from 'meteor/templating'; +import { ReactiveVar } from 'meteor/reactive-var'; + Template.serverInformationModal.onCreated(function() { - var instance = Template.instance(); + const instance = Template.instance(); instance.container = { mode: new ReactiveVar('list'), serverType: new ReactiveVar(null), @@ -14,7 +17,7 @@ Template.serverInformationModal.onCreated(function() { }); Template.serverInformationModal.events({ - 'click .js-back, click [data-dismiss=modal]': function(event, instance) { + 'click .js-back'(event, instance) { instance.container.resetState(); } }); diff --git a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.js b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.js index 2aaeb7c25..7988e42f8 100644 --- a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.js +++ b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.js @@ -3,6 +3,7 @@ import { Template } from 'meteor/templating'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Router } from 'meteor/iron:router'; +import { moment } from 'meteor/momentjs:moment'; import { OHIF } from 'meteor/ohif:core'; // Display the last login modal as default @@ -10,13 +11,14 @@ Session.setDefault('displayLastLoginModal', true); Template.userAccountMenu.helpers({ name: function() { - var nameSplit = Meteor.user().profile.fullName.split(' '); - var lastName = nameSplit[nameSplit.length - 1]; + const nameSplit = Meteor.user().profile.fullName.split(' '); + const lastName = nameSplit[nameSplit.length - 1]; nameSplit[nameSplit.length - 1] = lastName.substr(0, 1) + '.'; return nameSplit.join(' '); }, + currentUser: function() { - var verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false; + const verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false; if (!Meteor.user() || !Meteor.userId()) { return; @@ -36,7 +38,7 @@ Template.userAccountMenu.helpers({ Template.userAccountMenu.events({ 'click #serverInformation'() { - $('#serverInformationModal').modal('show'); + OHIF.ui.showDialog('serverInformationModal'); }, 'click #themeSelector'() { @@ -51,7 +53,7 @@ Template.userAccountMenu.events({ }); Template.userAccountMenu.onCreated(function userAccountMenuCreated() { - const instance = Template.instance(); + const instance = Template.instance(); // Create reactive last login date instance.lastLoginDate = new ReactiveVar(); @@ -60,14 +62,14 @@ Template.userAccountMenu.onCreated(function userAccountMenuCreated() { let oldUser; // Get last login date - Meteor.call('getPriorLoginDate', function(error, lastLoginDate){ + Meteor.call('getPriorLoginDate', function(error, lastLoginDate) { if (error) { - console.log(error); + OHIF.log.error(error); return; } // Format the last login date - const formattedLastLoginDate = moment(lastLoginDate).format("MMMM Do YYYY, HH:mm:ss A"); + const formattedLastLoginDate = moment(lastLoginDate).format('MMMM Do YYYY, HH:mm:ss A'); instance.lastLoginDate.set(formattedLastLoginDate); @@ -80,7 +82,7 @@ Template.userAccountMenu.onCreated(function userAccountMenuCreated() { } // Hook login/logout - var user = Meteor.user(); + const user = Meteor.user(); if (!user) { // Display last login modal for the next login Session.setPersistent('displayLastLoginModal', true); @@ -97,6 +99,7 @@ Template.userAccountMenu.onCreated(function userAccountMenuCreated() { // Remove the user by oldUserId from Reviewers Meteor.call('removeUserFromReviewers', oldUser._id); } + return; }