From f59de829eea8669f14038e7c3280016b86edb91a Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 4 Sep 2015 10:30:36 -0700 Subject: [PATCH 1/9] Restructuring forms --- app/pods/protected/species/edit/template.hbs | 2 +- app/pods/protected/species/new/template.hbs | 2 +- .../forms => protected/species}/species-form/component.js | 0 .../forms => protected/species}/species-form/template.hbs | 0 app/pods/protected/strains/edit/template.hbs | 2 +- app/pods/protected/strains/new/template.hbs | 2 +- .../forms => protected/strains}/strain-form/component.js | 0 .../forms => protected/strains}/strain-form/template.hbs | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename app/pods/{components/forms => protected/species}/species-form/component.js (100%) rename app/pods/{components/forms => protected/species}/species-form/template.hbs (100%) rename app/pods/{components/forms => protected/strains}/strain-form/component.js (100%) rename app/pods/{components/forms => protected/strains}/strain-form/template.hbs (100%) diff --git a/app/pods/protected/species/edit/template.hbs b/app/pods/protected/species/edit/template.hbs index 5c6c82f..c3b8a05 100644 --- a/app/pods/protected/species/edit/template.hbs +++ b/app/pods/protected/species/edit/template.hbs @@ -1,5 +1,5 @@ {{ - forms/species-form + protected/species/species-form species=model save="save" cancel="cancel" diff --git a/app/pods/protected/species/new/template.hbs b/app/pods/protected/species/new/template.hbs index 5c6c82f..c3b8a05 100644 --- a/app/pods/protected/species/new/template.hbs +++ b/app/pods/protected/species/new/template.hbs @@ -1,5 +1,5 @@ {{ - forms/species-form + protected/species/species-form species=model save="save" cancel="cancel" diff --git a/app/pods/components/forms/species-form/component.js b/app/pods/protected/species/species-form/component.js similarity index 100% rename from app/pods/components/forms/species-form/component.js rename to app/pods/protected/species/species-form/component.js diff --git a/app/pods/components/forms/species-form/template.hbs b/app/pods/protected/species/species-form/template.hbs similarity index 100% rename from app/pods/components/forms/species-form/template.hbs rename to app/pods/protected/species/species-form/template.hbs diff --git a/app/pods/protected/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs index e15fec0..d9c4d43 100644 --- a/app/pods/protected/strains/edit/template.hbs +++ b/app/pods/protected/strains/edit/template.hbs @@ -1,5 +1,5 @@ {{ - forms/strain-form + protected/strains/strain-form strain=strain species=species save="save" diff --git a/app/pods/protected/strains/new/template.hbs b/app/pods/protected/strains/new/template.hbs index e15fec0..d9c4d43 100644 --- a/app/pods/protected/strains/new/template.hbs +++ b/app/pods/protected/strains/new/template.hbs @@ -1,5 +1,5 @@ {{ - forms/strain-form + protected/strains/strain-form strain=strain species=species save="save" diff --git a/app/pods/components/forms/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js similarity index 100% rename from app/pods/components/forms/strain-form/component.js rename to app/pods/protected/strains/strain-form/component.js diff --git a/app/pods/components/forms/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs similarity index 100% rename from app/pods/components/forms/strain-form/template.hbs rename to app/pods/protected/strains/strain-form/template.hbs From ceccf6e53659a4b97d7a46234d287016243bd1d8 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 4 Sep 2015 10:47:32 -0700 Subject: [PATCH 2/9] Rough in detail view for characteristics --- .../components/x-application/template.hbs | 6 +-- .../characteristics/{ => index}/controller.js | 0 .../{ => index}/editable-row/component.js | 0 .../{ => index}/editable-row/template.hbs | 0 .../characteristics/{ => index}/route.js | 0 .../characteristics/{ => index}/template.hbs | 11 +++- .../protected/characteristics/show/route.js | 8 +++ .../characteristics/show/template.hbs | 53 +++++++++++++++++++ app/router.js | 6 ++- 9 files changed, 77 insertions(+), 7 deletions(-) rename app/pods/protected/characteristics/{ => index}/controller.js (100%) rename app/pods/protected/characteristics/{ => index}/editable-row/component.js (100%) rename app/pods/protected/characteristics/{ => index}/editable-row/template.hbs (100%) rename app/pods/protected/characteristics/{ => index}/route.js (100%) rename app/pods/protected/characteristics/{ => index}/template.hbs (55%) create mode 100644 app/pods/protected/characteristics/show/route.js create mode 100644 app/pods/protected/characteristics/show/template.hbs diff --git a/app/pods/components/x-application/template.hbs b/app/pods/components/x-application/template.hbs index a2097bd..3057eac 100644 --- a/app/pods/components/x-application/template.hbs +++ b/app/pods/components/x-application/template.hbs @@ -5,15 +5,15 @@ {{#link-to 'protected.compare' tagName='li' href=false}} {{link-to 'Compare' 'protected.compare'}} {{/link-to}} - {{#link-to 'protected.characteristics' tagName='li' href=false}} - {{link-to 'Characteristics' 'protected.characteristics'}} - {{/link-to}} {{#link-to 'protected.species' tagName='li' href=false}} {{link-to 'Species' 'protected.species'}} {{/link-to}} {{#link-to 'protected.strains' tagName='li' href=false}} {{link-to 'Strains' 'protected.strains'}} {{/link-to}} + {{#link-to 'protected.characteristics' tagName='li' href=false}} + {{link-to 'Characteristics' 'protected.characteristics'}} + {{/link-to}} {{#link-to 'protected.about' tagName='li' href=false}} {{link-to 'About' 'protected.about'}} {{/link-to}} diff --git a/app/pods/protected/characteristics/controller.js b/app/pods/protected/characteristics/index/controller.js similarity index 100% rename from app/pods/protected/characteristics/controller.js rename to app/pods/protected/characteristics/index/controller.js diff --git a/app/pods/protected/characteristics/editable-row/component.js b/app/pods/protected/characteristics/index/editable-row/component.js similarity index 100% rename from app/pods/protected/characteristics/editable-row/component.js rename to app/pods/protected/characteristics/index/editable-row/component.js diff --git a/app/pods/protected/characteristics/editable-row/template.hbs b/app/pods/protected/characteristics/index/editable-row/template.hbs similarity index 100% rename from app/pods/protected/characteristics/editable-row/template.hbs rename to app/pods/protected/characteristics/index/editable-row/template.hbs diff --git a/app/pods/protected/characteristics/route.js b/app/pods/protected/characteristics/index/route.js similarity index 100% rename from app/pods/protected/characteristics/route.js rename to app/pods/protected/characteristics/index/route.js diff --git a/app/pods/protected/characteristics/template.hbs b/app/pods/protected/characteristics/index/template.hbs similarity index 55% rename from app/pods/protected/characteristics/template.hbs rename to app/pods/protected/characteristics/index/template.hbs index 12ce1c1..76efee6 100644 --- a/app/pods/protected/characteristics/template.hbs +++ b/app/pods/protected/characteristics/index/template.hbs @@ -7,12 +7,19 @@ Name Type Sort Order - {{#each sortedCharacteristics as |row|}} - {{protected/characteristics/editable-row row=row}} + + + {{#link-to 'protected.characteristics.show' row}} + {{row.characteristicName}} + {{/link-to}} + + {{row.characteristicTypeName}} + {{row.sortOrder}} + {{/each}} diff --git a/app/pods/protected/characteristics/show/route.js b/app/pods/protected/characteristics/show/route.js new file mode 100644 index 0000000..f66a9c7 --- /dev/null +++ b/app/pods/protected/characteristics/show/route.js @@ -0,0 +1,8 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model: function(params) { + return this.store.findRecord('characteristic', params.characteristic_id, { reload: true }); + }, + +}); diff --git a/app/pods/protected/characteristics/show/template.hbs b/app/pods/protected/characteristics/show/template.hbs new file mode 100644 index 0000000..faf6596 --- /dev/null +++ b/app/pods/protected/characteristics/show/template.hbs @@ -0,0 +1,53 @@ +
+
+
+ + {{model.characteristicName}} + + + {{! ROW 1 }} +
+
+
Characteristic Type
+
+ {{model.characteristicTypeName}} +
+
+
+ + {{! ROW 2 }} +
+
+
Strains
+
+
    + {{#each model.strains as |strain index|}} +
  • + {{#link-to 'protected.strains.show' strain.id}} + {{{strain.strainNameMU}}} + {{/link-to}} +
    • + {{/each}} +
+
+
+
+ + {{! ROW 3 }} +
+
+
Record Created
+
{{null-time model.createdAt 'LL'}}
+
+
+
Record Updated
+
{{null-time model.updatedAt 'LL'}}
+
+
+
Record Deleted
+
{{null-time model.deletedAt 'LL'}}
+
+
+
+
+
diff --git a/app/router.js b/app/router.js index c34e885..42a594b 100644 --- a/app/router.js +++ b/app/router.js @@ -18,13 +18,15 @@ Router.map(function() { this.route('protected', { path: '/' }, function() { this.route('about'); - this.route('characteristics'); - this.route('measurements'); this.route('compare', function() { this.route('results'); }); + this.route('characteristics', function() { + this.route('show', { path: ':characteristic_id' }); + }); + this.route('species', function() { this.route('new'); this.route('show', { path: ':species_id' }); From fb296340c32b07d1194fd2a3b0123222ecf60d81 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 8 Sep 2015 06:31:57 -0700 Subject: [PATCH 3/9] Characteristics details --- .../index/editable-row/component.js | 28 ------------------- .../index/editable-row/template.hbs | 15 ---------- .../characteristics/loading/template.hbs | 1 + .../show/measurements-table/component.js | 16 +++++++++++ .../show/measurements-table/template.hbs | 26 +++++++++++++++++ .../characteristics/show/template.hbs | 12 ++------ .../protected/compare/loading/template.hbs | 1 + .../protected/species/loading/template.hbs | 1 + .../protected/strains/loading/template.hbs | 1 + 9 files changed, 48 insertions(+), 53 deletions(-) delete mode 100644 app/pods/protected/characteristics/index/editable-row/component.js delete mode 100644 app/pods/protected/characteristics/index/editable-row/template.hbs create mode 100644 app/pods/protected/characteristics/loading/template.hbs create mode 100644 app/pods/protected/characteristics/show/measurements-table/component.js create mode 100644 app/pods/protected/characteristics/show/measurements-table/template.hbs create mode 100644 app/pods/protected/compare/loading/template.hbs create mode 100644 app/pods/protected/species/loading/template.hbs create mode 100644 app/pods/protected/strains/loading/template.hbs diff --git a/app/pods/protected/characteristics/index/editable-row/component.js b/app/pods/protected/characteristics/index/editable-row/component.js deleted file mode 100644 index 384d254..0000000 --- a/app/pods/protected/characteristics/index/editable-row/component.js +++ /dev/null @@ -1,28 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - tagName: 'tr', - - actions: { - edit: function() { - this.set('characteristicName', this.get('row.characteristicName')); - this.set('characteristicTypeName', this.get('row.characteristicTypeName')); - this.set('sortOrder', this.get('row.sortOrder')); - this.toggleProperty('isEditing'); - }, - - save: function() { - if (this.get('characteristicName') !== this.get('row.characteristicName') || - this.get('characteristicTypeName') !== this.get('row.characteristicTypeName') || - this.get('sortOrder') !== this.get('row.sortOrder')) { - this.set('row.characteristicName', this.get('characteristicName')); - this.set('row.characteristicTypeName', this.get('characteristicTypeName')); - this.set('row.sortOrder', this.get('sortOrder')); - this.get('row').save(); - } - this.toggleProperty('isEditing'); - }, - - } - -}); diff --git a/app/pods/protected/characteristics/index/editable-row/template.hbs b/app/pods/protected/characteristics/index/editable-row/template.hbs deleted file mode 100644 index 8230297..0000000 --- a/app/pods/protected/characteristics/index/editable-row/template.hbs +++ /dev/null @@ -1,15 +0,0 @@ -{{#if isEditing}} - {{input value=characteristicName}} - {{input value=characteristicTypeName}} - {{input value=sortOrder}} - Save -{{else}} - {{row.characteristicName}} - {{row.characteristicTypeName}} - {{row.sortOrder}} - {{#if row.canEdit}} - Edit - {{else}} - - {{/if}} -{{/if}} diff --git a/app/pods/protected/characteristics/loading/template.hbs b/app/pods/protected/characteristics/loading/template.hbs new file mode 100644 index 0000000..e5a3e05 --- /dev/null +++ b/app/pods/protected/characteristics/loading/template.hbs @@ -0,0 +1 @@ +{{loading-panel}} diff --git a/app/pods/protected/characteristics/show/measurements-table/component.js b/app/pods/protected/characteristics/show/measurements-table/component.js new file mode 100644 index 0000000..03ff60b --- /dev/null +++ b/app/pods/protected/characteristics/show/measurements-table/component.js @@ -0,0 +1,16 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + measurementsTable: function() { + let measurements = this.get('model.measurements'); + let table = []; + measurements.forEach((measurement) => { + let row = {}; + row['measurement'] = measurement; + row['strain'] = this.store.peekRecord('strain', measurement.get('strain.id')); + table.push(row); + }); + return table; + }.property(), + +}); diff --git a/app/pods/protected/characteristics/show/measurements-table/template.hbs b/app/pods/protected/characteristics/show/measurements-table/template.hbs new file mode 100644 index 0000000..2e838ec --- /dev/null +++ b/app/pods/protected/characteristics/show/measurements-table/template.hbs @@ -0,0 +1,26 @@ + + + + + + + + + + {{#each measurementsTable as |row|}} + + + + + + {{/each}} + +
StrainValueNotes
+ {{#link-to 'protected.strains.show' row.strain.id}} + {{{row.strain.strainNameMU}}} + {{/link-to}} + + {{row.measurement.value}} + + {{row.measurement.notes}} +
diff --git a/app/pods/protected/characteristics/show/template.hbs b/app/pods/protected/characteristics/show/template.hbs index faf6596..1097ace 100644 --- a/app/pods/protected/characteristics/show/template.hbs +++ b/app/pods/protected/characteristics/show/template.hbs @@ -18,17 +18,9 @@ {{! ROW 2 }}
-
Strains
+
Measurements
-
    - {{#each model.strains as |strain index|}} -
  • - {{#link-to 'protected.strains.show' strain.id}} - {{{strain.strainNameMU}}} - {{/link-to}} -
    • - {{/each}} -
+ {{protected/characteristics/show/measurements-table model=model}}
diff --git a/app/pods/protected/compare/loading/template.hbs b/app/pods/protected/compare/loading/template.hbs new file mode 100644 index 0000000..e5a3e05 --- /dev/null +++ b/app/pods/protected/compare/loading/template.hbs @@ -0,0 +1 @@ +{{loading-panel}} diff --git a/app/pods/protected/species/loading/template.hbs b/app/pods/protected/species/loading/template.hbs new file mode 100644 index 0000000..e5a3e05 --- /dev/null +++ b/app/pods/protected/species/loading/template.hbs @@ -0,0 +1 @@ +{{loading-panel}} diff --git a/app/pods/protected/strains/loading/template.hbs b/app/pods/protected/strains/loading/template.hbs new file mode 100644 index 0000000..e5a3e05 --- /dev/null +++ b/app/pods/protected/strains/loading/template.hbs @@ -0,0 +1 @@ +{{loading-panel}} From de8ac653f63d42c16ecb750769408f2394c5c946 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 8 Sep 2015 10:37:48 -0700 Subject: [PATCH 4/9] Create and edit characteristics --- .../characteristic-form/component.js | 13 ++++++++ .../characteristic-form/template.hbs | 30 +++++++++++++++++++ .../characteristics/edit/controller.js | 30 +++++++++++++++++++ .../protected/characteristics/edit/route.js | 15 ++++++++++ .../characteristics/edit/template.hbs | 6 ++++ .../protected/characteristics/index/route.js | 5 ++++ .../characteristics/index/template.hbs | 2 ++ .../characteristics/new/controller.js | 24 +++++++++++++++ .../protected/characteristics/new/route.js | 26 ++++++++++++++++ .../characteristics/new/template.hbs | 6 ++++ .../show/measurements-table/component.js | 4 +++ .../show/measurements-table/template.hbs | 4 +++ .../characteristics/show/template.hbs | 14 ++++++++- app/router.js | 2 ++ 14 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 app/pods/protected/characteristics/characteristic-form/component.js create mode 100644 app/pods/protected/characteristics/characteristic-form/template.hbs create mode 100644 app/pods/protected/characteristics/edit/controller.js create mode 100644 app/pods/protected/characteristics/edit/route.js create mode 100644 app/pods/protected/characteristics/edit/template.hbs create mode 100644 app/pods/protected/characteristics/new/controller.js create mode 100644 app/pods/protected/characteristics/new/route.js create mode 100644 app/pods/protected/characteristics/new/template.hbs diff --git a/app/pods/protected/characteristics/characteristic-form/component.js b/app/pods/protected/characteristics/characteristic-form/component.js new file mode 100644 index 0000000..a53a469 --- /dev/null +++ b/app/pods/protected/characteristics/characteristic-form/component.js @@ -0,0 +1,13 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + actions: { + save: function() { + this.sendAction('save'); + }, + + cancel: function() { + this.sendAction('cancel'); + }, + } +}); diff --git a/app/pods/protected/characteristics/characteristic-form/template.hbs b/app/pods/protected/characteristics/characteristic-form/template.hbs new file mode 100644 index 0000000..b1d68c0 --- /dev/null +++ b/app/pods/protected/characteristics/characteristic-form/template.hbs @@ -0,0 +1,30 @@ +
+
+ {{characteristic.characteristicName}} +
+
+ + {{input value=characteristic.characteristicName}} +
+
+
+
+ + {{input value=characteristic.characteristicTypeName}} +
+
+ + {{input value=characteristic.sortOrder}} +
+
+
+
+ + Cancel + + {{#if characteristic.hasDirtyAttributes}} + + {{/if}} +
diff --git a/app/pods/protected/characteristics/edit/controller.js b/app/pods/protected/characteristics/edit/controller.js new file mode 100644 index 0000000..d0f2ec0 --- /dev/null +++ b/app/pods/protected/characteristics/edit/controller.js @@ -0,0 +1,30 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + actions: { + save: function() { + let characteristic = this.get('model'); + + if (characteristic.get('hasDirtyAttributes')) { + characteristic.save().then((characteristic) => { + this.transitionToRoute('protected.characteristics.show', characteristic); + }, (err) => { + this.get('flashMessages').error(err.responseJSON.error); + }); + } else { + characteristic.deleteRecord(); + this.transitionToRoute('protected.characteristics.show', characteristic); + } + }, + + cancel: function() { + let characteristic = this.get('model'); + + characteristic.get('errors').clear(); + characteristic.rollbackAttributes(); + + this.transitionToRoute('protected.characteristics.show', characteristic); + }, + + }, +}); diff --git a/app/pods/protected/characteristics/edit/route.js b/app/pods/protected/characteristics/edit/route.js new file mode 100644 index 0000000..3ab3562 --- /dev/null +++ b/app/pods/protected/characteristics/edit/route.js @@ -0,0 +1,15 @@ +import Ember from 'ember'; +import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; + +export default Ember.Route.extend(AuthenticatedRouteMixin, { + model: function(params) { + return this.store.findRecord('characteristic', params.characteristic_id, { reload: true }); + }, + + afterModel: function(model) { + if (!model.get('canEdit')) { + this.transitionTo('characteristics.show', model.get('id')); + } + }, + +}); diff --git a/app/pods/protected/characteristics/edit/template.hbs b/app/pods/protected/characteristics/edit/template.hbs new file mode 100644 index 0000000..3f1fe65 --- /dev/null +++ b/app/pods/protected/characteristics/edit/template.hbs @@ -0,0 +1,6 @@ +{{ + protected/characteristics/characteristic-form + characteristic=model + save="save" + cancel="cancel" +}} diff --git a/app/pods/protected/characteristics/index/route.js b/app/pods/protected/characteristics/index/route.js index cf8c61a..83aa3ef 100644 --- a/app/pods/protected/characteristics/index/route.js +++ b/app/pods/protected/characteristics/index/route.js @@ -5,4 +5,9 @@ export default Ember.Route.extend({ return this.store.findAll('characteristic'); }, + setupController: function(controller, model) { + controller.set('model', model); + controller.set('metaData', this.store.metadataFor('characteristic')); + }, + }); diff --git a/app/pods/protected/characteristics/index/template.hbs b/app/pods/protected/characteristics/index/template.hbs index 76efee6..3430386 100644 --- a/app/pods/protected/characteristics/index/template.hbs +++ b/app/pods/protected/characteristics/index/template.hbs @@ -1,6 +1,8 @@

{{genus-name}} Characteristics

Total characteristics: {{model.length}}

+{{add-button label="Add Characteristic" link="protected.characteristics.new" canAdd=metaData.canAdd}} + diff --git a/app/pods/protected/characteristics/new/controller.js b/app/pods/protected/characteristics/new/controller.js new file mode 100644 index 0000000..c211ec8 --- /dev/null +++ b/app/pods/protected/characteristics/new/controller.js @@ -0,0 +1,24 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + actions: { + save: function() { + let characteristic = this.get('model'); + + if (characteristic.get('hasDirtyAttributes')) { + characteristic.save().then((characteristic) => { + this.transitionToRoute('protected.characteristics.show', characteristic); + }, (err) => { + this.get('flashMessages').error(err.responseJSON.error); + }); + } else { + this.transitionToRoute('protected.characteristics.index'); + } + }, + + cancel: function() { + this.transitionToRoute('protected.characteristics.index'); + }, + + }, +}); diff --git a/app/pods/protected/characteristics/new/route.js b/app/pods/protected/characteristics/new/route.js new file mode 100644 index 0000000..6ddb337 --- /dev/null +++ b/app/pods/protected/characteristics/new/route.js @@ -0,0 +1,26 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + beforeModel: function(transition) { + this._super(transition); + if (this.get('session.currentUser.role') === 'R') { + this.transitionTo('characteristics.index'); + } + }, + + model: function() { + return this.store.createRecord('characteristic'); + }, + + actions: { + willTransition: function(/*transition*/) { + let controller = this.get('controller'); + let characteristic = controller.get('model'); + + if (characteristic.get('isNew')) { + characteristic.deleteRecord(); + } + }, + }, + +}); diff --git a/app/pods/protected/characteristics/new/template.hbs b/app/pods/protected/characteristics/new/template.hbs new file mode 100644 index 0000000..3f1fe65 --- /dev/null +++ b/app/pods/protected/characteristics/new/template.hbs @@ -0,0 +1,6 @@ +{{ + protected/characteristics/characteristic-form + characteristic=model + save="save" + cancel="cancel" +}} diff --git a/app/pods/protected/characteristics/show/measurements-table/component.js b/app/pods/protected/characteristics/show/measurements-table/component.js index 03ff60b..63d3165 100644 --- a/app/pods/protected/characteristics/show/measurements-table/component.js +++ b/app/pods/protected/characteristics/show/measurements-table/component.js @@ -1,6 +1,10 @@ import Ember from 'ember'; export default Ember.Component.extend({ + measurementsPresent: function() { + return this.get('model.measurements.length') > 0; + }.property('model.measurements'), + measurementsTable: function() { let measurements = this.get('model.measurements'); let table = []; diff --git a/app/pods/protected/characteristics/show/measurements-table/template.hbs b/app/pods/protected/characteristics/show/measurements-table/template.hbs index 2e838ec..1813ed8 100644 --- a/app/pods/protected/characteristics/show/measurements-table/template.hbs +++ b/app/pods/protected/characteristics/show/measurements-table/template.hbs @@ -1,3 +1,4 @@ +{{#if measurementsPresent}}
@@ -24,3 +25,6 @@ {{/each}}
+{{else}} +No measurements on record. +{{/if}} diff --git a/app/pods/protected/characteristics/show/template.hbs b/app/pods/protected/characteristics/show/template.hbs index 1097ace..ccdb9f4 100644 --- a/app/pods/protected/characteristics/show/template.hbs +++ b/app/pods/protected/characteristics/show/template.hbs @@ -7,12 +7,18 @@ {{! ROW 1 }}
-
+
Characteristic Type
{{model.characteristicTypeName}}
+
+
Sort Order
+
+ {{model.sortOrder}} +
+
{{! ROW 2 }} @@ -43,3 +49,9 @@ +{{#if model.canEdit}} +
+ {{#link-to 'protected.characteristics.edit' model.id class="button-gray smaller"}} + Edit + {{/link-to}} +{{/if}} diff --git a/app/router.js b/app/router.js index 42a594b..7398db7 100644 --- a/app/router.js +++ b/app/router.js @@ -24,7 +24,9 @@ Router.map(function() { }); this.route('characteristics', function() { + this.route('new'); this.route('show', { path: ':characteristic_id' }); + this.route('edit', { path: ':characteristic_id/edit' }); }); this.route('species', function() { From 37d7ca0029059002285993e4e16e91cc179fd0d4 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 9 Sep 2015 11:40:07 -0700 Subject: [PATCH 5/9] Application-wide serializer --- app/serializers/{strain.js => application.js} | 13 ++++++++++++- app/serializers/characteristic.js | 18 ------------------ 2 files changed, 12 insertions(+), 19 deletions(-) rename app/serializers/{strain.js => application.js} (57%) delete mode 100644 app/serializers/characteristic.js diff --git a/app/serializers/strain.js b/app/serializers/application.js similarity index 57% rename from app/serializers/strain.js rename to app/serializers/application.js index ddadf39..52f555e 100644 --- a/app/serializers/strain.js +++ b/app/serializers/application.js @@ -9,6 +9,17 @@ export default DS.RESTSerializer.extend({ var belongsTo = snapshot.belongsTo(key); key = this.keyForRelationship ? this.keyForRelationship(key, "belongsTo", "serialize") : key; json[key] = Ember.isNone(belongsTo) ? belongsTo : +belongsTo.record.id; - } + }, + + serializeHasMany: function(snapshot, json, relationship) { + var key = relationship.key; + var hasMany = snapshot.hasMany(key); + key = this.keyForRelationship ? this.keyForRelationship(key, "hasMany", "serialize") : key; + + json[key] = []; + hasMany.forEach((item) => { + json[key].push(+item.id); + }); + }, }); diff --git a/app/serializers/characteristic.js b/app/serializers/characteristic.js deleted file mode 100644 index 41ce180..0000000 --- a/app/serializers/characteristic.js +++ /dev/null @@ -1,18 +0,0 @@ -import DS from 'ember-data'; -import Ember from 'ember'; - -export default DS.RESTSerializer.extend({ - isNewSerializerAPI: true, - - serializeHasMany: function(snapshot, json, relationship) { - var key = relationship.key; - var hasMany = snapshot.hasMany(key); - key = this.keyForRelationship ? this.keyForRelationship(key, "hasMany", "serialize") : key; - - json[key] = []; - hasMany.forEach((item) => { - json[key].push(+item.get('id')); - }); - } - -}); From 137ba20bd9a93143ee20e88b87feb7d5bf1e7d9d Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 9 Sep 2015 11:40:15 -0700 Subject: [PATCH 6/9] Clean up models --- app/models/characteristic.js | 4 ++-- app/models/measurement.js | 4 ++-- app/models/strain.js | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/models/characteristic.js b/app/models/characteristic.js index ca4c5d9..8851175 100644 --- a/app/models/characteristic.js +++ b/app/models/characteristic.js @@ -3,8 +3,8 @@ import DS from 'ember-data'; export default DS.Model.extend({ characteristicName : DS.attr('string'), characteristicTypeName: DS.attr('string'), - strains : DS.hasMany('strain', { async: true }), - measurements : DS.hasMany('measurements', { async: true }), + strains : DS.hasMany('strain', { async: false }), + measurements : DS.hasMany('measurements', { async: false }), createdAt : DS.attr('date'), updatedAt : DS.attr('date'), deletedAt : DS.attr('date'), diff --git a/app/models/measurement.js b/app/models/measurement.js index 32ceac5..80b6136 100644 --- a/app/models/measurement.js +++ b/app/models/measurement.js @@ -1,8 +1,8 @@ import DS from 'ember-data'; export default DS.Model.extend({ - strain : DS.belongsTo('strain', { async: true }), - characteristic : DS.belongsTo('characteristic', { async: true }), + strain : DS.belongsTo('strain', { async: false }), + characteristic : DS.belongsTo('characteristic', { async: false }), textMeasurementType: DS.attr('string'), txtValue : DS.attr('string'), numValue : DS.attr('number'), diff --git a/app/models/strain.js b/app/models/strain.js index 1f54647..7bd4e50 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -2,7 +2,8 @@ import DS from 'ember-data'; import Ember from 'ember'; export default DS.Model.extend({ - measurements : DS.hasMany('measurements', { async: true }), + measurements : DS.hasMany('measurements', { async: false }), + characteristics : DS.hasMany('characteristics', { async: false }), species : DS.belongsTo('species', { async: false }), strainName : DS.attr('string'), typeStrain : DS.attr('boolean'), From 3b3f8cc6916396c209c32157ca3027675b7eaa94 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 9 Sep 2015 11:40:32 -0700 Subject: [PATCH 7/9] Add measurements to strains page --- .../strains/show/loading/template.hbs | 1 + .../show/measurements-table/component.js | 25 ++++++++++++++++ .../measurements-table/loading/template.hbs | 1 + .../show/measurements-table/template.hbs | 30 +++++++++++++++++++ app/pods/protected/strains/show/template.hbs | 16 +++++++++- 5 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 app/pods/protected/strains/show/loading/template.hbs create mode 100644 app/pods/protected/strains/show/measurements-table/component.js create mode 100644 app/pods/protected/strains/show/measurements-table/loading/template.hbs create mode 100644 app/pods/protected/strains/show/measurements-table/template.hbs diff --git a/app/pods/protected/strains/show/loading/template.hbs b/app/pods/protected/strains/show/loading/template.hbs new file mode 100644 index 0000000..e5a3e05 --- /dev/null +++ b/app/pods/protected/strains/show/loading/template.hbs @@ -0,0 +1 @@ +{{loading-panel}} diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js new file mode 100644 index 0000000..bddc5d1 --- /dev/null +++ b/app/pods/protected/strains/show/measurements-table/component.js @@ -0,0 +1,25 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + measurementsPresent: function() { + return this.get('model.measurements.length') > 0; + }.property('model.measurements'), + + measurementsTable: function() { + let measurements = this.get('model.measurements'); + let table = []; + measurements.forEach((measurement) => { + let row = {}; + row['measurement'] = measurement; + row['characteristic'] = this.store.peekRecord('characteristic', measurement.get('characteristic.id')); + table.push(row); + }); + table.sort((a, b) => { + let a_sort = a['characteristic'] && a['characteristic'].get('sortOrder'); + let b_sort = b['characteristic'] && b['characteristic'].get('sortOrder'); + return a_sort - b_sort; + }); + return table; + }.property(), + +}); diff --git a/app/pods/protected/strains/show/measurements-table/loading/template.hbs b/app/pods/protected/strains/show/measurements-table/loading/template.hbs new file mode 100644 index 0000000..e5a3e05 --- /dev/null +++ b/app/pods/protected/strains/show/measurements-table/loading/template.hbs @@ -0,0 +1 @@ +{{loading-panel}} diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/show/measurements-table/template.hbs new file mode 100644 index 0000000..188ac47 --- /dev/null +++ b/app/pods/protected/strains/show/measurements-table/template.hbs @@ -0,0 +1,30 @@ +{{#if measurementsPresent}} + + + + + + + + + + {{#each measurementsTable as |row|}} + + + + + + {{/each}} + +
CharacteristicValueNotes
+ {{#link-to 'protected.characteristics.show' row.characteristic.id}} + {{{row.characteristic.characteristicName}}} + {{/link-to}} + + {{row.measurement.value}} + + {{row.measurement.notes}} +
+{{else}} +No measurements on record. +{{/if}} diff --git a/app/pods/protected/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs index 55b2bff..7504458 100644 --- a/app/pods/protected/strains/show/template.hbs +++ b/app/pods/protected/strains/show/template.hbs @@ -59,12 +59,26 @@
Notes
- {{{model.notes}}} + {{#if model.notes}} + {{{model.notes}}} + {{else}} + No notes. + {{/if}}
{{! ROW 5 }} +
+
+
Characteristics
+
+ {{protected/strains/show/measurements-table model=model}} +
+
+
+ + {{! ROW 6 }}
Record Created
From be8a842c67615568fef9114409fe860ceaae2f6b Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 9 Sep 2015 14:23:25 -0700 Subject: [PATCH 8/9] Roughing in user admin --- app/models/user.js | 6 +++++- app/pods/components/x-application/template.hbs | 5 +++++ app/pods/protected/users/index/route.js | 8 ++++++++ app/pods/protected/users/index/template.hbs | 3 +++ app/router.js | 2 ++ 5 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/pods/protected/users/index/route.js create mode 100644 app/pods/protected/users/index/template.hbs diff --git a/app/models/user.js b/app/models/user.js index ae851d0..637a5f3 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -7,5 +7,9 @@ export default DS.Model.extend({ role : DS.attr('string'), createdAt: DS.attr('date'), updatedAt: DS.attr('date'), - deletedAt: DS.attr('date') + deletedAt: DS.attr('date'), + + isAdmin: function() { + return this.get('role') === 'A'; + }.property('role'), }); diff --git a/app/pods/components/x-application/template.hbs b/app/pods/components/x-application/template.hbs index 3057eac..f26e0d3 100644 --- a/app/pods/components/x-application/template.hbs +++ b/app/pods/components/x-application/template.hbs @@ -14,6 +14,11 @@ {{#link-to 'protected.characteristics' tagName='li' href=false}} {{link-to 'Characteristics' 'protected.characteristics'}} {{/link-to}} + {{#if session.currentUser.isAdmin}} + {{#link-to 'protected.users' tagName='li' href=false}} + {{link-to 'Users' 'protected.users'}} + {{/link-to}} + {{/if}} {{#link-to 'protected.about' tagName='li' href=false}} {{link-to 'About' 'protected.about'}} {{/link-to}} diff --git a/app/pods/protected/users/index/route.js b/app/pods/protected/users/index/route.js new file mode 100644 index 0000000..81b9562 --- /dev/null +++ b/app/pods/protected/users/index/route.js @@ -0,0 +1,8 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model: function() { + return this.store.findAll('user'); + }, + +}); diff --git a/app/pods/protected/users/index/template.hbs b/app/pods/protected/users/index/template.hbs new file mode 100644 index 0000000..f3239cb --- /dev/null +++ b/app/pods/protected/users/index/template.hbs @@ -0,0 +1,3 @@ +{{#each model as |user|}} + {{user.email}}
+{{/each}} diff --git a/app/router.js b/app/router.js index 7398db7..6eb5409 100644 --- a/app/router.js +++ b/app/router.js @@ -19,6 +19,8 @@ Router.map(function() { this.route('protected', { path: '/' }, function() { this.route('about'); + this.route('users'); + this.route('compare', function() { this.route('results'); }); From 425dd689aec04fb96b74c57600b5498d7bfbfcec Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 9 Sep 2015 16:49:48 -0700 Subject: [PATCH 9/9] Working on users --- app/models/user.js | 13 +++++ .../components/x-application/template.hbs | 2 +- app/pods/protected/users/index/route.js | 9 ++++ app/pods/protected/users/index/template.hbs | 36 ++++++++++++-- app/pods/protected/users/show/route.js | 8 +++ app/pods/protected/users/show/template.hbs | 49 +++++++++++++++++++ app/router.js | 5 +- 7 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 app/pods/protected/users/show/route.js create mode 100644 app/pods/protected/users/show/template.hbs diff --git a/app/models/user.js b/app/models/user.js index 637a5f3..bb7c5fd 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -12,4 +12,17 @@ export default DS.Model.extend({ isAdmin: function() { return this.get('role') === 'A'; }.property('role'), + + fullRole: function() { + let role = this.get('role'); + if (role === 'R') { + return 'Read-Only'; + } else if (role === 'W') { + return 'Write'; + } else if (role === 'A') { + return 'Admin'; + } else { + return 'Error'; + } + }.property('role'), }); diff --git a/app/pods/components/x-application/template.hbs b/app/pods/components/x-application/template.hbs index f26e0d3..e859890 100644 --- a/app/pods/components/x-application/template.hbs +++ b/app/pods/components/x-application/template.hbs @@ -24,7 +24,7 @@ {{/link-to}}

- {{session.currentUser.name}}
+ {{link-to session.currentUser.name 'protected.users.show' session.currentUser.id}}
Logout

{{else}} diff --git a/app/pods/protected/users/index/route.js b/app/pods/protected/users/index/route.js index 81b9562..e8b6bc7 100644 --- a/app/pods/protected/users/index/route.js +++ b/app/pods/protected/users/index/route.js @@ -1,6 +1,15 @@ import Ember from 'ember'; export default Ember.Route.extend({ + beforeModel: function(transition) { + this._super(transition); + this.get('session.currentUser').then((user) => { + if (!user.get('isAdmin')) { + this.transitionTo('protected.index'); + } + }); + }, + model: function() { return this.store.findAll('user'); }, diff --git a/app/pods/protected/users/index/template.hbs b/app/pods/protected/users/index/template.hbs index f3239cb..adb5b55 100644 --- a/app/pods/protected/users/index/template.hbs +++ b/app/pods/protected/users/index/template.hbs @@ -1,3 +1,33 @@ -{{#each model as |user|}} - {{user.email}}
-{{/each}} +

{{genus-name}} Users

+

Total users: {{model.length}}

+ + + + + + + + + + + + {{#each model as |row|}} + + + + + + + {{/each}} + +
NameEmailRoleDate Registered
+ {{#link-to 'protected.users.show' row}} + {{row.name}} + {{/link-to}} + + {{row.email}} + + {{row.fullRole}} + + {{null-time row.createdAt 'LL'}} +
diff --git a/app/pods/protected/users/show/route.js b/app/pods/protected/users/show/route.js new file mode 100644 index 0000000..bc22dc0 --- /dev/null +++ b/app/pods/protected/users/show/route.js @@ -0,0 +1,8 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model: function(params) { + return this.store.findRecord('user', params.user_id, { reload: true }); + }, + +}); diff --git a/app/pods/protected/users/show/template.hbs b/app/pods/protected/users/show/template.hbs new file mode 100644 index 0000000..de032f9 --- /dev/null +++ b/app/pods/protected/users/show/template.hbs @@ -0,0 +1,49 @@ +
+
+ + {{model.name}} + + + {{! ROW 1 }} +
+
+
Email
+
+ {{model.email}} +
+
+
+
Role
+
+ {{model.fullRole}} +
+
+
+ + {{! ROW 2 }} +
+
+
Record Created
+
{{null-time model.createdAt 'LL'}}
+
+
+
Record Updated
+
{{null-time model.updatedAt 'LL'}}
+
+
+
Record Deleted
+
{{null-time model.deletedAt 'LL'}}
+
+
+
+
+
+{{#link-to 'protected.users.show' model.id class="button-gray smaller"}} + Change Password (Does nothing at the moment) +{{/link-to}} +{{#if model.canEdit}} +
+ {{#link-to 'protected.user.edit' model.id class="button-gray smaller"}} + Edit + {{/link-to}} +{{/if}} diff --git a/app/router.js b/app/router.js index 6eb5409..5f48eec 100644 --- a/app/router.js +++ b/app/router.js @@ -19,7 +19,10 @@ Router.map(function() { this.route('protected', { path: '/' }, function() { this.route('about'); - this.route('users'); + this.route('users', function() { + this.route('show', { path: ':user_id' }); + this.route('edit', { path: ':user_id/edit' }); + }); this.route('compare', function() { this.route('results');