Total matching measurements: {{measurements.length}}
-
-
-
-{{#if measurementsEmpty}}
- No results
-{{else}}
- {{
- ember-table
- columns=tableColumns
- content=tableContent
- columnMode='fluid'
- hasFooter=false
- }}
-{{/if}}
diff --git a/app/pods/about/route.js b/app/pods/protected/about/route.js
similarity index 100%
rename from app/pods/about/route.js
rename to app/pods/protected/about/route.js
diff --git a/app/pods/about/template.hbs b/app/pods/protected/about/template.hbs
similarity index 100%
rename from app/pods/about/template.hbs
rename to app/pods/protected/about/template.hbs
diff --git a/app/pods/protected/characteristics/controller.js b/app/pods/protected/characteristics/controller.js
new file mode 100644
index 0000000..be9f042
--- /dev/null
+++ b/app/pods/protected/characteristics/controller.js
@@ -0,0 +1,6 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ sortParams: ['characteristicTypeName', 'sortOrder'],
+ sortedCharacteristics: Ember.computed.sort('model', 'sortParams'),
+});
diff --git a/app/pods/species/new/route.js b/app/pods/protected/characteristics/route.js
similarity index 80%
rename from app/pods/species/new/route.js
rename to app/pods/protected/characteristics/route.js
index 98741c6..77c7739 100644
--- a/app/pods/species/new/route.js
+++ b/app/pods/protected/characteristics/route.js
@@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi
export default Ember.Route.extend(AuthenticatedRouteMixin, {
model: function() {
- return this.store.createRecord('species');
+ return this.store.findAll('characteristic');
},
});
diff --git a/app/pods/characteristics/template.hbs b/app/pods/protected/characteristics/template.hbs
similarity index 65%
rename from app/pods/characteristics/template.hbs
rename to app/pods/protected/characteristics/template.hbs
index 63f40a4..a599cbd 100644
--- a/app/pods/characteristics/template.hbs
+++ b/app/pods/protected/characteristics/template.hbs
@@ -1,18 +1,20 @@
{{genus-name}} Characteristics
-
Total characteristics: {{characteristics.length}}
+
Total characteristics: {{model.length}}
Name
Type
+
Sort Order
{{#each sortedCharacteristics as |row|}}
{{row.characteristicName}}
-
{{row.characteristicType.characteristicTypeName}}
+
{{row.characteristicTypeName}}
+
{{row.sortOrder}}
{{/each}}
diff --git a/app/pods/protected/compare/controller.js b/app/pods/protected/compare/controller.js
new file mode 100644
index 0000000..da7295b
--- /dev/null
+++ b/app/pods/protected/compare/controller.js
@@ -0,0 +1,14 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ actions: {
+ search: function() {
+ let query = {
+ strain_ids: this.get('selectedStrains'),
+ characteristic_ids: this.get('selectedCharacteristics'),
+ };
+
+ this.transitionToRoute('protected.compare.results', {queryParams: query});
+ }
+ }
+});
diff --git a/app/pods/protected/compare/results/controller.js b/app/pods/protected/compare/results/controller.js
new file mode 100644
index 0000000..24fd5e7
--- /dev/null
+++ b/app/pods/protected/compare/results/controller.js
@@ -0,0 +1,50 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ queryParams: ['strain_ids', 'characteristic_ids'],
+
+ strains: function() {
+ let strains = [];
+ let strain_ids = this.get('strain_ids').split(',');
+ strain_ids.forEach((id) => {
+ strains.push(this.store.peekRecord('strain', id));
+ })
+ return strains;
+ }.property('strain_ids'),
+
+ characteristics: function() {
+ let characteristics = [];
+ let characteristic_ids = this.get('characteristic_ids').split(',');
+ characteristic_ids.forEach((id) => {
+ characteristics.push(this.store.peekRecord('characteristic', id));
+ })
+ return characteristics;
+ }.property('characteristic_ids'),
+
+ // Set up data table matrix
+ data: function() {
+ let characteristics = this.get('characteristics');
+ let strains = this.get('strains');
+ let measurements = this.get('model');
+ let data = Ember.A();
+
+ characteristics.forEach((characteristic) => {
+ let row = {
+ characteristic: characteristic.get('characteristicName'),
+ };
+
+ strains.forEach((strain) => {
+ let meas = measurements.filterBy('strain.id', strain.get('id'))
+ .filterBy('characteristic.id', characteristic.get('id'));
+ if (!Ember.isEmpty(meas)) {
+ row[strain.get('id')] = meas[0].get('value');
+ } else {
+ row[strain.get('id')] = '';
+ }
+ });
+ data.pushObject(row);
+ });
+ return data;
+ }.property('characteristics', 'strains'),
+
+});
diff --git a/app/pods/protected/compare/results/route.js b/app/pods/protected/compare/results/route.js
new file mode 100644
index 0000000..757d14d
--- /dev/null
+++ b/app/pods/protected/compare/results/route.js
@@ -0,0 +1,11 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+ model: function(params) {
+ let compare = this.controllerFor('protected.compare');
+ compare.set('selectedStrains', params.strain_ids);
+ compare.set('selectedCharacteristics', params.characteristic_ids);
+ return this.store.query('measurement', params);
+ },
+
+});
diff --git a/app/pods/compare/template.hbs b/app/pods/protected/compare/results/template.hbs
similarity index 55%
rename from app/pods/compare/template.hbs
rename to app/pods/protected/compare/results/template.hbs
index a4466f4..dbed78d 100644
--- a/app/pods/compare/template.hbs
+++ b/app/pods/protected/compare/results/template.hbs
@@ -1,17 +1,3 @@
-
{{genus-name}} - Compare Strains
-
-{{
- measurement-search-panel
- search='search'
- strainLabel='Select one or more strains'
- charLabel='Select one or more characteristics'
-}}
-
-{{#if dataEmpty}}
-
- Please select one or more strains and one or more characteristics.
-
-
-