dao-treasury 0.0.32__cp311-cp311-win_amd64.whl → 0.0.33__cp311-cp311-win_amd64.whl

dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json

@@ -18,7 +18,6 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
-  "id": 5,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -71,9 +70,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -133,9 +132,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Expenses' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Expenses' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -195,9 +194,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Cost of Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Cost of Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -205,7 +204,7 @@
           ]
         }
       ],
-      "title": "Cost Of Revenue",
+      "title": "Cost of Revenue",
       "type": "stat"
     },
     {
@@ -257,9 +256,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Other Income' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Other Income' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -319,9 +318,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Other Expenses' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Other Expenses' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -382,9 +381,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "queryText": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN t.value_usd ELSE 0 END)\n  + SUM(CASE WHEN gh.top_category = 'Other Income' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Other Expenses' THEN t.value_usd ELSE 0 END)\n) AS total_net\nFROM general_ledger t\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "rawQueryText": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN t.value_usd ELSE 0 END)\n  + SUM(CASE WHEN gh.top_category = 'Other Income' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Other Expenses' THEN t.value_usd ELSE 0 END)\n) AS total_net\nFROM general_ledger t\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -478,7 +477,7 @@
       },
       "gridPos": {
         "h": 12,
-        "w": 20,
+        "w": 24,
         "x": 0,
         "y": 4
       },
@@ -498,9 +497,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "queryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) AS \"Total Revenue\", SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses') THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\", SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses') THEN t.value_usd ELSE 0 END) AS \"Net\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "rawQueryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) AS \"Total Revenue\", SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses') THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\", SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses') THEN t.value_usd ELSE 0 END) AS \"Net\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
           "refId": "A",
           "timeColumns": [
             "timestamp"
@@ -523,7 +522,6 @@
           "options": {
             "conversions": [
               {
-                "dateFormat": "YYYY-WW",
                 "destinationType": "time",
                 "targetField": "timestamp"
               }
@@ -535,404 +533,45 @@
           "id": "groupBy",
           "options": {
             "fields": {
-              "Net": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
-              "Total Expenses": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
-              "Total Revenue": {
+              "Cost of Revenue": {
                 "aggregations": [
                   "sum"
                 ],
                 "operation": "aggregate"
               },
-              "cost_of_revenue": {
+              "Expenses": {
                 "aggregations": [
                   "sum"
                 ],
                 "operation": "aggregate"
               },
-              "expenses": {
+              "Net": {
                 "aggregations": [
                   "sum"
                 ],
                 "operation": "aggregate"
               },
-              "other_expenses": {
+              "Other Expenses": {
                 "aggregations": [
                   "sum"
                 ],
                 "operation": "aggregate"
               },
-              "other_income": {
+              "Other Income": {
                 "aggregations": [
                   "sum"
                 ],
                 "operation": "aggregate"
               },
-              "revenue": {
+              "Revenue": {
                 "aggregations": [
                   "sum"
                 ],
                 "operation": "aggregate"
               },
-              "timestamp": {
+              "Timestamp": {
                 "aggregations": [],
                 "operation": "groupby"
-              }
-            }
-          }
-        }
-      ],
-      "type": "timeseries"
-    },
-    {
-      "datasource": "SQLite",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 20,
-        "y": 4
-      },
-      "id": 8,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "10.2.0",
-      "targets": [
-        {
-          "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
-          "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
-          "refId": "A",
-          "timeColumns": [
-            "time",
-            "ts"
-          ]
-        }
-      ],
-      "title": "Unsorted (Inbound)",
-      "type": "stat"
-    },
-    {
-      "datasource": "SQLite",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 20,
-        "y": 8
-      },
-      "id": 9,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "10.2.0",
-      "targets": [
-        {
-          "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
-          "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
-          "refId": "A",
-          "timeColumns": [
-            "time",
-            "ts"
-          ]
-        }
-      ],
-      "title": "Unsorted (Outbound)",
-      "type": "stat"
-    },
-    {
-      "datasource": "SQLite",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 20,
-        "y": 12
-      },
-      "id": 6,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "10.2.0",
-      "targets": [
-        {
-          "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
-          "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
-          "refId": "A",
-          "timeColumns": [
-            "time",
-            "ts"
-          ]
-        }
-      ],
-      "title": "Total",
-      "type": "stat"
-    },
-    {
-      "datasource": "SQLite",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "bars",
-            "fillOpacity": 70,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Net (incl. Unsorted) (sum)"
-            },
-            "properties": [
-              {
-                "id": "custom.drawStyle",
-                "value": "line"
-              },
-              {
-                "id": "custom.stacking",
-                "value": {
-                  "group": "A",
-                  "mode": "none"
-                }
-              },
-              {
-                "id": "custom.fillOpacity",
-                "value": 19
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 24,
-        "x": 0,
-        "y": 16
-      },
-      "id": 12,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
-          "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
-          "refId": "A",
-          "timeColumns": [
-            "timestamp"
-          ]
-        }
-      ],
-      "title": "Weekly Cashflow (incl. Unsorted)",
-      "transformations": [
-        {
-          "id": "formatTime",
-          "options": {
-            "outputFormat": "YYYY-WW",
-            "timeField": "timestamp",
-            "timezone": "browser",
-            "useTimezone": true
-          }
-        },
-        {
-          "id": "convertFieldType",
-          "options": {
-            "conversions": [
-              {
-                "dateFormat": "YYYY-WW",
-                "destinationType": "time",
-                "targetField": "timestamp"
-              }
-            ],
-            "fields": {}
-          }
-        },
-        {
-          "id": "groupBy",
-          "options": {
-            "fields": {
-              "Net": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
-              "Net (incl. Unsorted)": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
               },
               "Total Expenses": {
                 "aggregations": [
@@ -940,54 +579,12 @@
                 ],
                 "operation": "aggregate"
               },
-              "Total Expenses (incl. Unsorted)": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
               "Total Revenue": {
                 "aggregations": [
                   "sum"
                 ],
                 "operation": "aggregate"
               },
-              "Total Revenue (incl. Unsorted)": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
-              "cost_of_revenue": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
-              "expenses": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
-              "other_expenses": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
-              "other_income": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
-              "revenue": {
-                "aggregations": [
-                  "sum"
-                ],
-                "operation": "aggregate"
-              },
               "timestamp": {
                 "aggregations": [],
                 "operation": "groupby"
@@ -1011,8 +608,8 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Cashflow Summary",
-  "uid": "fdf9969c-357a-4203-ae7b-12816e87bc7e",
+  "title": "Total Cashflow Summary",
+  "uid": "7e2b1c8a-4e2d-4b7a-9c1a-2f8e6b7d9c3f",
   "version": 1,
   "weekStart": ""
 }