diff --git a/bartender/README.md b/bartender/README.md index f0fb85e..6562cd0 100644 --- a/bartender/README.md +++ b/bartender/README.md @@ -5,78 +5,89 @@ ## SQL Query to get all articles with their variants and corresponding setting values. -COALESCE to select between two values where one is not null, if both are null first value is used. +COALESCE to select between two values where one is not null, if both are not null first value is used. With this default values are overridden. +## Lodner 3er Etikett + +### SQL Abfrage ```SQL -SELECT a.name AS product, - COALESCE(v.name, a.name) AS name, - CONCAT(CONCAT(v.weight, ' '), u.display) AS weight, - a.bio AS bio, - v.ean AS ean, - COALESCE(v.description, a.description) AS description, - CONCAT(COALESCE(v.ingredients, a.ingredients), - CASE - WHEN COALESCE(v.ingredients, a.ingredients) LIKE '%Zutaten:%' THEN CONCAT('
', s.bio_info) - ELSE '' END - ) AS ingredients, - CONCAT( - CONCAT( - CONCAT(COALESCE(a.bio_origin, s.bio), '
'), - CASE - WHEN a.origin = '0' THEN 'EU-' - WHEN a.origin = '1' THEN 'Nicht-EU-' - WHEN a.origin = '2' 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" +SELECT + a.name AS product, + CONCAT(a.topm_id, v.topm_row) AS aritcle_number, + COALESCE(v.name, a.name) AS name, + CONCAT(CONCAT(v.weight, ' '), u.display) AS weight, + a.bio AS bio, + v.ean AS ean, + COALESCE(v.description, a.description) AS description, + CONCAT(COALESCE(v.ingredients, a.ingredients), + CASE + WHEN COALESCE(v.ingredients, a.ingredients) LIKE '%Zutaten:%' THEN CONCAT('
', s.bio_info) + ELSE '' END + ) AS ingredients, + CONCAT( + CONCAT( + CONCAT(COALESCE(a.bio_origin, s.bio), '
'), + CASE + WHEN a.origin = '0' THEN 'EU-' + WHEN a.origin = '1' THEN 'Nicht-EU-' + WHEN a.origin = '2' 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 +WHERE v.label_id = 1 ORDER BY a.name, v.weight ASC ``` --- -### HTML settings for label +#### HTML settings for label -### Product title +##### Product title ```html

``` -### Product title Siegel +##### Product title Siegel ```html

``` -### Description +##### Description ```html

``` -### Ingredients +##### Ingredients ```html

``` -### Allergens info +##### Allergens info ```html

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

``` + +--- + +## Lodner kleines Etikett + diff --git a/frontend/app/layouts/default.vue b/frontend/app/layouts/default.vue index 3e8d000..2543b2a 100644 --- a/frontend/app/layouts/default.vue +++ b/frontend/app/layouts/default.vue @@ -22,7 +22,7 @@ - +