beef production creation form full with business controls

benjaminpochat · Feb 18, 2024 · adcf92d · adcf92d
1 parent 9eb993d
commit adcf92d
Show file tree

Hide file tree

Showing 15 changed files with 2,397 additions and 1,577 deletions.
diff --git a/frontend/app/package-lock.json b/frontend/app/package-lock.json
diff --git a/frontend/app/package.json b/frontend/app/package.json
@@ -20,7 +20,7 @@
     "react-cookie": "^7.0.2",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.46.1",
-    "react-hook-form-mui": "^6.5.2",
+    "react-hook-form-mui": "^6.8.0",
     "react-scripts": "5.0.1",
     "typescript": "^5.2.2",
     "viandeendirect_eu": "file:../gen",

diff --git a/frontend/app/src/App.css b/frontend/app/src/App.css
@@ -9,6 +9,10 @@
   margin: 1rem;
 }
 
+.form-select-list {
+  width: 10rem;
+}
+
 .card-clickable > *:hover {
   background-color: lightgrey;
   cursor: pointer;

diff --git a/frontend/app/src/App.js b/frontend/app/src/App.js
@@ -1,6 +1,8 @@
 import { ThemeProvider } from '@mui/material';
 import { createTheme } from '@mui/material/styles';
 import { frFR } from '@mui/material/locale';
+import { LocalizationProvider } from "@mui/x-date-pickers"
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'
 
 import { ReactKeycloakProvider } from '@react-keycloak/web'
 import Keycloak from 'keycloak-js'
@@ -69,7 +71,9 @@ function App() {
     <CookiesProvider>
       <ReactKeycloakProvider authClient={keycloakClient} initOptions={keycloakInitOptions}>
         <ThemeProvider theme={theme}>
-          {getLayoutWrapper()}
+          <LocalizationProvider dateAdapter={AdapterDayjs} adapterLocale="fr">
+            {getLayoutWrapper()}
+          </LocalizationProvider>
         </ThemeProvider>
       </ReactKeycloakProvider>
     </CookiesProvider>

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.tsx'
+import BeefProductionCreator from './views/beefProductionCreator/BeefProductionCreator.tsx'
 import PackageLotsCreator from './views/PackageLotsCreator'
 import ProductionsList from './views/ProductionsList.tsx'
 
@@ -16,7 +16,7 @@ export default function ProductionController() {
     function getContent() {
         switch (currentAction) {
             case PRODUCTIONS_LIST: return <ProductionsList createBeefProductionCallback={() => setCurrentAction(BEEF_PRODUCTION_CREATION)}></ProductionsList>
-            case BEEF_PRODUCTION_CREATION: return <BeefProductionForm callback={(action) => {setCurrentAction(action)}} />
+            case BEEF_PRODUCTION_CREATION: return <BeefProductionCreator callback={(action) => {setCurrentAction(action)}} />
             case BEEF_PRODUCTION_PACKAGE_MODIFICATION: return <PackageLotsCreator></PackageLotsCreator>
         }
     }

diff --git a/frontend/app/src/domains/production/components/PackageLotConfigurator.js b/frontend/app/src/domains/production/components/PackageLotConfigurator.js
@@ -7,7 +7,7 @@ import { Button } from "@mui/material"
  * @param {PackageLot} lot 
  * @returns 
  */
-export default function PackageLotsConfigurator({packageLot: packageLot}) {
+export default function PackageLotsConfigurator({packageLot: packageLot, changeCallback: changeCallback}) {
     const [quantity, setQuantity] = useState(packageLot.quantity)
 
     return <div>
@@ -41,6 +41,7 @@ export default function PackageLotsConfigurator({packageLot: packageLot}) {
     function addPackages(quantity) {
         packageLot.quantity += quantity
         setQuantity(packageLot.quantity)
+        changeCallback(packageLot)
     }
 
     /**
@@ -49,6 +50,7 @@ export default function PackageLotsConfigurator({packageLot: packageLot}) {
     function removePackages(quantity) {
         packageLot.quantity -= Math.min(quantity, packageLot.quantity)
         setQuantity(packageLot.quantity)
+        changeCallback(packageLot)
     }
 
 }
diff --git a/frontend/app/src/domains/production/service/BeefProductionService.ts b/frontend/app/src/domains/production/service/BeefProductionService.ts
@@ -0,0 +1,9 @@
+export class BeefProductionService {
+    static getMeatWeight(warmCarcassWeight: number): number {
+        return Math.round(warmCarcassWeight / 0.55 * 0.36 || 0 )
+    }
+
+    static getLiveWeight(warmCarcassWeight: number): number {
+        return Math.round(warmCarcassWeight / 0.55 || 0 )
+    }
+}
diff --git a/frontend/app/src/domains/production/views/BeefProductionForm.tsx b/frontend/app/src/domains/production/views/BeefProductionForm.tsx
diff --git a/frontend/app/src/domains/production/views/PackageLotsCreator.js b/frontend/app/src/domains/production/views/PackageLotsCreator.js
@@ -6,40 +6,44 @@ import PackageLot from "viandeendirect_eu/dist/model/PackageLot"
 import PackageLotsConfigurator from "../components/PackageLotConfigurator"
 
 
-export default function PackageLotsCreator() {
+export default function PackageLotsCreator({ production: production, changeProductionCallback: changeProductionCallback }) {
 
-    const { keycloak, initialized } = useKeycloak()
-    const [packageLots, setPackageLots] = useState([])
+    const { keycloak } = useKeycloak()
     const apiBuilder = new ApiBuilder()
 
     useEffect(() => {
-        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            apiBuilder.invokeAuthenticatedApi(() => {
-                api.getPackageTemplates((error, data, response) => {
-                    if (error) {
-                        console.error(error);
-                    } else {
-                        console.log('api.getPackageTemplates called successfully. Returned data: ' + data);
-                        const lots = []
-                        data.map(template => {
-                            let lot = new PackageLot()
-                            lot.label = template.label
-                            lot.description = template.description
-                            lot.unitPrice = template.unitPrice
-                            lot.netWeight = template.netWeight
-                            lot.quantity = 0
-                            lot.quantitySold = 0
-                            lots.push(lot)
-                        })
-                        setPackageLots(lots)
-                    }
-                })
-            }, keycloak)
-        })
+        if (!production.lots) {
+            apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+                apiBuilder.invokeAuthenticatedApi(() => {
+                    api.getPackageTemplates((error, data, response) => {
+                        if (error) {
+                            console.error(error);
+                        } else {
+                            console.log('api.getPackageTemplates called successfully. Returned data: ' + data);
+                            const lots = []
+                            data.map(template => {
+                                let lot = new PackageLot()
+                                lot.label = template.label
+                                lot.description = template.description
+                                lot.unitPrice = template.unitPrice
+                                lot.netWeight = template.netWeight
+                                lot.quantity = 0
+                                lot.quantitySold = 0
+                                lots.push(lot)
+                            })
+                            changeProductionCallback({ ...production, lots: lots })
+                        }
+                    })
+                }, keycloak)
+            })
+        }
     }, [keycloak])
 
     return <>
-        {packageLots.map(lot => <PackageLotsConfigurator packageLot={lot}></PackageLotsConfigurator>)}
+        {production.lots?.map(lot => <PackageLotsConfigurator packageLot={lot} changeCallback={changeLotConfiguration}></PackageLotsConfigurator>)}
     </>
 
+    function changeLotConfiguration(lot) {
+        changeProductionCallback({ ...production })
+    }
 }