ENH: Convert sex fields to lookup (#76)

.travis.yml

@@ -3,7 +3,7 @@ branches:
   only:
     - master
 node_js:
-  - "6"
+  - "9"
 sudo: required
 dist: trusty
 addons:

app/components/collection/detail-container.js

@@ -22,7 +22,7 @@ export default Component.extend({
     { label: 'Species', valuePath: 'species.commonName' },
     { label: 'Count', valuePath: 'count' },
     { label: 'Count Estimated?', valuePath: 'countEstimated' },
-    { label: 'Sex', valuePath: 'sex' },
+    { label: 'Sex', valuePath: 'sex.name' },
   ],
 
   envMeasColumns: [

app/controllers/collections/create.js

@@ -16,7 +16,8 @@ export default Controller.extend(ValidationMixin, {
 
   options: computed('projectOptions', 'studyLocationOptions',
                     'collectionTypeOptions', 'collectionMethodOptions',
-                    'speciesOptions', 'adfgPermitOptions', function() {
+                    'speciesOptions', 'adfgPermitOptions', 'sexOptions',
+                    function() {
     return {
       projects: this.get('projectOptions'),
       studyLocations: this.get('studyLocationOptions'),
@@ -24,6 +25,7 @@ export default Controller.extend(ValidationMixin, {
       collectionMethods: this.get('collectionMethodOptions'),
       species: this.get('speciesOptions'),
       adfgPermits: this.get('adfgPermitOptions'),
+      sexes: this.get('sexOptions'),
     };
   }),
 

app/controllers/collections/detail/edit.js

@@ -16,7 +16,8 @@ export default Controller.extend(ValidationMixin, {
 
   options: computed('projectOptions', 'studyLocationOptions',
                     'collectionTypeOptions', 'collectionMethodOptions',
-                    'speciesOptions', 'adfgPermitOptions', function() {
+                    'speciesOptions', 'adfgPermitOptions', 'sexOptions',
+                    function() {
     return {
       projects: this.get('projectOptions'),
       studyLocations: this.get('studyLocationOptions'),
@@ -24,6 +25,7 @@ export default Controller.extend(ValidationMixin, {
       collectionMethods: this.get('collectionMethodOptions'),
       species: this.get('speciesOptions'),
       adfgPermits: this.get('adfgPermitOptions'),
+      sexes: this.get('sexOptions'),
     };
   }),
 

app/models/collection-species.js

@@ -3,7 +3,7 @@ import DS from 'ember-data';
 const { Model, attr, belongsTo } = DS;
 
 export default Model.extend({
-  sex:            attr('string'),
+  sex:            belongsTo('sex'),
   count:          attr('number'),
   countEstimated: attr('boolean', { defaultValue: false }),
 

app/models/sex.js

@@ -0,0 +1,8 @@
+import DS from 'ember-data';
+
+const { Model, attr } = DS;
+
+export default Model.extend({
+  name:      attr('string'),
+  sortOrder: attr('number'),
+});

app/routes/collections/create.js

@@ -12,6 +12,7 @@ export default Route.extend({
       collectionMethodOptions: store.findAll('collection-method'),
       speciesOptions: store.findAll('species'),
       adfgPermitOptions: store.findAll('adfg-permit'),
+      sexOptions: store.findAll('sex'),
     });
   },
 

app/routes/collections/detail/edit.js

@@ -13,6 +13,7 @@ export default Route.extend({
       collectionMethodOptions: store.findAll('collection-method'),
       speciesOptions: store.findAll('species'),
       adfgPermitOptions: store.findAll('adfg-permit'),
+      sexOptions: store.findAll('sex'),
     });
   },
 

app/templates/components/collection/create-container.hbs

@@ -143,7 +143,15 @@
                   </td>
                   <td class="col-md-3">
                     {{#validated-field property='sex' changeset=cs.changeset}}
-                      {{input value=cs.changeset.sex}}
+                      {{#power-select
+                        options=options.sexes
+                        selected=cs.changeset.sex
+                        onchange=(action (mut cs.changeset.sex))
+                        searchField='name'
+                        as |sex|
+                      }}
+                        {{sex.name}}
+                      {{/power-select}}
                     {{/validated-field}}
                   </td>
                   <td class="col-md-2">

package.json

@@ -54,5 +54,8 @@
   "engines": {
     "node": "^4.5 || 6.* || >= 7.*"
   },
-  "private": true
+  "private": true,
+  "dependencies": {
+    "npm": "^5.7.1"
+  }
 }