+ {% if vehicle.uses_fuel() %}
{{ _('Total Fuel Cost') }}
{{ "%.2f"|format(stats.total_fuel_cost) }}
{{ current_user.currency }}
+ {% endif %}
+ {% if vehicle.uses_charging() %}
+
+
{{ _('Total Charging Cost') }}
+ {{ "%.2f"|format(stats.total_charging_cost) }}
+ {{ current_user.currency }}
+
+ {% endif %}
{{ _('Other Expenses') }}
{{ "%.2f"|format(stats.total_expense_cost) }}
@@ -85,11 +94,20 @@ {{ vehicle.name }}<
{{ "%.0f"|format(stats.total_distance) }}
{{ vehicle.get_effective_odometer_unit() }}
+ {% if vehicle.uses_fuel() %}
{{ _('Avg. Consumption') }}
{% if stats.avg_consumption %}{{ "%.1f"|format(stats.avg_consumption) }}{% else %}-{% endif %}
{{ current_user.consumption_unit }}
+ {% endif %}
+ {% if vehicle.uses_charging() %}
+
+
{{ _('Avg. Charging') }}
+ {% if stats.avg_charging_consumption %}{{ "%.1f"|format(stats.avg_charging_consumption) }}{% else %}-{% endif %}
+ kWh / 100 {{ vehicle.get_effective_odometer_unit() }}
+
+ {% endif %}
{{ _('Cost per') }} {{ vehicle.get_effective_odometer_unit() }}
{% if stats.cost_per_distance %}{{ "%.2f"|format(stats.cost_per_distance) }}{% else %}-{% endif %}
@@ -694,6 +712,7 @@
{{ _('Parts & Cons
})();
+{% if vehicle.uses_fuel() %}
{{ _('Fuel Consumption Trend') }}
@@ -701,6 +720,7 @@ {{ _('Fuel Co
+{% endif %}
diff --git a/config.py b/config.py
index c5b5ae5..7a25c82 100644
--- a/config.py
+++ b/config.py
@@ -4,7 +4,7 @@
basedir = Path(__file__).parent.absolute()
-APP_VERSION = '0.22.3'
+APP_VERSION = '0.22.4'
RELEASE_CHANNEL = os.environ.get('RELEASE_CHANNEL', 'stable')
GIT_SHA = os.environ.get('GIT_SHA', '')[:7] # Short SHA
GITHUB_REPO = 'dannymcc/may'
diff --git a/tests/test_charging.py b/tests/test_charging.py
index b27f566..6db95b0 100644
--- a/tests/test_charging.py
+++ b/tests/test_charging.py
@@ -35,6 +35,75 @@ def sample_session(app, test_user, ev_vehicle):
return session
+class TestEVStats:
+ """#175 — EV cost/consumption stats must include charging."""
+
+ def test_total_cost_includes_charging(self, app, test_user, ev_vehicle):
+ # Pure EV: no fuel logs, but two charging sessions
+ ev_vehicle.odometer_unit = 'km'
+ db.session.commit()
+ db.session.add_all([
+ ChargingSession(vehicle_id=ev_vehicle.id, user_id=test_user.id,
+ date=date(2026, 4, 1), odometer=10000, kwh_added=30, total_cost=6.0),
+ ChargingSession(vehicle_id=ev_vehicle.id, user_id=test_user.id,
+ date=date(2026, 4, 15), odometer=10500, kwh_added=40, total_cost=8.0),
+ ])
+ db.session.commit()
+ assert ev_vehicle.get_total_cost() == 14.0
+
+ def test_average_charging_consumption_km(self, app, test_user, ev_vehicle):
+ ev_vehicle.odometer_unit = 'km'
+ db.session.commit()
+ db.session.add_all([
+ ChargingSession(vehicle_id=ev_vehicle.id, user_id=test_user.id,
+ date=date(2026, 4, 1), odometer=10000, kwh_added=30),
+ ChargingSession(vehicle_id=ev_vehicle.id, user_id=test_user.id,
+ date=date(2026, 4, 15), odometer=10500, kwh_added=40),
+ ])
+ db.session.commit()
+ # 70 kWh over 500 km = 14 kWh / 100 km
+ consumption = ev_vehicle.get_average_charging_consumption()
+ assert consumption is not None
+ assert abs(consumption - 14.0) < 0.01
+
+ def test_average_charging_consumption_mi_to_km(self, app, test_user, ev_vehicle):
+ """Vehicle in miles, asked for kWh/100km — must convert."""
+ ev_vehicle.odometer_unit = 'mi'
+ db.session.commit()
+ db.session.add_all([
+ ChargingSession(vehicle_id=ev_vehicle.id, user_id=test_user.id,
+ date=date(2026, 4, 1), odometer=10000, kwh_added=30),
+ ChargingSession(vehicle_id=ev_vehicle.id, user_id=test_user.id,
+ date=date(2026, 4, 15), odometer=10500, kwh_added=40),
+ ])
+ db.session.commit()
+ # 70 kWh over 500 mi = 804.672 km → ~8.70 kWh/100km
+ consumption = ev_vehicle.get_average_charging_consumption('km')
+ assert consumption is not None
+ assert abs(consumption - 8.70) < 0.05
+
+ def test_cost_per_kwh(self, app, test_user, ev_vehicle):
+ db.session.add_all([
+ ChargingSession(vehicle_id=ev_vehicle.id, user_id=test_user.id,
+ date=date(2026, 4, 1), kwh_added=30, total_cost=9.0),
+ ChargingSession(vehicle_id=ev_vehicle.id, user_id=test_user.id,
+ date=date(2026, 4, 15), kwh_added=20, total_cost=4.0),
+ ])
+ db.session.commit()
+ # 13 / 50 = 0.26
+ assert abs(ev_vehicle.get_cost_per_kwh() - 0.26) < 0.001
+
+ def test_no_sessions_returns_none(self, app, test_user, ev_vehicle):
+ assert ev_vehicle.get_average_charging_consumption() is None
+ assert ev_vehicle.get_cost_per_kwh() is None
+
+ def test_fuel_index_lists_charging(self, auth_client, sample_session):
+ resp = auth_client.get('/fuel/')
+ assert resp.status_code == 200
+ assert b'Charging History' in resp.data
+ assert b'Tesla Model 3' in resp.data
+
+
class TestChargingIndex:
def test_index_requires_auth(self, client):
resp = client.get('/charging/', follow_redirects=False)
diff --git a/tests/test_reminders.py b/tests/test_reminders.py
index bcc2032..767af16 100644
--- a/tests/test_reminders.py
+++ b/tests/test_reminders.py
@@ -118,3 +118,58 @@ def test_uncomplete_reminder(self, auth_client, sample_reminder):
assert resp.status_code == 200
db.session.refresh(sample_reminder)
assert sample_reminder.is_completed is False
+
+
+class TestReminderFlexibleRecurrence:
+ """#184 — recurrence is now a unit + interval pair (e.g., every 2 years)."""
+
+ def test_create_with_interval(self, auth_client, sample_vehicle):
+ resp = auth_client.post('/reminders/new', data={
+ 'vehicle_id': str(sample_vehicle.id),
+ 'title': 'French MOT',
+ 'reminder_type': 'mot',
+ 'due_date': '2025-06-01',
+ 'recurrence': 'yearly',
+ 'recurrence_interval': '2',
+ 'notify_days_before': '14',
+ }, follow_redirects=True)
+ assert resp.status_code == 200
+ r = Reminder.query.filter_by(title='French MOT').first()
+ assert r is not None
+ assert r.recurrence == 'yearly'
+ assert r.recurrence_interval == 2
+
+ def test_complete_uses_interval_for_next_occurrence(self, auth_client, sample_vehicle, test_user):
+ r = Reminder(
+ vehicle_id=sample_vehicle.id, user_id=test_user.id,
+ title='Biennial MOT', reminder_type='mot',
+ due_date=date(2025, 6, 1),
+ recurrence='yearly', recurrence_interval=2,
+ )
+ db.session.add(r)
+ db.session.commit()
+ auth_client.post(f'/reminders/{r.id}/complete', follow_redirects=True)
+ next_r = Reminder.query.filter(Reminder.title == 'Biennial MOT', Reminder.is_completed == False).first()
+ assert next_r is not None
+ assert next_r.due_date == date(2027, 6, 1)
+ assert next_r.recurrence_interval == 2
+
+ def test_legacy_quarterly_still_resolves(self):
+ from app.routes.reminders import calculate_next_due_date
+ # Reminders created before 0.22.4 may have recurrence='quarterly'
+ # and recurrence_interval=1; should still advance by 3 months.
+ next_due = calculate_next_due_date(date(2025, 1, 1), 'quarterly', 1)
+ assert next_due == date(2025, 4, 1)
+
+ def test_legacy_biannual_still_resolves(self):
+ from app.routes.reminders import calculate_next_due_date
+ next_due = calculate_next_due_date(date(2025, 1, 1), 'biannual', 1)
+ assert next_due == date(2025, 7, 1)
+
+ def test_daily_interval(self):
+ from app.routes.reminders import calculate_next_due_date
+ assert calculate_next_due_date(date(2025, 6, 1), 'daily', 10) == date(2025, 6, 11)
+
+ def test_weekly_interval(self):
+ from app.routes.reminders import calculate_next_due_date
+ assert calculate_next_due_date(date(2025, 6, 1), 'weekly', 3) == date(2025, 6, 22)