diff --git a/application/__pycache__/database_payloads.cpython-313.pyc b/application/__pycache__/database_payloads.cpython-313.pyc index 134fe43..0d26499 100644 Binary files a/application/__pycache__/database_payloads.cpython-313.pyc and b/application/__pycache__/database_payloads.cpython-313.pyc differ diff --git a/application/administration/sql/CREATE/food_info.sql b/application/administration/sql/CREATE/food_info.sql index 18a0e92..0ec79a9 100644 --- a/application/administration/sql/CREATE/food_info.sql +++ b/application/administration/sql/CREATE/food_info.sql @@ -1,5 +1,6 @@ CREATE TABLE IF NOT EXISTS %%site_name%%_food_info ( id SERIAL PRIMARY KEY, + food_info_uuid UUID gen_random_uuid(), food_groups TEXT [], ingrediants TEXT [], nutrients JSONB, diff --git a/application/administration/sql/CREATE/item.sql b/application/administration/sql/CREATE/item.sql index 5824864..85db086 100644 --- a/application/administration/sql/CREATE/item.sql +++ b/application/administration/sql/CREATE/item.sql @@ -1,19 +1,22 @@ CREATE TABLE IF NOT EXISTS %%site_name%%_items( id SERIAL PRIMARY KEY, item_uuid UUID DEFAULT gen_random_uuid(), - barcode VARCHAR(255) NOT NULL, + barcode VARCHAR(255), item_name VARCHAR(255) NOT NULL, brand INTEGER, description TEXT, tags TEXT [], links JSONB, item_info_id INTEGER NOT NULL, + item_info_uuid UUID NOT NULL, logistics_info_id INTEGER NOT NULL, + logistics_info_uuid UUID NOT NULL, food_info_id INTEGER, + food_info_uuid UUID NOT NULL, row_type VARCHAR(255) NOT NULL, item_type VARCHAR(255) NOT NULL, search_string TEXT NOT NULL, - UNIQUE(item_uuid, barcode, item_info_id), + UNIQUE(item_uuid), CONSTRAINT fk_item_info FOREIGN KEY(item_info_id) REFERENCES %%site_name%%_item_info(id) diff --git a/application/administration/sql/CREATE/item_info.sql b/application/administration/sql/CREATE/item_info.sql index 0dd1d93..54a985b 100644 --- a/application/administration/sql/CREATE/item_info.sql +++ b/application/administration/sql/CREATE/item_info.sql @@ -1,6 +1,7 @@ CREATE TABLE IF NOt EXISTS %%site_name%%_item_info ( id SERIAL PRIMARY KEY, - barcode VARCHAR(255) NOT NULL, + item_info_uuid UUID gen_random_uuid(), + barcode VARCHAR(255), packaging VARCHAR(255), uom_quantity FLOAT8, uom INTEGER, diff --git a/application/administration/sql/CREATE/logistics_info.sql b/application/administration/sql/CREATE/logistics_info.sql index dbf9f6e..22a52fa 100644 --- a/application/administration/sql/CREATE/logistics_info.sql +++ b/application/administration/sql/CREATE/logistics_info.sql @@ -1,6 +1,7 @@ CREATE TABLE IF NOT EXISTS %%site_name%%_logistics_info( id SERIAL PRIMARY KEY, - barcode VARCHAR(255) NOT NULL, + logistics_info_uuid UUID gen_random_uuid(), + barcode VARCHAR(255), primary_location INTEGER NOT NULL, primary_zone INTEGER NOT NULL, auto_issue_location INTEGER NOT NULL, diff --git a/application/administration/sql/CREATE/plan_events.sql b/application/administration/sql/CREATE/plan_events.sql new file mode 100644 index 0000000..53fbe22 --- /dev/null +++ b/application/administration/sql/CREATE/plan_events.sql @@ -0,0 +1,13 @@ +CREATE TABLE IF NOT EXISTS %%site_name%%_plan_events( + id SERIAL PRIMARY KEY, + event_uuid UUID DEFAULT gen_random_uuid(), + plan_uuid UUID, + recipe_uuid UUID, + event_shortname VARCHAR(32) NOT NULL, + event_description TEXT, + event_date_start TIMESTAMP NOT NULL, + event_date_end TIMESTAMP NOT NULL, + created_by INTEGER NOT NULL, + event_type VARCHAR(32) NOT NULL, + UNIQUE(event_uuid) +) diff --git a/application/administration/sql/CREATE/recipes.sql b/application/administration/sql/CREATE/recipes.sql index 5611abb..c0320b0 100644 --- a/application/administration/sql/CREATE/recipes.sql +++ b/application/administration/sql/CREATE/recipes.sql @@ -1,9 +1,11 @@ CREATE TABLE IF NOT EXISTS %%site_name%%_recipes ( - id SERIAL PRIMARY KEY, + id SERIAL PRIMARY KEY, + recipe_uuid UUID DEFAULT gen_random_uuid() NOT NULL, name VARCHAR, author INTEGER, description TEXT, creation_date TIMESTAMP, instructions TEXT [], - picture_path TEXT + picture_path TEXT, + UNIQUE(recipe_uuid) ); \ No newline at end of file diff --git a/application/administration/templates/admin_index.html b/application/administration/templates/admin_index.html index 3c20105..503aea5 100644 --- a/application/administration/templates/admin_index.html +++ b/application/administration/templates/admin_index.html @@ -32,6 +32,7 @@ Apps