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

sort order

Browse source
This commit is contained in:
Matthew Dillon 2015-06-18 10:33:21 -08:00
parent 84cf7817bb
commit 0a73b347f9
12 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/characteristic-type.js
View file

@ -8,5 +8,6 @@ export default DS.Model.extend({
deletedAt: DS.attr('date'), deletedAt: DS.attr('date'),
createdBy: DS.attr('number'), createdBy: DS.attr('number'),
updatedBy: DS.attr('number'), updatedBy: DS.attr('number'),
deletedBy: DS.attr('number') deletedBy: DS.attr('number'),
sortOrder: DS.attr('number'),
}); });

3
app/models/characteristic.js
View file

@ -10,5 +10,6 @@ export default DS.Model.extend({
deletedAt : DS.attr('date'), deletedAt : DS.attr('date'),
createdBy : DS.attr('number'), createdBy : DS.attr('number'),
updatedBy : DS.attr('number'), updatedBy : DS.attr('number'),
deletedBy : DS.attr('number') deletedBy : DS.attr('number'),
sortOrder : DS.attr('number'),
}); });

1
app/models/species.js
View file

@ -15,6 +15,7 @@ export default DS.Model.extend({
createdBy : DS.attr('number'), createdBy : DS.attr('number'),
updatedBy : DS.attr('number'), updatedBy : DS.attr('number'),
deletedBy : DS.attr('number'), deletedBy : DS.attr('number'),
sortOrder : DS.attr('number'),
speciesNameMU: function() { speciesNameMU: function() {
return Ember.String.htmlSafe(`<em>${this.get('speciesName')}</em>`); return Ember.String.htmlSafe(`<em>${this.get('speciesName')}</em>`);

1
app/models/strain.js
View file

@ -17,6 +17,7 @@ export default DS.Model.extend({
updatedBy : DS.attr('number'), updatedBy : DS.attr('number'),
deletedBy : DS.attr('number'), deletedBy : DS.attr('number'),
totalMeasurements: 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>' : '';

2
app/pods/characteristics/route.js
View file

@ -16,6 +16,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
controller.set('model', models.characteristics); controller.set('model', models.characteristics);
controller.set('tableAttrs', tableAttrs); controller.set('tableAttrs', tableAttrs);
controller.set('row', 'characteristic-index-row'); controller.set('row', 'characteristic-index-row');
controller.set('sort', ['characteristicName']); controller.set('sort', ['characteristicType.characteristicTypeName', 'sortOrder']);
}, },
}); });

4
app/pods/components/measurement-search-panel/component.js
View file

@ -23,10 +23,10 @@ export default Ember.Component.extend({
models[item.model] = models[item.model].filter((i) => { models[item.model] = models[item.model].filter((i) => {
if (!Ember.isEmpty(i.get(item.children))) { return true; } if (!Ember.isEmpty(i.get(item.children))) { return true; }
}); });
models[item.model] = models[item.model].sortBy(item.text); models[item.model] = models[item.model].sortBy('sortOrder');
let temp = models[item.model].map((data) => { let temp = models[item.model].map((data) => {
let temp_children = []; let temp_children = [];
let sorted_children = data.get(item.children).sortBy(item.ctext); let sorted_children = data.get(item.children).sortBy('sortOrder');
sorted_children.forEach((child) => { sorted_children.forEach((child) => {
temp_children.push({id: child.get(item.cid), text: child.get(item.ctext)}); temp_children.push({id: child.get(item.cid), text: child.get(item.ctext)});
}); });

2
app/pods/species/index/route.js
View file

@ -13,6 +13,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
controller.set('model', model); controller.set('model', model);
controller.set('tableAttrs', tableAttrs); controller.set('tableAttrs', tableAttrs);
controller.set('row', 'species-index-row'); controller.set('row', 'species-index-row');
controller.set('sort', ['speciesName']); controller.set('sort', ['sortOrder']);
}, },
}); });

2
app/pods/strains/index/route.js
View file

