diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/info.html b/Packages/ohif-core/client/components/bootstrap/dialog/info.html index 52b355e5c..5126a40d2 100644 --- a/Packages/ohif-core/client/components/bootstrap/dialog/info.html +++ b/Packages/ohif-core/client/components/bootstrap/dialog/info.html @@ -6,9 +6,13 @@ {{#each message in this.messages}}
{{{message}}}
{{else}} - {{#let message=(choose this.reason this.message 'An error has ocurred.')}} + {{#if eq this.errorType 'Meteor.Error'}} + {{>pageError (extend this error=this.details)}} + {{else}} + {{#let message=(choose this.reason this.message 'An error has ocurred.')}}
{{message}}
- {{/let}} + {{/let}} + {{/if}} {{/each}} {{/dialogSimple}} diff --git a/Packages/ohif-core/client/components/index.js b/Packages/ohif-core/client/components/index.js index 59ded893b..fdcfd036b 100644 --- a/Packages/ohif-core/client/components/index.js +++ b/Packages/ohif-core/client/components/index.js @@ -1,5 +1,6 @@ import './base'; import './bootstrap'; +import './pages'; import './paginationArea'; import './playground/playground.html'; import './playground/playground.styl'; diff --git a/Packages/ohif-core/client/components/pages/error/error.html b/Packages/ohif-core/client/components/pages/error/error.html new file mode 100644 index 000000000..e9d2b7771 --- /dev/null +++ b/Packages/ohif-core/client/components/pages/error/error.html @@ -0,0 +1,16 @@ + diff --git a/Packages/ohif-core/client/components/pages/error/error.js b/Packages/ohif-core/client/components/pages/error/error.js new file mode 100644 index 000000000..78766f36e --- /dev/null +++ b/Packages/ohif-core/client/components/pages/error/error.js @@ -0,0 +1,13 @@ +import { Meteor } from 'meteor/meteor'; +import { Template } from 'meteor/templating'; + +Template.pageError.helpers({ + shallDisplayErrorStack() { + return Meteor.isDevelopment; + }, + + getDefaultErrorMessage() { + const instance = Template.instance(); + return instance.view.templateContentBlock ? '' : 'An error has ocurred.'; + } +}); diff --git a/Packages/ohif-core/client/components/pages/error/error.styl b/Packages/ohif-core/client/components/pages/error/error.styl new file mode 100644 index 000000000..d174e908b --- /dev/null +++ b/Packages/ohif-core/client/components/pages/error/error.styl @@ -0,0 +1,19 @@ +@require '{ohif:design}/app' + +.page-error .error-stack + display: table + margin-top: 10px + table-layout: fixed + width: 100% + + p + theme('background-color', '$uiGrayDarkest') + theme('border', '1px solid $uiGray') + border-radius(4px) + display: inline-block + font-family: monospace + margin: 0 + padding: 10px 20px + overflow-x: auto + white-space: pre + width: 100% diff --git a/Packages/ohif-core/client/components/pages/error/index.js b/Packages/ohif-core/client/components/pages/error/index.js new file mode 100644 index 000000000..c8ab38d0e --- /dev/null +++ b/Packages/ohif-core/client/components/pages/error/index.js @@ -0,0 +1,3 @@ +import './error.html'; +import './error.js'; +import './error.styl'; diff --git a/Packages/ohif-core/client/components/pages/index.js b/Packages/ohif-core/client/components/pages/index.js new file mode 100644 index 000000000..b3d517bff --- /dev/null +++ b/Packages/ohif-core/client/components/pages/index.js @@ -0,0 +1,2 @@ +import './error'; +import './message'; diff --git a/Packages/ohif-core/client/components/pages/message/index.js b/Packages/ohif-core/client/components/pages/message/index.js new file mode 100644 index 000000000..d6c7a9b72 --- /dev/null +++ b/Packages/ohif-core/client/components/pages/message/index.js @@ -0,0 +1,2 @@ +import './message.html'; +import './message.styl'; diff --git a/Packages/ohif-core/client/components/pages/message/message.html b/Packages/ohif-core/client/components/pages/message/message.html new file mode 100644 index 000000000..1ba3c9d0c --- /dev/null +++ b/Packages/ohif-core/client/components/pages/message/message.html @@ -0,0 +1,9 @@ + diff --git a/Packages/ohif-core/client/components/pages/message/message.styl b/Packages/ohif-core/client/components/pages/message/message.styl new file mode 100644 index 000000000..7242c2a33 --- /dev/null +++ b/Packages/ohif-core/client/components/pages/message/message.styl @@ -0,0 +1,31 @@ +@require '{ohif:design}/app' + +.page-message + theme('color', '$textPrimaryColor') + font-weight: 300 + padding: 10px 0 20px + + .message-container + display: table + margin: 0 auto + padding: 0 32px + + .message-title + theme('color', '$textSecondaryColor') + font-size: 30px + font-weight: 300 + + .message-content + font-size: 18px + + a + &, &:hover, &:active, &:focus + theme('color', '$activeColor') + +.modal .page-message + + .page-message, .message-container + padding: 0 + + .message-title + display: none diff --git a/Packages/ohif-measurements/client/lib/isNewLesionsMeasurement.js b/Packages/ohif-measurements/client/lib/isNewLesionsMeasurement.js index dcd63d716..e3f0e4cce 100644 --- a/Packages/ohif-measurements/client/lib/isNewLesionsMeasurement.js +++ b/Packages/ohif-measurements/client/lib/isNewLesionsMeasurement.js @@ -11,7 +11,8 @@ OHIF.measurements.isNewLesionsMeasurement = measurementData => { if (!measurementData) return; const { timepointApi, measurementApi } = OHIF.viewer; - const { timepointId, toolType } = measurementData; + const currentMeasurement = measurementApi.tools.bidirectional.findOne(measurementData._id); + const { timepointId, toolType, measurementNumber } = currentMeasurement; const toolConfig = OHIF.measurements.getToolConfiguration(toolType); // Stop here if the needed information is not set @@ -31,5 +32,5 @@ OHIF.measurements.isNewLesionsMeasurement = measurementData => { const numbers = atBaseline.map(m => m.measurementNumber); // Return true if the measurement number from follow-up is not present at baseline - return !_.contains(numbers, measurementData.measurementNumber); + return !_.contains(numbers, measurementNumber); }; diff --git a/Packages/ohif-studies/imports/client/components/browser/item.js b/Packages/ohif-studies/imports/client/components/browser/item.js index 99d8e3a27..b9fcbf39f 100644 --- a/Packages/ohif-studies/imports/client/components/browser/item.js +++ b/Packages/ohif-studies/imports/client/components/browser/item.js @@ -101,7 +101,7 @@ Template.studyBrowserItem.helpers({ modalityStyle(modalities) { // Responsively styles the Modality Acronyms for studies with more than one modality - const numModalities = modalities.split(/\s/g).length; + const numModalities = modalities ? modalities.split(/\s/g).length : 1; if (numModalities === 1) { // If we have only one modality, it should take up the whole div