first evolution to manage hybrid cars

MyPSACC.py

@@ -358,7 +358,12 @@ class MyPSACC:
     def get_charge_hour(self, vin):
         reg = r"PT([0-9]{1,2})H([0-9]{1,2})?"
         data = self.get_vehicle_info(vin)
-        hour_str = data.energy[0].charging.next_delayed_time
+        if data.energy[0].type == 'Electric':
+            hour_str = data.energy[0].charging.next_delayed_time
+        elif data.energy[1].type == 'Electric':
+            hour_str = data.energy[1].charging.next_delayed_time
+        else:
+            hour_str = ''
         hour = re.findall(reg, hour_str)[0]
         h = int(hour[0])
         if hour[1] == '':
@@ -369,7 +374,12 @@ class MyPSACC:
 
     def get_charge_status(self, vin):
         data = self.get_vehicle_info(vin)
-        status = data.energy[0].charging.status
+        if data.energy[0].type == 'Electric':
+            status = data.energy[0].charging.status
+        elif data.energy[1].type == 'Electric':
+            status = data.energy[1].charging.status
+        else:
+            status = ''
         return status
 
     def veh_charge_request(self, vin, hour, miinute, charge_type):
@@ -466,8 +476,24 @@ class MyPSACC:
         latitude = status.last_position.geometry.coordinates[1]
         date = status.last_position.properties.updated_at
         mileage = status.timed_odometer.mileage
-        level = status.energy[0].level
-        charging_status = status.energy[0].charging.status
+        if status.energy[0].type == 'Electric':
+            level = status.energy[0].level
+            charging_status = status.energy[0].charging.status
+            charge_date = status.energy[0].updated_at
+        elif status.energy[1].type == 'Electric':
+            level = status.energy[1].level
+            charging_status = status.energy[1].charging.status
+            charge_date = status.energy[1].updated_at
+        else:
+            level = ''
+            charging_status = ''
+            charge_date = ''
+        if status.energy[0].type == 'Fuel':
+            level_fuel = status.energy[0].level
+        elif status.energy[1].type == 'Fuel':
+            level_fuel = status.energy[1].level
+        else:
+            level_fuel = ''
         moving = status.kinetic.moving
         conn = get_db()
         if mileage == 0:  # fix a bug of the api
@@ -487,8 +513,8 @@ class MyPSACC:
                         logger.error(f"Unable to get temperature from openweathermap :{e}")
 
                 conn.execute(
-                    "INSERT INTO position(Timestamp,VIN,longitude,latitude,mileage,level, moving, temperature) VALUES(?,?,?,?,?,?,?,?)",
-                    (date, vin, longitude, latitude, mileage, level, moving, temp))
+                    "INSERT INTO position(Timestamp,VIN,longitude,latitude,mileage,level,level_fuel,moving,temperature) VALUES(?,?,?,?,?,?,?,?,?)",
+                    (date, vin, longitude, latitude, mileage, level, level_fuel, moving, temp))
 
                 conn.commit()
                 logger.info(f"new position recorded for {vin}")
@@ -505,7 +531,6 @@ class MyPSACC:
                 logger.debug("position already saved")
 
         # todo handle battery status
-        charge_date = status.energy[0].updated_at
         if charging_status == "InProgress":
             try:
                 in_progress = conn.execute("SELECT stop_at FROM battery WHERE VIN=? ORDER BY start_at DESC limit 1",

web/db.py

@@ -18,7 +18,19 @@ def get_db(db_file=default_db_file):
     conn = sqlite3.connect(db_file, detect_types=sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES)
     conn.row_factory = sqlite3.Row
     conn.execute("CREATE TABLE IF NOT EXISTS position (Timestamp DATETIME PRIMARY KEY, VIN TEXT, longitude REAL, "
-                 "latitude REAL, mileage REAL, level INTEGER, moving BOOLEAN, temperature INTEGER);")
+                 "latitude REAL, mileage REAL, level INTEGER, level_fuel INTEGER, moving BOOLEAN, temperature INTEGER);")
+    try:
+        conn.execute("ALTER TABLE position ADD level_fuel INTEGER;")
+    except:
+        pass
+    try:
+        conn.execute("ALTER TABLE position ADD moving BOOLEAN;")
+    except:
+        pass
+    try:
+        conn.execute("ALTER TABLE position ADD temperature INTEGER;")
+    except:
+        pass
     conn.execute("CREATE TABLE IF NOT EXISTS battery (start_at DATETIME PRIMARY KEY,stop_at DATETIME,VIN TEXT, "
                  "start_level INTEGER, end_level INTEGER, co2 INTEGER, kw INTEGER);")
     conn.create_function("update_trips", 0, update_callback)

web/figures.py

@@ -113,4 +113,4 @@ def get_figures(trips: List[Trip], charging: List[dict]):
         charge_speed = 0
     battery_info = html.Div(children=[html.P("Average gC02/kW: {:.1f}".format(co2_per_kw)),
                    html.P("Average gC02/km: {:1f}".format(co2_per_km)),
-                    html.P("Average Charge SPEED {:1f} kW/h".format(charge_speed))])
+                   html.P("Average Charge SPEED {:1f} kW/h".format(charge_speed))])