Commit Graph

272 Commits

Author SHA1 Message Date
e89c1742fb remove deprecated django.db.backends.postgresql_psycopg2 2023-10-30 21:42:57 -05:00
e746b44f3b Merge pull request #2632 from smilerz/unique_name
updates to multiple models uniqueness capabilities
2023-10-05 18:57:08 +02:00
a7795092b3 make 'name' unique in space for MealType
make MealType, Unit, Supermarket, Supermarket Category, PropoertyType
case insenstive for get_or_create
convert unit conversion create serializer to get_or_create behavior
enable create duplicate tests for unitconversion and mealtype api
2023-09-14 14:46:37 -05:00
1f0cd58d7d remove unused imports, variables and commented code
from tests
2023-09-13 13:08:26 -05:00
768a5ea237 Squashed commit of the following:
commit 36403ecbae
Author: smilerz <smilerz@gmail.com>
Date:   Fri Sep 1 12:04:04 2023 -0500

    update migration for new Automation Types

commit 4620ebaf30
Author: smilerz <smilerz@gmail.com>
Date:   Fri Sep 1 07:49:10 2023 -0500

    add Name and Instruction automation to YouTube importer

commit c907da84c1
Author: smilerz <smilerz@gmail.com>
Date:   Fri Sep 1 07:45:32 2023 -0500

    remove old commented automation code

commit 9b5e39415e
Author: smilerz <smilerz@gmail.com>
Date:   Fri Sep 1 07:37:36 2023 -0500

    test for automations applied during url import
    renamed TITLE_REPLACE to NAME_REPLACE

commit 2679a22464
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 31 15:29:59 2023 -0500

    added tests for regex_replace

commit 8bae21025b
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 31 13:51:46 2023 -0500

    updated Automation Modal and translations

commit 4120adc546
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 31 13:12:41 2023 -0500

    applied regex_replace automation to food and unit automations
    updated automation documentation

commit 30c891abfc
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 31 12:46:34 2023 -0500

    migrate regex_replace functions to AutomationEngine
    create TITLE_REPLACE, UNIT_REPLACE and FOOD REPLACE automation types
    create migration for new types

commit b8317c2c29
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 30 20:44:40 2023 -0500

    move transpose words to AutomationEngine
    create tests for transpose words

commit 39253cfd02
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 30 17:03:29 2023 -0500

    refactor never_unit automation to AutomationEngine
    create tests for never_unit

commit 7c0b8b151c
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 30 11:21:06 2023 -0500

    update ingredient parser to use AutomationEngine for unt, keyword, food
    update test_ingredient_parser tests to accomodate changes

commit 8e1b8923af
Author: smilerz <smilerz@gmail.com>
Date:   Mon Aug 28 16:44:35 2023 -0500

    keyword and unit Automtations refactored to Automation Engine
    keyword and unit automation tests added

commit 52eb876a08
Author: smilerz <smilerz@gmail.com>
Date:   Mon Aug 28 15:03:19 2023 -0500

    food_alias tests added

commit a820b9c09e
Author: smilerz <smilerz@gmail.com>
Date:   Sat Aug 26 12:37:16 2023 -0500

    create AutomationEngine class
    create food_automation method
    refactor food automations to use AutomationEngine
