@@ -9,7 +9,15 @@ export default Component.extend({
|
||||
kredits: service(),
|
||||
|
||||
attributes: null,
|
||||
contributors: alias('kredits.contributorsSorted'),
|
||||
|
||||
contributors: computed('kredits.contributorsSorted.[]', function() {
|
||||
return this.kredits.contributorsSorted.map(c => {
|
||||
return {
|
||||
id: c.id.toString(),
|
||||
name: c.name
|
||||
}
|
||||
})
|
||||
}),
|
||||
|
||||
isValidContributor: notEmpty('contributorId'),
|
||||
isValidKind: notEmpty('kind'),
|
||||
@@ -57,6 +65,8 @@ export default Component.extend({
|
||||
|
||||
const attributes = this.getProperties(Object.keys(this.attributes));
|
||||
|
||||
attributes.contributorId = parseInt(this.contributorId);
|
||||
|
||||
let dateInput = (attributes.date instanceof Array) ?
|
||||
attributes.date[0] : attributes.date;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<p>
|
||||
<select required onchange={{action (mut this.contributorId) value="target.value"}}>
|
||||
<option value="" selected disabled hidden></option>
|
||||
{{#each @contributors as |contributor|}}
|
||||
{{#each this.contributors as |contributor|}}
|
||||
<option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
|
||||
{{/each}}
|
||||
</select>
|
||||
|
||||
@@ -24,10 +24,9 @@ export default Component.extend({
|
||||
contributors: sort('kredits.contributors', 'contributorsSorting'),
|
||||
|
||||
contributorsActive: computed('contributors.[]', 'contributions', function() {
|
||||
const activeIds = new Set(this.contributions.mapBy('contributorId')
|
||||
.map(id => id.toString()));
|
||||
const activeIds = new Set(this.contributions.mapBy('contributorId'));
|
||||
|
||||
return this.contributors.filter(c => activeIds.has(c.id.toString()));
|
||||
return this.contributors.filter(c => activeIds.has(c.id));
|
||||
}),
|
||||
|
||||
contributionKinds: computed('contributions.[]', function() {
|
||||
@@ -42,7 +41,7 @@ export default Component.extend({
|
||||
c.amount <= 500) { included = false; }
|
||||
|
||||
if (isPresent(this.contributorId) &&
|
||||
c.contributorId.toString() !== this.contributorId.toString()) { included = false; }
|
||||
c.contributorId !== parseInt(this.contributorId)) { included = false; }
|
||||
|
||||
if (isPresent(this.contributionKind) &&
|
||||
c.kind !== this.contributionKind) { included = false; }
|
||||
|
||||
Reference in New Issue
Block a user