From 6e8806d1ef524ecda1d45ced404a41a84ef75af6 Mon Sep 17 00:00:00 2001 From: Jake Kasper Date: Mon, 25 Aug 2025 09:27:00 -0400 Subject: [PATCH] a;sdhf --- backend/src/routes/equipment.js | 10 +--------- frontend/src/pages/Products/Products.js | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/backend/src/routes/equipment.js b/backend/src/routes/equipment.js index 7993580..7646f41 100644 --- a/backend/src/routes/equipment.js +++ b/backend/src/routes/equipment.js @@ -194,15 +194,7 @@ router.get('/spreaders', async (req, res, next) => { LEFT JOIN equipment_categories ec ON ue.category_id = ec.id WHERE ue.user_id = $1 AND ue.is_active = true - AND ( - ec.name ILIKE '%spreader%' - OR ue.spreader_type IS NOT NULL - OR ue.custom_name ILIKE '%spreader%' - OR ue.manufacturer ILIKE '%spreader%' - OR ue.manufacturer ILIKE '%lesco%' - ) - AND ue.custom_name NOT ILIKE '%nozzle%' - AND ue.custom_name NOT ILIKE '%sprayer%' + AND ec.name ILIKE 'spreader' ORDER BY ue.custom_name, ue.manufacturer, ue.model`, [req.user.id] ); diff --git a/frontend/src/pages/Products/Products.js b/frontend/src/pages/Products/Products.js index a6d043e..ff5f384 100644 --- a/frontend/src/pages/Products/Products.js +++ b/frontend/src/pages/Products/Products.js @@ -462,6 +462,7 @@ const CreateProductModal = ({ onSubmit, onCancel, sharedProducts, categories }) const selectedSpreader = availableSpreaders.find(s => s.id === parseInt(newSpreaderSetting.equipmentId)); const settingWithSpreaderInfo = { ...newSpreaderSetting, + equipmentId: parseInt(newSpreaderSetting.equipmentId), // Convert to number id: Date.now(), equipmentName: selectedSpreader?.name, equipmentManufacturer: selectedSpreader?.manufacturer, @@ -915,6 +916,7 @@ const EditProductModal = ({ product, onSubmit, onCancel, sharedProducts, categor const selectedSpreader = availableEditSpreaders.find(s => s.id === parseInt(newEditSpreaderSetting.equipmentId)); const settingWithSpreaderInfo = { ...newEditSpreaderSetting, + equipmentId: parseInt(newEditSpreaderSetting.equipmentId), // Convert to number equipmentName: selectedSpreader?.name, equipmentManufacturer: selectedSpreader?.manufacturer, equipmentModel: selectedSpreader?.model