LT-253: Added Collection to store Additional Findings in the database. Set up some form components that store temporary UI state

2016-07-22 11:12:04 +02:00
1 parent 022c534895
commit 40062e2e9d
@@ -1,7 +1,14 @@
 Timepoints = new Meteor.Collection('timepoints');
 Studies = new Meteor.Collection('studies');
 Measurements = new Meteor.Collection('measurements');
+
+// ImageMeasurements describe temporary measurements that aren't
+// specifically listed in the Lesion Table
 ImageMeasurements = new Meteor.Collection('imageMeasurements');

+// Additional Findings stores details from the Additional Findings
+// panel, and represents items such as data quality,
+AdditionalFindings = new Meteor.Collection('additionalFindings');
+
 WorklistSubscriptions = ['studies', 'timepoints'];
 Reviewers = new Meteor.Collection('reviewers');
@@ -0,0 +1,58 @@
+import { SimpleSchema } from 'meteor/aldeed:simple-schema';
+
+SimpleSchema.extendOptions({
+    allowedSelect2Values: Match.Optional(Array),
+});
+
+export const AdditionalFinding = new SimpleSchema({
+    measurableDisease: {
+        type: String,
+        label: 'Measurable Disease',
+        allowedValues: ['Present', 'Absent'],
+        defaultValue: 'Absent',
+        optional: true
+    },
+    // TODO: Add check so that the value cannot be None & something other region
+    regionsOfMetastaticDisease: {
+        type: [String],
+        label: 'Regions of Metastatic Disease',
+        allowedSelect2Values: ['None', 'Lymph Node'], // allowedValues doesn't seem show up in the Schema since this is an Array. There may be a better way to do this
+        defaultValue: ['None'],
+        optional: true
+    },
+    tracerRelatedToMetastaticDisease: {
+        type: String,
+        label: 'Tracer Related to Metastatic Disease?',
+        allowedValues: ['Yes', 'No'],
+        defaultValue: 'Yes',
+        optional: true
+    },
+    numberOfBoneLesions: {
+        type: String,
+        label: 'Number of Bone Lesions',
+        allowedValues: ['0', '1-2', '2-4', '>5'],
+        defaultValue: '0',
+        optional: true
+    },
+    acceptableImageQuality: {
+        type: String,
+        label: 'Acceptable Image Quality',
+        allowedValues: ['Yes', 'No'],
+        defaultValue: 'Yes',
+        optional: true
+    },
+    adequateAnatomicalCoverage: {
+        type: String,
+        label: 'Adequate Anatomical Coverage',
+        allowedValues: ['Yes', 'No'],
+        defaultValue: 'Yes',
+        optional: true
+    },
+    presenceOfContrast: {
+        type: String,
+        label: 'Presence of Contrast',
+        allowedValues: ['Yes', 'No'],
+        defaultValue: 'Yes',
+        optional: true
+    }
+});
@@ -1,48 +1,34 @@
-<template name="additionalMeasurements">
-    <div id="additionalMeasurements">
+<template name="additionalFindings">
+    <div class="additionalFindings">
        <div class="scrollArea">
-            <div class="section">
+            <div class="row">
                <div class="header">
                    Additional Findings: Baseline
                </div>
-                <div>
-                    {{ >radioOptionGroup measurableDiseaseButtonData}}
-                </div>
+                {{> radioOptionGroup (stateDataWithKey "measurableDisease")}}
            </div>
-
-            <div class="section">
+            <div class="row">
                <div class="header">
                    Supplementary Measurements
                </div>
-                <div class="entrySection">
-                    <label>Number of bone lesions</label>
-                    <div>
-                        <select>
-                            <option>0</option>
-                            <option>1-2</option>
-                            <option selected>2-4</option>
-                            <option>>5</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="entrySection">
-                    <label>Regions of metastatic disease</label>
-                    <select id="regionsOfMetastaticDisease">
-                        <option>None</option>
-                        <option>Lymph node</option>
-                    </select>
-                </div>
-                {{ >radioOptionGroup metastaticDiseaseButtonData}}
+                {{> selectInput (stateDataWithKey "numberOfBoneLesions")}}
+                {{> select2Input
+                    key="regionsOfMetastaticDisease"
+                    select2Options=regionsOfMetastaticDiseaseSelect2Options
+                    state=state
+                    currentSchema=currentSchema
+                }}
+                {{> radioOptionGroup (stateDataWithKey "tracerRelatedToMetastaticDisease")}}
            </div>
