Browse Source

removed focus from input field, add Rechenschritte headings

Bernadette Elena Hammerle 4 years ago
parent
commit
51afd150d0
2 changed files with 5 additions and 19 deletions
  1. 3 11
      src/Addition.js
  2. 2 8
      src/Subtraction.js

+ 3 - 11
src/Addition.js

@@ -81,14 +81,6 @@ function Addition() {
   const ResultCarryForm = ({handleResChange, handleCarryChange}) => {
     let resInputField = useRef(null);
     let carryInputField = useRef(null);
-
-    // focus the input field
-    useEffect(()=>{
-      if(resInputField.current && resInputField.current.value === ""){
-        resInputField.current.focus();
-      }
-    },[])
-
     let labelText = "";
     let nosLeft = imdtResIdx + 1;
     let carryText = "Übertrag = ";
@@ -124,7 +116,7 @@ function Addition() {
           }
           labelText += " = ";
         }else{
-          labelText += " + "; // TODO: replace with -/* etc.
+          labelText += " + ";
         }
       }
 
@@ -235,6 +227,7 @@ function Addition() {
       }
     }
 
+    document.getElementById("stepsParagraph").innerHTML = "Rechenschritte: ";
     setStepsGrid(stepsGridCopy);
     let btnSubmit = document.createElement("button");
     btnSubmit.innerHTML = "Ergebnis abgeben";
@@ -263,8 +256,6 @@ function Addition() {
     document.getElementById("finishCalculation").innerHTML = message
   }
 
-
-
   return (
     <main>
 
@@ -316,6 +307,7 @@ function Addition() {
       <div id="finishCalculation"></div>
 
       <div id="idmtResultSteps">
+        <p id="stepsParagraph"></p>
         <DataGrid
           dataSource={stepsGrid}
           focusedRowEnabled={true}

+ 2 - 8
src/Subtraction.js

@@ -85,14 +85,6 @@ function Subtraction() {
   const ResultCarryForm = ({handleResChange, handleCarryChange}) => {
     let resInputField = useRef(null);
     let carryInputField = useRef(null);
-
-    // focus the input field
-    useEffect(()=>{
-      if(resInputField.current && resInputField.current.value === ""){
-        resInputField.current.focus();
-      }
-    },[])
-
     let labelText = "";
     let nosLeft = imdtResIdx + 1;
     let carryText = "Übertrag = ";
@@ -269,6 +261,7 @@ function Subtraction() {
       }
     }
 
+    document.getElementById("stepsParagraph").innerHTML = "Rechenschritte: ";
     setStepsGrid(stepsGridCopy);
     let btnSubmit = document.createElement("button");
     btnSubmit.innerHTML = "Ergebnis abgeben";
@@ -358,6 +351,7 @@ function Subtraction() {
       <div id="finishCalculation"></div>
 
       <div id="idmtResultSteps">
+        <p id="stepsParagraph"></p>
         <DataGrid
           dataSource={stepsGrid}
           focusedRowEnabled={true}