fix chargelog costs

packages/control/chargelog/chargelog.py

@@ -147,8 +147,8 @@ def save_data(chargepoint, charging_ev, immediately: bool = True, reset: bool =
             json.dump(content, json_file)
         log.debug(f"Neuer Ladelog-Eintrag: {new_entry}")
 
-        _reset_data_regarding_chargemode(chargepoint, reset)
-        Pub().pub(f"openWB/set/chargepoint/{chargepoint.num}/set/log", asdict(log_data))
+        chargepoint.reset_log_data_regarding_chargemode(reset)
+        Pub().pub(f"openWB/set/chargepoint/{chargepoint.num}/set/log", asdict(chargepoint.data.set.log))
     except Exception:
         log.exception("Fehler im Ladelog-Modul")
 
@@ -269,36 +269,17 @@ def reset_data(chargepoint, charging_ev, immediately: bool = True):
         Soll sofort ein Eintrag erstellt werden oder gewartet werden, bis die Ladung beendet ist.
     """
     try:
-        log_data = chargepoint.data.set.log
         if charging_ev == -1:
             # Es wurde noch nie ein Auto zugeordnet.
             return
         if not immediately:
             if chargepoint.data.get.power != 0:
                 return
         save_data(chargepoint, charging_ev, immediately, reset=True)
-
-        log_data.imported_at_plugtime = 0
-        log_data.imported_since_plugged = 0
-        _reset_data_regarding_chargemode(chargepoint, True)
-        Pub().pub(f"openWB/set/chargepoint/{chargepoint.num}/set/log", asdict(log_data))
     except Exception:
         log.exception("Fehler im Ladelog-Modul")
 
 
-def _reset_data_regarding_chargemode(chargepoint, reset: bool = False) -> None:
-    log_data = chargepoint.data.set.log
-    log_data.timestamp_start_charging = None
-    if reset:
-        log_data.imported_at_mode_switch = 0
-    else:
-        log_data.imported_at_mode_switch = chargepoint.data.get.imported
-    log_data.chargemode_log_entry = "_"
-    log_data.imported_since_mode_switch = 0
-    log_data.range_charged = 0
-    log_data.time_charged = "00:00"
-
-
 def truncate(number: Union[int, float], decimals: int = 0):
     """
     Returns a value truncated to a specific number of decimal places.

packages/control/chargepoint/chargepoint.py

@@ -483,6 +483,15 @@ def remember_previous_values(self):
         self.data.set.plug_state_prev = self.data.get.plug_state
         Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/set/plug_state_prev", self.data.set.plug_state_prev)
 
+    def reset_log_data_regarding_chargemode(self, reset: bool = False) -> None:
+        reset_log = Log()
+        if reset is False:
+            # Wenn ein Zwischeneintrag, zB bei Wechsel des Lademodus, erstellt wird, Zählerstände nicht verwerfen.
+            reset_log.imported_at_mode_switch = self.data.get.imported
+            reset_log.imported_at_plugtime = self.data.set.log.imported_at_plugtime
+            reset_log.imported_since_plugged = self.data.set.log.imported_since_plugged
+        self.data.set.log = reset_log
+
     def prepare_cp(self) -> Tuple[int, Optional[str]]:
         try:
             # Für Control-Pilot-Unterbrechung set current merken.