thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added characteristic

Browse source
This commit is contained in:
Matthew Dillon 2015-02-03 12:32:46 -09:00
parent d2951e600f
commit e106f15041
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/characteristic.js Normal file
View file

@ -0,0 +1,11 @@
import DS from 'ember-data';
import Ember from 'ember';
export default DS.Model.extend({
characteristicName: DS.attr(),
characteristicTypeId: DS.attr(),
measurements: DS.hasMany('measurement', {async: true}),
createdAt: DS.attr('date'),
updatedAt: DS.attr('date'),
deletedAt: DS.attr('date')
});

1
app/models/measurement.js
View file

@ -10,6 +10,7 @@ export default DS.Model.extend({
notes: DS.attr(), notes: DS.attr(),
testMethodId: DS.attr(), testMethodId: DS.attr(),
strain: DS.belongsTo('strain', {async: true}), strain: DS.belongsTo('strain', {async: true}),
characteristic: DS.belongsTo('characteristic', {async: true}),
createdAt: DS.attr('date'), createdAt: DS.attr('date'),
updatedAt: DS.attr('date') updatedAt: DS.attr('date')
}); });

12
app/templates/strain.hbs
View file

@ -55,17 +55,13 @@
<div class="grid-1"> <div class="grid-1">
<div class="span-1"> <div class="span-1">
<fieldset class="flakes-information-box"> <fieldset class="flakes-information-box">
<legend>{{id}}</legend> <legend>{{characteristic.characteristicName}}</legend>
<div class="grid-9"> <div class="grid-8">
<dl class="span-3"> <dl class="span-4">
<dt>Characteristic</dt>
<dd>{{characteristicId}}</dd>
</dl>
<dl class="span-3">
<dt>Text Measurement Type</dt> <dt>Text Measurement Type</dt>
<dd>{{textMeasurementTypeId}}</dd> <dd>{{textMeasurementTypeId}}</dd>
</dl> </dl>
<dl class="span-3"> <dl class="span-4">
<dt>Text Value</dt> <dt>Text Value</dt>
<dd>{{txtValue}}</dd> <dd>{{txtValue}}</dd>
</dl> </dl>