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 2d618ef..0000000 --- a/app/pods/components/measurement-search-table/component.js +++ /dev/null @@ -1,26 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - actions: { - search: function() { - 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); - }); - return; - } - 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); - }); - } - }, -}); 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 601ad48..0000000 --- a/app/pods/components/measurement-search-table/template.hbs +++ /dev/null @@ -1,34 +0,0 @@ -
-
- {{search-button isLoading=isLoading action='search'}} -
-
-
-
-

Total matching measurements: {{measurements.length}}

-
-
- -{{#if isLoading}} - {{!-- This doesn't work yet, something is blocking --}} - {{loading-panel}} -{{else}} - - - - - - - - - - {{#each measurements as |measurement|}} - - - - - - {{/each}} - -
StrainCharacteristicValue
{{{measurement.strain.fullNameMU}}}{{measurement.characteristic.characteristicName}}{{{measurement.value}}}
-{{/if}} 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 9c45e22..d460d65 100644 --- a/app/pods/measurements/route.js +++ b/app/pods/measurements/route.js @@ -4,39 +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) { - controller.set('measurements', []); - // Set up search parameters - models.strains = models.strains.sortBy('fullName'); - let strains = models.strains.map((strain)=>{ - return Ember.Object.create({ - id: strain.get('id'), - text: strain.get('fullName'), - }); - }); - strains.unshiftObjects(Ember.Object.create({ - id: 'all', - text: '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({ - id: characteristic.get('id'), - text: 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({ - id: 'all', - text: 'All Characteristics', - })); - controller.set('characteristics', characteristics); + }, }); diff --git a/app/pods/measurements/template.hbs b/app/pods/measurements/template.hbs index 882fce6..fe3922c 100644 --- a/app/pods/measurements/template.hbs +++ b/app/pods/measurements/template.hbs @@ -1,37 +1,61 @@

{{genus-name}} Measurements

-
-
- Strains -
-
- {{ - select-2 - multiple=true - content=strains - value=selectedStrains - optionValuePath="id" - placeholder="Choose a strain" - }} -
-
-
-
- Characteristics -
-
- {{ - select-2 - multiple=true - content=characteristics - value=selectedCharacteristic - optionValuePath="id" - placeholder="Choose a characteristic" - }} +
+
+
+
+
    +
  • + + {{ + 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 - selectedStrain=selectedStrain - selectedCharacteristic=selectedCharacteristic -}} +
+
+

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/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/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/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); +});