From bb1410cf34617b48a65c2429bf9e27630f38c08a Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 11 Apr 2024 14:04:16 +0200
Subject: [PATCH] update: initiali implementation of dynamic bar data
 allocation

---
 app/lib/widgets/graph_data/bar_data.dart      |  31 +++-------------
 .../logs/icemodelling_2024-04-11.log          |  34 ++++++++++++++++++
 .../get_measurements.cpython-311.pyc          | Bin 4248 -> 4248 bytes
 server/map_handler/get_measurements.py        |   2 ++
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/app/lib/widgets/graph_data/bar_data.dart b/app/lib/widgets/graph_data/bar_data.dart
index bafb97f2..7ff4b683 100644
--- a/app/lib/widgets/graph_data/bar_data.dart
+++ b/app/lib/widgets/graph_data/bar_data.dart
@@ -15,24 +15,10 @@ class BarData extends StatefulWidget {
 class _BarDataState extends State<BarData> {
   static const double barWidth = 30;
 
-  // NB should be allocated values dynamically
-  /*
-  selectedTile.IceStats.asMap().forEach((index, iceStats) {
-    barData[index] = [iceStats.slushIce, iceStats.blackIce,
-                      iceStats.snowDepth, iceStats.steelIce];
-  });
-   */
-
-  // Bar items show data for 10 previous days
-  static const barData = <int, List<double>>{
-    0: [1.5, 3.2, 1.5, 2.2],
-    1: [1.8, 4.6, 2, 3.1],
-    2: [1.5, 2.1, 2.5, 1.8],
-    3: [1.5, 1, 3, 2.6],
-    4: [2, 2, 3.9, 2.3],
-    5: [1.2, 1.2, 3.3, 2.9],
-    6: [1.2, 2.3, 3.3, 3.2],
-  };
+  // Allocate bar data dynamically from selected subdivision
+  var barData = Map<int, List<double>>.from(selectedSubDiv!.iceStats.asMap().map((index, iceStats) {
+    return MapEntry(index, [iceStats.slushIce, iceStats.blackIce, iceStats.snowDepth]);
+  })); // NB should not be index, should be the date, fix 
 
   int touchedIndex = -1;
 
@@ -46,9 +32,8 @@ class _BarDataState extends State<BarData> {
       double value1,
       double value2,
       double value3,
-      double value4,
       ) {
-    final sum = value1 + value2 + value3 + value4;
+    final sum = value1 + value2 + value3;
     final isTouched = touchedIndex == x;
     return BarChartGroupData(
       x: x,
@@ -77,11 +62,6 @@ class _BarDataState extends State<BarData> {
               value1 + value2 + value3,
               const Color(0xFF3766E0),
             ),
-            BarChartRodStackItem(
-              value1 + value2 + value3,
-              value1 + value2 + value3 + value4,
-              Colors.white60,
-            ),
           ],
         ),
       ],
@@ -187,7 +167,6 @@ class _BarDataState extends State<BarData> {
                       e.value[0],
                       e.value[1],
                       e.value[2],
-                      e.value[3],
                     ),
                   ).toList(),
                 ),
diff --git a/server/ModelFromNVE/logs/icemodelling_2024-04-11.log b/server/ModelFromNVE/logs/icemodelling_2024-04-11.log
index b1589360..ee9d6d5f 100644
--- a/server/ModelFromNVE/logs/icemodelling_2024-04-11.log
+++ b/server/ModelFromNVE/logs/icemodelling_2024-04-11.log
@@ -42,3 +42,37 @@
 13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
 13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
 13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:38: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+14:00: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
diff --git a/server/map_handler/__pycache__/get_measurements.cpython-311.pyc b/server/map_handler/__pycache__/get_measurements.cpython-311.pyc
index 1535b8fd5611f1843b85ccc7fb383e8309e8ec88..345aae043a5b137df043e0198456ce0a4f1e6169 100644
GIT binary patch
delta 66
zcmbQCI75+lIWI340}uqB7EgP*kyo6XF?q8pcNrt2+U7YtRZNT}o5lIv7=>~e8I3+L
LAdzvC^93{kHn|a5

delta 66
zcmbQCI75+lIWI340}!k^A)a<(Bd<6&W8!92?lMM3rOk7As+bsyHjDGSF$!fdG8%ng
MKq8|i=L={806`BCegFUf

diff --git a/server/map_handler/get_measurements.py b/server/map_handler/get_measurements.py
index 307a7336..dcca78cd 100644
--- a/server/map_handler/get_measurements.py
+++ b/server/map_handler/get_measurements.py
@@ -81,6 +81,8 @@ def get_measurements(self, cursor, lake_name):
                     'Subdivisions': [sub_division],  # Array of sub_division objects
                 }
 
+        # Add remaining stuff
+
         # NB remember to clos file after implementation
         # f.close()
 
-- 
GitLab