Vacant division fixes #287
Conversation
src/views/ward-leader.vue
Outdated
| // Check for sub division id in ward leader data and add placeholder if missing | ||
| let personData = commPersons.find(c => c.id == subDivisionId) | ||
| if (personData == undefined) { | ||
| personData = JSON.parse(JSON.stringify(personDefault)) |
There was a problem hiding this comment.
I don't think we need this "deep clone"?
There was a problem hiding this comment.
oh, I see - this is for the default. could just create an object... let's talk
src/views/ward-leader.vue
Outdated
| @@ -293,6 +293,69 @@ export default { | |||
| ]), | |||
| sampleBallotFormPrefilled () { | |||
| return `${SAMPLE_BALLOT_FORM}?ward=${this.ward}&party=${this.party}` | |||
| }, | |||
| allCommitteePersons: function () { | |||
There was a problem hiding this comment.
very minor, you can write this in the short hand style like the one above:
allCommitteePersons() {
src/views/ward-leader.vue
Outdated
| // Get all divisions from ward boundaries | ||
| let allDivisions = this.wardBoundaries.features.map(x => x.properties.division) | ||
| // Default committe person data for Vacant divisions | ||
| let personDefault = function (ward, party) { |
There was a problem hiding this comment.
minor, this can be a const instead of let
There was a problem hiding this comment.
Also, if you make it an arrow function (and maybe rename as vacantPerson()) you could use this.ward and this.party instead of taking them as params and take in the division and subdivision as arguments so you could have code below more like:
committeePersonsList.push(personData || vacantPerson(subDivisionId, division, subDivision));
src/views/ward-leader.vue
Outdated
| } | ||
| let wardString = wardName.toString().padStart(2, '0') | ||
| let partyString = this.party.slice(0, 3).toUpperCase() | ||
| for (let a in allDivisions) { |
There was a problem hiding this comment.
I realize these are trivial variables, but you also use a and b as arguments in the sort below, which could lead to confusion. Maybe make the variable names a little more expressive like
for (let div in allDivisions) {
src/views/ward-leader.vue
Outdated
| return this.wardBoundaries.features.length * 2 | ||
| }, | ||
| vacanciesCount () { | ||
| let vacantDivisions = this.allCommitteePersons.filter((p) => p.fullName === 'VACANT') |
There was a problem hiding this comment.
minor, you don't need the intermediate variable I think you can just do:
return this.allCommitteePersons.filter((p) => p.fullName === 'VACANT').length;
Updates to show Vacant Divisions for all wards and only show included divisions for sub wards