kasperj/turftracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applications

Browse Source
This commit is contained in:
Jake Kasper
2025-08-22 14:48:08 -04:00
parent 9c891c6156
commit 5afa1ee5a9
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/src/pages/Applications/Applications.js
View File

@@ -112,6 +112,7 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
propertyId: '', propertyId: '',
selectedAreas: [], selectedAreas: [],
productId: '', productId: '',
selectedProduct: null,
applicationType: '', // 'liquid' or 'granular' applicationType: '', // 'liquid' or 'granular'
equipmentId: '', equipmentId: '',
notes: '' notes: ''
@@ -135,11 +136,20 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
console.log('Equipment response:', equipmentResponse.data); console.log('Equipment response:', equipmentResponse.data);
setProperties(propertiesResponse.data.data.properties || []); setProperties(propertiesResponse.data.data.properties || []);
// Combine shared and user products // Combine shared and user products with unique IDs
const allProducts = [ const sharedProducts = (productsResponse.data.data.sharedProducts || []).map(product => ({
...(productsResponse.data.data.sharedProducts || []), ...product,
...(productsResponse.data.data.userProducts || []) uniqueId: `shared_${product.id}`,
]; isShared: true
}));
const userProducts = (productsResponse.data.data.userProducts || []).map(product => ({
...product,
uniqueId: `user_${product.id}`,
isShared: false
}));
const allProducts = [...sharedProducts, ...userProducts];
setProducts(allProducts); setProducts(allProducts);
setEquipment(equipmentResponse.data.data.equipment || []); setEquipment(equipmentResponse.data.data.equipment || []);
} catch (error) { } catch (error) {
@@ -297,7 +307,7 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
className="input" className="input"
value={planData.productId} value={planData.productId}
onChange={(e) => { onChange={(e) => {
const selectedProduct = products.find(p => p.id === parseInt(e.target.value)); const selectedProduct = products.find(p => p.uniqueId === e.target.value);
console.log('Selected product:', selectedProduct); console.log('Selected product:', selectedProduct);
// Determine application type from product type // Determine application type from product type
@@ -315,6 +325,7 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
setPlanData({ setPlanData({
...planData, ...planData,
productId: e.target.value, productId: e.target.value,
selectedProduct: selectedProduct,
applicationType: applicationType applicationType: applicationType
}); });
}} }}
@@ -330,7 +341,7 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
: ''; : '';
return ( return (
<option key={product.id} value={product.id}> <option key={product.uniqueId} value={product.uniqueId}>
{displayName}{brand ? ` - ${brand}` : ''}{productType ? ` (${productType})` : ''}{rateInfo} {displayName}{brand ? ` - ${brand}` : ''}{productType ? ` (${productType})` : ''}{rateInfo}
</option> </option>
); );