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

Linting

Browse source
This commit is contained in:
Matthew Dillon 2015-11-12 05:54:18 -07:00
parent aeb3206fd9
commit 21e0e6c624
10 changed files with 112 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/models/characteristic.js
View file

@ -1,14 +1,16 @@
import DS from 'ember-data'; import DS from 'ember-data';
export default DS.Model.extend({ const { Model, attr, hasMany } = DS;
characteristicName : DS.attr('string'),
characteristicTypeName: DS.attr('string'), export default Model.extend({
strains : DS.hasMany('strain', { async: false }), characteristicName : attr('string'),
measurements : DS.hasMany('measurements', { async: false }), characteristicTypeName: attr('string'),
createdAt : DS.attr('date'), strains : hasMany('strain', { async: false }),
updatedAt : DS.attr('date'), measurements : hasMany('measurements', { async: false }),
createdBy : DS.attr('number'), createdAt : attr('date'),
updatedBy : DS.attr('number'), updatedAt : attr('date'),
sortOrder : DS.attr('number'), createdBy : attr('number'),
canEdit : DS.attr('boolean'), updatedBy : attr('number'),
sortOrder : attr('number'),
canEdit : attr('boolean'),
}); });

26
app/models/measurement.js
View file

@ -1,15 +1,17 @@
import DS from 'ember-data'; import DS from 'ember-data';
export default DS.Model.extend({ const { Model, belongsTo, attr } = DS;
strain : DS.belongsTo('strain', { async: false }),
characteristic : DS.belongsTo('characteristic', { async: false }), export default Model.extend({
value : DS.attr('string'), strain : belongsTo('strain', { async: false }),
confidenceInterval : DS.attr('number'), characteristic : belongsTo('characteristic', { async: false }),
unitType : DS.attr('string'), value : attr('string'),
notes : DS.attr('string'), confidenceInterval : attr('number'),
testMethod : DS.attr('string'), unitType : attr('string'),
createdAt : DS.attr('date'), notes : attr('string'),
updatedAt : DS.attr('date'), testMethod : attr('string'),
createdBy : DS.attr('number'), createdAt : attr('date'),
updatedBy : DS.attr('number'), updatedAt : attr('date'),
createdBy : attr('number'),
updatedBy : attr('number'),
}); });

29
app/models/species.js
View file

