From 0fad2a876d10642ed7f2208cab41645f486c5c5f Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 20 Nov 2025 16:21:16 +0100 Subject: [PATCH] Hide orders&co for now --- .../activity/includes/activity_info.html | 3 +- apps/food/templates/food/food_detail.html | 2 ++ apps/food/templates/food/food_list.html | 2 ++ apps/food/tests/test_food.py | 6 ++-- apps/food/urls.py | 30 +++++++++---------- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/apps/activity/templates/activity/includes/activity_info.html b/apps/activity/templates/activity/includes/activity_info.html index f9d6116a..5a8887e2 100644 --- a/apps/activity/templates/activity/includes/activity_info.html +++ b/apps/activity/templates/activity/includes/activity_info.html @@ -65,10 +65,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% if activity.open and activity.activity_type.manage_entries and ".change__open"|has_perm:activity %} {% trans "Entry page" %} {% endif %} - + {% if false %} {% if activity.activity_type.name == "Perm bouffe" %} {% trans "Dish page" %} {% endif %} + {% endif %} {% if request.path_info == activity_detail_url %} {% if activity.valid and ".change__open"|has_perm:activity %} diff --git a/apps/food/templates/food/food_detail.html b/apps/food/templates/food/food_detail.html index 024dee1e..c0bc9555 100644 --- a/apps/food/templates/food/food_detail.html +++ b/apps/food/templates/food/food_detail.html @@ -47,9 +47,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "Manage ingredients" %} + {% if false %} {% trans "Use a recipe" %} + {% endif %} {% endif %} {% trans "Return to the food list" %} diff --git a/apps/food/templates/food/food_list.html b/apps/food/templates/food/food_list.html index 54c8fb1c..d126f607 100644 --- a/apps/food/templates/food/food_list.html +++ b/apps/food/templates/food/food_list.html @@ -70,6 +70,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "New meal" %} {% endif %} + {% if false %} {% if can_view_recipes %} {% trans "View recipes" %} @@ -85,6 +86,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "View" %} {{ activity.name }} {% endfor %} + {% endif %} {% if served.data %} diff --git a/apps/food/tests/test_food.py b/apps/food/tests/test_food.py index 4c4d356d..38629a43 100644 --- a/apps/food/tests/test_food.py +++ b/apps/food/tests/test_food.py @@ -11,7 +11,7 @@ from member.models import Club from ..api.views import AllergenViewSet, BasicFoodViewSet, TransformedFoodViewSet, QRCodeViewSet, \ DishViewSet, SupplementViewSet, OrderViewSet, FoodTransactionViewSet -from ..models import Allergen, BasicFood, TransformedFood, QRCode, Dish, Supplement, Order, FoodTransaction +from ..models import Allergen, BasicFood, TransformedFood, QRCode, Dish, Supplement, Order # TODO FoodTransaction class TestFood(TestCase): @@ -120,7 +120,7 @@ class TestFood(TestCase): self.assertEqual(response.status_code, 200) -class TestFoodOrder(TestCase): +'''class TestFoodOrder(TestCase): """ Test Food Order """ @@ -337,7 +337,7 @@ class TestFoodOrder(TestCase): self.assertEqual(response.status_code, 200) self.assertTrue(Order.objects.filter(dish=self.dish, user=self.user, served=False).exists()) - self.assertTrue(FoodTransaction.objects.filter(order=self.order, valid=False).exists()) + self.assertTrue(FoodTransaction.objects.filter(order=self.order, valid=False).exists())''' class TestFoodAPI(TestAPI): diff --git a/apps/food/urls.py b/apps/food/urls.py index 00bdc3e3..299548f6 100644 --- a/apps/food/urls.py +++ b/apps/food/urls.py @@ -20,19 +20,19 @@ urlpatterns = [ path('add/ingredient//', views.AddIngredientView.as_view(), name='add_ingredient'), path('redirect/', views.QRCodeRedirectView.as_view(), name='redirect_view'), # TODO not always store activity_pk in url - path('activity//dishes/add/', views.DishCreateView.as_view(), name='dish_create'), - path('activity//dishes/', views.DishListView.as_view(), name='dish_list'), - path('activity//dishes//', views.DishDetailView.as_view(), name='dish_detail'), - path('activity//dishes//update/', views.DishUpdateView.as_view(), name='dish_update'), - path('activity//dishes//delete/', views.DishDeleteView.as_view(), name='dish_delete'), - path('activity//order/', views.OrderCreateView.as_view(), name='order_create'), - path('activity//orders/', views.OrderListView.as_view(), name='order_list'), - path('activity//orders/served', views.ServedOrderListView.as_view(), name='served_order_list'), - path('activity//kitchen/', views.KitchenView.as_view(), name='kitchen'), - path('recipe/add/', views.RecipeCreateView.as_view(), name='recipe_create'), - path('recipe/', views.RecipeListView.as_view(), name='recipe_list'), - path('recipe//', views.RecipeDetailView.as_view(), name='recipe_detail'), - path('recipe//update/', views.RecipeUpdateView.as_view(), name='recipe_update'), - path('update/ingredients//recipe/', views.UseRecipeView.as_view(), name='recipe_use'), - path('ajax/get_ingredients/', views.get_ingredients_for_recipe, name='get_ingredients'), + # path('activity//dishes/add/', views.DishCreateView.as_view(), name='dish_create'), + # path('activity//dishes/', views.DishListView.as_view(), name='dish_list'), + # path('activity//dishes//', views.DishDetailView.as_view(), name='dish_detail'), + # path('activity//dishes//update/', views.DishUpdateView.as_view(), name='dish_update'), + # path('activity//dishes//delete/', views.DishDeleteView.as_view(), name='dish_delete'), + # path('activity//order/', views.OrderCreateView.as_view(), name='order_create'), + # path('activity//orders/', views.OrderListView.as_view(), name='order_list'), + # path('activity//orders/served', views.ServedOrderListView.as_view(), name='served_order_list'), + # path('activity//kitchen/', views.KitchenView.as_view(), name='kitchen'), + # path('recipe/add/', views.RecipeCreateView.as_view(), name='recipe_create'), + # path('recipe/', views.RecipeListView.as_view(), name='recipe_list'), + # path('recipe//', views.RecipeDetailView.as_view(), name='recipe_detail'), + # path('recipe//update/', views.RecipeUpdateView.as_view(), name='recipe_update'), + # path('update/ingredients//recipe/', views.UseRecipeView.as_view(), name='recipe_use'), + # path('ajax/get_ingredients/', views.get_ingredients_for_recipe, name='get_ingredients'), ]