From 92391c88133543fb87ad426082bc8831002588bf Mon Sep 17 00:00:00 2001
From: Karan Nayak <nayakaran@gmail.com>
Date: Thu, 19 Oct 2023 16:03:29 +1300
Subject: [PATCH 1/5] Fixed typo in Ecology options

---
 components/formset_basic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/formset_basic.vue b/components/formset_basic.vue
index bcd88d3..db67683 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)">
-            <option value="mycorrihizal">Mycorrihizal</option>
+            <option value="mycorrhizal">Mycorrhizal</option>
             <option value="saprotrophic">Saprotrophic</option>
             <option value="parasitic">Parasitic</option>
         </select>

From 1a21de088146bb9ef2aaa85304e693c434a51200 Mon Sep 17 00:00:00 2001
From: Karan Nayak <nayakaran@gmail.com>
Date: Thu, 19 Oct 2023 16:43:10 +1300
Subject: [PATCH 2/5] Fixed native field write back and changed stored ints to
 floats

---
 components/formset_basic.vue |  2 +-
 components/formset_cap.vue   |  8 ++++----
 components/formset_stipe.vue | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/formset_basic.vue b/components/formset_basic.vue
index db67683..4fdc219 100644
--- a/components/formset_basic.vue
+++ b/components/formset_basic.vue
@@ -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..fdc29bf 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')" />
 
         <label for="mush_cap_diameter_max">Max Diameter (cm)</label>
         <input
@@ -57,7 +57,7 @@
             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
@@ -65,7 +65,7 @@
             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
@@ -73,7 +73,7 @@
             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
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')" />
 
         <label for="mush_stipe_diameter_max">Max Diameter (cm)</label>
         <input
@@ -23,7 +23,7 @@
             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,7 +65,7 @@
             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
@@ -73,7 +73,7 @@
             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
@@ -81,7 +81,7 @@
             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
@@ -89,7 +89,7 @@
             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

From e1327baab4f85a3997e741887bbe45f2b6080266 Mon Sep 17 00:00:00 2001
From: Karan Nayak <nayakaran@gmail.com>
Date: Thu, 19 Oct 2023 16:48:47 +1300
Subject: [PATCH 3/5] Fixed the native field write back bug again

---
 components/formset_basic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/formset_basic.vue b/components/formset_basic.vue
index 4fdc219..b1f6fdd 100644
--- a/components/formset_basic.vue
+++ b/components/formset_basic.vue
@@ -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_or_introduced')
+        native.value = mushJSON.value['native_or_introduced']
         /* if (mushJSON.value['native_or_introduced'] == true) {
             native.value ="Native"
         } else {

From 2c6bbf73d5bcab5a9dfd1df3ac1df4581d7f586b Mon Sep 17 00:00:00 2001
From: Karan Nayak <nayakaran@gmail.com>
Date: Sat, 21 Oct 2023 09:53:46 +1300
Subject: [PATCH 4/5] Added irregular option to cap shape

---
 components/formset_cap.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/formset_cap.vue b/components/formset_cap.vue
index fdc29bf..d581d04 100644
--- a/components/formset_cap.vue
+++ b/components/formset_cap.vue
@@ -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>

From 63147cee28f6897484f2b532ad9846bdbaa0ef35 Mon Sep 17 00:00:00 2001
From: Karan Nayak <nayakaran@gmail.com>
Date: Sat, 21 Oct 2023 12:49:32 +1300
Subject: [PATCH 5/5] Updated initData to enforce all fields being initialised
 to blank

---
 assets/data/initData.js | 47 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

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