From 9616fbbdc2b96200216ace245b37bec4ad3c3a28 Mon Sep 17 00:00:00 2001 From: maxmielchen Date: Sun, 10 Mar 2024 20:20:38 +0100 Subject: [PATCH] Refactor Versandkosten component to use nec function for input values --- src/lib/versandkosten.tsx | 82 ++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/src/lib/versandkosten.tsx b/src/lib/versandkosten.tsx index 7bf36d2..1d3f7b4 100644 --- a/src/lib/versandkosten.tsx +++ b/src/lib/versandkosten.tsx @@ -2,58 +2,70 @@ import React from "react"; import { useState } from "react"; import { Table } from "react-bootstrap"; -import waehrung from "./standard/waehrung"; import WaehrungBadge from "./standard/waehrungBadge"; +import nec from "./standard/nec"; function Versandkosten() { const [kg, setKg] = useState(0); - const [fpDAL, setFpDAL] = useState(0); - const [fpDeltapost, setFpDeltapost] = useState(0); - const [fpPOC, setFpPOC] = useState(0); - const [fpPostbox, setFpPostbox] = useState(0); - - const [kgDAL, setKgDAL] = useState(0); - const [kgDeltapost, setKgDeltapost] = useState(0); - const [kgPOC, setKgPOC] = useState(0); - const [kgPostbox, setKgPostbox] = useState(0); + const [fpDAL, setFpDAL] = useState("0"); + let getFpDAL = nec(fpDAL); + const [fpDeltapost, setFpDeltapost] = useState("0"); + let getFpDeltapost = nec(fpDeltapost); + const [fpPOC, setFpPOC] = useState("0"); + let getFpPOC = nec(fpPOC); + const [fpPostbox, setFpPostbox] = useState("0"); + let getFpPostbox = nec(fpPostbox); + + const [kgDAL, setKgDAL] = useState("0"); + let getKgDAL = nec(kgDAL); + const [kgDeltapost, setKgDeltapost] = useState("0"); + let getKgDeltapost = nec(kgDeltapost); + const [kgPOC, setKgPOC] = useState("0"); + let getKgPOC = nec(kgPOC); + const [kgPostbox, setKgPostbox] = useState("0"); + let getKgPostbox = nec(kgPostbox); const calcFpDAL = () => { - return kg * kgDAL + fpDAL; + return kg * getKgDAL + getFpDAL; } const calcFpDeltapost = () => { - return kg * kgDeltapost + fpDeltapost; + return kg * getKgDeltapost + getFpDeltapost; } const calcFpPOC = () => { - return kg * kgPOC + fpPOC; + return kg * getKgPOC + getFpPOC; } const calcFpPostbox = () => { - return kg * kgPostbox + fpPostbox; + return kg * getKgPostbox + getFpPostbox; } - const [exDAL, setExDAL] = useState(0); - const [exDeltapost, setExDeltapost] = useState(0); - const [exPOC, setExPOC] = useState(0); - const [exPostbox, setExPostbox] = useState(0); + const [exDAL, setExDAL] = useState("0"); + let getExDAL = nec(exDAL); + const [exDeltapost, setExDeltapost] = useState("0"); + let getxDeltapost = nec(exDeltapost); + const [exPOC, setExPOC] = useState("0"); + let getExPOC = nec(exPOC); + const [exPostbox, setExPostbox] = useState("0"); + let getExPostbox = nec(exPostbox); const calcExDAL = () => { - return kg * exDAL + calcFpDAL(); + return kg * getExDAL + calcFpDAL(); } const calcExDeltapost = () => { - return kg * exDeltapost + calcFpDeltapost(); + return kg * getxDeltapost + calcFpDeltapost(); } const calcExPOC = () => { - return kg * exPOC + calcFpPOC(); + return kg * getExPOC + calcFpPOC(); } const calcExPostbox = () => { - return kg * exPostbox + calcFpPostbox(); + return kg * getExPostbox + calcFpPostbox(); } return ( @@ -62,7 +74,7 @@ function Versandkosten() Gewicht - setKg(parseFloat(e.target.value))} /> kg + setKg(nec(e.target.value))} /> kg @@ -80,14 +92,14 @@ function Versandkosten() Festpreis - setFpDAL(parseFloat(e.target.value))} /> - setFpDeltapost(parseFloat(e.target.value))} /> + setFpDAL(e.target.value)} /> + setFpDeltapost(e.target.value)} /> Kilopreis - setKgDAL(parseFloat(e.target.value))} /> - setKgDeltapost(parseFloat(e.target.value))} /> + setKgDAL(e.target.value)} /> + setKgDeltapost(e.target.value)} /> @@ -102,8 +114,8 @@ function Versandkosten() Express - setExDAL(parseFloat(e.target.value))} /> - setExDeltapost(parseFloat(e.target.value))} /> + setExDAL(e.target.value)} /> + setExDeltapost(e.target.value)} /> @@ -135,14 +147,14 @@ function Versandkosten() Festpreis - setFpPOC(parseFloat(e.target.value))} /> - setFpPostbox(parseFloat(e.target.value))} /> + setFpPOC(e.target.value)} /> + setFpPostbox(e.target.value)} /> Kilopreis - setKgPOC(parseFloat(e.target.value))} /> - setKgPostbox(parseFloat(e.target.value))} /> + setKgPOC(e.target.value)} /> + setKgPostbox(e.target.value)} /> @@ -157,8 +169,8 @@ function Versandkosten() Express - setExPOC(parseFloat(e.target.value))} /> - setExPostbox(parseFloat(e.target.value))} /> + setExPOC(e.target.value)} /> + setExPostbox(e.target.value)} />