From 3de9794106fe898e60c235f84872692254ffb3fc Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Fri, 24 Apr 2015 08:24:07 -0800
Subject: [PATCH] Rename genbank and accession
---
app/models/strain.js | 4 ++--
app/templates/strains/show.hbs | 6 +++---
server/mocks/strains.js | 28 ++++++++++++----------------
3 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/app/models/strain.js b/app/models/strain.js
index f73278e..16ccb4d 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -6,8 +6,8 @@ export default DS.Model.extend({
speciesName: DS.attr('string'),
strainName: DS.attr('string'),
typeStrain: DS.attr('boolean'),
- accessionBanks: DS.attr('string'),
- genbankEmblDdb: DS.attr('string'),
+ accessionNumbers: DS.attr('string'),
+ genbank: DS.attr('string'),
isolatedFrom: DS.attr('string'),
notes: DS.attr('string'),
createdAt: DS.attr('date'),
diff --git a/app/templates/strains/show.hbs b/app/templates/strains/show.hbs
index c2d2e8f..c33b795 100644
--- a/app/templates/strains/show.hbs
+++ b/app/templates/strains/show.hbs
@@ -16,12 +16,12 @@
{{! ROW 2 }}
<div class="grid-4">
<dl class="span-2">
- <dt>Accession Banks</dt>
- <dd>{{model.accessionBanks}}</dd>
+ <dt>Accession Numbers</dt>
+ <dd>{{model.accessionNumbers}}</dd>
</dl>
<dl class="span-2">
<dt>Genbank</dt>
- <dd>{{model.genbankEmblDdb}}</dd>
+ <dd>{{model.genbank}}</dd>
</dl>
</div>
{{! ROW 3 }}
diff --git a/server/mocks/strains.js b/server/mocks/strains.js
index 1a29aaa..e4fbe4c 100644
--- a/server/mocks/strains.js
+++ b/server/mocks/strains.js
@@ -8,68 +8,64 @@ module.exports = function(app) {
speciesName: "Species One",
strainName: "ABC",
typeStrain: true,
- etymology: "Test Etymology",
- accessionBanks: "Test Accession",
- genbankEmblDdb: "Test Genbank",
+ accessionNumbers: "Test Accession",
+ genbank: "Test Genbank",
isolatedFrom: "Location 1",
measurements: [1,2,3,4,5],
createdAt: "0001-01-01T00:00:00Z",
updatedAt: "0001-01-01T00:00:00Z",
deletedAt: null,
author: 1,
- notes: "Test notes",
totalMeasurements: 5,
+ notes: "Test notes",
},
{
id: 2,
speciesName: "Species Two",
strainName: "XYZ",
typeStrain: false,
- etymology: "Test Etymology",
- accessionBanks: "Test Accession",
- genbankEmblDdb: "Test Genbank",
+ accessionNumbers: "Test Accession",
+ genbank: "Test Genbank",
isolatedFrom: "Location 2",
measurements: [6,7,8,9,10],
createdAt: "0001-01-01T00:00:00Z",
updatedAt: "0001-01-01T00:00:00Z",
deletedAt: null,
- notes: "Test notes",
author: 3,
totalMeasurements: 5,
+ notes: "Test notes",
},
{
id: 3,
speciesName: "Species Three",
strainName: "QRS",
typeStrain: true,
- etymology: "Test Etymology",
- accessionBanks: "Test Accession",
- genbankEmblDdb: "Test Genbank",
+ accessionNumbers: "Test Accession",
+ genbank: "Test Genbank",
isolatedFrom: "Location 1",
measurements: [],
createdAt: "0001-01-01T00:00:00Z",
updatedAt: "0001-01-01T00:00:00Z",
- notes: "Test notes",
deletedAt: null,
author: 1,
totalMeasurements: 0,
+ notes: "Test notes",
},
{
id: 4,
speciesName: "Species Four",
strainName: "LMN",
typeStrain: true,
- etymology: "Test Etymology",
- accessionBanks: "Test Accession",
- genbankEmblDdb: "Test Genbank",
+ accessionNumbers: "Test Accession",
+ genbank: "Test Genbank",
isolatedFrom: "Location 2",
measurements: [],
createdAt: "0001-01-01T00:00:00Z",
- notes: "Test notes",
updatedAt: "0001-01-01T00:00:00Z",
deletedAt: null,
author: 3,
totalMeasurements: 0,
+ notes: "Test notes",
}
];