-            <div class="section">
+            <div class="row">
                <div class="header">
                    Image Quality
                </div>
-                {{ >radioOptionGroup imageQualityButtonData}}
-                {{ >radioOptionGroup anatomicalCoverageButtonData}}
-                {{ >radioOptionGroup presenceOfContrastButtonData}}
+                {{> radioOptionGroup (stateDataWithKey "acceptableImageQuality")}}
+                {{> radioOptionGroup (stateDataWithKey "adequateAnatomicalCoverage")}}
+                {{> radioOptionGroup (stateDataWithKey "presenceOfContrast")}}
            </div>
-            <div class="section">
+            <div class="row">
                <div class="header">
                    Additional Screen Captures
                </div>
@@ -57,7 +43,7 @@
                    </div>
                </div>
            </div>
-            <div class="section">
+            <div class="row">
                <div class="header">
                    Comments
                </div>
@@ -0,0 +1,82 @@
+import { Template } from 'meteor/templating';
+import { ReactiveDict } from 'meteor/reactive-dict';
+
+// TODO: Check why I can't use absolute paths for this? Keeps saying module not found
+import { AdditionalFinding } from '../../../both/schema/additionalFinding';
+
+Template.additionalFindings.onCreated(function additionalFindingsOnCreated() {
+    console.log('additionalFindingsOnCreated');
+    const instance = Template.instance();
+
+    instance.currentSchema = AdditionalFinding;
+    instance.state = new ReactiveDict();
+
+    if (!instance.data.currentTimepointId) {
+        console.warn('Case has no timepointId');
+        return;
+    }
+
+    const currentTimepointId = instance.data.currentTimepointId;
+    if (!currentTimepointId) {
+        console.warn('No currentTimepointId');
+    }
+
+    console.log(AdditionalFindings.find().fetch());
+    const additionalFindings = AdditionalFindings.findOne({
+        timepointId: currentTimepointId
+    });
+
+    if (additionalFindings) {
+        instance.id = additionalFindings._id;
+
+        // Don't store the MongoDB Id in the ReactiveDict
+        delete additionalFindings._id;
+
+        instance.state.set(additionalFindings);
+    } else {
+        const defaultData = instance.currentSchema.clean({});
+        instance.state.set(defaultData);
+
+        // Include patientId and timepointId
+        defaultData.patientId = Session.get('patientId');
+        defaultData.timepointId = currentTimepointId;
+
+        // TODO: Turn this into a Meteor Call to insert it on the server
+        instance.id = AdditionalFindings.insert(defaultData);
+    }
+});
+
+Template.additionalFindings.onRendered(function additionalFindingsOnRendered() {
+    const instance = Template.instance();
+
+    instance.autorun(() => {
+        console.log('Updating AdditionalFindings Collection');
+        console.log(instance.state.all());
+
+        // TODO: Turn this into a Meteor Call to update it on the server
+        let update = instance.state.all();
+        AdditionalFindings.update(instance.id, {
+            $set: update
+        });
+    });
+});
+
+Template.additionalFindings.helpers({
+    // We need these helper methods
+    // since we assign them into instance object instead of instance.data
+    currentSchema() {
+        return Template.instance().currentSchema;
+    },
+
+    state() {
+        return Template.instance().state;
+    },
+
+    regionsOfMetastaticDiseaseSelect2Options() {
+        return {
+            placeholder: 'Search Regions',
+            allowClear: true,
+            multiple: true
+        };
+    }
+});
@@ -1,6 +1,6 @@
@import "{design}/app"

-#additionalMeasurements
+.additionalFindings
  width: 100%
  height: 100%
  background-color: #000000
@@ -15,6 +15,10 @@

    -webkit-overflow-scrolling: touch

