From 5a63ee26e60d1eb397fc45cf8542f2e4fed2962c Mon Sep 17 00:00:00 2001
From: saksham vitwekar <saksham.vitwekar@gmail.com>
Date: Mon, 30 Mar 2026 23:29:24 +0530
Subject: [PATCH] Complete and working implementation of renderCalc.tsx | v1.0

---
 .../calculate/[section]/[id]/page.tsx         | 32 ++------
 .../calculate/[section]/[id]/renderCalc.tsx   | 74 +++++++++++++++++++
 src/app/(calculators)/layoutClient.tsx        |  8 +-
 src/app/utils/Input.tsx                       | 63 ++++++++--------
 src/app/utils/Result.tsx                      | 29 ++++++++
 src/app/utils/Section.tsx                     |  6 +-
 .../miscellaneous/cockcroft-gault-eq.ts       | 12 +--
 src/app/utils/calculators/types.ts            |  5 +-
 8 files changed, 161 insertions(+), 68 deletions(-)
 create mode 100644 src/app/(calculators)/calculate/[section]/[id]/renderCalc.tsx
 create mode 100644 src/app/utils/Result.tsx

diff --git a/src/app/(calculators)/calculate/[section]/[id]/page.tsx b/src/app/(calculators)/calculate/[section]/[id]/page.tsx
index e3e5283..827cfcb 100644
--- a/src/app/(calculators)/calculate/[section]/[id]/page.tsx
+++ b/src/app/(calculators)/calculate/[section]/[id]/page.tsx
@@ -1,29 +1,9 @@
-import InputComponent from "@/app/utils/Input";
-import Input from "@/app/utils/Input";
-import { CalculatorRegistry } from "@/app/utils/calculators/registry";
+import RenderCalculator from "./renderCalc";
+
+
 export default async function Calculator({params} : {params:Promise<{section:string, id:string}>}){
     const calcData : {section:string, id:string} = await params;
-    const calculator = CalculatorRegistry[calcData.section].calculators.find(e => e.id === calcData.id);
-    console.log(calculator);
-    return calculator ? (
-        <>
-            <div className="mb-6 mt-10">
-                <h1 className="text-2xl font-semibold">
-                    {calculator?.name}
-                </h1>
-
-                <p className="text-gray-500 mt-1 max-w-xl">
-                    {calculator?.desc}
-                </p>
-                <h1 className="text-1xl font-semibold">
-                    Unit of the value:- {calculator?.unit}
-                </h1>
-            </div>
-            {calculator.inputs.map(e => {
-                return(
-                    <InputComponent {...e}/>
-                );
-            })}
-        </>
-    ) : null;
+    return(
+        <RenderCalculator key={calcData.id} section={calcData.section} id={calcData.id}/>
+    );
 }
\ No newline at end of file
diff --git a/src/app/(calculators)/calculate/[section]/[id]/renderCalc.tsx b/src/app/(calculators)/calculate/[section]/[id]/renderCalc.tsx
new file mode 100644
index 0000000..9cfd27e
--- /dev/null
+++ b/src/app/(calculators)/calculate/[section]/[id]/renderCalc.tsx
@@ -0,0 +1,74 @@
+"use client"
+
+import InputComponent from "@/app/utils/Input";
+import Input from "@/app/utils/Input";
+import Result from "@/app/utils/Result";
+import { CalculatorRegistry } from "@/app/utils/calculators/registry";
+import { Interpretation } from "@/app/utils/calculators/types";
+import { useState } from "react";
+
+export default function RenderCalculator({section, id} : {section:string, id:string}){
+    const calculator = CalculatorRegistry[section].calculators.find(e => e.id === id);
+    const [form, setForm] = useState<Record<string, string | number>>({});
+    const [value, setValue] = useState<string | number>("");
+    function handleDataChange(key:string, value:string){
+        setForm(prev => {
+            return {
+                ...prev,
+                [key]:value
+            }
+        });
+    }
+    const [showResult, setResultStatus] = useState<boolean>(false);
+    const [result, setResult] = useState<Interpretation>({
+        level:"none",
+        message:"none"
+    });
+    console.log(form);
+    return calculator ? (
+        <>
+            <div className="mb-6 mt-10">
+                <h1 className="text-2xl font-semibold">
+                    {calculator?.name}
+                </h1>
+
+                <p className="text-gray-500 mt-1 max-w-xl">
+                    {calculator?.desc}
+                </p>
+                <h1 className="text-1xl font-semibold">
+                    Unit of the value:- {calculator?.unit}
+                </h1>
+            </div>
+            <div className="max-w-2xl">
+                <form onSubmit={(e: React.SubmitEvent) => {
+                    e.preventDefault();
+                    setResultStatus(true);
+                    const calculatedValue = calculator.calc_func(form);
+                    setValue(calculatedValue);
+                    setResult(calculator.interpret_func(calculatedValue));
+                }}>
+                    <div className="card max-w-auto bg-white bg-base-100 shadow-sm">
+                        <div className="card-body">
+                            <div className="grid grid-cols-1 md:grid-cols-2 gap-x-6 gap-y-4">
+                                {calculator.inputs.map(e => {
+                                    return(
+                                        <InputComponent key={e.id} {...e} handleDataChange={handleDataChange}/>
+                                    );
+                                })}
+                                <button type={"submit"} className="btn md:col-span-2 w-full text-white border-none bg-[#ed1b24] hover:bg-[#c9161e]"
+                                >Calculate</button>
+                            </div>
+                        </div>
+                    </div>
+                    {showResult ? <h3>
+                        <Result 
+                            interpretation={result}
+                            calculated_value={value}
+                            unit={calculator.unit ?? ""}
+                        />
+                    </h3> : null}
+                </form>
+            </div>
+        </>
+    ) : null;
+}
\ No newline at end of file
diff --git a/src/app/(calculators)/layoutClient.tsx b/src/app/(calculators)/layoutClient.tsx
index b27b625..3488f79 100644
--- a/src/app/(calculators)/layoutClient.tsx
+++ b/src/app/(calculators)/layoutClient.tsx
@@ -7,11 +7,13 @@ const font = Roboto({});
 export default function LayoutClient({children} : {children:React.ReactNode}){
     const [navbar, setNavbar] = useState<boolean>(false);
     return(
-        <div className={`grid grid-cols-[300px_1fr] grid-rows-[60px_1fr_40px] overflow-hidden calculators-container ${font.className}`}>
+        <div className={`grid grid-cols-[300px_1fr] grid-rows-[60px_1fr_40px] calculators-container ${font.className}`}>
             <Navbar navbarToggle={setNavbar}/>
             <Sidemenu isNavOpen={navbar}/>
-            <div className="content">
-                {children}
+            <div className="content w-full flex justify-center px-4 pb-6">
+                <div className="w-full max-w-2xl">
+                    {children}
+                </div>
             </div>
             <div className="footer"></div>
         </div>
diff --git a/src/app/utils/Input.tsx b/src/app/utils/Input.tsx
index 31e3467..e63cf21 100644
--- a/src/app/utils/Input.tsx
+++ b/src/app/utils/Input.tsx
@@ -2,41 +2,41 @@
 import { useState } from "react";
 import { Input } from "./calculators/types";
 
-export default function InputComponent({id, type, inputOptions, min, max, required, defaultUnit, unitOptions, name, placeholder} : Input){
+export default function InputComponent({id, type, inputOptions, min, max, required, defaultUnit, unitOptions, name, placeholder, handleDataChange} : Input){
     const [showError, setErrorStatus] = useState(false);
     const [error, setError] = useState<string>();
     const [option, setOption] = useState<string>("");
-    console.log(id);
     if(type === "number"){
-        console.log(min);
         return(
             <>
                 <fieldset className="fieldset">
                     <legend className="fieldset-legend text-black">{name}</legend>
-                    <input type="number"
-                    id={id} 
-                    className="input bg-white" 
-                    placeholder={placeholder} 
-                    min={min} 
-                    max={max} 
-                    required={required}
-                    onChange={(e) => {
-                        if(e.target.value === ""){
-                            return;
-                        }
-                        const val = Number(e.target.value);
-                        if(min !== undefined && val < min){
-                            setError(`Value must be greater than or equal to ${min}`)
-                            setErrorStatus(true);
-                        }else if(max !== undefined && val > max){
-                            setError(`Value must be smaller than or equal to ${max}`);
-                            setErrorStatus(true);
-                        }else{
-                            setError("");
-                            setErrorStatus(false);
-                        }
-                    }}
-                    />
+                        <input type="number"
+                        id={id} 
+                        className="input bg-white border-solid border-black" 
+                        placeholder={placeholder} 
+                        min={min} 
+                        max={max} 
+                        step={0.1}
+                        required={required}
+                        onChange={(e) => {
+                            if(e.target.value === ""){
+                                return;
+                            }
+                            const val = Number(e.target.value);
+                            if(min !== undefined && val < min){
+                                setError(`Value must be greater than or equal to ${min}`)
+                                setErrorStatus(true);
+                            }else if(max !== undefined && val > max){
+                                setError(`Value must be smaller than or equal to ${max}`);
+                                setErrorStatus(true);
+                            }else{
+                                setError("");
+                                setErrorStatus(false);
+                                handleDataChange !== undefined ? handleDataChange(id, e.target.value) : null;
+                            }
+                        }}
+                        />
                     {showError ? <p className="label text-red-400">{error}</p> : null}
                 </fieldset>
             </>
@@ -46,11 +46,14 @@ export default function InputComponent({id, type, inputOptions, min, max, requir
             <fieldset className="fieldset">
                 <legend className="fieldset-legend text-black">{name}</legend>
                     <select value={option} 
-                    className="select bg-white"
+                    className="select bg-white border-solid border-black"
                     onChange={(e) => {
                         setOption(e.target.value);
-                    }}>
-                        <option value="" disabled selected hidden>{placeholder}</option>
+                        handleDataChange !== undefined ? handleDataChange(id, e.target.value) : null;
+                    }}
+                    required={required}
+                    >
+                        <option value="" disabled hidden>{placeholder}</option>
                         {inputOptions?.map(e => {
                             return(
                                 <option key={e.label} value={e.value}>{e.value}</option>
diff --git a/src/app/utils/Result.tsx b/src/app/utils/Result.tsx
new file mode 100644
index 0000000..0734032
--- /dev/null
+++ b/src/app/utils/Result.tsx
@@ -0,0 +1,29 @@
+import { Interpretation } from "./calculators/types";
+
+export default function Result({interpretation, calculated_value, unit} : {interpretation:Interpretation, calculated_value:string | number, unit:string
+}){
+    var {level, message, diagnosis, advice} = interpretation;
+    var levelClass = "";
+    if(level === "none" || level === "low"){
+        levelClass = "bg-success";
+    }else if(level === "moderate"){
+        levelClass = "bg-orange-600";
+    }else if(level === "high" || level === "severe"){
+        levelClass = "bg-red-500";
+    }else{
+        levelClass = "bg-white";
+    }
+    console.log(levelClass);
+    return(
+        <div className={`card max-w-auto ${levelClass} bg-base-100 shadow-sm mt-5 ${levelClass}`}>
+            <div className="card-body">
+                <h2 className="card-title self-center">Calculated Score/Value: {calculated_value} {unit}</h2>
+                <p>{message}</p>
+                {diagnosis ? <p>Diagnosis: {diagnosis}</p> : null}
+                {advice ? <p>Advice: {advice}</p> : null}
+                <div className="card-actions justify-end">
+                </div>
+            </div>
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/src/app/utils/Section.tsx b/src/app/utils/Section.tsx
index 4837ed2..2f63bea 100644
--- a/src/app/utils/Section.tsx
+++ b/src/app/utils/Section.tsx
@@ -8,7 +8,11 @@ export default function Section({sectionName, Calculators, id} : {sectionName:st
             <ul>
                 {Calculators.map((e) => {
                     return(
-                        <li><a key={e.id} href={`/calculate/${id}/${e.id}`}>{e.name}</a></li>
+                        <li key={e.id}>
+                            <a href={`/calculate/${id}/${e.id}`}>
+                                {e.name}
+                            </a>
+                        </li>
                     )
                 })}
             </ul>
diff --git a/src/app/utils/calculators/miscellaneous/cockcroft-gault-eq.ts b/src/app/utils/calculators/miscellaneous/cockcroft-gault-eq.ts
index b74b353..4bcb15f 100644
--- a/src/app/utils/calculators/miscellaneous/cockcroft-gault-eq.ts
+++ b/src/app/utils/calculators/miscellaneous/cockcroft-gault-eq.ts
@@ -4,7 +4,7 @@ const parameters:Input[] = [
     {
         id:"gender",
         name:"Gender",
-        placeholder:"Enter your gender",
+        placeholder:"Select gender",
         type:"select",
         inputOptions:[
             {
@@ -22,7 +22,7 @@ const parameters:Input[] = [
         id:"age",
         type:"number",
         name:"Age",
-        placeholder:"Enter your age",
+        placeholder:"Enter age",
         min:18,
         max:95,
         required:true
@@ -31,7 +31,7 @@ const parameters:Input[] = [
         id:"creatinine",
         type:"number",
         name:"Creatinine",
-        placeholder:"Enter your serum creatinine values",
+        placeholder:"Enter serum creatinine values in mg/dL",
         min:0.2,
         max:20,
         required:true
@@ -40,7 +40,7 @@ const parameters:Input[] = [
         id:"weight",
         type:"number",
         name:"Weight",
-        placeholder:"Enter your weight in kilograms",
+        placeholder:"Enter weight in kilograms",
         min:10,
         max:100 ,
         required:true
@@ -52,8 +52,8 @@ function calc_func(values : Values):number{
     const weight = values.weight as number;
     const creatinine = values.creatinine as number;
     return gender === "male" 
-    ? ((140 - age) * weight)/(72 * creatinine)
-    : (((140 - age) * weight)/(72 * creatinine)) * 0.85;
+    ? Math.floor(((140 - age) * weight)/(72 * creatinine))
+    : Math.floor((((140 - age) * weight)/(72 * creatinine)) * 0.85);
 }
 function interpret_func(gfr:number):Interpretation{
     if(gfr >= 90){
diff --git a/src/app/utils/calculators/types.ts b/src/app/utils/calculators/types.ts
index 61e4ab8..83cf535 100644
--- a/src/app/utils/calculators/types.ts
+++ b/src/app/utils/calculators/types.ts
@@ -22,11 +22,12 @@ export interface Input{
     max?:number,
     required?:boolean,
     defaultUnit?:string,
-    unitOptions?:string[]    
+    unitOptions?:string[],
+    handleDataChange?:Function    
 }
 
 export interface Interpretation{
-    level?: "none" | "low" | "moderate" | "high" | "severe",
+    level: "none" | "low" | "moderate" | "high" | "severe",
     diagnosis?:string,
     message:string,
     advice?:string