diff --git a/assets/data/initData.js b/assets/data/initData.js index 45f4ffb..296cbf6 100644 --- a/assets/data/initData.js +++ b/assets/data/initData.js @@ -1,6 +1,45 @@ export default { - id: 0, - stipe_features: {}, - gills: {}, - cap_features: {} + "id": 0, + "tags": [], + "common_names": [], + "latin_names": [], + "maori_names": [], + "genus": "", + "description": "", + "lookalikes": [], + "lookalikes_description": "", + "links": [], + "nz_books": [], + "edibility": "", + "ecology": "", + "environment": "", + "time_of_year": [], + "native_or_introduced": "", + "photos": [], + "cap_features": { + "description": "", + "colour": [], + "diameter_min": null, + "diameter_max": null, + "thickness_min": null, + "thickness_max": null, + "texture": "", + "shape": [] + }, + "gills": { + "description": "", + "colour": [], + "attachment": "", + "spore_colour": "" + }, + "stipe_features": { + "description": "", + "diameter_min": null, + "diameter_max": null, + "colour": [], + "length_min": null, + "length_max": null, + "bruising_colour": "na", + "type": "" + } } \ No newline at end of file diff --git a/components/formset_basic.vue b/components/formset_basic.vue index bcd88d3..b1f6fdd 100644 --- a/components/formset_basic.vue +++ b/components/formset_basic.vue @@ -88,7 +88,7 @@ class="form-input" v-model="ecology" @change="addMushKey('ecology', ecology)"> - + @@ -239,7 +239,7 @@ watch(mushJSON, async (newMushJSON, oldMushJSON) => { timeOfYear.value = mushJSON.value['time_of_year'] } if (mushJSON.value['native_or_introduced']) { - native.value = mushJSON.value('native') + native.value = mushJSON.value['native_or_introduced'] /* if (mushJSON.value['native_or_introduced'] == true) { native.value ="Native" } else { diff --git a/components/formset_cap.vue b/components/formset_cap.vue index d145f74..d581d04 100644 --- a/components/formset_cap.vue +++ b/components/formset_cap.vue @@ -49,7 +49,7 @@ id="mush_cap_diameter_min" class="form-input" v-model="capDiaMin" - @change="addMushKey('cap_features', parseInt(capDiaMin), 'diameter_min')" /> + @change="addMushKey('cap_features', parseFloat(capDiaMin), 'diameter_min')" /> + @change="addMushKey('cap_features', parseFloat(capDiaMax), 'diameter_max')" /> + @change="addMushKey('cap_features', parseFloat(capThcMin), 'thickness_min')" /> + @change="addMushKey('cap_features', parseFloat(capThcMax), 'thickness_max')" /> Offset + diff --git a/components/formset_stipe.vue b/components/formset_stipe.vue index ec8c46a..df42c3f 100644 --- a/components/formset_stipe.vue +++ b/components/formset_stipe.vue @@ -15,7 +15,7 @@ id="mush_stipe_diameter_min" class="form-input" v-model="stipeDiaMin" - @change="addMushKey('stipe_features', parseInt(stipeDiaMin), 'diameter_min')" /> + @change="addMushKey('stipe_features', parseFloat(stipeDiaMin), 'diameter_min')" /> + @change="addMushKey('stipe_features', parseFloat(stipeDiaMax), 'diameter_max')" /> + @change="addMushKey('stipe_features', parseFloat(stipeLenMax), 'length_max')" /> + @change="addMushKey('stipe_features', parseFloat(stipeHgtMax), 'height_max')" /> -->