feat: multicategories views on preparation

ungdev · Sep 11, 2024 · a9f0cbf · a9f0cbf
1 parent ca8480b
commit a9f0cbf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import 'moment/locale/fr';
 import moment from 'moment';
-import { useDispatch, useSelector } from "react-redux";
+import { useDispatch, useSelector } from 'react-redux';
 import Navbar from '@/components/navbar';
 import FontAwesome from 'react-fontawesome';
 import { logout } from '@/reducers/login';
@@ -35,7 +35,7 @@ const App = () => {
                 <div onClick={() => router.push('/preparation?only=pizzas')}>
                   <FontAwesome name="pizza-slice" /> Pizzas
                 </div>
-                <div onClick={() => router.push('/preparation?only=crepes')}>
+                <div onClick={() => router.push('/preparation?only=crepes,galettes')}>
                   <FontAwesome name="stroopwafel" /> Crêpes
                 </div>
                 <div onClick={() => router.push('/preparation?only=croques')}>
@@ -52,7 +52,7 @@ const App = () => {
                 <div onClick={() => router.push('/preparation?only=pizzas&by=item')}>
                   <FontAwesome name="pizza-slice" /> Pizzas
                 </div>
-                <div onClick={() => router.push('/preparation?only=crepes&by=item')}>
+                <div onClick={() => router.push('/preparation?only=crepes,galettes&by=item')}>
                   <FontAwesome name="stroopwafel" /> Crêpes
                 </div>
                 <div onClick={() => router.push('/preparation?only=croques&by=item')}>

diff --git a/src/app/preparation/page.tsx b/src/app/preparation/page.tsx
@@ -19,9 +19,15 @@ const Page = () => {
 
   // Renvoie les commandes contenant au moins un item dans la catégory du paramètre
   if (searchParams.has("only")) {
+    const categoriesToDisplay = searchParams.get("only").split(",");
     orders = orders.filter((order) =>
-      order.orderItems.some((orderItem) => orderItem.item.category.key == searchParams.get("only"))
+      order.orderItems.some((orderItem) => categoriesToDisplay.includes(orderItem.item.category.key))
     );
+    if (searchParams.has("by") && searchParams.get("by") == "item") {
+      orders.forEach((order) => {
+        order.orderItems = order.orderItems.filter((orderItem) => categoriesToDisplay.includes(orderItem.item.category.key));
+      });
+    }
   }
 
   // used only to refresh the component every minute
@@ -65,7 +71,7 @@ const Page = () => {
     }
   };
 
-  const separate_by: string = searchParams.has('by') ? searchParams.get('by') : 'order';
+  const separate_by: string = searchParams.get('by') ?? 'order';
 
   const displayOrders = (orders: Array<Order>) => {