Update TODO & README.

2 files changed, 10 insertions, 5 deletions

diff --git a/README b/README
index 2edcd96..c86f394 100644
--- a/README
+++ b/README
@@ -10,8 +10,13 @@ CREATE TABLE ingredients (id INTEGER PRIMARY KEY AUTOINCREMENT, name, shop_posit
 CREATE TABLE contents (recipe_id INTEGER, ingredient_id INTEGER, quantity FLOAT, unit);
 CREATE TABLE plan (date DATETIME, mealtype, recipe_id INTEGER, state, comment_id);
 CREATE TABLE comments (id INTEGER PRIMARY KEY AUTOINCREMENT, comment);
-CREATE TABLE inventory (id INTEGER PRIMARY KEY AUTOINCREMENT, recipe_id INTEGER, preparation_date DATETIME, amount INTEGER, storage);
+CREATE TABLE inventory (id INTEGER PRIMARY KEY AUTOINCREMENT, recipe_id INTEGER, amount INTEGER, storage, preparation_date DATETIME, energy INTEGER);
 CREATE TABLE queue (id INTEGER PRIMARY KEY, recipe_id INTEGER, servings INTEGER);
+CREATE TABLE mealtypes (id INTEGER PRIMARY KEY AUTOINCREMENT, mealtype);
+CREATE TABLE typemap (recipe_id INTEGER, mealtype_id INTEGER);
+CREATE TABLE stock (product_id TEXT, quantity FLOAT, unit TEXT, up_to_date DATETIME);
+CREATE TABLE products (id TEXT PRIMARY KEY, ingredient_id INTEGER, description TEXT);
+CREATE TABLE cookings (recipe_id INTEGER, date DATETIME, specific_energy INTEGER);
 
 All basic operations are performed using the perl script mat. It is possible to
 get a crude list of commands available by running: "mat help".
diff --git a/TODO b/TODO
index 9c4439f..76771ff 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,10 @@
  * Replace currently cooking with a planned queue of meals.
 
+ * Implement unit conversion for ingredients.
+
  * Combine into one row on the shoppinglist when there are several entries of
-   the same ingredient.
+   the same ingredient, even when their units differ.
 
- * Add command to feedback when portions were too small (still hungry/ate five
-   chocolate bars after lunch) or too large (became full/lunch took two hours
-   to complete).
+ * Group shoppinglist by store placement.
 
  * Include kitchen computer scripts in this repository.