1
0

3 Revīzijas a362007a4e ... 3a6270276e

Autors SHA1 Ziņojums Datums
  Daniel Sheffield 3a6270276e modify colors 11 stundas atpakaļ
  Daniel Sheffield fe44dc0057 split out odo to add/edit 12 stundas atpakaļ
  Daniel Sheffield f81d2c2886 show mileage chart for each vehicle 12 stundas atpakaļ
6 mainītis faili ar 202 papildinājumiem un 50 dzēšanām
  1. 19 0
      site/index.sql
  2. 108 0
      site/odo-edit.sql
  3. 26 45
      site/odo.sql
  4. 1 0
      site/shell.sql
  5. 43 0
      site/stats.sql
  6. 5 5
      sqlpage/migrations/00_schema.sql

+ 19 - 0
site/index.sql

@@ -1,3 +1,7 @@
+SET ":title" = 'Mileage';
+SET ":from" = COALESCE(NULLIF($from,''), datetime('now', 'start of year'));
+SET ":to" = COALESCE(NULLIF($to,''), datetime('now', 'start of year', '+1 year')); --, '-1 day'));
+
 SELECT 'dynamic' AS component, sqlpage.run_sql('shell.sql') AS properties;
 
 SELECT 'button' AS component;
@@ -13,3 +17,18 @@ SELECT 'table' AS component
 ;
 SELECT name AS _sqlpage_id, name, make, model, vin FROM cars;
 
+--SELECT 'debug' AS component;
+--SELECT datetime(:from, 'utc'), datetime(:to, 'utc');
+--SELECT :from, :to;
+
+SELECT 'card' as component
+, 'Mileage' as title
+, 2 as columns
+;
+SELECT '/stats.sql?car_id='||id
+||'&from='||:from
+||'&to='||:to
+||'&_sqlpage_embed' as embed
+FROM cars
+;
+

+ 108 - 0
site/odo-edit.sql

@@ -0,0 +1,108 @@
+SET ":title" = 'Edit Odometer Reading';
+SET ":car_id" = COALESCE(:car_id, (SELECT car_id FROM odometer_entries WHERE id = $entry_id));
+SET ":category" = (SELECT name FROM trip_categories WHERE id = :category_id);
+SET ":car" = (SELECT name FROM cars WHERE id = :car_id);
+SET ":location" = '/odo.sql' || '?'
+    || COALESCE('car=' || :car || '&', '')
+    || COALESCE('category=' || :category, '')
+;
+
+-- handle update entry
+UPDATE odometer_entries
+SET car_id = CAST(:car_id AS INTEGER), odo_reading = :odo, category_id = NULLIF(:category_id,''), note = :note, entry_date = datetime(:entry_date || ' ' || :entry_time, 'utc')
+WHERE NULLIF(:entry_id, '') IS NOT NULL AND id = CAST(:entry_id AS INTEGER)
+;
+
+-- return to form
+SELECT 'redirect' AS component, :location AS link
+WHERE NULLIF(:entry_id, '') IS NOT NULL
+;
+
+SELECT 'dynamic' AS component, sqlpage.run_sql('shell.sql') AS properties;
+
+SELECT 'form' AS component
+, :title AS title
+, 'Submit' AS validate
+, 'POST' AS method
+;
+SELECT 'entry_id' AS name
+, 'hidden' AS type
+, $entry_id AS value
+;
+SELECT 'car_id' AS name
+, 'hidden' AS type
+, ( 
+    SELECT car_id
+    FROM odometer_entries
+    WHERE id = CAST($entry_id AS INTEGER)
+) AS value
+;
+SELECT 'odo' AS name
+, 'number' AS type
+, 'Odometer Reading' AS label
+, TRUE AS required
+, 2 AS width
+, ( 
+    SELECT odo_reading
+    FROM odometer_entries
+    WHERE id = $entry_id
+) AS value
+;
+SELECT 'entry_date' AS name
+, 'Date' AS label
+, 'date' AS type
+, 1 AS width
+, (
+    SELECT date(datetime(entry_date, 'localtime'))
+    FROM odometer_entries
+    WHERE id = $entry_id
+) AS value
+;
+SELECT 'entry_time' AS name
+, 'Time' AS label
+, 'time' AS type
+, 1 AS width
+, (
+    SELECT time(datetime(entry_date, 'localtime'))
+    FROM odometer_entries
+    WHERE id = $entry_id
+) AS value
+;
+SELECT 'category_id' AS name
+, 'select' AS type
+, 'Category' AS label
+, (
+    SELECT JSON_GROUP_ARRAY(
+        JSON_OBJECT('value', id, 'label', name, 'selected', id = (
+                SELECT COALESCE(category_id, (SELECT id FROM trip_categories WHERE name = 'Personal'))
+                FROM odometer_entries
+                WHERE id = $entry_id
+            )
+        )
+    )
+    FROM (SELECT * FROM trip_categories)
+) AS options
+, 2 AS width
+;
+SELECT 'note' AS name
+, 'input' AS type
+, 'Note' AS label
+, 6 AS width
+, ( 
+    SELECT COALESCE(note, '')
+    FROM odometer_entries
+    WHERE id = $entry_id
+) AS value
+;
+
+SELECT 'table' AS component;
+SELECT * FROM cars
+WHERE name = :car
+;
+
+SELECT 'table' AS component;
+SELECT id AS _sqlpage_id, *
+FROM odometer_entries
+WHERE id = $entry_id
+;
+

