diff --git a/proiect-nutritie-java/src/main/webapp/index.html b/proiect-nutritie-java/src/main/webapp/index.html index 3e972c8..b5a2020 100644 --- a/proiect-nutritie-java/src/main/webapp/index.html +++ b/proiect-nutritie-java/src/main/webapp/index.html @@ -3,7 +3,7 @@ - NutriAI Elite v20.0 + NutriAI Elite v22.0 @@ -57,13 +57,11 @@

NUTRI ELITE

-
-
-
@@ -144,6 +138,23 @@ function setTheme(t) { document.body.className = 'theme-' + t; } + function setUnits(mode) { + if((mode==='metric' && !isMetric) || (mode==='imperial' && isMetric)) { + isMetric = !isMetric; + const w = document.getElementById('w'), t = document.getElementById('t'), h = document.getElementById('h'); + if(w.value) w.value = isMetric ? (w.value/2.205).toFixed(0) : (w.value*2.205).toFixed(0); + if(t.value) t.value = isMetric ? (t.value/2.205).toFixed(0) : (t.value*2.205).toFixed(0); + if(h.value) h.value = isMetric ? (h.value*2.54).toFixed(0) : (h.value/2.54).toFixed(0); + + document.getElementById('txtW').innerText = isMetric ? "Weight (kg)" : "Weight (lb)"; + document.getElementById('txtT').innerText = isMetric ? "Target (kg)" : "Target (lb)"; + document.getElementById('txtH').innerText = isMetric ? "Height (cm)" : "Height (in)"; + document.getElementById('btnMetric').className = isMetric ? "btn btn-primary active btn-sm" : "btn btn-outline-primary btn-sm"; + document.getElementById('btnImperial').className = !isMetric ? "btn btn-primary active btn-sm" : "btn btn-outline-primary btn-sm"; + update(); + } + } + function update() { const wv = parseFloat(document.getElementById('w').value)||0, hv = parseFloat(document.getElementById('h').value)||0; const av = parseFloat(document.getElementById('age').value)||0, act = parseFloat(document.getElementById('act').value)||1; @@ -155,7 +166,7 @@ const total = Math.round((bmr * act) + agg); document.getElementById('kcal').innerText = total; - document.getElementById('h2o').innerText = (wc * 0.035).toFixed(1) + "L"; + document.getElementById('h2o').innerText = isMetric ? (wc * 0.035).toFixed(1) + "L" : (wv * 0.6).toFixed(0) + "oz"; document.getElementById('aggDisp').innerText = (agg>0?'+':'')+agg+" kcal"; const pG = Math.round((total * 0.3)/4), cG = Math.round((total * 0.4)/4), fG = Math.round((total * 0.3)/9); document.getElementById('pG').innerText = pG+"g"; document.getElementById('cG').innerText = cG+"g"; document.getElementById('fG').innerText = fG+"g"; @@ -166,28 +177,37 @@ ['w','t','h','age','agg'].forEach(id => document.getElementById(id).value = id === 'agg' ? 0 : ""); document.getElementById('act').selectedIndex = 0; document.getElementById('kcal').innerText = "0"; - document.getElementById('h2o').innerText = "0.0L"; - document.getElementById('chat').innerHTML = `
System reset. Ready for new inputs.
`; + document.getElementById('h2o').innerText = isMetric ? "0.0L" : "0oz"; + document.getElementById('chat').innerHTML = `
System reset. Unit system: ${isMetric?'Metric':'Imperial'}.
`; if(mChart) { mChart.data.datasets[0].data = [1,1,1]; mChart.update(); } } async function talk(custom) { const box = document.getElementById('chat'), input = document.getElementById('uIn'); - const text = custom || input.value; if(!text) return; + const isShopReq = custom === 'GENERATE_SHOPPING_LIST'; + const text = isShopReq ? "Please generate a shopping list for the current meal plan." : (custom || input.value); + if(!text) return; + if(!custom) { box.innerHTML += `
${text}
`; input.value=""; } const id = 'ai-'+Date.now(); box.innerHTML += `
Processing...
`; box.scrollTop = box.scrollHeight; + try { const res = await fetch("https://api.groq.com/openai/v1/chat/completions", { method: "POST", headers: {"Content-Type":"application/json", "Authorization":`Bearer ${API}`}, body: JSON.stringify({ model:"llama-3.3-70b-versatile", messages:[ - {role:"system", content:`Pro Nutritionist. Target: ${document.getElementById('kcal').innerText} kcal. Use Markdown tables.`}, + {role:"system", content: `Expert Nutritionist. Target: ${document.getElementById('kcal').innerText} kcal. SYSTEM: ${isMetric ? 'METRIC' : 'IMPERIAL'}. + MANDATORY RULES: + 1. ALWAYS use raw weights for ingredients in meal plans. + 2. DO NOT generate a shopping list unless the user explicitly asks for one. + 3. If requested, provide shopping list quantities in ${isMetric ? 'grams/kilograms' : 'ounces/lbs'}. + 4. Use Markdown tables.`}, {role:"user", content:text} ]}) }); const d = await res.json(); document.getElementById(id).innerHTML = marked.parse(d.choices[0].message.content); - } catch(e) { document.getElementById(id).innerText = "Error connecting to coach."; } + } catch(e) { document.getElementById(id).innerText = "Connection error."; } box.scrollTop = box.scrollHeight; }