diff --git a/app/models/strain.js b/app/models/strain.js index 12c7196..8a46bfd 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -1,5 +1,4 @@ import DS from 'ember-data'; -import Ember from 'ember'; export default DS.Model.extend({ measurements: DS.hasMany('measurements', { async: true }), @@ -17,7 +16,14 @@ export default DS.Model.extend({ updatedBy: DS.attr('number'), deletedBy: DS.attr('number'), totalMeasurements: DS.attr('number'), - fullName: Ember.computed('species.speciesName', 'strainName', function() { - return this.get('species.speciesName') + ' (strain ' + this.get('strainName') + ')'; - }) + strainNameMU: function() { + let type = this.get('typeStrain') ? 'T' : ''; + return `${this.get('strainName')}${type}`; + }.property('strainName', 'typeStrain').readOnly(), + fullName: function() { + return `${this.get('species.speciesName')} (strain ${this.get('strainName')})`; + }.property('species', 'strainName').readOnly(), + fullNameMU: function() { + return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`; + }.property('species', 'strainNameMU').readOnly(), }); diff --git a/app/pods/components/genus-name/component.js b/app/pods/components/genus-name/component.js index bae8cb9..ce66e93 100644 --- a/app/pods/components/genus-name/component.js +++ b/app/pods/components/genus-name/component.js @@ -4,5 +4,5 @@ export default Ember.Component.extend({ tagName: 'em', genus: function() { return this.get('globals.genus').capitalize(); - }.property(), + }.property().readOnly(), }); diff --git a/app/pods/components/measurement-index-row/component.js b/app/pods/components/measurement-index-row/component.js deleted file mode 100644 index f48ea57..0000000 --- a/app/pods/components/measurement-index-row/component.js +++ /dev/null @@ -1,5 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - tagName: 'tr', -}); diff --git a/app/pods/components/measurement-index-row/template.hbs b/app/pods/components/measurement-index-row/template.hbs deleted file mode 100644 index fe9a6b6..0000000 --- a/app/pods/components/measurement-index-row/template.hbs +++ /dev/null @@ -1,9 +0,0 @@ - - {{scientific-name strain=data.strain}} - - - {{data.characteristic.characteristicName}} - - - {{{data.value}}} - diff --git a/app/pods/components/measurement-search-table/component.js b/app/pods/components/measurement-search-table/component.js deleted file mode 100644 index 693dd17..0000000 --- a/app/pods/components/measurement-search-table/component.js +++ /dev/null @@ -1,32 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - isLoading: false, - actions: { - search: function() { - this.set('isLoading', true); - let strain = this.get('selectedStrain'); - let characteristic = this.get('selectedCharacteristic'); - if ((strain === 'all') && (characteristic === 'all')) { - this.store.findAll('measurement').then((measurements)=>{ - this.set('measurements', measurements); - }); - this.set('isLoading', false); - console.log(this.get('isLoading')); - return false; - } - let search = {}; - if (strain !== 'all') { - search['strain'] = strain; - } - if (characteristic !== 'all') { - search['characteristic'] = characteristic; - } - this.store.find('measurement', search).then((measurements)=>{ - this.set('measurements', measurements); - }); - this.set('isLoading', false); - return false; - } - }, -}); diff --git a/app/pods/components/measurement-search-table/template.hbs b/app/pods/components/measurement-search-table/template.hbs deleted file mode 100644 index 667312e..0000000 --- a/app/pods/components/measurement-search-table/template.hbs +++ /dev/null @@ -1,29 +0,0 @@ -
-
- {{search-button isLoading=isLoading action='search'}} -
-
-
-
-

Total matching measurements: {{measurements.length}}

-
-
- -{{#if isLoading}} - {{loading-panel}} -{{else}} - - - - - - - - - - {{#each measurements as |measurement|}} - {{measurement-index-row data=measurement}} - {{/each}} - -
StrainCharacteristicValue
-{{/if}} diff --git a/app/pods/components/scientific-name/component.js b/app/pods/components/scientific-name/component.js deleted file mode 100644 index 40bf39c..0000000 --- a/app/pods/components/scientific-name/component.js +++ /dev/null @@ -1,6 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - tagName: 'span', - strain: null, // passed in -}); diff --git a/app/pods/components/scientific-name/template.hbs b/app/pods/components/scientific-name/template.hbs deleted file mode 100644 index 1f3609e..0000000 --- a/app/pods/components/scientific-name/template.hbs +++ /dev/null @@ -1 +0,0 @@ -{{strain.species.speciesName}} (strain {{strain-name strain=strain}}) diff --git a/app/pods/components/species-details/template.hbs b/app/pods/components/species-details/template.hbs index 756a6a0..813ada2 100644 --- a/app/pods/components/species-details/template.hbs +++ b/app/pods/components/species-details/template.hbs @@ -18,7 +18,7 @@ {{#each species.strains as |strain index|}} {{if index ","}} {{#link-to 'strains.show' strain.id}} - {{strain-name strain=strain}} + {{{strain.strainNameMU}}} {{/link-to}} {{/each}} {{#unless species.isNew}} diff --git a/app/pods/components/species-index-row/template.hbs b/app/pods/components/species-index-row/template.hbs index e3455a7..e86113a 100644 --- a/app/pods/components/species-index-row/template.hbs +++ b/app/pods/components/species-index-row/template.hbs @@ -9,7 +9,7 @@ {{#each data.strains as |strain index|}} {{if index ","}} {{#link-to 'strains.show' strain.id}} - {{strain-name strain=strain}} + {{{strain.strainNameMU}}} {{/link-to}} {{/each}} diff --git a/app/pods/components/strain-index-row/template.hbs b/app/pods/components/strain-index-row/template.hbs index 4d64b0b..f512924 100644 --- a/app/pods/components/strain-index-row/template.hbs +++ b/app/pods/components/strain-index-row/template.hbs @@ -1,6 +1,6 @@ {{#link-to 'strains.show' data.id classBinding="data.typeStrain:type-strain"}} - {{scientific-name strain=data}} + {{{data.fullNameMU}}} {{/link-to}} diff --git a/app/pods/components/strain-name/component.js b/app/pods/components/strain-name/component.js deleted file mode 100644 index ced0374..0000000 --- a/app/pods/components/strain-name/component.js +++ /dev/null @@ -1,5 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - tagName: 'span', -}); diff --git a/app/pods/components/strain-name/template.hbs b/app/pods/components/strain-name/template.hbs deleted file mode 100644 index 3082ce7..0000000 --- a/app/pods/components/strain-name/template.hbs +++ /dev/null @@ -1 +0,0 @@ -{{strain.strainName}}{{{if strain.typeStrain 'T'}}} diff --git a/app/pods/measurements/controller.js b/app/pods/measurements/controller.js new file mode 100644 index 0000000..8bb7819 --- /dev/null +++ b/app/pods/measurements/controller.js @@ -0,0 +1,15 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + actions: { + search: function() { + let search = { + strain: this.get('selectedStrains'), + characteristic: this.get('selectedCharacteristics'), + }; + this.store.find('measurement', search).then((measurements)=>{ + this.set('measurements', measurements); + }); + } + }, +}); diff --git a/app/pods/measurements/route.js b/app/pods/measurements/route.js index 9dbfd63..d460d65 100644 --- a/app/pods/measurements/route.js +++ b/app/pods/measurements/route.js @@ -4,46 +4,28 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return Ember.RSVP.hash({ - species: this.store.findAll('species'), + species: this.store.findAll('species'), // need this bc async strains: this.store.findAll('strain'), characteristics: this.store.findAll('characteristic'), }); }, setupController: function(controller, models) { - var tableAttrs = [ - { name: 'Strain', attr: 'strain.strainName' }, - { name: 'Characteristic', attr: 'characteristic.characteristicName' }, - { name: 'Value', attr: 'computedValue'} - ]; - controller.set('tableAttrs', tableAttrs); - controller.set('row', 'measurement-index-row'); - controller.set('measurements', []); - // Set up search parameters - models.strains = models.strains.sortBy('fullName'); - let strains = models.strains.map((strain)=>{ - return Ember.Object.create({ - val: strain.get('id'), - lab: strain.get('fullName'), - }); - }); - strains.unshiftObjects(Ember.Object.create({ - val: 'all', - lab: 'All Strains', - })); - controller.set('strains', strains); + let selects = [ + { model: 'strains', id: 'id', text: 'fullName' }, + { model: 'characteristics', id: 'id', text: 'characteristicName' }, + ]; - models.characteristics = models.characteristics.sortBy('characteristicName'); - let characteristics = models.characteristics.map((characteristic)=>{ - return Ember.Object.create({ - val: characteristic.get('id'), - lab: characteristic.get('characteristicName'), + selects.forEach((item, index, enumerable) => { + models[item.model] = models[item.model].sortBy(item.text); + let temp = models[item.model].map((data) => { + return Ember.Object.create({ + id: data.get(item.id), + text: data.get(item.text), + }); }); + controller.set(item.model, temp); }); - characteristics.unshiftObjects(Ember.Object.create({ - val: 'all', - lab: 'All Characteristics', - })); - controller.set('characteristics', characteristics); + }, }); diff --git a/app/pods/measurements/template.hbs b/app/pods/measurements/template.hbs index 87b6327..fe3922c 100644 --- a/app/pods/measurements/template.hbs +++ b/app/pods/measurements/template.hbs @@ -1,31 +1,61 @@

{{genus-name}} Measurements

-
-
- Strains -
-
- {{ - view "select" - content=strains - optionValuePath="content.val" - optionLabelPath="content.lab" - value=selectedStrain - }} -
-
-
-
- Characteristics -
-
- {{ - view "select" - content=characteristics - optionValuePath="content.val" - optionLabelPath="content.lab" - value=selectedCharacteristic - }} +
+
+
+
+
    +
  • + + {{ + select-2 + multiple=true + content=strains + value=selectedStrains + optionValuePath="id" + placeholder="All strains" + }} +
    • +
  • + + {{ + select-2 + multiple=true + content=characteristics + value=selectedCharacteristics + optionValuePath="id" + placeholder="Choose a characteristic" + }} +
    • +
  • + {{search-button isLoading=isLoading action='search'}} +
    • +
+
+
-{{measurement-search-table}} +
+
+

Total matching measurements: {{measurements.length}}

+
+
+ + + + + + + + + + + {{#each measurements as |measurement|}} + + + + + + {{/each}} + +
StrainCharacteristicValue
{{{measurement.strain.fullNameMU}}}{{measurement.characteristic.characteristicName}}{{{measurement.value}}}
diff --git a/app/styles/app.css b/app/styles/app.css index b5d48ca..ff245dd 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -2,6 +2,10 @@ padding: 2em 0em 0em 0em; } +.select2-container { + width: 100%; +} + .flakes-table thead tr th span { cursor: pointer; } diff --git a/bower.json b/bower.json index bb963a8..6b573d8 100644 --- a/bower.json +++ b/bower.json @@ -14,6 +14,7 @@ "qunit": "~1.17.1", "flakes": "~1.0.0", "ember-simple-auth": "~0.8.0-beta.3", - "moment": "~2.9.0" + "moment": "~2.9.0", + "select2": "3.5.2" } } diff --git a/config/environment.js b/config/environment.js index c1ece05..3ce0d37 100644 --- a/config/environment.js +++ b/config/environment.js @@ -41,7 +41,7 @@ module.exports = function(environment) { 'font-src': "'self'", 'connect-src': "'self' http://127.0.0.1:4200", 'img-src': "'self'", - 'style-src': "'self'", + 'style-src': "'self' 'unsafe-inline'", 'media-src': "'self'" } } diff --git a/package.json b/package.json index 1dcc597..d2dc24b 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "ember-data": "1.0.0-beta.18", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", + "ember-select-2": "1.3.0", "express": "^4.12.4", "glob": "^4.5.3", "jsonwebtoken": "^5.0.0", diff --git a/tests/unit/components/display-error-test.js b/tests/unit/components/display-error-test.js deleted file mode 100644 index e81245a..0000000 --- a/tests/unit/components/display-error-test.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - moduleForComponent, - test -} from 'ember-qunit'; - -moduleForComponent('display-error', { - // Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'] -}); - -test('it renders', function(assert) { - assert.expect(2); - - // Creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // Renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/components/genus-name-test.js b/tests/unit/components/genus-name-test.js deleted file mode 100644 index 8993325..0000000 --- a/tests/unit/components/genus-name-test.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - moduleForComponent, - test -} from 'ember-qunit'; - -moduleForComponent('genus-name', { - // Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'] -}); - -test('it renders', function(assert) { - assert.expect(2); - - // Creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // Renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/components/measurements/measurement-row-test.js b/tests/unit/components/measurements/measurement-row-test.js deleted file mode 100644 index 1664fcd..0000000 --- a/tests/unit/components/measurements/measurement-row-test.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - moduleForComponent, - test -} from 'ember-qunit'; - -moduleForComponent('measurements/measurement-row', { - // specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'] -}); - -test('it renders', function(assert) { - assert.expect(2); - - // creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/components/scientific-name-test.js b/tests/unit/components/scientific-name-test.js deleted file mode 100644 index b6a7957..0000000 --- a/tests/unit/components/scientific-name-test.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - moduleForComponent, - test -} from 'ember-qunit'; - -moduleForComponent('scientific-name', { - // specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'] -}); - -test('it renders', function(assert) { - assert.expect(2); - - // creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/components/species/species-details-test.js b/tests/unit/components/species/species-details-test.js deleted file mode 100644 index b3c5c67..0000000 --- a/tests/unit/components/species/species-details-test.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - moduleForComponent, - test -} from 'ember-qunit'; - -moduleForComponent('species/species-details', { - // Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'] -}); - -test('it renders', function(assert) { - assert.expect(2); - - // Creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // Renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/components/strains/strain-details-test.js b/tests/unit/components/strains/strain-details-test.js deleted file mode 100644 index a52c33c..0000000 --- a/tests/unit/components/strains/strain-details-test.js +++ /dev/null @@ -1,21 +0,0 @@ -import { - moduleForComponent, - test -} from 'ember-qunit'; - -moduleForComponent('strains/strain-details', { - // Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'] -}); - -test('it renders', function(assert) { - assert.expect(2); - - // Creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // Renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/pods/components/measurement-index-row/component-test.js b/tests/unit/pods/components/measurement-index-row/component-test.js deleted file mode 100644 index af52af6..0000000 --- a/tests/unit/pods/components/measurement-index-row/component-test.js +++ /dev/null @@ -1,18 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; - -moduleForComponent('measurement-index-row', 'Unit | Component | measurement index row', { - // Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'] -}); - -test('it renders', function(assert) { - assert.expect(2); - - // Creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // Renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/pods/components/measurement-search-table/component-test.js b/tests/unit/pods/components/measurement-search-table/component-test.js deleted file mode 100644 index 6ec5359..0000000 --- a/tests/unit/pods/components/measurement-search-table/component-test.js +++ /dev/null @@ -1,19 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; - -moduleForComponent('measurement-search-table', 'Unit | Component | measurement search table', { - // Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'], - unit: true -}); - -test('it renders', function(assert) { - assert.expect(2); - - // Creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // Renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/pods/components/strain-name/component-test.js b/tests/unit/pods/components/strain-name/component-test.js deleted file mode 100644 index 3874bf8..0000000 --- a/tests/unit/pods/components/strain-name/component-test.js +++ /dev/null @@ -1,19 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; - -moduleForComponent('strain-name', 'Unit | Component | strain name', { - // Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'], - unit: true -}); - -test('it renders', function(assert) { - assert.expect(2); - - // Creates the component instance - var component = this.subject(); - assert.equal(component._state, 'preRender'); - - // Renders the component to the page - this.render(); - assert.equal(component._state, 'inDOM'); -}); diff --git a/tests/unit/pods/measurements/controller-test.js b/tests/unit/pods/measurements/controller-test.js new file mode 100644 index 0000000..f20328f --- /dev/null +++ b/tests/unit/pods/measurements/controller-test.js @@ -0,0 +1,12 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('controller:measurements', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +// Replace this with your real tests. +test('it exists', function(assert) { + var controller = this.subject(); + assert.ok(controller); +});