+ 26 - 45
site/odo.sql

@@ -1,6 +1,6 @@
 SET ":title" = 'Add Odometer Reading';
-SET ":category" = COALESCE((SELECT name FROM trip_categories WHERE id = :category_id), $category);
-SET ":car" = COALESCE(NULLIF(:car, ''), $car, (SELECT name FROM cars WHERE id = :car_id));
+SET ":category" = COALESCE($category, (SELECT name FROM trip_categories WHERE id = :category_id));
+SET ":car" = COALESCE($car, (SELECT name FROM cars WHERE id = :car_id));
 SET ":location" = '/odo.sql' || '?'
     || COALESCE('car=' || :car || '&', '')
     || COALESCE('category=' || :category, '')
@@ -12,6 +12,7 @@ SET ":odo_max" = (
     FROM odometer_entries WHERE car_id = :car_id
 );
 
+-- handle new entry
 INSERT INTO odometer_entries (
     car_id,
     odo_reading,
@@ -21,43 +22,30 @@ INSERT INTO odometer_entries (
 SELECT
     :car_id,
     :odo,
-    NULLIF(:category_id,''),
+    :category_id,
     :note
-WHERE NULLIF(:missed, '') IS NOT NULL
-;
-UPDATE odometer_entries
-SET car_id = CAST(:car_id AS INTEGER), odo_reading = :odo, category_id = NULLIF(:category_id,''), note = :note
-WHERE NULLIF(:entry_id, '') IS NOT NULL AND id = CAST(:entry_id AS INTEGER)
-;
-INSERT INTO odometer_entries (
-    car_id,
-    odo_reading,
-    category_id,
-    note
-)
-SELECT
-    :car_id,
-    :odo,
-    NULLIF(:category_id,''),
-    :note
-WHERE :odo > :odo_max AND NULLIF(:missed, '') IS NOT NULL
+WHERE NULLIF(:odo, '') IS NOT NULL AND (NULLIF(:missed, '') IS NOT NULL OR :odo > :odo_max)
 ;
+
+-- return to form
 SELECT 'redirect' AS component, :location AS link
-WHERE :odo > :odo_max OR NULLIF(:missed, '') IS NOT NULL OR NULLIF(:entry_id, '') IS NOT NULL
+WHERE NULLIF(:odo, '') IS NOT NULL AND (NULLIF(:missed, '') IS NOT NULL OR :odo > :odo_max)
 ;
 
 SELECT 'dynamic' AS component, sqlpage.run_sql('shell.sql') AS properties;
 
+-- handle invalid odo reading
 SELECT 'alert' AS component
 , 'Invalid Odometer Reading' AS title
-, 'Odometer reading ' || COALESCE(:odo, '') || ' should be greater than ' || :odo_max AS description
-WHERE :odo <= :odo_max AND NULLIF(:odo, '') IS NOT NULL
+, 'Odometer reading ''' || COALESCE(:odo, '') || ''' should be greater than ''' || :odo_max || '''' AS description
+WHERE NULLIF(:odo, '') IS NOT NULL AND NULLIF(:missed, '') IS NULL AND :odo <= :odo_max
 ;
 
+-- handle invalid car name
 SELECT 'alert' AS component
 , 'Invalid Car' AS title
-, 'Car ' || COALESCE(:car, '') || ' not found' AS description
-WHERE NULLIF(:car, '') IS NOT NULL AND :car_id IS NULL
+, 'Car ''' || COALESCE(:car, '') || ''' not found' AS description
+WHERE NOT EXISTS (SELECT 1 FROM cars WHERE name = NULLIF(:car, ''))
 ;
 
 SELECT 'form' AS component
@@ -65,22 +53,9 @@ SELECT 'form' AS component
 , 'Submit' AS validate
 , 'POST' AS method
 ;
-SELECT 'car' AS name
-, 'hidden' AS type
-, :car AS value
-;
 SELECT 'car_id' AS name
 , 'hidden' AS type
-, COALESCE(NULLIF(:car_id,''), (
-        SELECT car_id
-        FROM odometer_entries
-        WHERE id = CAST($entry_id AS INTEGER)
-    )
-) AS value
-;
-SELECT 'entry_id' AS name
-, 'hidden' AS type
-, $entry_id AS value
+, :car_id AS value
 ;
 SELECT 'odo' AS name
 , 'number' AS type
@@ -94,8 +69,12 @@ SELECT 'category_id' AS name
 , (
     SELECT JSON_GROUP_ARRAY(
         JSON_OBJECT('value', id, 'label', name, 'selected', (
-                name = 'Personal' AND NULLIF(:category, '') IS NULL
-            ) OR name = NULLIF(:category, '')
+                name = 'Personal' AND NULLIF(:category, '') IS NULL AND NULLIF($entry_id, '') IS NOT NULL
+            ) OR name = NULLIF(:category, '') OR id = (
+                SELECT category_id
+                FROM odometer_entries
+                WHERE id = $entry_id
+            )
         )
     )
     FROM (SELECT * FROM trip_categories)
@@ -105,7 +84,7 @@ SELECT 'category_id' AS name
 SELECT 'note' AS name
 , 'input' AS type
 , 'Note' AS label
-, 6 AS width
+, 7 AS width
 ;
 SELECT 'missed' AS name
 , 'Missed Reading' AS label
@@ -116,10 +95,12 @@ SELECT 'missed' AS name
 ;
 
 SELECT 'table' AS component;
-SELECT * FROM cars;
+SELECT * FROM cars
+WHERE name = :car
+;
 
 SELECT 'table' AS component
-, '/odo.sql?entry_id={id}' AS edit_url
+, '/odo-edit.sql?entry_id={id}' AS edit_url
 ;
 SELECT id AS _sqlpage_id, *
 FROM odometer_entries

+ 1 - 0
site/shell.sql

@@ -1,4 +1,5 @@
 SELECT 'shell' AS component
 , 'dark' AS theme
 , 'fluid' AS layout
+, :title AS title
 ;

+ 43 - 0
site/stats.sql

@@ -0,0 +1,43 @@
+SET ":from" = $from
+SET ":to" = $to
+SET ":car_id" = $car_id
+SELECT 'dynamic' AS component, sqlpage.run_sql('shell.sql') AS properties;
+
+SELECT 'chart' AS component
+, 'bar' AS type
+, 'Mileage for ' || cars.name AS title
+, TRUE AS horizontal
+, TRUE AS labels
+, FALSE AS show_legend
+FROM cars
+WHERE id = :car_id
+;
+WITH curr AS (
+    SELECT odo_reading
+    , entry_date
+    , LAG(id) OVER (ORDER BY odo_reading) AS prev_id
+    , category_id
+    FROM odometer_entries
+    WHERE car_id = :car_id
+)
+SELECT COALESCE(c.name, 'Unknown') AS label
+, SUM(curr.odo_reading - COALESCE(prev.odo_reading, 0)) value
+, c.color AS color
+, COALESCE(c.name, 'Unknown') AS sort
+FROM curr
+LEFT JOIN trip_categories c ON curr.category_id = c.id
+LEFT JOIN odometer_entries prev ON curr.prev_id = prev.id
+WHERE car_id = :car_id AND datetime(curr.entry_date, 'localtime') BETWEEN :from AND :to
+GROUP BY car_id, curr.category_id
+UNION
+SELECT 'Total' AS label
+, SUM(curr.odo_reading - COALESCE(prev.odo_reading, 0)) value
+, 'black' AS color
+, '' AS sort
+FROM curr
+LEFT JOIN trip_categories c ON curr.category_id = c.id
+LEFT JOIN odometer_entries prev ON curr.prev_id = prev.id
+WHERE car_id = :car_id AND datetime(curr.entry_date, 'localtime') BETWEEN :from AND :to
+ORDER BY sort
+;
+

+ 5 - 5
sqlpage/migrations/00_schema.sql

@@ -21,7 +21,7 @@ CREATE TABLE odometer_entries (
 
     entry_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 
-    category_id INTEGER,
+    category_id INTEGER NOT NULL,
     note TEXT,
 
     FOREIGN KEY (car_id) REFERENCES cars(id),
@@ -35,7 +35,7 @@ CREATE INDEX idx_odo_car_reading
 ON odometer_entries(car_id, odo_reading);
 
 INSERT INTO trip_categories (name, color) VALUES
-('Personal', '#4CAF50'),
-('Work', '#2196F3'),
-('Vacation', '#FF9800'),
-('Business', '#9C27B0');
+('Personal', 'gray'),
+('Spark', 'green'),
+('Wayne Werk', 'navy')
+;