@ -13,6 +13,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
controller.set('model', model); controller.set('model', model);
controller.set('tableAttrs', tableAttrs); controller.set('tableAttrs', tableAttrs);
controller.set('row', 'strain-index-row'); controller.set('row', 'strain-index-row');
controller.set('sort', ['fullNameMU']); controller.set('sort', ['sortOrder']);
}, },
}); });

9
server/mocks/characteristic-types.js
View file

@ -12,7 +12,8 @@ module.exports = function(app) {
deletedAt: null, deletedAt: null,
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null deletedBy: null,
sortOrder: 1,
}, },
{ {
id: 2, id: 2,
@ -23,7 +24,8 @@ module.exports = function(app) {
deletedAt: null, deletedAt: null,
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null deletedBy: null,
sortOrder: 2,
}, },
{ {
id: 3, id: 3,
@ -34,7 +36,8 @@ module.exports = function(app) {
deletedAt: null, deletedAt: null,
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null deletedBy: null,
sortOrder: 3,
}, },
] ]

15
server/mocks/characteristics.js
View file

@ -14,7 +14,8 @@ module.exports = function(app) {
deletedAt: null, deletedAt: null,
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null deletedBy: null,
sortOrder: 1,
}, },
{ {
id: 2, id: 2,
@ -27,7 +28,8 @@ module.exports = function(app) {
deletedAt: null, deletedAt: null,
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null deletedBy: null,
sortOrder: 2,
}, },
{ {
id: 3, id: 3,
@ -40,7 +42,8 @@ module.exports = function(app) {
deletedAt: null, deletedAt: null,
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null deletedBy: null,
sortOrder: 3,
}, },
{ {
id: 4, id: 4,
@ -53,7 +56,8 @@ module.exports = function(app) {
deletedAt: null, deletedAt: null,
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null deletedBy: null,
sortOrder: 4,
}, },
{ {
id: 5, id: 5,
@ -66,7 +70,8 @@ module.exports = function(app) {
deletedAt: null, deletedAt: null,
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null deletedBy: null,
sortOrder: 5,
} }
] ]

4
server/mocks/species.js
View file

@ -17,6 +17,7 @@ module.exports = function(app) {
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null, deletedBy: null,
sortOrder: 1,
}, },
{ {
id: 2, id: 2,
@ -32,6 +33,7 @@ module.exports = function(app) {
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null, deletedBy: null,
sortOrder: 2,
}, },
{ {
id: 3, id: 3,
@ -47,6 +49,7 @@ module.exports = function(app) {
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null, deletedBy: null,
sortOrder: 3,
}, },
{ {
id: 4, id: 4,
@ -62,6 +65,7 @@ module.exports = function(app) {
createdBy: 1, createdBy: 1,
updatedBy: 1, updatedBy: 1,
deletedBy: null, deletedBy: null,
sortOrder: 4,
} }
]; ];

4
server/mocks/strains.js
View file

@ -20,6 +20,7 @@ module.exports = function(app) {
deletedBy: null, deletedBy: null,
totalMeasurements: 5, totalMeasurements: 5,
notes: "Test notes", notes: "Test notes",
sortOrder: 1,
}, },
{ {
id: 2, id: 2,
@ -38,6 +39,7 @@ module.exports = function(app) {
deletedBy: null, deletedBy: null,
totalMeasurements: 5, totalMeasurements: 5,
notes: "Test notes", notes: "Test notes",
sortOrder: 2,
}, },
{ {
id: 3, id: 3,
@ -56,6 +58,7 @@ module.exports = function(app) {
deletedBy: null, deletedBy: null,
totalMeasurements: 0, totalMeasurements: 0,
notes: "Test notes", notes: "Test notes",
sortOrder: 3,
}, },
{ {
id: 4, id: 4,
@ -74,6 +77,7 @@ module.exports = function(app) {
deletedBy: null, deletedBy: null,
totalMeasurements: 0, totalMeasurements: 0,
notes: "Test notes", notes: "Test notes",
sortOrder: 4.
} }
]; ];