-adjust dashboards for cashflow

-adjust learning dashboards -fix simple market causing issues with writing bids
assume-framework · Sep 28, 2023 · abe821e · abe821e
1 parent 1bd92c8
commit abe821e
Show file tree

Hide file tree

Showing 3 changed files with 300 additions and 76 deletions.
diff --git a/assume/markets/clearing_algorithms/simple.py b/assume/markets/clearing_algorithms/simple.py
@@ -123,7 +123,7 @@ def clear(
                     gen_vol -= diff
 
                     # add left over to supply_orders again
-                    supply_orders.insert(0, supply_order)
+                    # supply_orders.insert(0, supply_order)
                     demand_order["accepted_volume"] = demand_order["volume"]
                 else:
                     demand_order["accepted_volume"] = demand_order["volume"]

diff --git a/docker_configs/dashboard-definitions/ASSUME.json b/docker_configs/dashboard-definitions/ASSUME.json
@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 1,
+  "id": 2,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -406,7 +406,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 44
+        "y": 32
       },
       "id": 19,
       "options": {
@@ -611,7 +611,7 @@
         "h": 9,
         "w": 12,
         "x": 12,
-        "y": 44
+        "y": 32
       },
       "id": 20,
       "options": {
@@ -731,7 +731,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 53
+        "y": 41
       },
       "id": 74,
       "panels": [],
@@ -820,7 +820,7 @@
         "h": 12,
         "w": 10,
         "x": 0,
-        "y": 54
+        "y": 42
       },
       "id": 72,
       "options": {
@@ -954,7 +954,7 @@
         "h": 12,
         "w": 9,
         "x": 10,
-        "y": 54
+        "y": 42
       },
       "id": 76,
       "options": {
@@ -1039,7 +1039,7 @@
         "h": 12,
         "w": 5,
         "x": 19,
-        "y": 54
+        "y": 42
       },
       "id": 7,
       "options": {
@@ -1132,7 +1132,7 @@
         "h": 3,
         "w": 24,
         "x": 0,
-        "y": 66
+        "y": 54
       },
       "id": 22,
       "options": {
@@ -1187,7 +1187,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 69
+        "y": 57
       },
       "id": 41,
       "panels": [],
@@ -1259,7 +1259,7 @@
         "h": 9,
         "w": 18,
         "x": 0,
-        "y": 70
+        "y": 58
       },
       "id": 24,
       "options": {
@@ -1376,7 +1376,7 @@
         "h": 9,
         "w": 6,
         "x": 18,
-        "y": 70
+        "y": 58
       },
       "id": 26,
       "options": {
@@ -1533,7 +1533,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 79
+        "y": 67
       },
       "id": 70,
       "options": {
@@ -1798,7 +1798,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 79
+        "y": 67
       },
       "id": 78,
       "options": {
@@ -1982,7 +1982,7 @@
         "h": 9,
         "w": 24,
         "x": 0,
-        "y": 87
+        "y": 75
       },
       "id": 82,
       "options": {
@@ -2009,7 +2009,7 @@
             "type": "postgres",
             "uid": "P7B13B9DF907EC40C"
           },
-          "format": "table",
+          "format": "time_series",
           "group": [],
           "metricColumn": "none",
           "rawQuery": true,
@@ -2079,7 +2079,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 96
+        "y": 84
       },
       "id": 39,
       "panels": [],
@@ -2148,7 +2148,7 @@
         "h": 9,
         "w": 18,
         "x": 0,
-        "y": 97
+        "y": 85
       },
       "id": 36,
       "options": {
@@ -2264,7 +2264,7 @@
         "h": 9,
         "w": 6,
         "x": 18,
-        "y": 97
+        "y": 85
       },
       "id": 37,
       "options": {
@@ -2395,7 +2395,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 106
+        "y": 94
       },
       "id": 89,
       "options": {
@@ -2603,7 +2603,7 @@
         "h": 9,
         "w": 12,
         "x": 12,
-        "y": 106
+        "y": 94
       },
       "id": 90,
       "options": {
@@ -2788,7 +2788,7 @@
         "h": 9,
         "w": 24,
         "x": 0,
-        "y": 115
+        "y": 103
       },
       "id": 86,
       "options": {
@@ -2884,7 +2884,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 124
+        "y": 112
       },
       "id": 44,
       "panels": [],
@@ -2936,7 +2936,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -2952,7 +2953,7 @@
         "h": 9,
         "w": 18,
         "x": 0,
-        "y": 125
+        "y": 113
       },
       "id": 65,
       "options": {
@@ -3052,7 +3053,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3067,7 +3069,7 @@
         "h": 9,
         "w": 6,
         "x": 18,
-        "y": 125
+        "y": 113
       },
       "id": 47,
       "options": {
@@ -3167,7 +3169,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3183,7 +3186,7 @@
         "h": 9,
         "w": 24,
         "x": 0,
-        "y": 134
+        "y": 122
       },
       "id": 80,
       "options": {
@@ -3303,7 +3306,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3332,7 +3336,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 143
+        "y": 131
       },
       "id": 91,
       "options": {
@@ -3495,7 +3499,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3539,7 +3544,7 @@
         "h": 9,
         "w": 12,
         "x": 12,
-        "y": 143
+        "y": 131
       },
       "id": 92,
       "options": {
@@ -3691,7 +3696,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3723,7 +3729,7 @@
         "h": 9,
         "w": 24,
         "x": 0,
-        "y": 152
+        "y": 140
       },
       "id": 84,
       "options": {
@@ -3822,7 +3828,7 @@
     "list": [
       {
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "example_01a_base",
           "value": "example_01a_base"
         },
@@ -3979,6 +3985,6 @@
   "timezone": "",
   "title": "ASSUME: Main overview",
   "uid": "mQ3Lvkr4k",
-  "version": 3,
+  "version": 2,
   "weekStart": ""
 }