refactored with all features restored

sqlpage/apply.sql

@@ -0,0 +1,9 @@
+SELECT 'dynamic' AS component, sqlpage.run_sql('cookie.sql') AS properties;
+SELECT 'redirect' AS component
+, (
+  SELECT CASE
+    WHEN $title IN ('Products', 'Categories', 'Groups', 'Tags')
+    THEN lower($title)||'.sql' ELSE 'transactions.sql'
+  END
+) AS link
+;

sqlpage/clear.sql

@@ -3,11 +3,8 @@ SET categories = NULL;
 SET groups = NULL;
 SET start = NULL;
 SET end = NULL;
-SELECT 'dynamic' AS component, sqlpage.run_sql('cookie.sql') AS properties;
+SET tags = NULL;
-SELECT
+SET unit_volume = NULL;
-  'redirect' AS component,
+SET unit_mass = NULL;
-  (SELECT CASE
+SET unit_count = NULL;
-    WHEN $title IN ('Products', 'Categories', 'Groups', 'Tags')
+SELECT 'dynamic' AS component, sqlpage.run_sql('apply.sql') AS properties;
-    THEN lower($title)||'.sql' ELSE 'transactions.sql'
-    END
-  ) AS link;

sqlpage/cookie.sql

@@ -5,53 +5,43 @@ SELECT
 WHERE sqlpage.cookie('session') IS NULL
 ;
 
-SELECT
+SELECT 'cookie' AS component,
-  'cookie' AS component,
-  'products' AS name,
-  $products AS value
-WHERE $products IS NOT NULL
-;
-SELECT
-  'cookie' AS component,
   'products' AS name,
   $products AS value,
-  TRUE AS remove
+  $products IS NULL AS remove
-WHERE $products IS NULL
 ;
-SELECT
+SELECT 'cookie' AS component,
-  'cookie' AS component,
-  'categories' AS name,
-  $categories AS value
-WHERE $categories IS NOT NULL
-;
-SELECT
-  'cookie' AS component,
   'categories' AS name,
   $categories AS value,
-  TRUE AS remove
+  $categories IS NULL AS remove
-WHERE $categories IS NULL
 ;
-SELECT
+SELECT 'cookie' AS component,
-  'cookie' AS component,
-  'groups' AS name,
-  $groups AS value
-WHERE $groups IS NOT NULL
-;
-SELECT
-  'cookie' AS component,
   'groups' AS name,
   $groups AS value,
-  TRUE AS remove
+  $groups IS NULL AS remove
-WHERE $groups IS NULL
 ;
-
 SELECT 'cookie' AS component
 , 'start' AS name
 , $start AS value
-, $start IS NULL AS remove
+, ($start IS NULL OR $start = '') AS remove
 ;
 SELECT 'cookie' AS component
 , 'end' AS name
 , $end AS value
-, $end IS NULL AS remove
+, ($end IS NULL OR $end = '') AS remove
+;
+SELECT 'cookie' AS component
+, 'unit_volume' AS name
+, $unit_volume AS value
+, ($unit_volume IS NULL OR $unit_volume = '') AS remove
+;
+SELECT 'cookie' AS component
+, 'unit_mass' AS name
+, $unit_mass AS value
+, ($unit_mass IS NULL OR $unit_mass = '') AS remove
+;
+SELECT 'cookie' AS component
+, 'unit_count' AS name
+, $unit_count AS value
+, $unit_count IS NULL AS remove
 ;

sqlpage/data/Transactions.sql

@@ -11,19 +11,20 @@ SELECT
   c.name AS "Category",
   g.name AS "Group",
   CASE WHEN t.organic THEN 'yes' ELSE 'no' END AS "Organic",
-  to_char(t.price, 'FM999999999.00') AS "Price"
+  to_char(t.price, 'FM999999999.00') AS "Price",
   --to_char(quantity, '9.'||repeat('9',3-1)||'EEEE') AS Quantity,
-  -- to_char(CASE
+  to_char(CASE
-  -- WHEN ut.name = 'Count' THEN t.price
+    WHEN ut.name = 'Count' THEN t.quantity
-  -- ELSE t.quantity * convert_unit(u.name, CASE
+    ELSE t.quantity * convert_unit(u.name, CASE
-  -- WHEN ut.name = 'Volume' THEN ouv.name
+      WHEN ut.name = 'Volume' THEN $unit_volume
-  -- WHEN ut.name = 'Mass' THEN oum.name
+      WHEN ut.name = 'Mass' THEN $unit_mass
-  -- END, p.name) END, 'FM999999999.000') AS "Quantity",
+    END, p.name)
-  -- CASE
+    END, 'FM999999999.000') AS "Quantity",
-  -- WHEN ut.name = 'Count' THEN u.name
+  CASE
-  -- WHEN ut.name = 'Volume' THEN ouv.name
+    WHEN ut.name = 'Count' THEN u.name
-  -- WHEN ut.name = 'Mass' THEN oum.name
+    WHEN ut.name = 'Volume' THEN $unit_volume
-  -- END AS "Unit"
+    WHEN ut.name = 'Mass' THEN $unit_mass
+  END AS "Unit"
 FROM transactions t
 JOIN products p ON (product_id = p.id)
 JOIN categories c ON (category_id = c.id)
@@ -31,13 +32,18 @@ JOIN groups g ON (group_id = g.id)
 JOIN stores s ON (store_id = s.id)
 JOIN units u ON (t.unit_id = u.id)
 JOIN unit_types ut ON (u.unit_type_id = ut.id)
---LEFT JOIN sqlpage_options ouv ON ouv.type = 'unit_volume' AND ut.name = 'Volume'
 WHERE
   (p.name IN (SELECT v#>>'{}' FROM json_array_elements($products::json) j(v)) OR $products IS NULL)
 AND
   (c.name IN (SELECT v#>>'{}' FROM json_array_elements($categories::json) j(v)) OR $categories IS NULL)
 AND
   (g.name IN (SELECT v#>>'{}' FROM json_array_elements($groups::json) j(v)) OR $groups IS NULL)
+AND
+  CASE
+    WHEN ut.name = 'Count'
+    THEN (u.name IN (SELECT v#>>'{}' FROM json_array_elements($unit_count::json) j(v)) OR $unit_count IS NULL)
+    ELSE TRUE
+  END
 AND
   ((ts AT TIME ZONE 'UTC') AT TIME ZONE 'Pacific/Auckland')::date
   BETWEEN $start::date AND $end::date
@@ -50,4 +56,4 @@ AND
     )
   ) OR $tags IS NULL)
 ORDER BY ts DESC
-LIMIT 100);
+LIMIT 1000);

sqlpage/entry.sql

@@ -1,6 +1,18 @@
 SET products = COALESCE($products, sqlpage.cookie('products'));
 SET categories = COALESCE($categories, sqlpage.cookie('categories'));
 SET groups = COALESCE($groups, sqlpage.cookie('groups'));
+SET tags = COALESCE($tags, sqlpage.cookie('tags'));
+SET unit_volume = (CASE
+  WHEN $unit_volume = '' OR $unit_volume IS NULL
+  THEN COALESCE(sqlpage.cookie('unit_volume'), 'L')
+  ELSE $unit_volume
+END);
+SET unit_mass = (CASE
+  WHEN $unit_mass = '' OR $unit_mass IS NULL
+  THEN COALESCE(sqlpage.cookie('unit_mass'), 'kg')
+  ELSE $unit_mass
+END);
+SET unit_count = COALESCE($unit_count, sqlpage.cookie('unit_count'));
 SET start = (CASE
   WHEN $start = '' OR $start IS NULL
   THEN COALESCE(sqlpage.cookie('start'), to_char(now()-'30 days'::interval, 'YYYY-MM-DD'))
@@ -80,6 +92,39 @@ FROM (
 WHERE value IS NOT NULL
 );
 
+DROP TABLE IF EXISTS sqlpage_units;
+CREATE TEMPORARY TABLE IF NOT EXISTS sqlpage_units AS
+SELECT u.name, ut.name AS type FROM units u
+JOIN unit_types ut ON ut.id = u.unit_type_id
+;
+SET unit_volume_options = (
+SELECT json_agg(json_build_object(
+   'label', o.name,
+   'value', o.name,
+   'selected', o.name = $unit_volume
+ ) ORDER BY o.name)
+FROM sqlpage_units o
+WHERE type = 'Volume'
+);
+SET unit_mass_options = (
+SELECT json_agg(json_build_object(
+   'label', o.name,
+   'value', o.name,
+   'selected', o.name = $unit_mass
+ ) ORDER BY o.name)
+FROM sqlpage_units o
+WHERE type = 'Mass'
+);
+SET unit_count_options = (
+SELECT json_agg(json_build_object(
+   'label', o.name,
+   'value', o.name,
+   'selected', o.name IN (SELECT v#>>'{}' FROM json_array_elements($unit_count::json) j(v))
+ ) ORDER BY o.name)
+FROM sqlpage_units o
+WHERE type = 'Count'
+);
+
 SELECT 'dynamic' AS component, sqlpage.run_sql('cookie.sql') AS properties;
 SELECT 'dynamic' AS component, sqlpage.run_sql('theme.sql') AS properties;
 SELECT 'dynamic' AS component, sqlpage.run_sql('nav.sql') AS properties;

sqlpage/nav.sql

@@ -31,13 +31,9 @@ SELECT 'form' AS component
 , 'get' AS method
 , '' AS title
 , 'Apply' AS validate
+, 'apply.sql' AS action
 ;
 
--- SELECT
---   'path' AS name,
---   sqlpage.path() AS value,
---   'hidden' AS type
--- ;
 SELECT 'hidden' AS type
 , 'title' AS name
 , $title AS value
@@ -86,58 +82,27 @@ SELECT 'Tags' AS label
 , TRUE AS multiple
 , $tag_options AS options
 ;
---SELECT
+SELECT 'Unit (vol.)' AS label
---  'unit_volume' AS name,
+, 'unit_volume' AS name
---  'Unit (vol.)' AS label,
+, 1 AS width
---  1 AS width,
+, 'select' AS type
---  'select' AS type,
+, $unit_volume_options AS options
---  json_agg(json_build_object(
+;
---    'label', o.name,
+SELECT 'Unit (mass)' AS label
---    'value', o.name,
+, 'unit_mass' AS name
---    'selected', COALESCE(o.selected, FALSE)
+, 1 AS width
---  ) ORDER BY o.name) AS options
+, 'select' AS type
---FROM sqlpage_options o
+, $unit_mass AS value
---WHERE
+, $unit_mass_options AS options
---  o.type = 'unit_volume'
+;
---AND
+SELECT 'Unit (count)' AS label
---  o.session = sqlpage.cookie('session')
+, 'unit_count[]' AS name
---;
+, 2 AS width
---SELECT
+, 'select' AS type
---  'unit_mass' AS name,
+, TRUE AS multiple
---  'Unit (mass)' AS label,
+, TRUE AS dropdown
---  1 AS width,
+, '' AS value
---  'select' AS type,
+, $unit_count_options AS options;
---  $unit_mass AS value,
---  json_agg(json_build_object(
---    'label', o.name,
---    'value', o.name,
---    'selected', COALESCE(o.selected, FALSE)
---  ) ORDER BY o.name) AS options
---FROM sqlpage_options o
---WHERE
---  o.type = 'unit_mass'
---AND
---  o.session = sqlpage.cookie('session')
---;
---SELECT
---  'unit_count[]' AS name,
---  'Unit (count)' AS label,
---  2 AS width,
---  'select' AS type,
---  TRUE AS multiple,
---  TRUE AS dropdown,
---  '' AS value,
---  json_agg(json_build_object(
---    'label', o.name,
---    'value', o.name,
---    'selected', COALESCE(o.selected, FALSE)
---  ) ORDER BY o.name) AS options
---FROM sqlpage_options o
---WHERE
---  o.type = 'unit_count'
---AND
---  o.session = sqlpage.cookie('session')
---;
 SELECT 'Clear' AS value
 , 'clear' AS name
 , '' AS label

sqlpage/products.sql

@@ -1,9 +1,2 @@
 SET title = 'Products';
 SELECT 'dynamic' AS component, sqlpage.run_sql('entry.sql') AS properties;
--- SELECT
---   'redirect' AS component,
---   (SELECT CASE
---     WHEN $title IN ('Products', 'Categories', 'Groups', 'Tags')
---     THEN 'entry.sql?title='||$title ELSE 'transactions.sql'
---     END
---   ) AS link;

sqlpage/tags.sql

@@ -1,2 +1,2 @@
 SET title = 'Tags';
-SELECT 'dynamic' AS component, sqlpage.run_sql('entry.sql') AS properties;
+SELECT 'dynamic' AS component, sqlpage.run_sql('entry.sql') AS properties;