strain whole genome sequence
This commit is contained in:
		
							parent
							
								
									0a73b347f9
								
							
						
					
					
						commit
						43800d6dd8
					
				
					 3 changed files with 34 additions and 18 deletions
				
			
		| 
						 | 
					@ -2,22 +2,23 @@ import DS from 'ember-data';
 | 
				
			||||||
import Ember from 'ember';
 | 
					import Ember from 'ember';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default DS.Model.extend({
 | 
					export default DS.Model.extend({
 | 
				
			||||||
  measurements     : DS.hasMany('measurements', { async: true }),
 | 
					  measurements       : DS.hasMany('measurements', { async: true }),
 | 
				
			||||||
  species          : DS.belongsTo('species', { async: true }),
 | 
					  species            : DS.belongsTo('species', { async: true }),
 | 
				
			||||||
  strainName       : DS.attr('string'),
 | 
					  strainName         : DS.attr('string'),
 | 
				
			||||||
  typeStrain       : DS.attr('boolean'),
 | 
					  typeStrain         : DS.attr('boolean'),
 | 
				
			||||||
  accessionNumbers : DS.attr('string'),
 | 
					  accessionNumbers   : DS.attr('string'),
 | 
				
			||||||
  genbank          : DS.attr('string'),
 | 
					  genbank            : DS.attr('string'),
 | 
				
			||||||
  isolatedFrom     : DS.attr('string'),
 | 
					  wholeGenomeSequence: DS.attr('string'),
 | 
				
			||||||
  notes            : DS.attr('string'),
 | 
					  isolatedFrom       : DS.attr('string'),
 | 
				
			||||||
  createdAt        : DS.attr('date'),
 | 
					  notes              : DS.attr('string'),
 | 
				
			||||||
  updatedAt        : DS.attr('date'),
 | 
					  createdAt          : DS.attr('date'),
 | 
				
			||||||
  deletedAt        : DS.attr('date'),
 | 
					  updatedAt          : DS.attr('date'),
 | 
				
			||||||
  createdBy        : DS.attr('number'),
 | 
					  deletedAt          : DS.attr('date'),
 | 
				
			||||||
  updatedBy        : DS.attr('number'),
 | 
					  createdBy          : DS.attr('number'),
 | 
				
			||||||
  deletedBy        : DS.attr('number'),
 | 
					  updatedBy          : DS.attr('number'),
 | 
				
			||||||
  totalMeasurements: DS.attr('number'),
 | 
					  deletedBy          : DS.attr('number'),
 | 
				
			||||||
  sortOrder        : DS.attr('number'),
 | 
					  totalMeasurements  : DS.attr('number'),
 | 
				
			||||||
 | 
					  sortOrder          : DS.attr('number'),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  strainNameMU: function() {
 | 
					  strainNameMU: function() {
 | 
				
			||||||
    let type = this.get('typeStrain') ? '<sup>T</sup>' : '';
 | 
					    let type = this.get('typeStrain') ? '<sup>T</sup>' : '';
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,7 +5,7 @@
 | 
				
			||||||
        {{#if isEditing}}
 | 
					        {{#if isEditing}}
 | 
				
			||||||
          {{input value=strain.strainName}}
 | 
					          {{input value=strain.strainName}}
 | 
				
			||||||
        {{else}}
 | 
					        {{else}}
 | 
				
			||||||
          <em>{{strain.strainName}}</em>
 | 
					          {{strain.strainNameMU}}
 | 
				
			||||||
        {{/if}}
 | 
					        {{/if}}
 | 
				
			||||||
        {{display-errors a=strain.errors.strainName}}
 | 
					        {{display-errors a=strain.errors.strainName}}
 | 
				
			||||||
    </legend>
 | 
					    </legend>
 | 
				
			||||||
| 
						 | 
					@ -43,7 +43,7 @@
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {{! ROW 2 }}
 | 
					    {{! ROW 2 }}
 | 
				
			||||||
    <div class="grid-4">
 | 
					    <div class="grid-6">
 | 
				
			||||||
      <dl class="span-2">
 | 
					      <dl class="span-2">
 | 
				
			||||||
        <dt>Accession Numbers</dt>
 | 
					        <dt>Accession Numbers</dt>
 | 
				
			||||||
        <dd>
 | 
					        <dd>
 | 
				
			||||||
| 
						 | 
					@ -66,6 +66,17 @@
 | 
				
			||||||
          {{display-errors a=strain.errors.genbank}}
 | 
					          {{display-errors a=strain.errors.genbank}}
 | 
				
			||||||
        </dd>
 | 
					        </dd>
 | 
				
			||||||
      </dl>
 | 
					      </dl>
 | 
				
			||||||
 | 
					      <dl class="span-2">
 | 
				
			||||||
 | 
					        <dt>Whole Genome Sequence</dt>
 | 
				
			||||||
 | 
					        <dd>
 | 
				
			||||||
 | 
					          {{#if isEditing}}
 | 
				
			||||||
 | 
					            {{input value=strain.wholeGenomeSequence}}
 | 
				
			||||||
 | 
					          {{else}}
 | 
				
			||||||
 | 
					            {{strain.wholeGenomeSequence}}
 | 
				
			||||||
 | 
					          {{/if}}
 | 
				
			||||||
 | 
					          {{display-errors a=strain.errors.wholeGenomeSequence}}
 | 
				
			||||||
 | 
					        </dd>
 | 
				
			||||||
 | 
					      </dl>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {{! ROW 3 }}
 | 
					    {{! ROW 3 }}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,6 +10,7 @@ module.exports = function(app) {
 | 
				
			||||||
      typeStrain: true,
 | 
					      typeStrain: true,
 | 
				
			||||||
      accessionNumbers: "Test Accession",
 | 
					      accessionNumbers: "Test Accession",
 | 
				
			||||||
      genbank: "Test Genbank",
 | 
					      genbank: "Test Genbank",
 | 
				
			||||||
 | 
					      wholeGenomeSequence: "Seq123",
 | 
				
			||||||
      isolatedFrom: "Location 1",
 | 
					      isolatedFrom: "Location 1",
 | 
				
			||||||
      measurements: [1,2,3,4,5],
 | 
					      measurements: [1,2,3,4,5],
 | 
				
			||||||
      createdAt: "0001-01-01T00:00:00Z",
 | 
					      createdAt: "0001-01-01T00:00:00Z",
 | 
				
			||||||
| 
						 | 
					@ -29,6 +30,7 @@ module.exports = function(app) {
 | 
				
			||||||
      typeStrain: false,
 | 
					      typeStrain: false,
 | 
				
			||||||
      accessionNumbers: "Test Accession",
 | 
					      accessionNumbers: "Test Accession",
 | 
				
			||||||
      genbank: "Test Genbank",
 | 
					      genbank: "Test Genbank",
 | 
				
			||||||
 | 
					      wholeGenomeSequence: null,
 | 
				
			||||||
      isolatedFrom: "Location 2",
 | 
					      isolatedFrom: "Location 2",
 | 
				
			||||||
      measurements: [6,7,8,9,10],
 | 
					      measurements: [6,7,8,9,10],
 | 
				
			||||||
      createdAt: "0001-01-01T00:00:00Z",
 | 
					      createdAt: "0001-01-01T00:00:00Z",
 | 
				
			||||||
| 
						 | 
					@ -48,6 +50,7 @@ module.exports = function(app) {
 | 
				
			||||||
      typeStrain: true,
 | 
					      typeStrain: true,
 | 
				
			||||||
      accessionNumbers: "Test Accession",
 | 
					      accessionNumbers: "Test Accession",
 | 
				
			||||||
      genbank: "Test Genbank",
 | 
					      genbank: "Test Genbank",
 | 
				
			||||||
 | 
					      wholeGenomeSequence: "Seq123",
 | 
				
			||||||
      isolatedFrom: "Location 1",
 | 
					      isolatedFrom: "Location 1",
 | 
				
			||||||
      measurements: [],
 | 
					      measurements: [],
 | 
				
			||||||
      createdAt: "0001-01-01T00:00:00Z",
 | 
					      createdAt: "0001-01-01T00:00:00Z",
 | 
				
			||||||
| 
						 | 
					@ -67,6 +70,7 @@ module.exports = function(app) {
 | 
				
			||||||
      typeStrain: true,
 | 
					      typeStrain: true,
 | 
				
			||||||
      accessionNumbers: "Test Accession",
 | 
					      accessionNumbers: "Test Accession",
 | 
				
			||||||
      genbank: "Test Genbank",
 | 
					      genbank: "Test Genbank",
 | 
				
			||||||
 | 
					      wholeGenomeSequence: "Seq123",
 | 
				
			||||||
      isolatedFrom: "Location 2",
 | 
					      isolatedFrom: "Location 2",
 | 
				
			||||||
      measurements: [],
 | 
					      measurements: [],
 | 
				
			||||||
      createdAt: "0001-01-01T00:00:00Z",
 | 
					      createdAt: "0001-01-01T00:00:00Z",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue