|
@@ -257,23 +257,31 @@ function Addition() {
|
|
text += " = "
|
|
text += " = "
|
|
if (trueNumbers){
|
|
if (trueNumbers){
|
|
text += resArr[idxNumbers]
|
|
text += resArr[idxNumbers]
|
|
- text += " und " + carries[idxCarry-1] + " Übertrag "
|
|
|
|
|
|
+ text += " mit Übertrag " + carries[idxCarry-1]
|
|
text = text.replace(/ /g, "0")
|
|
text = text.replace(/ /g, "0")
|
|
- text += resArr[idxNumbers]===realSum && carries[idxCarry-1]===realCarry ? "(Richtig) " : "(Falsch) ";
|
|
|
|
-
|
|
|
|
|
|
+ text += resArr[idxNumbers]===realSum && carries[idxCarry-1]===realCarry ? ": Richtig " : ": Falsch ";
|
|
stepsGridCopy.push({step: text});
|
|
stepsGridCopy.push({step: text});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- document.getElementById("stepsParagraph").innerHTML = "Rechenschritte: ";
|
|
|
|
- setStepsGrid(stepsGridCopy);
|
|
|
|
|
|
+ let paragraph = document.getElementById("stepsParagraph")
|
|
|
|
+ paragraph.innerHTML = "Rechenschritte: ";
|
|
|
|
|
|
let btnSubmit = document.createElement("button");
|
|
let btnSubmit = document.createElement("button");
|
|
btnSubmit.innerHTML = "Ergebnis abgeben";
|
|
btnSubmit.innerHTML = "Ergebnis abgeben";
|
|
btnSubmit.addEventListener("click", finishCalculation);
|
|
btnSubmit.addEventListener("click", finishCalculation);
|
|
btnSubmit.classList = "btn btn-secondary btn-sm";
|
|
btnSubmit.classList = "btn btn-secondary btn-sm";
|
|
- btnSubmit.id = "btnSubmitSteps";
|
|
|
|
- document.getElementById("idmtResultSteps").appendChild(btnSubmit);
|
|
|
|
|
|
+ btnSubmit.id = "btnSubmitSteps1";
|
|
|
|
+ document.getElementById("idmtResultSteps").insertBefore(btnSubmit, paragraph);
|
|
|
|
+
|
|
|
|
+ setStepsGrid(stepsGridCopy);
|
|
|
|
+
|
|
|
|
+ let btnSubmit2 = document.createElement("button");
|
|
|
|
+ btnSubmit2.innerHTML = "Ergebnis abgeben";
|
|
|
|
+ btnSubmit2.addEventListener("click", finishCalculation);
|
|
|
|
+ btnSubmit2.classList = "btn btn-secondary btn-sm";
|
|
|
|
+ btnSubmit2.id = "btnSubmitSteps2";
|
|
|
|
+ document.getElementById("idmtResultSteps").appendChild(btnSubmit2);
|
|
|
|
|
|
document.getElementById("idmtResultSteps").tabIndex = 0;
|
|
document.getElementById("idmtResultSteps").tabIndex = 0;
|
|
document.getElementById("idmtResultSteps").focus();
|
|
document.getElementById("idmtResultSteps").focus();
|
|
@@ -305,7 +313,8 @@ function Addition() {
|
|
|
|
|
|
setCarryArr(carryArrCopy);
|
|
setCarryArr(carryArrCopy);
|
|
|
|
|
|
- document.getElementById("btnSubmitSteps").remove();
|
|
|
|
|
|
+ document.getElementById("btnSubmitSteps1").remove();
|
|
|
|
+ document.getElementById("btnSubmitSteps2").remove();
|
|
document.getElementById("idmtResultSteps").style.display = "none";
|
|
document.getElementById("idmtResultSteps").style.display = "none";
|
|
}
|
|
}
|
|
|
|
|
|
@@ -323,7 +332,9 @@ function Addition() {
|
|
message = "Das ist leider falsch."
|
|
message = "Das ist leider falsch."
|
|
}
|
|
}
|
|
message = "<p>" + message + "</p>"
|
|
message = "<p>" + message + "</p>"
|
|
- document.getElementById("finishCalculation").innerHTML = message
|
|
|
|
|
|
+ document.getElementById("finishCalculation").innerHTML = message;
|
|
|
|
+ document.getElementById("finishCalculation").tabIndex = "0";
|
|
|
|
+ document.getElementById("finishCalculation").focus();
|
|
}
|
|
}
|
|
|
|
|
|
return (
|
|
return (
|
|
@@ -345,6 +356,8 @@ function Addition() {
|
|
<input type="submit" value="berechnen"/>
|
|
<input type="submit" value="berechnen"/>
|
|
</form>
|
|
</form>
|
|
|
|
|
|
|
|
+ <div id="finishCalculation"></div>
|
|
|
|
+
|
|
<div id="overview">
|
|
<div id="overview">
|
|
<DataGrid
|
|
<DataGrid
|
|
dataSource={numbersGrid}
|
|
dataSource={numbersGrid}
|
|
@@ -374,8 +387,6 @@ function Addition() {
|
|
handleCarryChange={handleCarryChange}/>
|
|
handleCarryChange={handleCarryChange}/>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- <div id="finishCalculation"></div>
|
|
|
|
-
|
|
|
|
<div id="idmtResultSteps">
|
|
<div id="idmtResultSteps">
|
|
<p id="stepsParagraph"></p>
|
|
<p id="stepsParagraph"></p>
|
|
<DataGrid
|
|
<DataGrid
|