+    .row
+      margin-right: 0
+      margin-left: 0
+
    &::-webkit-scrollbar
      display: none

@@ -27,7 +31,47 @@
      color: $textPrimaryColor
      background-color: $uiGrayDarker

-    .entrySection
+    .form-group
+      padding: 10px
+      color: $textPrimaryColor
+
+      &:not(:last-child)
+        border-bottom: $uiBorderThickness solid $uiBorderColorDark
+
+      h5
+        font-weight: 300
+
+      label
+        font-size: 14px
+        font-weight: 100
+        display: inline-block
+        padding: 5px
+
+      .radio-group
+        height: 30px
+
+        .radio-option
+          width: 50%
+          text-align: center
+          float: left
+          display: inline-block
+          padding: 5px
+          height: 30px
+
+          input
+            float: left
+            height: 30px
+            width: 30px
+            display: inline-block
+
+          label
+            float: left
+            height: 30px
+            line-height: 30px
+            font-size: 14px
+            font-weight: 100
+            display: inline-block
+
      #regionsOfMetastaticDisease
        width: 285px
        height: 30px
@@ -1,87 +0,0 @@
-var yesNoOptions = [{
-    key: 'yes',
-    text: 'Yes'
-}, {
-    key: 'no',
-    text: 'No'
-}];
-
-Template.additionalMeasurements.onCreated(function additionalMeasurementsOnCreated() {
-    const instance = this;
-
-    instance.measurableDisease = new ReactiveVar();
-    instance.numberOfBoneLesions = new ReactiveVar();
-    instance.regionsOfMetastaticDisease = new ReactiveVar();
-    instance.tracerRelatedToMetastaticDisease = new ReactiveVar();
-    instance.acceptableImageQuality = new ReactiveVar();
-    instance.adequateAnatomicalCoverage = new ReactiveVar();
-    instance.presenceOfContrast = new ReactiveVar();
-    instance.phaseOfContrast = new ReactiveVar();
-
-    instance.measurableDisease.set('absent');
-    instance.tracerRelatedToMetastaticDisease.set('no');
-    instance.acceptableImageQuality.set('yes');
-    instance.adequateAnatomicalCoverage.set('yes');
-    instance.presenceOfContrast.set('yes');
-});
-
-Template.additionalMeasurements.onRendered(function additionalMeasurementsOnRendered() {
-    const instance = this;
-
-    instance.$("#regionsOfMetastaticDisease").select2({
-        multiple: true
-    });
-});
-
-Template.additionalMeasurements.helpers({
-    measurableDiseaseButtonData() {
-        const instance = Template.instance();
-        return {
-            text: 'Measurable disease',
-            value: instance.measurableDisease,
-            options: [{
-                key: 'present',
-                text: 'Present'
-            }, {
-                key: 'absent',
-                text: 'Absent'
-            }]
-        };
-    },
-
-    metastaticDiseaseButtonData() {
-        const instance = Template.instance();
-        return {
-            text: 'Tracer related to metastatic disease',
-            value: instance.tracerRelatedToMetastaticDisease,
-            options: yesNoOptions
-        };
-    },
-
-    imageQualityButtonData() {
-        const instance = Template.instance();
-        return {
-            text: 'Acceptable image quality',
-            value: instance.acceptableImageQuality,
-            options: yesNoOptions
-        };
-    },
-
-    anatomicalCoverageButtonData() {
-        const instance = Template.instance();
-        return {
-            text: 'Adequate anatomical coverage',
-            value: instance.adequateAnatomicalCoverage,
-            options: yesNoOptions
-        };
-    },
-
-    presenceOfContrastButtonData() {
-        const instance = Template.instance();
-        return {
-            text: 'Presence of contrast',
-            value: instance.presenceOfContrast,
-            options: yesNoOptions
-        };
-    }
-});
@@ -1,16 +0,0 @@
-<template name="radioOptionGroup">
-    <div class="{{class}} entrySection viewerRadioOptionGroup">
-        <h5>{{text}}</h5>
-        <div>
-            {{#each item in this.options}}
-                <label>
-                    <input type="radio"
-                           name="{{item.key}}"
-                           data-key="{{item.key}}"
-                        {{inlineIf value.get item.key 'selected'}}/>
-                    {{item.text}}
-                </label>
-            {{/each}}
-        </div>
-    </div>
-</template>
@@ -1,15 +0,0 @@
-Template.radioOptionGroup.onRendered(() => {
-    const instance = Template.instance();
-    const value = instance.data.value;
-    if (!value.get()) {
-        value.set(instance.data.options[0].key);
-    }
-});
-
-Template.radioOptionGroup.events({
-    'click [data-key]'(event, instance) {
-        const $element = $(event.currentTarget);
-        const key = $element.attr('data-key');
-        instance.data.value.set(key);
-    }
-});
@@ -1,20 +0,0 @@
-@import "{design}/app"
-
-.entrySection
-  padding: 10px
-  color: $textPrimaryColor
-
-  &:not(:last-child)
-    border-bottom: $uiBorderThickness solid $uiBorderColorDark
-
-  h5
-    font-weight: 300
-
-  label
-    font-size: 14px
-    font-weight: 100
-    display: inline-block
-    padding: 5px
-
-    input
-      margin: 5px
@@ -6,12 +6,12 @@
        <div class="mainContent {{#if leftSidebarOpen}}sidebar-left-open{{/if}} {{#if rightSidebarOpen}}sidebar-right-open{{/if}}">
            {{>viewerMain}}
        </div>
-        <div class="sidebarMenu sidebar-right {{#if or lesionSidebarOpen additionalMeasurementsSidebarOpen}}sidebar-open{{/if}}">
+        <div class="sidebarMenu sidebar-right {{#if or lesionSidebarOpen additionalFindingsSidebarOpen}}sidebar-open{{/if}}">
            <div class="sidebar-option {{#if lesionSidebarOpen}}active{{/if}}">
                {{>lesionTable (extend this)}}
            </div>
-            <div class="sidebar-option {{#if additionalMeasurementsSidebarOpen}}active{{/if}}">
-                {{>additionalMeasurements (extend this)}}
+            <div class="sidebar-option {{#if additionalFindingsSidebarOpen}}active{{/if}}">
+                {{>additionalFindings (extend this)}}
            </div>
        </div>
    </div>
@@ -17,7 +17,7 @@ Template.flexboxLayout.helpers({
        return Template.instance().data.state.get('rightSidebar') === 'lesions';
    },

-    additionalMeasurementsSidebarOpen() {
+    additionalFindingsSidebarOpen() {
        return Template.instance().data.state.get('rightSidebar') === 'additional';
    },

@@ -4,7 +4,7 @@
  display: flex
  flex-flow: row nowrap
  align-items: stretch
-  height: 100%
+  height: calc(100% - 78px);
  width: 100%

  .sidebarMenu
@@ -34,33 +34,11 @@
            {{/if}}

            <div class="toolbarSectionEntry pull-right rm-l-1 p-x-1">
-                {{ >caseProgress }}
+                {{> caseProgress }}
            </div>
            <div class="pull-right m-t-1 rm-x-1">
                {{>roundedButtonGroup rightSidebarToggleButtonData}}
            </div>
-            <!-- <div class="capsule-group pull-right">
-                <div id="lesionSidebarToggle" class="capsule-entry">
-                    <div class="svgContainer capsule">
-                        <svg>
-                            <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-measurements-lesions"></use>
-                        </svg>
-                    </div>
-                    <div class="buttonLabel">
-                        Lesions
-                    </div>
-                </div>
-                <div id="additionalMeasurementsSidebarToggle" class="capsule-entry">
-                    <div class="svgContainer capsule">
-                        <svg>
-                            <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-measurements-additional"></use>
-                        </svg>
-                    </div>
-                    <div class="buttonLabel">
-                        Additional
-                    </div>
-                </div>
-            </div> -->
            <div id="toggleHUD" class="toolbarSectionButton pull-right rp-x-1 m-t-1 rm-r-3">
                <div class="svgContainer">
                    <svg>
@@ -127,6 +127,7 @@ Template.viewer.onCreated(function() {
        instance.subscribe('singlePatientTimepoints', dataContext.studies[0].patientId);
        instance.subscribe('singlePatientMeasurements', dataContext.studies[0].patientId);
        instance.subscribe('singlePatientImageMeasurements', dataContext.studies[0].patientId);
+        instance.subscribe('singlePatientAdditionalFindings', dataContext.studies[0].patientId);

        var subscriptionsReady = instance.subscriptionsReady();
        log.info('autorun viewer.js. Ready: ' + subscriptionsReady);
@@ -5,7 +5,7 @@ Package.describe({
 });

 Package.onUse(function(api) {
-    api.versionsFrom('1.2.0.2');
+    api.versionsFrom('1.3.4.1');

    api.use('ecmascript');
    api.use('standard-app-packages');
@@ -15,6 +15,9 @@ Package.onUse(function(api) {

    api.use('validatejs');

+    // Schema for Data Models
+    api.use('aldeed:simple-schema');
+
    // Control over logging
    api.use('practicalmeteor:loglevel');

@@ -24,12 +27,16 @@ Package.onUse(function(api) {
    // Template overriding
    api.use('aldeed:template-extension@4.0.0');

-    // Our custom package
+    // Our custom packages
    api.use('worklist');
    api.use('cornerstone');
+    api.use('reactive-form-controls');

    api.addFiles('log.js', [ 'client', 'server' ]);

+    // Schema
+    api.addFiles('both/schema/additionalFinding.js', [ 'client', 'server' ]);
+
    // Client-side collections
    api.addFiles('client/collections/LesionLocations.js', 'client');
    api.addFiles('client/collections/LocationResponses.js', 'client');
@@ -86,13 +93,9 @@ Package.onUse(function(api) {

    api.addFiles('client/components/lesionTrackerLayout/lesionTrackerLayout.html', 'client');

-    api.addFiles('client/components/additionalMeasurements/additionalMeasurements.html', 'client');
-    api.addFiles('client/components/additionalMeasurements/additionalMeasurements.styl', 'client');
-    api.addFiles('client/components/additionalMeasurements/additionalMeasurements.js', 'client');
-
-    api.addFiles('client/components/additionalMeasurements/radioOptionGroup/radioOptionGroup.html', 'client');
-    api.addFiles('client/components/additionalMeasurements/radioOptionGroup/radioOptionGroup.styl', 'client');
-    api.addFiles('client/components/additionalMeasurements/radioOptionGroup/radioOptionGroup.js', 'client');
+    api.addFiles('client/components/additionalFindings/additionalFindings.html', 'client');
+    api.addFiles('client/components/additionalFindings/additionalFindings.styl', 'client');
+    api.addFiles('client/components/additionalFindings/additionalFindings.js', 'client');

    api.addFiles('client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.html', 'client');
    api.addFiles('client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.styl', 'client');
@@ -279,6 +282,7 @@ Package.onUse(function(api) {
    api.export('TrialCriteriaTypes', 'client');

    // Export collections spanning both client and server
+    api.export('AdditionalFindings', [ 'client', 'server' ]);
    api.export('ImageMeasurements', [ 'client', 'server' ]);
    api.export('Measurements', [ 'client', 'server' ]);
    api.export('Studies', [ 'client', 'server' ]);
@@ -30,11 +30,20 @@ Meteor.publish('singlePatientImageMeasurements', function(patientId) {
    });
 });

+Meteor.publish('additionalFindings', function() {
+    return AdditionalFindings.find();
+});
+
+Meteor.publish('singlePatientAdditionalFindings', function(patientId) {
+    return AdditionalFindings.find({
+        patientId: patientId
+    });
+});
+
 Meteor.publish('reviewers', function() {
    return Reviewers.find();
 });

-
 // Temporary fix to drop all Collections on server restart
 // http://stackoverflow.com/questions/23891631/meteor-how-can-i-drop-all-mongo-collections-and-clear-all-data-on-startup
 Meteor.startup(function() {