This commit is contained in:
Jake Kasper
2025-08-25 09:27:00 -04:00
parent 792f186715
commit 6e8806d1ef
2 changed files with 3 additions and 9 deletions

View File

@@ -194,15 +194,7 @@ router.get('/spreaders', async (req, res, next) => {
LEFT JOIN equipment_categories ec ON ue.category_id = ec.id LEFT JOIN equipment_categories ec ON ue.category_id = ec.id
WHERE ue.user_id = $1 WHERE ue.user_id = $1
AND ue.is_active = true AND ue.is_active = true
AND ( AND ec.name ILIKE 'spreader'
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%'
ORDER BY ue.custom_name, ue.manufacturer, ue.model`, ORDER BY ue.custom_name, ue.manufacturer, ue.model`,
[req.user.id] [req.user.id]
); );

View File

@@ -462,6 +462,7 @@ const CreateProductModal = ({ onSubmit, onCancel, sharedProducts, categories })
const selectedSpreader = availableSpreaders.find(s => s.id === parseInt(newSpreaderSetting.equipmentId)); const selectedSpreader = availableSpreaders.find(s => s.id === parseInt(newSpreaderSetting.equipmentId));
const settingWithSpreaderInfo = { const settingWithSpreaderInfo = {
...newSpreaderSetting, ...newSpreaderSetting,
equipmentId: parseInt(newSpreaderSetting.equipmentId), // Convert to number
id: Date.now(), id: Date.now(),
equipmentName: selectedSpreader?.name, equipmentName: selectedSpreader?.name,
equipmentManufacturer: selectedSpreader?.manufacturer, 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 selectedSpreader = availableEditSpreaders.find(s => s.id === parseInt(newEditSpreaderSetting.equipmentId));
const settingWithSpreaderInfo = { const settingWithSpreaderInfo = {
...newEditSpreaderSetting, ...newEditSpreaderSetting,
equipmentId: parseInt(newEditSpreaderSetting.equipmentId), // Convert to number
equipmentName: selectedSpreader?.name, equipmentName: selectedSpreader?.name,
equipmentManufacturer: selectedSpreader?.manufacturer, equipmentManufacturer: selectedSpreader?.manufacturer,
equipmentModel: selectedSpreader?.model equipmentModel: selectedSpreader?.model