2 Коміти 0dd98218c0 ... a362007a4e

Автор SHA1 Опис Дата
  Daniel Sheffield a362007a4e add ability to edit entries 3 днів тому
  Daniel Sheffield 7a16847ca4 add ability to manage fleet 3 днів тому
3 змінених файлів з 115 додано та 14 видалено
  1. 32 3
      site/cars.sql
  2. 15 0
      site/index.sql
  3. 68 11
      site/odo.sql

+ 32 - 3
site/cars.sql

@@ -1,41 +1,70 @@
 SET ":title" = 'Cars';
 SET ":location" = '/cars.sql';
+SET ":edit" = (SELECT NULLIF($car_id, '') IS NOT NULL);
+SET ":car_id" = CAST(COALESCE(NULLIF($car_id, ''), 0) AS INTEGER);
+
+UPDATE cars
+SET name = :name, make = :make, model = :model, vin = :vin
+WHERE NULLIF(:vin, '') IS NOT NULL
+AND :edit
+;
 
 INSERT INTO cars (name, make, model, vin)
 SELECT :name, :make, :model, :vin
 WHERE NULLIF(:vin, '') IS NOT NULL
+AND NOT :edit
 ;
+
 SELECT 'redirect' AS component, :location AS link
 WHERE NULLIF(:vin, '') IS NOT NULL
 ;
 
 SELECT 'dynamic' AS component, sqlpage.run_sql('shell.sql') AS properties;
+-- SELECT 'debug' AS component;
+-- SELECT 'edit' AS name, :edit AS value;
+-- SELECT 'car_id' AS name, :car_id AS value;
+
+SET ":name" = (SELECT name FROM cars WHERE id = :car_id AND :edit);
+SET ":make" = (SELECT make FROM cars WHERE id = :car_id AND :edit);
+SET ":model" = (SELECT model FROM cars WHERE id = :car_id AND :edit);
+SET ":vin" = (SELECT vin FROM cars WHERE id = :car_id AND :edit);
+
 
 SELECT 'form' AS component
 , 'POST' AS METHOD
-, 'Add' AS validate
+, CASE WHEN :edit THEN 'Update' ELSE 'Add' END AS validate
+;
+SELECT 'car_id' AS name
+, 'hidden' AS type
+, :car_id AS value
 ;
 SELECT 'name' AS name
 , 'input' AS type
 , 'Car name' AS label
 , 2 AS width
+, :name AS value
 ;
 SELECT 'make' AS name
 , 'input' AS type
 , 'Car make' AS label
 , 2 AS width
+, :make AS value
 ;
 SELECT 'model' AS name
 , 'input' AS type
 , 'Car model' AS label
 , 2 AS width
+, :model AS value
 ;
 SELECT 'vin' AS name
 , 'input' AS type
 , 'Vin no.' AS label
 , 6 AS width
+, :vin AS value
 ;
 
-SELECT 'table' AS component;
-SELECT * FROM cars;
+SELECT 'table' AS component
+, :location || '?car_id={id}' AS edit_url
+;
+SELECT id AS _sqlpage_id, * FROM cars;
 

+ 15 - 0
site/index.sql

@@ -0,0 +1,15 @@
+SELECT 'dynamic' AS component, sqlpage.run_sql('shell.sql') AS properties;
+
+SELECT 'button' AS component;
+SELECT 'Manage Fleet' AS title
+, '/cars.sql' AS link
+;
+
+SELECT 'title' AS component
+, 'Enter an odometer reading' AS contents
+;
+SELECT 'table' AS component
+, '/odo.sql?car={id}' AS edit_url
+;
+SELECT name AS _sqlpage_id, name, make, model, vin FROM cars;
+

+ 68 - 11
site/odo.sql

@@ -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);