Merge pull request #10 from kloudsoft91/fix-mycorrhizal-typo

Fixed typo in Ecology options
kloudsoft91 · Oct 21, 2023 · 2921547 · 2921547
2 parents 7203025 + 63147ce
commit 2921547
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 16 deletions.
diff --git 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": ""
+    }
 }
diff --git a/components/formset_basic.vue b/components/formset_basic.vue
@@ -88,7 +88,7 @@
             class="form-input"
             v-model="ecology"
             @change="addMushKey('ecology', ecology)">
-            <option value="mycorrihizal">Mycorrihizal</option>
+            <option value="mycorrhizal">Mycorrhizal</option>
             <option value="saprotrophic">Saprotrophic</option>
             <option value="parasitic">Parasitic</option>
         </select>
@@ -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
@@ -49,31 +49,31 @@
             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')" />
 
         <label for="mush_cap_diameter_max">Max Diameter (cm)</label>
         <input
             type="text"
             id="mush_cap_diameter_max"
             class="form-input"
             v-model="capDiaMax"
-            @change="addMushKey('cap_features', parseInt(capDiaMax), 'diameter_max')" />
+            @change="addMushKey('cap_features', parseFloat(capDiaMax), 'diameter_max')" />
 
         <label for="mush_cap_thickness_min">Min Thickness (cm)</label>
         <input
             type="text"
             id="mush_cap_thickness_min"
             class="form-input"
             v-model="capThcMin"
-            @change="addMushKey('cap_features', parseInt(capThcMin), 'thickness_min')" />
+            @change="addMushKey('cap_features', parseFloat(capThcMin), 'thickness_min')" />
 
         <label for="mush_cap_thickness_max">Max Thickness (cm)</label>
         <input
             type="text"
             id="mush_cap_thickness_max"
             class="form-input"
             v-model="capThcMax"
-            @change="addMushKey('cap_features', parseInt(capThcMax), 'thickness_max')" />
+            @change="addMushKey('cap_features', parseFloat(capThcMax), 'thickness_max')" />
 
         <label for="mush_cap_texture">Texture</label>
         <input
@@ -101,6 +101,7 @@
                 <option value="offset">Offset</option>
                 <option value="ovate">Ovate</option>
                 <option value="umbillicate">Umbillicate</option>
+                <option value="irregular">Irregular</option>
         </select>
     </fieldset>
 </template>

diff --git a/components/formset_stipe.vue b/components/formset_stipe.vue
@@ -15,15 +15,15 @@
             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')" />
 
         <label for="mush_stipe_diameter_max">Max Diameter (cm)</label>
         <input
             type="text"
             id="mush_stipe_diameter_max"
             class="form-input"
             v-model="stipeDiaMax"
-            @change="addMushKey('stipe_features', parseInt(stipeDiaMax), 'diameter_max')" />
+            @change="addMushKey('stipe_features', parseFloat(stipeDiaMax), 'diameter_max')" />
 
         <label for="mush_stipe_colour">Stipe Colour</label>
         <select
@@ -65,31 +65,31 @@
             id="mush_stipe_length_min"
             class="form-input"
             v-model="stipeLenMin"
-            @change="addMushKey('stipe_features', parseInt(stipeLenMin), 'length_min')" />
+            @change="addMushKey('stipe_features', parseFloat(stipeLenMin), 'length_min')" />
 
         <label for="mush_stipe_length_max">Max Length (cm)</label>
         <input
             type="text"
             id="mush_stipe_length_max"
             class="form-input"
             v-model="stipeLenMax"
-            @change="addMushKey('stipe_features', parseInt(stipeLenMax), 'length_max')" />
+            @change="addMushKey('stipe_features', parseFloat(stipeLenMax), 'length_max')" />
 
         <!-- <label for="mush_stipe_height_min">Min Height (mm)</label>
         <input
             type="text"
             id="mush_stipe_height_min"
             class="form-input"
             v-model="stipeHgtMin"
-            @change="addMushKey('stipe_features', parseInt(stipeHgtMin), 'height_min')" />
+            @change="addMushKey('stipe_features', parseFloat(stipeHgtMin), 'height_min')" />
 
         <label for="mush_stipe_height_max">Max Height (mm)</label>
         <input
             type="text"
             id="mush_stipe_height_max"
             class="form-input"
             v-model="stipeHgtMax"
-            @change="addMushKey('stipe_features', parseInt(stipeHgtMax), 'height_max')" /> -->
+            @change="addMushKey('stipe_features', parseFloat(stipeHgtMax), 'height_max')" /> -->
 
         <label for="mush_stipe_bruise_colour">Bruising Colour</label>
         <select