Merge pull request #51 from CivicTechAtlanta/steve-fixes-3

fixes 3

Author: steveschannel

src/app/calculator-flow/components/ChlorineWeightFlow.tsx

@@ -38,7 +38,7 @@ export default function ChlorineWeightFormula({ onCalculate, sharedState }: { on
     });
 
     // Calculate with chlorine percentage given as a whole number (e.g., 70 => 0.70)
-    const chlorinePct = (Number(formData.chlorinePercentage) || 0) / 100;
+    const chlorinePct = (Number(formData.chlorinePercentage) || 0);
 
     const chlorineWeight = ( Number(formData.waterIngress) * (Number(formData.rechargeTimeDays) * 86400)  *  Number(formData.desiredConcentration) ) / (10 * chlorinePct)
 

src/app/calculator-flow/components/MotherSolutionConcentrationFlow.tsx

@@ -9,11 +9,13 @@ import Form from "../../mother-solution-concentration/components/Form";
 import "../../mother-solution-concentration/styles/Main.css";
 
 import modalData from "../../modals/mother-solution-concentration-modal-data";
-import { formatSig2 } from "@/app/utils/format";
-
 
 import { CalculatorFlowSharedStateData } from "./Interfaces";
 
+const formatTwoDecimalPlaces = (num: number): string => {
+  return num.toFixed(2);
+};
+
 export default function MotherSolutionConcentrationFormula({ onCalculate, sharedState }: { onCalculate: (data: number) => void, sharedState: CalculatorFlowSharedStateData }) {
 
   const { t } = useTranslation();
@@ -41,7 +43,7 @@ export default function MotherSolutionConcentrationFormula({ onCalculate, shared
         <h2>{`${t('The concentration of the mother solution is')}:`}</h2>
 
         <p className="answer">
-          {`${formatSig2(concentratedMotherSolution)} ${t('milligrams')}/${t('liters')}`}
+          {`${formatTwoDecimalPlaces(concentratedMotherSolution)} ${t('milligrams')}/${t('liters')}`}
         </p>
       </div>
       <Modal

src/app/chlorine-weight/page.tsx

@@ -26,7 +26,7 @@ export default function ChlorineWeightFormula() {
         rechargeTimeDays: '',
     });
 
-    const chlorinePct = (Number(formData.chlorinePercentage) || 0) / 100;
+    const chlorinePct = (Number(formData.chlorinePercentage) || 0);
     const chlorineWeight = ( Number(formData.waterIngress) * (Number(formData.rechargeTimeDays) * 86400)  *  Number(formData.desiredConcentration) ) / (10 * chlorinePct)
 
     const handleClick = () => {

src/app/mother-solution-concentration/components/Form.tsx

@@ -12,7 +12,7 @@ type FormProps = {
     msVolume?: number | null;
     chlorineWeight?: number | null;
     msConcentration?: number | null;
-    desiredConcentration?: number | null;
+    chlorinePercentage?: number | null;
   };
 };
 
@@ -23,11 +23,11 @@ export default function Form({ onCalculate, sharedState }: FormProps) {
   const [formData, setFormData] = useState<{
     motherSolutionVolume: number;
     weightOfChlorine: number;
-    desiredReservoirConcentration: number;
+    chlorinePercentage: number;
   }>({
     motherSolutionVolume: sharedState.msVolume || 0,
     weightOfChlorine: sharedState.chlorineWeight || 0,
-    desiredReservoirConcentration: sharedState.desiredConcentration || 0,
+    chlorinePercentage: sharedState.chlorinePercentage || 0,
   });
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -43,7 +43,7 @@ export default function Form({ onCalculate, sharedState }: FormProps) {
     setFormData({
       motherSolutionVolume: 0,
       weightOfChlorine: 0,
-      desiredReservoirConcentration: 0,
+      chlorinePercentage: 0,
     });
   }
 
@@ -52,24 +52,26 @@ export default function Form({ onCalculate, sharedState }: FormProps) {
     const {
       motherSolutionVolume,
       weightOfChlorine,
-      desiredReservoirConcentration,
+      chlorinePercentage,
     } = formData;
 
     let newConcentratedMotherSolution;
     if (motherSolutionVolume != 0) {
       newConcentratedMotherSolution =
-        (weightOfChlorine * 10 * desiredReservoirConcentration) /
+        (weightOfChlorine * 1000 * (chlorinePercentage / 100)) /
         motherSolutionVolume;
     } else {
       newConcentratedMotherSolution = 0;
     }
 
+    console.log(newConcentratedMotherSolution)
+
     onCalculate(newConcentratedMotherSolution);
   };
 
   const motherSolutionVolumeLabel = `${t('Mother Solution Volume')} (${t('liters')})`;
   const weightOfChlorineLabel = `${t('Weight of Chlorine')} (${t('grams')})`;
-  const desiredReservoirConcentrationLabel = `${t('Desired Reservoir Concentration')} (${t('milligrams')}/${t('liters')})`;
+  const chlorinePercentageLabel = `${t('Chlorine Percentage')} (%)`;
 
   return (
     <form className="form" onSubmit={handleSubmit}>
@@ -88,11 +90,11 @@ export default function Form({ onCalculate, sharedState }: FormProps) {
         defaultValue={formData.weightOfChlorine.toString()}
       />
       <Input
-        label={desiredReservoirConcentrationLabel}
-        name="desiredReservoirConcentration"
+        label={chlorinePercentageLabel}
+        name="chlorinePercentage"
         min="0"
         handleChange={handleChange}
-        defaultValue={formData.desiredReservoirConcentration.toString()}
+        defaultValue={formData.chlorinePercentage.toString()}
       />
       <button type="reset" className="button" onClick={clear}>
         {t('Clear')}

src/app/mother-solution-concentration/page.tsx

@@ -10,11 +10,13 @@ import LanguageSelector from "../components/LanguageSelector/LanguageSelector";
 import Modal from '../components/Modal/Modal';
 
 import modalData from '../modals/mother-solution-concentration-modal-data';
-import { formatSig2 } from "../utils/format";
-
 
 import "./styles/Main.css";
 
+const formatTwoDecimalPlaces = (num: number): string => {
+  return num.toFixed(2);
+};
+
 export default function MotherSolutionConcentrationFormula() {
   const { t } = useTranslation();
 
@@ -33,13 +35,13 @@ export default function MotherSolutionConcentrationFormula() {
       <h1 className="pageHeader">{t('Mother Solution Concentration Formula')}
           <svg onClick={() => setShowModal('info')} fill="#288DCE" viewBox="0 0 50 50"><path d="M 25 2 C 12.309295 2 2 12.309295 2 25 C 2 37.690705 12.309295 48 25 48 C 37.690705 48 48 37.690705 48 25 C 48 12.309295 37.690705 2 25 2 z M 25 4 C 36.609824 4 46 13.390176 46 25 C 46 36.609824 36.609824 46 25 46 C 13.390176 46 4 36.609824 4 25 C 4 13.390176 13.390176 4 25 4 z M 25 11 A 3 3 0 0 0 22 14 A 3 3 0 0 0 25 17 A 3 3 0 0 0 28 14 A 3 3 0 0 0 25 11 z M 21 21 L 21 23 L 22 23 L 23 23 L 23 36 L 22 36 L 21 36 L 21 38 L 22 38 L 23 38 L 27 38 L 28 38 L 29 38 L 29 36 L 28 36 L 27 36 L 27 21 L 26 21 L 22 21 L 21 21 z" /></svg>
       </h1>
-      <Form onCalculate={handleCalculate} sharedState={{}}></Form>
+      <Form onCalculate={handleCalculate} sharedState={{}}/>
 
       <div className="result-wrapper">
         <h2>{`${t('The concentration of the mother solution is')}:`}</h2>
 
         <p className="answer">
-          {`${formatSig2(concentratedMotherSolution)} ${t('mg')}/${t('L')}`}
+          {`${formatTwoDecimalPlaces(concentratedMotherSolution)} ${t('mg')}/${t('L')}`}
         </p>
       </div>