cleaning up measurements table

app/pods/components/measurement-search-table/component.js

@@ -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);
-      });
-    }
-  },
-});

app/pods/components/measurement-search-table/template.hbs

@@ -1,34 +0,0 @@
-<div class="grid-12 gutter-50">
-  <div class="span-12">
-    {{search-button isLoading=isLoading action='search'}}
-  </div>
-</div>
-<div class="grid-12 gutter-50">
-  <div class="span-12">
-    <h3>Total matching measurements: {{measurements.length}}</h3>
-  </div>
-</div>
-
-{{#if isLoading}}
-  {{!-- This doesn't work yet, something is blocking --}}
-  {{loading-panel}}
-{{else}}
-  <table class="flakes-table">
-    <thead>
-      <tr>
-        <th>Strain</th>
-        <th>Characteristic</th>
-        <th>Value</th>
-      </tr>
-    </thead>
-    <tbody>
-      {{#each measurements as |measurement|}}
-        <tr>
-          <td>{{{measurement.strain.fullNameMU}}}</td>
-          <td>{{measurement.characteristic.characteristicName}}</td>
-          <td>{{{measurement.value}}}</td>
-        </tr>
-      {{/each}}
-    </tbody>
-  </table>
-{{/if}}

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

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 selects = [
-    let strains = models.strains.map((strain)=>{
+      { model: 'strains', id: 'id', text: 'fullName' },
-      return Ember.Object.create({
+      { model: 'characteristics', id: 'id', text: 'characteristicName' },
-        id: strain.get('id'),
+    ];
-        text: strain.get('fullName'),
-      });
-    });
-    strains.unshiftObjects(Ember.Object.create({
-      id: 'all',
-      text: 'All Strains',
-    }));
-    controller.set('strains', strains);
 
-    models.characteristics = models.characteristics.sortBy('characteristicName');
+    selects.forEach((item, index, enumerable) => {
-    let characteristics = models.characteristics.map((characteristic)=>{
+      models[item.model] = models[item.model].sortBy(item.text);
-      return Ember.Object.create({
+      let temp = models[item.model].map((data) => {
-        id: characteristic.get('id'),
+        return Ember.Object.create({
-        text: characteristic.get('characteristicName'),
+          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);
   },
 });

app/pods/measurements/template.hbs

@@ -1,37 +1,61 @@
 <h2>{{genus-name}} Measurements</h2>
-<div class="grid-12 gutter-50">
+<div class="grid-1 gutter-50">
-  <div class="span-4">
+  <div class="span-1">
-    Strains
+    <fieldset>
-  </div>
+      <form>
-  <div class="span-8">
+        <ul>
-    {{
+          <li>
-      select-2
+            <label>Species</label>
-      multiple=true
+            {{
-      content=strains
+              select-2
-      value=selectedStrains
+              multiple=true
-      optionValuePath="id"
+              content=strains
-      placeholder="Choose a strain"
+              value=selectedStrains
-    }}
+              optionValuePath="id"
-  </div>
+              placeholder="All strains"
-</div>
+            }}
-<div class="grid-12 gutter-50">
+          </li>
-  <div class="span-4">
+          <li>
-    Characteristics
+            <label>Characteristics</label>
-  </div>
+            {{
-  <div class="span-8">
+              select-2
-    {{
+              multiple=true
-      select-2
+              content=characteristics
-      multiple=true
+              value=selectedCharacteristics
-      content=characteristics
+              optionValuePath="id"
-      value=selectedCharacteristic
+              placeholder="Choose a characteristic"
-      optionValuePath="id"
+            }}
-      placeholder="Choose a characteristic"
+          </li>
-    }}
+          <li>
+            {{search-button isLoading=isLoading action='search'}}
+          </li>
+        </ul>
+      </form>
+    </fieldset>
   </div>
 </div>
 
-{{
+<div class="grid-12 gutter-50">
-  measurement-search-table
+  <div class="span-12">
-  selectedStrain=selectedStrain
+    <h3>Total matching measurements: {{measurements.length}}</h3>
-  selectedCharacteristic=selectedCharacteristic
+  </div>
-}}
+</div>
+
+<table class="flakes-table">
+  <thead>
+    <tr>
+      <th>Strain</th>
+      <th>Characteristic</th>
+      <th>Value</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#each measurements as |measurement|}}
+      <tr>
+        <td>{{{measurement.strain.fullNameMU}}}</td>
+        <td>{{measurement.characteristic.characteristicName}}</td>
+        <td>{{{measurement.value}}}</td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>

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;
 }

tests/unit/components/display-error-test.js

@@ -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');
-});

tests/unit/components/genus-name-test.js

@@ -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');
-});

tests/unit/components/measurements/measurement-row-test.js

@@ -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');
-});

tests/unit/components/species/species-details-test.js

@@ -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');
-});

tests/unit/components/strains/strain-details-test.js

@@ -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');
-});

tests/unit/pods/components/measurement-index-row/component-test.js

@@ -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');
-});

tests/unit/pods/components/measurement-search-table/component-test.js

@@ -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');
-});

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