mirror of
https://github.com/grocy/grocy.git
synced 2025-08-20 04:12:59 +00:00
Fixed battery charge cycle undo handling (fixes #1800)
This commit is contained in:
@@ -40,6 +40,7 @@
|
|||||||
|
|
||||||
- Fixed that the batteries overview page was broken when there was any battery Userfields with enabled "Show as column in tables" option
|
- Fixed that the batteries overview page was broken when there was any battery Userfields with enabled "Show as column in tables" option
|
||||||
- Fixed that grocycode label printer printing didn't work from the battery edit page (master data) (thanks @andreheuer)
|
- Fixed that grocycode label printer printing didn't work from the battery edit page (master data) (thanks @andreheuer)
|
||||||
|
- Fixed that undoing a battery charge cycle had no effect on "Last charged" and "Next planned charge cycle" of the corresponding battery
|
||||||
|
|
||||||
### Equipment
|
### Equipment
|
||||||
|
|
||||||
|
17
migrations/0172.sql
Normal file
17
migrations/0172.sql
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
DROP VIEW batteries_current;
|
||||||
|
CREATE VIEW batteries_current
|
||||||
|
AS
|
||||||
|
SELECT
|
||||||
|
b.id, -- Dummy, LessQL needs an id column
|
||||||
|
b.id AS battery_id,
|
||||||
|
MAX(l.tracked_time) AS last_tracked_time,
|
||||||
|
CASE WHEN b.charge_interval_days = 0
|
||||||
|
THEN '2999-12-31 23:59:59'
|
||||||
|
ELSE datetime(MAX(l.tracked_time), '+' || CAST(b.charge_interval_days AS TEXT) || ' day')
|
||||||
|
END AS next_estimated_charge_time
|
||||||
|
FROM batteries b
|
||||||
|
LEFT JOIN battery_charge_cycles l
|
||||||
|
ON b.id = l.battery_id
|
||||||
|
AND l.undone = 0
|
||||||
|
WHERE b.active = 1
|
||||||
|
GROUP BY b.id, b.charge_interval_days;
|
Reference in New Issue
Block a user