From 9be1ad71c2bf6657ab36a746ba057f692186f098 Mon Sep 17 00:00:00 2001
From: Aart van Halteren <aart@van-halteren.net>
Date: Mon, 6 Jan 2025 10:05:25 +0100
Subject: [PATCH] Cost 2024 added

---
 app/models/cost.rb | 14 ++++++++++++--
 ar-no-rails.rb     |  4 ++--
 docker-compose.yml |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/models/cost.rb b/app/models/cost.rb
index c7b377c..317e605 100644
--- a/app/models/cost.rb
+++ b/app/models/cost.rb
@@ -6,8 +6,8 @@ EASY_ENERGY_TARIFFS = {}
 
 # See https://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/belastingdienst/zakelijk/overige_belastingen/belastingen_op_milieugrondslag/tarieven_milieubelastingen/tabellen_tarieven_milieubelastingen
 # Without VAT
-ENERGY_TAX_KWH = { 2020 => 0.09770, 2021 => 0.09428, 2022 => 0.03679, 2023 => 0.12599 }
-ODE_KWH = { 2020 => 0.0273, 2021 => 0.0300, 2022 => 0.0305, 2023 => 0.0}
+ENERGY_TAX_KWH = { 2020 => 0.09770, 2021 => 0.09428, 2022 => 0.03679, 2023 => 0.12599, 2024 => 0.10880 }
+ODE_KWH = { 2020 => 0.0273, 2021 => 0.0300, 2022 => 0.0305, 2023 => 0.0, 2024 => 0.0}
 # merge by adding values
 TAX_KWH = ENERGY_TAX_KWH.merge(ODE_KWH){|key, energy_tax, ode| energy_tax + ode}
 
@@ -82,6 +82,9 @@ class Cost
       end
     when 2023
       0.018
+    when 2024
+      # opslag met BTW: 0,02178
+      0.018457
     end  
   end
   
@@ -250,6 +253,8 @@ class Cost
       when 2023
         # rate excl. VAT
         high_tariff ? 0.47758 : 0.34165  
+      when 2024
+        0.25767769
     end
   end
   
@@ -284,6 +289,11 @@ class Cost
         vat = 1 + vat_at(Date.parse(formatted_hour))
         normaal_kwh_cost = 0.47758*vat
         dal_kwh_cost = 0.34165*vat   
+      # From 1 Jan 2024 until 31 December 2024
+      when 1704063600..1735603199
+        vat = 1 + vat_at(Date.parse(formatted_hour))
+        normaal_kwh_cost = 0.25767769*vat
+        dal_kwh_cost = 0.25767769*vat   
       else
         p "Not supported interval Oxxio for value: %d" % date.to_time.to_i
         # catch-all, incase 'formated_hour' is outside any of the cases
diff --git a/ar-no-rails.rb b/ar-no-rails.rb
index 4f93e91..ef5b5a3 100644
--- a/ar-no-rails.rb
+++ b/ar-no-rails.rb
@@ -2,8 +2,8 @@ require "rubygems"
 require "bundler/setup"
 require "active_record"
 require "open-uri"
-require 'gr/plot'
-require 'histogram'
+#require 'gr/plot'
+#require 'histogram'
 
 project_root = File.dirname(File.absolute_path(__FILE__))
 Dir.glob(project_root + "/app/models/*.rb").each{|f| require f}
diff --git a/docker-compose.yml b/docker-compose.yml
index b6fbcc0..0381a56 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   db:
     container_name: smartmeter_db
     restart: unless-stopped
-    image: mysql
+    image: mysql:8.3
     volumes:
       - /home/pcog/smartmeter/data:/var/lib/mysql
     ports: