diff --git a/bartender/README.md b/bartender/README.md index a4c72a7..ab0e161 100644 --- a/bartender/README.md +++ b/bartender/README.md @@ -10,20 +10,31 @@ With this default values are overridden. ```SQL SELECT a.name AS product, - CONCAT(CONCAT(v.weight, ' '), u.display) AS weight, - a.bio AS bio, - COALESCE(v.description, a.description) AS description, - COALESCE(v.ingredients, a.ingredients) AS ingredients, - COALESCE(v.name, a.name) AS name, - COALESCE(a.bio_origin, s.bio) AS "bio origin", - COALESCE(a.mhd, s.mhd) AS mhd, - COALESCE(a.allergens_text, s.allergens_text) AS "allergens info" + COALESCE(v.name, a.name) AS name, + CONCAT(CONCAT(v.weight, ' '), u.display) AS weight, + a.bio AS bio, + COALESCE(v.description, a.description) AS description, + CONCAT(COALESCE(v.ingredients, a.ingredients), s.bio_info) AS ingredients, + CONCAT( + CONCAT( + CONCAT(COALESCE(a.bio_origin, s.bio), '
'), + CASE + WHEN a.origin = '1' THEN 'EU-' + WHEN a.origin = '2' THEN 'Nicht-EU-' + WHEN a.origin = '3' THEN 'EU-/Nicht-EU-' + ELSE 'ERROR' END + ), + 'Landwirtschaft' + ) AS "bio", + COALESCE(a.mhd, s.mhd) AS mhd, + COALESCE(a.allergens_text, s.allergens_text) AS "allergens info" FROM article AS a -INNER JOIN variant AS v ON v.article_id = a.id -INNER JOIN settings AS s ON v.article_id = v.article_id -INNER JOIN unit AS u ON v.unit_id = u.id -INNER JOIN label AS l ON v.label_id = l.id + INNER JOIN variant AS v ON v.article_id = a.id + INNER JOIN settings AS s ON v.article_id = v.article_id + INNER JOIN unit AS u ON v.unit_id = u.id + INNER JOIN label AS l ON v.label_id = l.id ORDER BY a.name, v.weight ASC + ``` --- @@ -38,7 +49,8 @@ ORDER BY a.name, v.weight ASC ### Ingredients ```html - +

+

``` ### Allergens info @@ -46,3 +58,8 @@ ORDER BY a.name, v.weight ASC

``` + +### BIO text +```html + +```