Roughing in measurements
This commit is contained in:
		
							parent
							
								
									ced3f7d2d2
								
							
						
					
					
						commit
						4f96f4dc07
					
				
					 13 changed files with 109 additions and 2 deletions
				
			
		
							
								
								
									
										15
									
								
								app/models/measurement.js
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								app/models/measurement.js
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,15 @@
 | 
			
		|||
import DS from 'ember-data';
 | 
			
		||||
 | 
			
		||||
export default DS.Model.extend({
 | 
			
		||||
  strain: DS.belongsTo('strain'),
 | 
			
		||||
  characteristic: DS.attr('string'),
 | 
			
		||||
  textMeasurementType: DS.attr('string'),
 | 
			
		||||
  txtValue: DS.attr('string'),
 | 
			
		||||
  numValue: DS.attr('number'),
 | 
			
		||||
  confidenceInterval: DS.attr('number'),
 | 
			
		||||
  unitType: DS.attr('string'),
 | 
			
		||||
  notes: DS.attr('string'),
 | 
			
		||||
  testMethod: DS.attr('string'),
 | 
			
		||||
  createdAt: DS.attr('date'),
 | 
			
		||||
  updatedAt: DS.attr('date')
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			@ -1,6 +1,7 @@
 | 
			
		|||
import DS from 'ember-data';
 | 
			
		||||
 | 
			
		||||
export default DS.Model.extend({
 | 
			
		||||
  measurements: DS.hasMany('measurements', { async: true }),
 | 
			
		||||
  strainName: DS.attr('string'),
 | 
			
		||||
  strainType: DS.attr('string'),
 | 
			
		||||
  etymology: DS.attr('string'),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,9 @@ Router.map(function() {
 | 
			
		|||
  this.route('login');
 | 
			
		||||
  this.route('about');
 | 
			
		||||
  this.resource('strains', function() {
 | 
			
		||||
    this.route('show', { path: ':strain_id' });
 | 
			
		||||
    this.route('show', { path: ':strain_id' }, function() {
 | 
			
		||||
      this.resource('measurements', function() {});
 | 
			
		||||
    });
 | 
			
		||||
  });
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								app/routes/measurements.js
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								app/routes/measurements.js
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,4 @@
 | 
			
		|||
import Ember from 'ember';
 | 
			
		||||
 | 
			
		||||
export default Ember.Route.extend({
 | 
			
		||||
});
 | 
			
		||||
							
								
								
									
										7
									
								
								app/routes/measurements/index.js
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								app/routes/measurements/index.js
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,7 @@
 | 
			
		|||
import Ember from 'ember';
 | 
			
		||||
 | 
			
		||||
export default Ember.Route.extend({
 | 
			
		||||
  model: function() {
 | 
			
		||||
    return this.modelFor('strains/show').get('measurements');
 | 
			
		||||
  }
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
.measurements-container {
 | 
			
		||||
  padding: 2em 0em 0em 0em;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										1
									
								
								app/templates/measurements.hbs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								app/templates/measurements.hbs
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
{{outlet}}
 | 
			
		||||
							
								
								
									
										28
									
								
								app/templates/measurements/index.hbs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								app/templates/measurements/index.hbs
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,28 @@
 | 
			
		|||
<table class="flakes-table">
 | 
			
		||||
  <thead>
 | 
			
		||||
    <tr>
 | 
			
		||||
      <th>Characteristic</th>
 | 
			
		||||
      <th>Text Meas. Type</th>
 | 
			
		||||
      <th>Text Value</th>
 | 
			
		||||
      <th>Num. Value</th>
 | 
			
		||||
      <th>Confidence Int.</th>
 | 
			
		||||
      <th>Unit</th>
 | 
			
		||||
      <th>Notes</th>
 | 
			
		||||
      <th>Test Method</th>
 | 
			
		||||
    </tr>
 | 
			
		||||
  </thead>
 | 
			
		||||
  <tbody>
 | 
			
		||||
    {{#each measurement in model}}
 | 
			
		||||
      <tr>
 | 
			
		||||
        <td>{{measurement.characteristic}}</td>
 | 
			
		||||
        <td>{{measurement.textMeasurementType}}</td>
 | 
			
		||||
        <td>{{measurement.txtValue}}</td>
 | 
			
		||||
        <td>{{measurement.numValue}}</td>
 | 
			
		||||
        <td>{{measurement.confidenceInterval}}</td>
 | 
			
		||||
        <td>{{measurement.unitType}}</td>
 | 
			
		||||
        <td>{{measurement.notes}}</td>
 | 
			
		||||
        <td>{{measurement.testMethod}}</td>
 | 
			
		||||
      </tr>
 | 
			
		||||
    {{/each}}
 | 
			
		||||
  </tbody>
 | 
			
		||||
</table>
 | 
			
		||||
| 
						 | 
				
			
			@ -11,7 +11,7 @@
 | 
			
		|||
  <tbody>
 | 
			
		||||
    {{#each strain in model}}
 | 
			
		||||
      <tr>
 | 
			
		||||
        <td>{{link-to strain.strainName 'strains.show' strain}}</td>
 | 
			
		||||
        <td>{{link-to strain.strainName 'measurements' strain}}</td>
 | 
			
		||||
        <td></td>
 | 
			
		||||
      </tr>
 | 
			
		||||
    {{/each}}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -38,3 +38,6 @@
 | 
			
		|||
    </fieldset>
 | 
			
		||||
  </div>
 | 
			
		||||
</div>
 | 
			
		||||
<div class="measurements-container">
 | 
			
		||||
  {{outlet}}
 | 
			
		||||
</div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue