Moving measurements into strain for now
This commit is contained in:
		
							parent
							
								
									867c20948b
								
							
						
					
					
						commit
						d2951e600f
					
				
					 4 changed files with 58 additions and 8 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +0,0 @@
 | 
			
		|||
import DS from 'ember-data';
 | 
			
		||||
 | 
			
		||||
export default DS.RESTAdapter.reopen({
 | 
			
		||||
  namespace: 'api'
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			@ -14,7 +14,6 @@ Router.map(function() {
 | 
			
		|||
  this.resource('strain', { path: '/strain/:strain_id' }, function() {
 | 
			
		||||
    this.resource('measurements');
 | 
			
		||||
  });
 | 
			
		||||
  this.resource('measurements');
 | 
			
		||||
  this.resource('measurement', { path: '/measurement/:measurement_id' });
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,4 @@
 | 
			
		|||
<div class="grid-1">
 | 
			
		||||
  {{#each}}
 | 
			
		||||
  <div class="span-1">
 | 
			
		||||
    <fieldset class="read-only-information">
 | 
			
		||||
      <legend>{{id}}</legend>
 | 
			
		||||
| 
						 | 
				
			
			@ -49,5 +48,4 @@
 | 
			
		|||
      </dl>
 | 
			
		||||
    </fieldset>
 | 
			
		||||
  </div>
 | 
			
		||||
  {{/each}}
 | 
			
		||||
</div>
 | 
			
		||||
| 
						 | 
				
			
			@ -50,4 +50,62 @@
 | 
			
		|||
      </div>
 | 
			
		||||
    </fieldset>
 | 
			
		||||
  </div>
 | 
			
		||||
  <div>
 | 
			
		||||
    {{#each measurements}}
 | 
			
		||||
    <div class="grid-1">
 | 
			
		||||
      <div class="span-1">
 | 
			
		||||
        <fieldset class="flakes-information-box">
 | 
			
		||||
          <legend>{{id}}</legend>
 | 
			
		||||
          <div class="grid-9">
 | 
			
		||||
            <dl class="span-3">
 | 
			
		||||
              <dt>Characteristic</dt>
 | 
			
		||||
              <dd>{{characteristicId}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
            <dl class="span-3">
 | 
			
		||||
              <dt>Text Measurement Type</dt>
 | 
			
		||||
              <dd>{{textMeasurementTypeId}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
            <dl class="span-3">
 | 
			
		||||
              <dt>Text Value</dt>
 | 
			
		||||
              <dd>{{txtValue}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
          </div>
 | 
			
		||||
          <div class="grid-9">
 | 
			
		||||
            <dl class="span-3">
 | 
			
		||||
              <dt>Numerical Value</dt>
 | 
			
		||||
              <dd>{{numValue}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
            <dl class="span-3">
 | 
			
		||||
              <dt>Confidence Interval</dt>
 | 
			
		||||
              <dd>{{confidenceInterval}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
            <dl class="span-3">
 | 
			
		||||
              <dt>Unit Type</dt>
 | 
			
		||||
              <dd>{{unitTypeId}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
          </div>
 | 
			
		||||
          <div class="grid-8">
 | 
			
		||||
            <dl class="span-4">
 | 
			
		||||
              <dt>Notes</dt>
 | 
			
		||||
              <dd>{{notes}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
            <dl class="span-4">
 | 
			
		||||
              <dt>Test Method</dt>
 | 
			
		||||
              <dd>{{testMethodId}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
          </div>
 | 
			
		||||
          <div class="grid-8">
 | 
			
		||||
            <dl class="span-4">
 | 
			
		||||
              <dt>Created</dt>
 | 
			
		||||
              <dd>{{createdAt}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
            <dl class="span-4">
 | 
			
		||||
              <dt>Updated</dt>
 | 
			
		||||
              <dd>{{updatedAt}}</dd>
 | 
			
		||||
            </dl>
 | 
			
		||||
          </div>
 | 
			
		||||
        </fieldset>
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
    {{/each}}
 | 
			
		||||
</div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue