Merge pull request #50 from CivicTechAtlanta/steve-fixes-v2

steveschannel · web-flow · commit 63ecfcf88111 · 2025-08-19T20:15:35.000-04:00
save fixes
diff --git a/src/app/calculator-flow/components/ChlorineWeightFlow.tsx b/src/app/calculator-flow/components/ChlorineWeightFlow.tsx
@@ -15,10 +15,8 @@ import { formatSig2 } from "@/app/utils/format";
 
 type ChlorineWeightCalc = {
     chlorineWeight: number;
-    msVolume: number | string;
     waterIngress: number | string;
     desiredConcentration: number;
-    dripRate: number | string;
     chlorinePercentage: number | string;
 };
 
@@ -30,25 +28,26 @@ export default function ChlorineWeightFormula({ onCalculate, sharedState }: { on
 
     const [showModal, setShowModal] = useState(null as string | null);
 
+    console.log("SharedState", sharedState)
+
     const [formData, setFormData] = useState({
-        motherSolution: sharedState.msVolume || '',
         waterIngress: sharedState.reservoirIngress || '',
         desiredConcentration: sharedState.desiredConcentration || '',
-        dripRate: sharedState.desiredDripRate || '',
         chlorinePercentage: sharedState.chlorinePercentage || '',
+        rechargeTimeDays: sharedState.refillTime || '',
     });
 
     // Calculate with chlorine percentage given as a whole number (e.g., 70 => 0.70)
     const chlorinePct = (Number(formData.chlorinePercentage) || 0) / 100;
-    const chlorineWeight = .36 * ((Number(formData.motherSolution) * Number(formData.waterIngress) * Number(formData.desiredConcentration)) / (Number(formData.dripRate) * chlorinePct))
+
+    const chlorineWeight = ( Number(formData.waterIngress) * (Number(formData.rechargeTimeDays) * 86400)  *  Number(formData.desiredConcentration) ) / (10 * chlorinePct)
 
     const handleClick = () => {
         if (
-            formData.motherSolution === '' ||
             formData.waterIngress === '' ||
             formData.desiredConcentration === '' ||
-            formData.dripRate === '' ||
-            formData.chlorinePercentage === ''
+            formData.chlorinePercentage === '' ||
+            formData.rechargeTimeDays === ''
         ) {
             setErrorMessage('Please fill all inputs');
             setShowText(false);
@@ -57,10 +56,8 @@ export default function ChlorineWeightFormula({ onCalculate, sharedState }: { on
             setShowText(true);
             onCalculate({
                 chlorineWeight: chlorineWeight,
-                msVolume: formData.motherSolution,
                 waterIngress: formData.waterIngress,
                 desiredConcentration: Number(formData.desiredConcentration),
-                dripRate: formData.dripRate,
                 chlorinePercentage: formData.chlorinePercentage
             });
         }
@@ -96,35 +93,28 @@ export default function ChlorineWeightFormula({ onCalculate, sharedState }: { on
 
             <div className="input-wrapper">
                 <Input
-                    label={`${t('Mother Solution')} (${t('liters')})`}
-                    name='motherSolution'
-                    value={formData.motherSolution}
-                    placeholder='600'
+                    label={`${t('Refill Time')} (${t('days')})`}
+                    name='rechargeTimeDays'
+                    value={formData.rechargeTimeDays}
+                    placeholder='7'
                     handleChange={handleChange}
                 />
                 <Input
-                    label={`${t('Water Ingress')} (${t('liters')}/${'second'})`}
+                    label={`${t('Water Ingress')} (${t('liters')}/${t('second')})`}
                     name='waterIngress'
                     value={formData.waterIngress}
                     placeholder='20'
                     handleChange={handleChange}
                 />
                 <Input
-                    label={`${t('Desired Concentration')} (${t('miligrams')}/${'liter'})`}
+                    label={`${t('Desired Concentration')} (${t('milligrams')}/${t('liter')})`}
                     name='desiredConcentration'
                     value={formData.desiredConcentration}
                     placeholder='1'
                     handleChange={handleChange}
                 />
                 <Input
-                    label={`${t('Drip Rate')} (${t('liters')}/${'hour'})`}
-                    name='dripRate'
-                    value={formData.dripRate}
-                    placeholder='2'
-                    handleChange={handleChange}
-                />
-                <Input
-                    label={`${t('Chlorine Percentage')}`}
+                    label={`${t('Chlorine Percentage')} (%)`}
                     name='chlorinePercentage'
                     value={formData.chlorinePercentage}
                     placeholder='70'
diff --git a/src/app/calculator-flow/components/DripRateCalculatorFlow.tsx b/src/app/calculator-flow/components/DripRateCalculatorFlow.tsx
@@ -49,7 +49,7 @@ export default function DripRateFormula({ onCalculate, sharedState }: {
                                 </div>
 
                                 <div className="input-group">
-                                        <label>{`${t('Refill time')} (${t('days')})`}</label>
+                                        <label>{`${t('Refill Time')} (${t('days')})`}</label>
                                         <input type="number" value={refillTime} onChange={(event) => { setRefillTime(Number(event.target.value)) }} />
                                 </div>
 
diff --git a/src/app/calculator-flow/components/MotherSolutionConcentrationFlow.tsx b/src/app/calculator-flow/components/MotherSolutionConcentrationFlow.tsx
@@ -41,7 +41,7 @@ export default function MotherSolutionConcentrationFormula({ onCalculate, shared
         <h2>{`${t('The concentration of the mother solution is')}:`}</h2>
 
         <p className="answer">
-          {`${formatSig2(concentratedMotherSolution)} ${t('mg')}/${t('L')}`}
+          {`${formatSig2(concentratedMotherSolution)} ${t('milligrams')}/${t('liters')}`}
         </p>
       </div>
       <Modal
diff --git a/src/app/calculator-flow/page.tsx b/src/app/calculator-flow/page.tsx
@@ -287,8 +287,8 @@ export default function CalculatorFlow() {
               />
             </label>
             <div style={{display:'flex',gap:12,justifyContent:'flex-end'}}>
-              <button onClick={() => setShowSavePopup(false)} style={{padding:'8px 16px'}}>{t('Cancel')}</button>
-              <button onClick={saveSharedState} style={{padding:'8px 16px',background:'#288DCE',color:'#fff',border:'none',borderRadius:4}}>{t('Save')}</button>
+              <button onClick={() => setShowSavePopup(false)} style={{padding:'8px 16px'}}>{t('configurations.cancel')}</button>
+              <button onClick={saveSharedState} style={{padding:'8px 16px',background:'#288DCE',color:'#fff',border:'none',borderRadius:4}}>{t('configurations.save')}</button>
             </div>
           </div>
         </div>
diff --git a/src/app/chlorine-weight/page.tsx b/src/app/chlorine-weight/page.tsx
@@ -20,24 +20,21 @@ export default function ChlorineWeightFormula() {
     const [showModal, setShowModal] = useState(null as string | null);
 
     const [formData, setFormData] = useState({
-        motherSolution: '',
         waterIngress: '',
         desiredConcentration: '',
-        dripRate: '',
         chlorinePercentage: '',
+        rechargeTimeDays: '',
     });
 
-    // Calculate with chlorine percentage given as a whole number (e.g., 70 => 0.70)
     const chlorinePct = (Number(formData.chlorinePercentage) || 0) / 100;
-    const chlorineWeight = .36 * ((Number(formData.motherSolution) * Number(formData.waterIngress) * Number(formData.desiredConcentration)) / (Number(formData.dripRate) * chlorinePct))
+    const chlorineWeight = ( Number(formData.waterIngress) * (Number(formData.rechargeTimeDays) * 86400)  *  Number(formData.desiredConcentration) ) / (10 * chlorinePct)
 
     const handleClick = () => {
         if (
-            formData.motherSolution === '' ||
             formData.waterIngress === '' ||
             formData.desiredConcentration === '' ||
-            formData.dripRate === '' ||
-            formData.chlorinePercentage === ''
+            formData.chlorinePercentage === '' ||
+            formData.rechargeTimeDays === ''
         ) {
             setErrorMessage('Please fill all inputs');
             setShowText(false);
@@ -79,35 +76,28 @@ export default function ChlorineWeightFormula() {
 
             <div className="input-wrapper">
                 <Input
-                    label={`${t('Mother Solution')} (${t('liters')})`}
-                    name='motherSolution'
-                    value={formData.motherSolution}
-                    placeholder='600'
+                    label={`${t('Refill Time')} (${t('days')})`}
+                    name='rechargeTimeDays'
+                    value={formData.rechargeTimeDays}
+                    placeholder='7'
                     handleChange={handleChange}
                 />
                 <Input
-                    label={`${t('Water Ingress')} (${t('liters')}/${'second'})`}
+                    label={`${t('Water Ingress')} (${t('liters')}/${t('second')})`}
                     name='waterIngress'
                     value={formData.waterIngress}
                     placeholder='20'
                     handleChange={handleChange}
                 />
                 <Input
-                    label={`${t('Desired Concentration')} (${t('miligrams')}/${'liter'})`}
+                    label={`${t('Desired Concentration')} (${t('milligrams')}/${t('liter')})`}
                     name='desiredConcentration'
                     value={formData.desiredConcentration}
                     placeholder='1'
                     handleChange={handleChange}
                 />
                 <Input
-                    label={`${t('Drip Rate')} (${t('liters')}/${'hour'})`}
-                    name='dripRate'
-                    value={formData.dripRate}
-                    placeholder='2'
-                    handleChange={handleChange}
-                />
-                <Input
-                    label={`${t('Chlorine Percentage')}`}
+                    label={`${t('Chlorine Percentage')} (%)`}
                     name='chlorinePercentage'
                     value={formData.chlorinePercentage}
                     placeholder='70'
@@ -116,13 +106,13 @@ export default function ChlorineWeightFormula() {
 
                 {errorMessage && <p style={{ color: 'red' }}>{errorMessage}</p>}
 
+                <button className="button" onClick={handleClear}>{t('Clear')}</button>
+                
                 {showText ? (
                     <p>{`${t('The weight of chlorine needed is')}: ${formatSig2(chlorineWeight)} ${t('grams')}`}</p>
                 ) : (
-                    <button className="button primary" onClick={handleClick}>{t('Show Chlorine Weight')}</button>
+                    <button className="button primary" onClick={handleClick}>{t('Submit')}</button>
                 )}
-
-                <button className="button" onClick={handleClear}>{t('Clear')}</button>
             </div>
 
             <Modal
diff --git a/src/app/drip-rate/page.tsx b/src/app/drip-rate/page.tsx
@@ -31,13 +31,13 @@ export default function DripRateFormula() {
     return (
         <div className="center">
             <Home />
-            <h1 className="pageHeader">{t('Drip Rate Formula')}
+            <h1 className="pageHeader">{t('Recharge Time 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>
             <div className="input-wrapper">
 
                 <div className="input-group">
-                    <label>{`${t('Mother Solution Volume')} (${t('L')})`}</label>
+                    <label>{`${t('Mother Solution Volume')} (${t('liters')})`}</label>
                     <input type="number" value={motherSolutionVolume} onChange={(event) => { setMotherSolutionVolume(Number(event.target.value)) }} />
                 </div>
 
diff --git a/src/app/locales/en.json b/src/app/locales/en.json
@@ -32,6 +32,7 @@
     "The ingress formula is": "The ingress formula is",
     "days": "days",
     "hours": "hours",
+    "liter": "liter",
     "liters": "liters",
     "minute": "minute",
     "second": "second",
@@ -82,6 +83,15 @@
 
     "mother solution max weight text 1" : "There is a recommended maximum weight of the mother tank, which is 50 kilograms. This is to ensure that the tank is manageable and the water is not strongly chlorinated.",
 
+    "Mother Tank Maximum Weight Formula": "Mother Tank Maximum Weight Formula",
+    "The maximum weight of the mother tank is": "The maximum weight of the mother tank is",
+
+    "Save Configuration": "Save Configuration",
+    "Configuration Name": "Configuration Name",
+    "Description": "Description",
+    "Enter a name": "Enter a name",
+    "Enter a description": "Enter a description",
+
     "configurations.no_configurations": "No configurations",
     "configurations.add_configuration_message": "Add a configuration to see it here.",
     "configurations.configuration": "Configuration",
diff --git a/src/app/locales/es.json b/src/app/locales/es.json
@@ -31,6 +31,7 @@
     "The ingress formula is": "La fórmula de entrada es",
     "days": "días",
     "hours": "horas",
+    "liter": "litro",
     "liters": "litros",
     "second": "segundo",
     "minute": "minuto",
@@ -83,6 +84,16 @@
     "flow rate text 1" : "El caudal de entrada del reservorio es la tasa a la que el agua entra en el reservorio en litros por segundo. Se recomienda medir regularmente este caudal, ya que diferentes factores, como el clima o la época del año, pueden afectar la entrada de agua.",
     "flow rate text 2" : "Siempre que tenga el tamaño del contenedor y el tiempo que tarda en llenarse, puede usar cualquier contenedor para medir el caudal.",
 
+    "mother solution max weight header 1" : "El Peso Máximo del Tanque Madre",
+
+    "mother solution max weight text 1" : "Existe un peso máximo recomendado para el tanque madre, que es de 50 kilogramos. Esto es para asegurar que el tanque sea manejable y que el agua no esté fuertemente clorada.",
+
+    "Save Configuration": "Guardar Configuración",
+    "Configuration Name": "Nombre de Configuración",
+    "Description": "Descripción",
+    "Enter a name": "Ingrese un nombre",
+    "Enter a description": "Ingrese una descripción",
+
     "configurations.no_configurations": "Sin configuraciones",
     "configurations.add_configuration_message": "Agregue una configuración para verla aquí.",
     "configurations.configuration": "Configuración",
diff --git a/src/app/mother-solution-concentration/components/Form.tsx b/src/app/mother-solution-concentration/components/Form.tsx
@@ -67,9 +67,9 @@ export default function Form({ onCalculate, sharedState }: FormProps) {
     onCalculate(newConcentratedMotherSolution);
   };
 
-  const motherSolutionVolumeLabel = `${t('Mother Solution Volume')} (${t('L')})`;
-  const weightOfChlorineLabel = `${'Weight of Chlorine'} (${t('g')})`;
-  const desiredReservoirConcentrationLabel = `${'Desired Reservoir Concentration'} (${t('mg')}/${t('L')})`;
+  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')})`;
 
   return (
     <form className="form" onSubmit={handleSubmit}>
