|
|
@@ -1,8 +1,16 @@
|
|
|
SET ":title" = 'Add Odometer Reading';
|
|
|
-SET ":location" = '/odo.sql' || COALESCE('?car=' || $car, '');
|
|
|
-SET ":car" = $car;
|
|
|
-SET ":car_id" = (SELECT id FROM cars WHERE name = :car);
|
|
|
-SET ":odo_max" = (SELECT COALESCE(MAX(odo_reading),0) FROM odometer_entries WHERE car_id = :car_id);
|
|
|
+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 ":location" = '/odo.sql' || '?'
|
|
|
+ || COALESCE('car=' || :car || '&', '')
|
|
|
+ || COALESCE('category=' || :category, '')
|
|
|
+;
|
|
|
+
|
|
|
+SET ":car_id" = COALESCE(:car_id, (SELECT id FROM cars WHERE name = :car));
|
|
|
+SET ":odo_max" = (
|
|
|
+ SELECT COALESCE(MAX(odo_reading),0)
|
|
|
+ FROM odometer_entries WHERE car_id = :car_id
|
|
|
+);
|
|
|
|
|
|
INSERT INTO odometer_entries (
|
|
|
car_id,
|
|
|
@@ -15,10 +23,27 @@ SELECT
|
|
|
:odo,
|
|
|
NULLIF(:category_id,''),
|
|
|
:note
|
|
|
-WHERE :odo > :odo_max
|
|
|
+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
|
|
|
;
|
|
|
SELECT 'redirect' AS component, :location AS link
|
|
|
-WHERE :odo > :odo_max
|
|
|
+WHERE :odo > :odo_max OR NULLIF(:missed, '') IS NOT NULL OR NULLIF(:entry_id, '') IS NOT NULL
|
|
|
;
|
|
|
|
|
|
SELECT 'dynamic' AS component, sqlpage.run_sql('shell.sql') AS properties;
|
|
|
@@ -40,9 +65,22 @@ 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
|
|
|
-, :car_id AS value
|
|
|
+, 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
|
|
|
;
|
|
|
SELECT 'odo' AS name
|
|
|
, 'number' AS type
|
|
|
@@ -53,18 +91,37 @@ SELECT 'odo' AS name
|
|
|
SELECT 'category_id' AS name
|
|
|
, 'select' AS type
|
|
|
, 'Category' AS label
|
|
|
-, (SELECT JSON_GROUP_ARRAY(JSON_OBJECT('value', id, 'label', name, 'selected', FALSE)) FROM trip_categories) AS options
|
|
|
+, (
|
|
|
+ SELECT JSON_GROUP_ARRAY(
|
|
|
+ JSON_OBJECT('value', id, 'label', name, 'selected', (
|
|
|
+ name = 'Personal' AND NULLIF(:category, '') IS NULL
|
|
|
+ ) OR name = NULLIF(:category, '')
|
|
|
+ )
|
|
|
+ )
|
|
|
+ FROM (SELECT * FROM trip_categories)
|
|
|
+) AS options
|
|
|
, 2 AS width
|
|
|
;
|
|
|
SELECT 'note' AS name
|
|
|
, 'input' AS type
|
|
|
, 'Note' AS label
|
|
|
-, 8 AS width
|
|
|
+, 6 AS width
|
|
|
+;
|
|
|
+SELECT 'missed' AS name
|
|
|
+, 'Missed Reading' AS label
|
|
|
+, 'checkbox' AS type
|
|
|
+, FALSE AS checked
|
|
|
+, 1 AS value
|
|
|
+, 1 AS width
|
|
|
;
|
|
|
|
|
|
SELECT 'table' AS component;
|
|
|
SELECT * FROM cars;
|
|
|
|
|
|
-SELECT 'table' AS component;
|
|
|
-SELECT * FROM odometer_entries WHERE car_id = :car_id;
|
|
|
+SELECT 'table' AS component
|
|
|
+, '/odo.sql?entry_id={id}' AS edit_url
|
|
|
+;
|
|
|
+SELECT id AS _sqlpage_id, *
|
|
|
+FROM odometer_entries
|
|
|
+WHERE car_id = :car_id OR id = CAST($entry_id AS INTEGER);
|
|
|
|