values checking added

hw/hw7/hw7.css

@@ -29,6 +29,20 @@ p{
     width: 80%;
 }
 
+.bad-input-tooltip {
+    display: block;
+    background: #ffffff;    
+    color: #721c24;
+    border: 1px solid #8f0c19;
+    padding: 4px 8px;
+    max-width: 220px;
+    white-space: normal;
+}
+
+.bad-input-highlight {
+    outline: 2px solid #990917;
+}
+
 .hidden{
     display: none;
 }

hw/hw7/hw7.html

@@ -40,6 +40,7 @@
             </fieldset>
             <fieldset id="outputsFieldset">
                 <legend>что вычислить</legend>
+                <span class="bad-input-tooltip hidden" id="outputValuesErr"><br></span>
                 <input type="checkbox" name="output-valuesR" id="outputValuesR" checked>
                 <label for="outputValuesR">радиус вписанной окружности</label><br>
                 <input type="checkbox" name="output-valuesH" id="outputValuesH" checked>

hw/hw7/hw7.js

@@ -18,6 +18,7 @@ let elements = {
     baseAdjacentAngleErr: document.getElementById('baseAdjacentAngleErr'),
 
     outputsFieldset: document.getElementById('outputsFieldset'),
+    outputValuesErr: document.getElementById('outputValuesErr'),
     outputR: document.getElementById('outputValuesR'),
     outputH: document.getElementById('outputValuesH'),
     outputL: document.getElementById('outputValuesL'),
@@ -40,6 +41,51 @@ let inputsB = {
     angle: null
 };
 
+function highlightError(errorFieldIndex, add = true) {
+    let fields = [
+        elements.equalSideLength,
+        elements.baseAngle,
+        elements.baseSideLength,
+        elements.baseAdjacentAngle,
+        outputsFieldset
+    ];
+    if (fields[errorFieldIndex]) {
+        if (add) {
+            fields[errorFieldIndex].classList.add("bad-input-highlight");
+        }
+        else {
+            fields[errorFieldIndex].classList.remove("bad-input-highlight");
+        }
+    }
+
+}
+
+function setErrTooltip(errorFieldIndex, tooltip) {
+    let errElem = [
+        elements.equalSideLengthErr,
+        elements.baseAngleErr,
+        elements.baseSideLengthErr,
+        elements.baseAdjacentAngleErr,
+        elements.outputValuesErr
+    ][errorFieldIndex];
+    if (errElem) {
+        highlightError(errorFieldIndex, tooltip !== "");
+
+        if (tooltip !== "") {
+            errElem.classList.remove("hidden");;
+        }
+        else {
+            errElem.classList.add("hidden");;
+        }
+        if (errorFieldIndex == 4) {
+            tooltip += "<br>"
+        }
+        errElem.innerHTML = tooltip;
+    }
+
+
+}
+
 function deg2rad(degrees) {
     return degrees * (Math.PI / 180);
 }
@@ -78,7 +124,13 @@ function updateCheckboxes() {
     outputFields["radius"] = elements.outputR.checked;
     outputFields["heights"] = elements.outputH.checked;
     outputFields["lengths"] = elements.outputL.checked;
-    console.log("output fields:", outputFields)
+    let ret = !outputFields.radius && !outputFields.heights && !outputFields.lengths;
+    if (ret) {
+        setErrTooltip(4, "Выберите хотя бы один параметр для вывода.");
+    } else {
+        setErrTooltip(4, "");
+    }
+    updateCalculateButton();
 }
 
 function updateCalculateButton() {
@@ -89,7 +141,8 @@ function updateCalculateButton() {
     else {
         ret = inputsB["l"] !== null && inputsB["angle"] !== null
     }
-    console.log(inputsA, inputsB, ret);
+    ret &= elements.outputR.checked || elements.outputH.checked || elements.outputL.checked;
+
     elements.calculateButton.disabled = !ret;
 }
 
@@ -109,6 +162,33 @@ function switchAppearance(selectA) {
     updateCalculateButton();
 }
 
+function displayTable(calcResults) {
+    let table = elements.outputsTable;
+    table.innerHTML = ""; // Clear previous content
+
+    let header = "<tr><th>Parameter</th><th>Value</th></tr>";
+    let rows = "";
+
+    if (outputFields.radius) {
+        rows += `<tr><td>Radius</td><td>${calcResults.radius.toFixed(3)}</td></tr>`;
+    }
+    if (outputFields.heights) {
+        rows += `<tr><td>Height 1</td><td>${calcResults.heights[0].toFixed(3)}</td></tr>`;
+        rows += `<tr><td>Height 2</td><td>${calcResults.heights[1].toFixed(3)}</td></tr>`;
+    }
+    if (outputFields.lengths) {
+        rows += `<tr><td>Length 1</td><td>${calcResults.lengths[0].toFixed(3)}</td></tr>`;
+        rows += `<tr><td>Length 2</td><td>${calcResults.lengths[1].toFixed(3)}</td></tr>`;
+    }
+    table.innerHTML = header + rows;
+
+    if (rows === "") {
+        table.innerHTML = `<h3>Выберите параметры для вычислений, сейчас таблица пустая</h3>`;
+    }
+
+    table.classList.remove("hidden");
+
+}
 
 function clearInputs() {
     if (currentModeIsA) {
@@ -129,6 +209,30 @@ function clearInputs() {
     }
     elements.outputsTable.classList.add("hidden");
 }
+function checkAngle(angleString) {
+    let angle = parseFloat(angleString);
+    if (isNaN(angle)) {
+        return "Введите корректное число";
+    }
+    if (angle <= 0) {
+        return "Угол должен быть больше 0";
+    }
+    if (angle >= 180) {
+        return "Угол должен быть меньше 180";
+    }
+    return "";
+}
+
+function checkLength(lengthString) {
+    let length = parseFloat(lengthString);
+    if (!isFinite(length)) {
+        return "Введите корректное число";
+    }
+    if (length <= 0) {
+        return "Длина должна быть больше 0";
+    }
+    return "";
+}
 
 elements.outputsFieldset.addEventListener('change', function (event) {
     if (event.target.type === 'checkbox') {
@@ -136,8 +240,10 @@ elements.outputsFieldset.addEventListener('change', function (event) {
     }
 });
 
-elements.inputsForm.addEventListener('change', function (event) {
-    if (event.target.type === 'radio') {
+elements.inputsForm.addEventListener('change', handleInputEvent);
+elements.inputsForm.addEventListener('input', handleInputEvent);
+
+function handleSwitchInputs(event) {
     if (event.target.id[event.target.id.length - 1].toLowerCase() == "a") {
         currentModeIsA = true;
         switchAppearance(true);
@@ -149,19 +255,53 @@ elements.inputsForm.addEventListener('change', function (event) {
         console.log("Switching inputs to B");
 
     }
-    } else if (event.target.type === 'number') {
+}
+
+function HandleInputsUpdate(event) {
     switch (event.target.id) {
         case "equalSideLength":
-                inputsA.l = parseFloat(event.target.value) || 0;
+            {
+                const err = checkLength(event.target.value);
+                setErrTooltip(0, err);
+                if (err === "") {
+                    inputsA.l = parseFloat(event.target.value);
+                } else {
+                    inputsA.l = null;
+                }
+            }
             break;
         case "baseAngle":
-                inputsA.angle = parseFloat(event.target.value) || 0;
+            {
+                const err = checkAngle(event.target.value);
+                setErrTooltip(1, err);
+                if (err === "") {
+                    inputsA.angle = parseFloat(event.target.value);
+                } else {
+                    inputsA.angle = null;
+                }
+            }
             break;
         case "baseSideLength":
-                inputsB.l = parseFloat(event.target.value) || 0;
+            {
+                const err = checkLength(event.target.value);
+                setErrTooltip(2, err);
+                if (err === "") {
+                    inputsB.l = parseFloat(event.target.value);
+                } else {
+                    inputsB.l = null;
+                }
+            }
             break;
         case "baseAdjacentAngle":
-                inputsB.angle = parseFloat(event.target.value) || 0;
+            {
+                const err = checkAngle(event.target.value);
+                setErrTooltip(3, err);
+                if (err === "") {
+                    inputsB.angle = parseFloat(event.target.value);
+                } else {
+                    inputsB.angle = null;
+                }
+            }
             break;
         default:
             console.log(event.target.id)
@@ -170,7 +310,15 @@ elements.inputsForm.addEventListener('change', function (event) {
     updateCalculateButton();
 
 }
-});
+
+function handleInputEvent(event) {
+    if (event.target.type === 'radio') {
+        handleSwitchInputs(event);
+    } else if (event.target.type === 'number') {
+        HandleInputsUpdate(event);
+    }
+}
+
 
 elements.clearButton.addEventListener('click', (event) => {
     event.preventDefault();
@@ -180,7 +328,7 @@ elements.clearButton.addEventListener('click', (event) => {
 
 elements.calculateButton.addEventListener('click', (event) => {
     event.preventDefault();
-    console.log(getCalculations());
+    displayTable(getCalculations());
 });