Pending changes exported from your codespace

benjaminpochat · Feb 16, 2024 · 9eb993d · 9eb993d
1 parent c510665
commit 9eb993d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 205 deletions.
diff --git a/frontend/app/package-lock.json b/frontend/app/package-lock.json
diff --git a/frontend/app/src/api/mock/MockApiProductions.ts b/frontend/app/src/api/mock/MockApiProductions.ts
@@ -28,7 +28,7 @@ export class MockApiProductions {
             id: 1,
             animalIdentifier: '1234',
             slaughterDate: '2023-10-01T10:00:00',
-            animalLiveWeight: 450,
+            warmCarcassWeight: 450,
             animalType: 'BEEF_COW',
             lots: [
                 {

diff --git a/frontend/app/src/domains/production/ProductionController.js b/frontend/app/src/domains/production/ProductionController.js
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import BeefProductionForm from './views/BeefProductionForm'
+import BeefProductionForm from './views/BeefProductionForm.tsx'
 import PackageLotsCreator from './views/PackageLotsCreator'
 import ProductionsList from './views/ProductionsList.tsx'
 

diff --git a/frontend/app/src/domains/production/components/BeefProductionCard.tsx b/frontend/app/src/domains/production/components/BeefProductionCard.tsx
@@ -39,7 +39,7 @@ export default function BeefProductionCard({
                     Abattage le {dayjs(beefProduction.slaughterDate).format('DD/MM/YYYY')}
                 </Typography>
                 <Typography component="div">
-                    Poids vif estimé : {beefProduction.animalLiveWeight} kg
+                    Poids de carcasse chaude : {beefProduction.warmCarcassWeight} kg
                 </Typography>
             </CardContent>
             {getActions()}

diff --git a/...ns/production/views/BeefProductionForm.js → ...s/production/views/BeefProductionForm.tsx b/...ns/production/views/BeefProductionForm.js → ...s/production/views/BeefProductionForm.tsx
@@ -1,3 +1,4 @@
+import React from "react"
 import { useState } from "react"
 
 import { Button, ButtonGroup, Typography, Stepper, Step, StepLabel, StepContent } from "@mui/material"
@@ -12,7 +13,7 @@ import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'
 import 'dayjs/locale/fr'
 
 import { BeefProduction } from 'viandeendirect_eu';
-import PackageLotsCreator from "./PackageLotsCreator"
+import PackageLotsCreator from "./PackageLotsCreator.js"
 
 export default function BeefProductionForm({ callback }) {
 
@@ -31,13 +32,16 @@ export default function BeefProductionForm({ callback }) {
                     <StepLabel>Définir les caractéristiques de l'abattage</StepLabel>
                     <StepContent>
                         <LocalizationProvider dateAdapter={AdapterDayjs} adapterLocale="fr">
-                            <FormContainer onSuccess={validateProductionProperties} defaultValues={{ "animalLiveWeight": 400 }} >
+                            <FormContainer onSuccess={validateProductionProperties} defaultValues={{ "warmCarcassWeight": 400 }}>
                                 <div className="form">
                                     <div>
                                         <TextFieldElement required validation={{ required: 'Champ obligatoire'}} name="animalIdentifier" label="Numéro d'identification de l'animal" variant="standard" />
                                     </div>
                                     <div>
-                                        <SliderElement min={100} max={1000} step={50} required validation={{ required: 'Champ obligatoire'}} name="animalLiveWeight" label="Poids vif" variant="standard" />
+                                        <SliderElement value={beefProduction.warmCarcassWeight} onChange={updateProductionWeigth} min={100} max={1000} step={50} required validation={{ required: 'Champ obligatoire'}} name="warmCarcassWeight" label="Poids estimé de l'animal vif" variant="standard" />
+                                        <div>
+                                            <span>Poids de carcasse chaude : {beefProduction.warmCarcassWeight} kg</span>
+                                        </div>
                                     </div>
                                     <div>
                                         <DatePickerElement required validation={{ required: 'Champ obligatoire'}} name="birthDate" label="Date de naissance" variant="standard" />
@@ -78,13 +82,18 @@ export default function BeefProductionForm({ callback }) {
             </Stepper>
         </>            
 
+    function updateProductionWeigth(event, weight) {
+        console.log(weight)
+        setBeefProduction({...beefProduction, 
+            warmCarcassWeight: weight
+        })
+    }
 
     function validateProductionProperties(productionFormData) {
-        console.log(productionFormData)
         setBeefProduction({...beefProduction, 
             productionType: "BeefProduction",
             animalIdentifier: productionFormData.animalIdentifier,
-            animalLiveWeight: productionFormData.animalLiveWeight,
+            warmCarcassWeight: productionFormData.warmCarcassWeight,
             birthDate: productionFormData.birthDate,
             slaughterDate: productionFormData.slaughterDate,
             birthPlace: productionFormData.birthPlace,