From 6e2bef531745581af4aee6ca947c6899dc5b57c8 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Thu, 17 Nov 2016 13:45:51 -0200 Subject: [PATCH] LT-354: Converting to the new dialog/form structure --- LesionTracker/client/components/app/app.html | 31 +++++++-------- LesionTracker/client/routes.js | 5 +-- .../components/bootstrap/dialog/form.html | 8 ++-- .../confirmRemoveTimepointAssociation.html | 23 ----------- .../confirmRemoveTimepointAssociation.js | 6 --- .../client/components/association/index.js | 3 -- .../longitudinalStudyListContextMenu.html | 23 +++++------ .../longitudinalStudyListContextMenu.js | 38 +++++++++++-------- 8 files changed, 52 insertions(+), 85 deletions(-) delete mode 100644 Packages/ohif-measurements/client/components/association/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html delete mode 100644 Packages/ohif-measurements/client/components/association/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js diff --git a/LesionTracker/client/components/app/app.html b/LesionTracker/client/components/app/app.html index de8009353..627ee8af0 100644 --- a/LesionTracker/client/components/app/app.html +++ b/LesionTracker/client/components/app/app.html @@ -7,35 +7,32 @@ -
- Open Health Imaging Foundation -
+
Open Health Imaging Foundation
- {{ #if studyListToggleText }} - - {{studyListToggleText}} - - {{ /if }} + {{#if studyListToggleText}} + + {{studyListToggleText}} + + {{/if}}
{{>userAccountMenu}}
- {{ >timeoutCountdownDialog }} + {{>timeoutCountdownDialog}}
- {{> studylistResult }} + {{>studylistResult}}
- {{ >optionsModal }} - {{ >serverInformationModal }} - {{ >confirmRemoveTimepointAssociation }} - {{ >lastLoginModal }} - {{ >progressDialog }} - {{ >viewSeriesDetailsModal }} - {{ >themeSelectorModal }} + {{>optionsModal}} + {{>serverInformationModal}} + {{>lastLoginModal}} + {{>progressDialog}} + {{>viewSeriesDetailsModal}} + {{>themeSelectorModal}} diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js index 74963ad4c..33793c84e 100644 --- a/LesionTracker/client/routes.js +++ b/LesionTracker/client/routes.js @@ -14,7 +14,6 @@ var data = { additionalTemplates: [ 'optionsModal', 'serverInformationModal', - 'confirmRemoveTimepointAssociation', 'lastLoginModal', 'viewSeriesDetailsModal' ] @@ -29,7 +28,7 @@ Router.route('/', function() { if (Meteor.user() && Meteor.userId()) { if (verifyEmail && Meteor.user().emails && !Meteor.user().emails[0].verified) { this.render('emailVerification', routerOptions); - } + } else { const contentId = Session.get('activeContentId'); if(!contentId) { @@ -38,7 +37,7 @@ Router.route('/', function() { this.render('app', routerOptions); } - } + } else { this.render('entrySignIn', routerOptions); } diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/form.html b/Packages/ohif-core/client/components/bootstrap/dialog/form.html index 51f4bf9a4..84f0e9b97 100644 --- a/Packages/ohif-core/client/components/bootstrap/dialog/form.html +++ b/Packages/ohif-core/client/components/bootstrap/dialog/form.html @@ -16,12 +16,12 @@ {{>UI.contentBlock}}
- {{#button class='btn btn-default' - action='cancel' + {{#button action='cancel' + class=(concat 'btn ' (choose this.cancelClass 'btn-default')) tagAttributes=(extend this.tagAttributes data-dismiss='modal') }}{{choose this.cancelLabel 'Cancel'}}{{/button}} - {{#button class='btn btn-primary' - action='confirm' + {{#button action='confirm' + class=(concat 'btn ' (choose this.confirmClass 'btn-primary')) }}{{choose this.confirmLabel 'Confirm'}}{{/button}}
{{/form}} diff --git a/Packages/ohif-measurements/client/components/association/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html b/Packages/ohif-measurements/client/components/association/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html deleted file mode 100644 index 2aa06b4e7..000000000 --- a/Packages/ohif-measurements/client/components/association/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/Packages/ohif-measurements/client/components/association/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js b/Packages/ohif-measurements/client/components/association/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js deleted file mode 100644 index b92350a28..000000000 --- a/Packages/ohif-measurements/client/components/association/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js +++ /dev/null @@ -1,6 +0,0 @@ -Template.confirmRemoveTimepointAssociation.events({ - 'click #removeTimepointAssociations': function() { - // Remove association - StudyList.functions['removeTimepointAssociations'](); - } -}); diff --git a/Packages/ohif-measurements/client/components/association/index.js b/Packages/ohif-measurements/client/components/association/index.js index 1364461ce..a19ccd0b9 100644 --- a/Packages/ohif-measurements/client/components/association/index.js +++ b/Packages/ohif-measurements/client/components/association/index.js @@ -5,6 +5,3 @@ import './associationModal/associationModal.js'; import './associationModal/studyAssociationTable/studyAssociationTable.html'; import './associationModal/studyAssociationTable/studyAssociationTable.styl'; import './associationModal/studyAssociationTable/studyAssociationTable.js'; - -import './confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html'; -import './confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js'; diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.html b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.html index ce76cab1d..f236e4644 100644 --- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.html +++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.html @@ -4,28 +4,23 @@ {{#let classes=getAssociationClasses}} -
  • - Associate -
    • +
  • + Associate +
    • {{/let}} {{#let classes=getRemoveAssociationClasses}} -
  • - - Remove Association - -
    • +
  • + Remove Association +
    • {{/let}}
  • View Series Details + title="View Series Details">View Series Details
  • Anonymize
  • Send
    • diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js index f8eb55042..5376ad687 100644 --- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js +++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListContextMenu/longitudinalStudyListContextMenu.js @@ -1,5 +1,4 @@ import { Template } from 'meteor/templating'; -import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { OHIF } from 'meteor/ohif:core'; @@ -31,6 +30,7 @@ function getAssociationAssessment() { } } } + return assessment; } @@ -73,22 +73,30 @@ StudyList.functions.viewStudies = viewStudies; * Removes all present study / timepoint associations from the Clinical Trial */ function removeTimepointAssociations() { - // Get a Cursor pointing to the selected Studies from the StudyList - const selectedStudies = OHIF.studylist.getSelectedStudies(); + const dialogSettings = { + title: 'Remove Association', + message: 'Measurements related to this Study and Timepoint will be erased. Do you really want to delete this association?', + confirmClass: 'btn-danger' + }; - // Find the Timepoint that was previously referenced - const timepointApi = StudyList.timepointApi; - if (!timepointApi) { - OHIF.log.error('Remove Study/Timepoint Association: No Timepoint API found.') - return; - } + OHIF.ui.showFormDialog('dialogConfirm', dialogSettings).then(() => { + // Get a Cursor pointing to the selected Studies from the StudyList + const selectedStudies = OHIF.studylist.getSelectedStudies(); - // Loop through the Cursor of Selected Studies - selectedStudies.forEach(study => { - const studyInstanceUid = study.studyInstanceUid; - const timepoints = timepointApi.study(studyInstanceUid); - const timepointIds = timepoints.map(t => t.timepointId); - timepointApi.disassociateStudy(timepointIds, studyInstanceUid); + // Find the Timepoint that was previously referenced + const timepointApi = StudyList.timepointApi; + if (!timepointApi) { + OHIF.log.error('Remove Study/Timepoint Association: No Timepoint API found.'); + return; + } + + // Loop through the Cursor of Selected Studies + selectedStudies.forEach(study => { + const studyInstanceUid = study.studyInstanceUid; + const timepoints = timepointApi.study(studyInstanceUid); + const timepointIds = timepoints.map(t => t.timepointId); + timepointApi.disassociateStudy(timepointIds, studyInstanceUid); + }); }); }