@ -2,20 +2,23 @@ import DS from 'ember-data';
import config from '../config/environment'; import config from '../config/environment';
import Ember from 'ember'; import Ember from 'ember';
export default DS.Model.extend({ const { Model, attr, hasMany } = DS;
speciesName : DS.attr('string'),
typeSpecies : DS.attr('boolean'),
etymology : DS.attr('string'),
genusName : DS.attr('string', { defaultValue: config.APP.genus }),
strains : DS.hasMany('strain', { async: false }),
totalStrains: DS.attr('number'),
createdAt : DS.attr('date'),
updatedAt : DS.attr('date'),
createdBy : DS.attr('number'),
updatedBy : DS.attr('number'),
sortOrder : DS.attr('number'),
canEdit : DS.attr('boolean'),
export default Model.extend({
speciesName : attr('string'),
typeSpecies : attr('boolean'),
etymology : attr('string'),
genusName : attr('string', { defaultValue: config.APP.genus }),
strains : hasMany('strain', { async: false }),
totalStrains: attr('number'),
createdAt : attr('date'),
updatedAt : attr('date'),
createdBy : attr('number'),
updatedBy : attr('number'),
sortOrder : attr('number'),
canEdit : attr('boolean'),
// TODO: move this to component/helper
speciesNameMU: function() { speciesNameMU: function() {
return Ember.String.htmlSafe(`<em>${this.get('speciesName')}</em>`); return Ember.String.htmlSafe(`<em>${this.get('speciesName')}</em>`);
}.property('speciesName').readOnly(), }.property('speciesName').readOnly(),

41
app/models/strain.js
View file

@ -1,34 +1,39 @@
import DS from 'ember-data'; import DS from 'ember-data';
import Ember from 'ember'; import Ember from 'ember';
export default DS.Model.extend({ const { Model, hasMany, belongsTo, attr } = DS;
measurements : DS.hasMany('measurements', { async: false }),
characteristics : DS.hasMany('characteristics', { async: false }),
species : DS.belongsTo('species', { async: false }),
strainName : DS.attr('string'),
typeStrain : DS.attr('boolean'),
accessionNumbers : DS.attr('string'),
genbank : DS.attr('string'),
wholeGenomeSequence: DS.attr('string'),
isolatedFrom : DS.attr('string'),
notes : DS.attr('string'),
createdAt : DS.attr('date'),
updatedAt : DS.attr('date'),
createdBy : DS.attr('number'),
updatedBy : DS.attr('number'),
totalMeasurements : DS.attr('number'),
sortOrder : DS.attr('number'),
canEdit : DS.attr('boolean'),
export default Model.extend({
measurements : hasMany('measurements', { async: false }),
characteristics : hasMany('characteristics', { async: false }),
species : belongsTo('species', { async: false }),
strainName : attr('string'),
typeStrain : attr('boolean'),
accessionNumbers : attr('string'),
genbank : attr('string'),
wholeGenomeSequence: attr('string'),
isolatedFrom : attr('string'),
notes : attr('string'),
createdAt : attr('date'),
updatedAt : attr('date'),
createdBy : attr('number'),
updatedBy : attr('number'),
totalMeasurements : attr('number'),
sortOrder : attr('number'),
canEdit : attr('boolean'),
// TODO: move this to component/helper
strainNameMU: function() { strainNameMU: function() {
let type = this.get('typeStrain') ? '<sup>T</sup>' : ''; let type = this.get('typeStrain') ? '<sup>T</sup>' : '';
return Ember.String.htmlSafe(`${this.get('strainName')}${type}`); return Ember.String.htmlSafe(`${this.get('strainName')}${type}`);
}.property('strainName', 'typeStrain').readOnly(), }.property('strainName', 'typeStrain').readOnly(),
// TODO: move this to component/helper
fullName: Ember.computed('species', 'strainName', function() { fullName: Ember.computed('species', 'strainName', function() {
return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`; return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;
}), }),
// TODO: move this to component/helper
fullNameMU: function() { fullNameMU: function() {
return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainNameMU')}`); return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainNameMU')}`);
}.property('species', 'strainNameMU').readOnly(), }.property('species', 'strainNameMU').readOnly(),

41
app/models/user.js
View file

@ -1,29 +1,32 @@
import Ember from 'ember'; import Ember from 'ember';
import DS from 'ember-data'; import DS from 'ember-data';
export default DS.Model.extend({ const { Model, attr } = DS;
email : DS.attr('string'), const { computed } = Ember;
password : DS.attr('string'),
name : DS.attr('string'),
role : DS.attr('string'),
canEdit : DS.attr('boolean'),
createdAt: DS.attr('date'),
updatedAt: DS.attr('date'),
isAdmin: function() { export default Model.extend({
email : attr('string'),
password : attr('string'),
name : attr('string'),
role : attr('string'),
canEdit : attr('boolean'),
createdAt: attr('date'),
updatedAt: attr('date'),
isAdmin: computed('role', function() {
return this.get('role') === 'A'; return this.get('role') === 'A';
}.property('role'), }),
isWriter: function() { isWriter: computed('role', function() {
return this.get('role') === 'W'; return this.get('role') === 'W';
}.property('role'), }),
isReader: function() { isReader: computed('role', function() {
return this.get('role') === 'R'; return this.get('role') === 'R';
}.property('role'), }),
fullRole: function() { fullRole: computed('role', function() {
let role = this.get('role'); const role = this.get('role');
if (role === 'R') { if (role === 'R') {
return 'Read-Only'; return 'Read-Only';
} else if (role === 'W') { } else if (role === 'W') {
@ -33,13 +36,13 @@ export default DS.Model.extend({
} else { } else {
return 'Error'; return 'Error';
} }
}.property('role'), }),
canWrite: Ember.computed('role', function() { canWrite: computed('role', function() {
return this.get('role') !== 'R'; return this.get('role') !== 'R';
}), }),
metaData: Ember.computed('canWrite', function() { metaData: computed('canWrite', function() {
return { 'canAdd': this.get('canWrite') }; return { 'canAdd': this.get('canWrite') };
}), }),

4
app/pods/application/adapter.js
View file

@ -1,7 +1,9 @@
import DS from 'ember-data'; import DS from 'ember-data';
import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin'; import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
export default DS.RESTAdapter.extend(DataAdapterMixin, { const { RESTAdapter } = DS;
export default RESTAdapter.extend(DataAdapterMixin, {
authorizer: 'authorizer:application', authorizer: 'authorizer:application',
namespace: function() { namespace: function() {

6
app/pods/application/route.js
View file

@ -1,7 +1,9 @@
import Ember from 'ember'; import Ember from 'ember';
import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin'; import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
export default Ember.Route.extend(ApplicationRouteMixin, { const { Route } = Ember;
export default Route.extend(ApplicationRouteMixin, {
actions: { actions: {
invalidateSession: function() { invalidateSession: function() {
this.get('session').invalidate().then(() => { this.get('session').invalidate().then(() => {
@ -9,7 +11,5 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
return true; return true;
}); });
}, },
}, },
}); });

6
app/pods/not-found/route.js
View file

@ -1,8 +1,10 @@
import Ember from 'ember'; import Ember from 'ember';
export default Ember.Route.extend({ const { Route } = Ember;
export default Route.extend({
redirect: function() { redirect: function() {
let url = this.router.location.formatURL('/not-found'); const url = this.router.location.formatURL('/not-found');
if (window.location.pathname !== url) { if (window.location.pathname !== url) {
this.transitionTo('/not-found'); this.transitionTo('/not-found');

7
app/pods/protected/route.js
View file

@ -1,9 +1,12 @@
import Ember from 'ember'; import Ember from 'ember';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, { const { Route } = Ember;
export default Route.extend(AuthenticatedRouteMixin, {
actions: { actions: {
error: function() { error: function(err) {
console.log(err);
this.transitionTo('/not-found'); this.transitionTo('/not-found');
}, },

15
app/serializers/application.js
View file

@ -1,19 +1,22 @@
import DS from 'ember-data'; import DS from 'ember-data';
import Ember from 'ember'; import Ember from 'ember';
export default DS.RESTSerializer.extend({ const { RESTSerializer } = DS;
const { isNone } = Ember;
export default RESTSerializer.extend({
isNewSerializerAPI: true, isNewSerializerAPI: true,
serializeBelongsTo: function(snapshot, json, relationship) { serializeBelongsTo: function(snapshot, json, relationship) {
var key = relationship.key; let key = relationship.key;
var belongsTo = snapshot.belongsTo(key); const belongsTo = snapshot.belongsTo(key);
key = this.keyForRelationship ? this.keyForRelationship(key, "belongsTo", "serialize") : key; key = this.keyForRelationship ? this.keyForRelationship(key, "belongsTo", "serialize") : key;
json[key] = Ember.isNone(belongsTo) ? belongsTo : +belongsTo.record.id; json[key] = isNone(belongsTo) ? belongsTo : +belongsTo.record.id;
}, },
serializeHasMany: function(snapshot, json, relationship) { serializeHasMany: function(snapshot, json, relationship) {
var key = relationship.key; let key = relationship.key;
var hasMany = snapshot.hasMany(key); const hasMany = snapshot.hasMany(key);
key = this.keyForRelationship ? this.keyForRelationship(key, "hasMany", "serialize") : key; key = this.keyForRelationship ? this.keyForRelationship(key, "hasMany", "serialize") : key;
json[key] = []; json[key] = [];