From ed8956252bb248587780a659994ad1fc81fcc6b1 Mon Sep 17 00:00:00 2001
From: "Wortman, Elliot (UG - Comp Sci & Elec Eng)" <ew00710@surrey.ac.uk>
Date: Wed, 6 Dec 2023 15:02:57 +0000
Subject: [PATCH] Use real acceptable ranges for value indicators

---
 app.py                       | 12 ++++++------
 src/components/ValueTabs.vue | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app.py b/app.py
index 4fa320f..fe23338 100644
--- a/app.py
+++ b/app.py
@@ -20,14 +20,14 @@ def values():
 @app.route("/past-values")
 def pastValues():
     past_values = {"npkData": {
-        "nitrogen": [120, 118, 119, 121, 120, 122, 120],
-        "phosphorus": [110, 112, 111, 113, 110, 112, 111],
-        "potassium": [115, 116, 117, 115, 114, 116, 117]
+        "nitrogen": [40, 60, 55, 80, 48, 18, 43],
+        "phosphorus": [36, 20, 8, 42, 87, 77, 111],
+        "potassium": [90, 100, 160, 183, 200, 120, 99]
     },
         "thmData": {
-        "temperature": [18, 19, 20, 18, 17, 18, 19],
-        "humidity": [50, 52, 53, 50, 49, 51, 52],
-        "moisture": [40, 42, 45, 43, 41, 40, 44]
+        "temperature": [18, 19, 20, 24, 28, 15, 19],
+        "humidity": [50, 52, 53, 50, 46, 51, 54],
+        "moisture": [55, 50, 44, 52, 57, 55, 49]
     }}
     return jsonify(past_values)
 
diff --git a/src/components/ValueTabs.vue b/src/components/ValueTabs.vue
index 82c43d0..5c4f5d7 100644
--- a/src/components/ValueTabs.vue
+++ b/src/components/ValueTabs.vue
@@ -6,9 +6,11 @@ export default {
   data() {
     return {
       values: { 0: { N: 0 }, 1: { P: 0 }, 2: { K: 0 }, 3: { T: 0 }, 4: { H: 0 }, 5: { M: 0 } },
-      rangeNPK: [80, 100, 150, 170],
-      rangeT: [12, 15, 22, 25],
-      rangeHM: [30, 40, 60, 70],
+      rangeN: [20, 50, 70, 350],
+      rangeP: [9, 14, 150, 200],
+      rangeK: [100, 180, 600, 800],
+      rangeT: [6, 10, 12, 27],
+      rangeHM: [15, 50, 70, 85],
     }
   },
   mounted() {
@@ -45,25 +47,25 @@ export default {
       <div class="valueBox">
         Nitrogen (N):&nbsp;
         <li class="list-group-item"
-          v-bind:class="getClass(values[0].N, this.rangeNPK[0], this.rangeNPK[1], this.rangeNPK[2], this.rangeNPK[3])"
+          v-bind:class="getClass(values[0].N, this.rangeN[0], this.rangeN[1], this.rangeN[2], this.rangeN[3])"
           data-bs-toggle="tooltip"
-          :data-bs-title="'Ideal conditions: ' + this.rangeNPK[1] + '-' + this.rangeNPK[2] + ' ppm'">{{
+          :data-bs-title="'Ideal conditions: ' + this.rangeN[1] + '-' + this.rangeN[2] + ' ppm'">{{
             values[0].N }} ppm</li>
       </div>
       <div class="valueBox">
         Phosphorus (P):&nbsp;
         <li class="list-group-item"
-          v-bind:class="getClass(values[1].P, this.rangeNPK[0], this.rangeNPK[1], this.rangeNPK[2], this.rangeNPK[3])"
+          v-bind:class="getClass(values[1].P, this.rangeP[0], this.rangeP[1], this.rangeP[2], this.rangeP[3])"
           data-bs-toggle="tooltip"
-          :data-bs-title="'Ideal conditions: ' + this.rangeNPK[1] + '-' + this.rangeNPK[2] + ' ppm'">{{
+          :data-bs-title="'Ideal conditions: ' + this.rangeP[1] + '-' + this.rangeP[2] + ' ppm'">{{
             values[1].P }} ppm</li>
       </div>
       <div class="valueBox">
         Potassium (K):&nbsp;
         <li class="list-group-item"
-          v-bind:class="getClass(values[2].K, this.rangeNPK[0], this.rangeNPK[1], this.rangeNPK[2], this.rangeNPK[3])"
+          v-bind:class="getClass(values[2].K, this.rangeK[0], this.rangeK[1], this.rangeK[2], this.rangeK[3])"
           data-bs-toggle="tooltip"
-          :data-bs-title="'Ideal conditions: ' + this.rangeNPK[1] + '-' + this.rangeNPK[2] + ' ppm'">{{
+          :data-bs-title="'Ideal conditions: ' + this.rangeK[1] + '-' + this.rangeK[2] + ' ppm'">{{
             values[2].K }} ppm</li>
       </div>
       <div class="valueBox">
-- 
GitLab