2023-09-12 09:46:08 -05:00
794f9cf5b9 fixed meal plan factory 2023-09-08 16:38:38 +02:00
9954bb9410 fixed test and added meal plan client settings load save 2023-09-08 16:27:39 +02:00
4a1ec5adf7 fixed icon issues 2023-08-30 09:05:24 +02:00
01ce658883 fixed step factory 2023-08-25 09:12:58 +02:00
2f0929e90e Merge pull request #2539 from srwareham/hide-step-ingredients
Added option: Hide step ingredients
2023-08-24 10:33:57 +02:00
6785033a21 Add step-level configuration whether an ingredients table should be shown. User-level default added to settings 2023-08-23 21:46:09 -07:00
6f1befc43c fixed rating sort order and updated tests 2023-07-25 11:37:48 -05:00
c2cf7ba758 fixed test 2023-07-18 16:40:38 +02:00
a8f1cd26cd change guest recipe permission 2023-07-18 10:54:20 +02:00
a497a6b7f5 space api read for all users in space 2023-07-15 13:57:25 +02:00
a24628c771 fixed userspace tetsts 2023-07-11 17:25:43 +02:00
ebc213395d added property api test 2023-05-26 16:06:49 +02:00
aeb944b281 dont show properties if no reference amout is given 2023-05-26 15:32:55 +02:00
43105ddd2f fixed onhand test (cache) and fixed shared recipe properties 2023-05-26 10:57:08 +02:00
3302dacdc3 properties structure imporioved 2023-05-25 16:13:16 +02:00
2a538abf80 test work 2023-05-24 15:59:25 +02:00
2a5cba0178 improvements to property calculation 2023-05-07 00:30:32 +02:00
9a77089c6d improved unit conversion and tests 2023-05-06 23:57:45 +02:00
19f5da77b2 cleanup migrations, remove pint to speed up base conversion and calculate properties on converted ingredients 2023-05-06 22:21:27 +02:00
60f31608b9 added recipe properties 2023-05-06 19:14:25 +02:00
e3921cd6a8 Merge branch 'develop' into feature/unit-conversion 2023-05-06 17:01:06 +02:00
d8ddf66921 reload food objects to resolve inconsistent behavior 2023-05-03 10:17:59 -05:00
89e3e85d1e Merge branch 'develop' into feature/unit-conversion
# Conflicts:
#	requirements.txt
2023-04-30 21:51:56 +02:00
b711ee5257 update User factory to make username unique 2023-04-24 07:33:47 -05:00
c7b6253e04 fixed food tree search filter tests 2023-04-24 07:01:28 -05:00
595de0c5a1 fixed pytests 2023-04-22 17:56:01 -05:00
8c3195937b fix food tests 2023-04-21 13:14:23 -05:00
25c914606e improved converters and helpers 2023-04-02 10:54:57 +02:00
44cb2d9807 improved tests and limited conversion to existing units 2023-04-02 10:05:28 +02:00
7e350b2f90 improved property calculator 2023-03-25 07:59:07 +01:00
6d5592c1be basic food property calculation 2023-03-25 07:46:06 +01:00
cb518a0cca many more unit conversions 2023-03-16 17:07:46 +01:00
6efe4ab08d base unit conversions 2023-03-15 17:30:23 +01:00
d1d568a9d3 fixed import view step editor 2023-01-19 19:12:25 +01:00
274b17a860 improved unit factory and run CI on PR 2023-01-16 21:20:16 +01:00
388f2f441f tests 2023-01-06 22:35:14 +01:00
11e8af4c46 comment out broken test 2023-01-06 22:12:59 +01:00
6b59f53273 test wip but not working 2023-01-04 17:27:15 +01:00
6176eeb024 basics 2023-01-03 23:12:00 +01:00
9994b6f9c2 Add plural name for unit and food
Add an optional plural name for unit and food.
Additional options to show always the plural name for unit and food
for an ingredient is added.
2022-11-11 18:15:57 +01:00
24f331c208 improved ingredient parser handling of amount unit without space 2022-11-09 14:24:12 +01:00
327c83ce32 improved share link tests 2022-10-31 14:30:39 +01:00
3371102e64 improved and added tests for share link creation 2022-10-31 14:24:41 +01:00
b49393357a fixed tests 2022-09-21 16:54:41 +02:00
cffa731106 fix: ingredient parsing for non-latin languages
Before this change the ingredient string for non-latin
languages was not being parsed into the correct amount
or units when the food is found at the start of the
ingredient string.

This was because the regex being used was restricted to
latin characters.

With this change the amount and units are correctly
parsed from such a string.

Fixes https://github.com/TandoorRecipes/recipes/issues/1983
2022-08-07 21:37:59 +01:00