|
@@ -1,6 +1,6 @@
|
|
|
SET ":title" = 'Add Odometer Reading';
|
|
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' || '?'
|
|
SET ":location" = '/odo.sql' || '?'
|
|
|
|| COALESCE('car=' || :car || '&', '')
|
|
|| COALESCE('car=' || :car || '&', '')
|
|
|
|| COALESCE('category=' || :category, '')
|
|
|| COALESCE('category=' || :category, '')
|
|
@@ -12,6 +12,7 @@ SET ":odo_max" = (
|
|
|
FROM odometer_entries WHERE car_id = :car_id
|
|
FROM odometer_entries WHERE car_id = :car_id
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
|
|
+-- handle new entry
|
|
|
INSERT INTO odometer_entries (
|
|
INSERT INTO odometer_entries (
|
|
|
car_id,
|
|
car_id,
|
|
|
odo_reading,
|
|
odo_reading,
|
|
@@ -21,43 +22,30 @@ INSERT INTO odometer_entries (
|
|
|
SELECT
|
|
SELECT
|
|
|
:car_id,
|
|
:car_id,
|
|
|
:odo,
|
|
:odo,
|
|
|
- NULLIF(:category_id,''),
|
|
|
|
|
|
|
+ :category_id,
|
|
|
:note
|
|
: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
|
|
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;
|
|
SELECT 'dynamic' AS component, sqlpage.run_sql('shell.sql') AS properties;
|
|
|
|
|
|
|
|
|
|
+-- handle invalid odo reading
|
|
|
SELECT 'alert' AS component
|
|
SELECT 'alert' AS component
|
|
|
, 'Invalid Odometer Reading' AS title
|
|
, '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
|
|
SELECT 'alert' AS component
|
|
|
, 'Invalid Car' AS title
|
|
, '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
|
|
SELECT 'form' AS component
|
|
@@ -65,22 +53,9 @@ SELECT 'form' AS component
|
|
|
, 'Submit' AS validate
|
|
, 'Submit' AS validate
|
|
|
, 'POST' AS method
|
|
, 'POST' AS method
|
|
|
;
|
|
;
|
|
|
-SELECT 'car' AS name
|
|
|
|
|
-, 'hidden' AS type
|
|
|
|
|
-, :car AS value
|
|
|
|
|
-;
|
|
|
|
|
SELECT 'car_id' AS name
|
|
SELECT 'car_id' AS name
|
|
|
, 'hidden' AS type
|
|
, '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
|
|
SELECT 'odo' AS name
|
|
|
, 'number' AS type
|
|
, 'number' AS type
|
|
@@ -94,8 +69,12 @@ SELECT 'category_id' AS name
|
|
|
, (
|
|
, (
|
|
|
SELECT JSON_GROUP_ARRAY(
|
|
SELECT JSON_GROUP_ARRAY(
|
|
|
JSON_OBJECT('value', id, 'label', name, 'selected', (
|
|
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)
|
|
FROM (SELECT * FROM trip_categories)
|
|
@@ -105,7 +84,7 @@ SELECT 'category_id' AS name
|
|
|
SELECT 'note' AS name
|
|
SELECT 'note' AS name
|
|
|
, 'input' AS type
|
|
, 'input' AS type
|
|
|
, 'Note' AS label
|
|
, 'Note' AS label
|
|
|
-, 6 AS width
|
|
|
|
|
|
|
+, 7 AS width
|
|
|
;
|
|
;
|
|
|
SELECT 'missed' AS name
|
|
SELECT 'missed' AS name
|
|
|
, 'Missed Reading' AS label
|
|
, 'Missed Reading' AS label
|
|
@@ -116,10 +95,12 @@ SELECT 'missed' AS name
|
|
|
;
|
|
;
|
|
|
|
|
|
|
|
SELECT 'table' AS component;
|
|
SELECT 'table' AS component;
|
|
|
-SELECT * FROM cars;
|
|
|
|
|
|
|
+SELECT * FROM cars
|
|
|
|
|
+WHERE name = :car
|
|
|
|
|
+;
|
|
|
|
|
|
|
|
SELECT 'table' AS component
|
|
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, *
|
|
SELECT id AS _sqlpage_id, *
|
|
|
FROM odometer_entries
|
|
FROM odometer_entries
|