From 19a220a349bb774712670ea0bd760c8d9f551a59 Mon Sep 17 00:00:00 2001 From: structix Date: Sat, 18 May 2019 10:43:07 +0200 Subject: [PATCH 01/20] Update min max --- uebung3/min-max.html | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/uebung3/min-max.html b/uebung3/min-max.html index 6b0a5ce..eded486 100644 --- a/uebung3/min-max.html +++ b/uebung3/min-max.html @@ -5,10 +5,20 @@ From 19b81617ceef7aa1a4263b62dad0c0b8f49eca2e Mon Sep 17 00:00:00 2001 From: structix Date: Sat, 18 May 2019 11:31:53 +0200 Subject: [PATCH 02/20] farbenlehre --- uebung3/broetchenrechner.html | 1 - uebung3/farbenlehre.html | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 uebung3/farbenlehre.html diff --git a/uebung3/broetchenrechner.html b/uebung3/broetchenrechner.html index d9186bf..6f8101c 100644 --- a/uebung3/broetchenrechner.html +++ b/uebung3/broetchenrechner.html @@ -24,7 +24,6 @@ } alert("Die Brötchen kosten " + result + "€"); } - diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html new file mode 100644 index 0000000..a99ef14 --- /dev/null +++ b/uebung3/farbenlehre.html @@ -0,0 +1,36 @@ + + + Farbenlehre + + + + +
+ + +
+ + +
+ +
+ +
+ + + + + From 517c8d20cd0ac276404de2b7f14e2c92beeb2cae Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 11:46:50 +0200 Subject: [PATCH 03/20] Update farbenlehre --- uebung3/farbenlehre.html | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index a99ef14..549b3dd 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -1,5 +1,6 @@ + Farbenlehre @@ -23,12 +24,20 @@ let gruen = document.getElementById("gruen"); let blau = document.getElementById("blau"); let table = document.createElement("table") - - btn.addEventListener("click", updateTable); table.id = "farben"; + btn.addEventListener("click", updateTable); + function updateTable() { - + let cell1 = row.insertCell(0); + let cell2 = row.insertCell(1); + let cell3 = row.insertCell(2); + let cell4 = row.insertCell(3); + + cell1.innerHTML = "rot"; + cell1.innerHTML = "grün"; + cell1.innerHTML = "blau"; + cell1.innerHTML = "farbwert"; } From 9f06f5e7615114f0abb0e68a6c12eb744c88c315 Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 11:48:28 +0200 Subject: [PATCH 04/20] Update farbenlehre --- uebung3/farbenlehre.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index 549b3dd..de0ac62 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -23,12 +23,12 @@ let rot = document.getElementById("rot"); let gruen = document.getElementById("gruen"); let blau = document.getElementById("blau"); - let table = document.createElement("table") - table.id = "farben"; + let table = document.getElementById("farben") btn.addEventListener("click", updateTable); function updateTable() { + table.insertRow(0); let cell1 = row.insertCell(0); let cell2 = row.insertCell(1); let cell3 = row.insertCell(2); From 39be3a0b442860baae8cd2ddfc32eb02f9af7e63 Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 11:49:47 +0200 Subject: [PATCH 05/20] Update farbenlehre --- uebung3/farbenlehre.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index de0ac62..31b6c82 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -23,11 +23,11 @@ let rot = document.getElementById("rot"); let gruen = document.getElementById("gruen"); let blau = document.getElementById("blau"); - let table = document.getElementById("farben") btn.addEventListener("click", updateTable); function updateTable() { + let table = document.getElementById("farben"); table.insertRow(0); let cell1 = row.insertCell(0); let cell2 = row.insertCell(1); From 581d76532aad045fd4de04d0d2d50d41357b4e88 Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 11:50:34 +0200 Subject: [PATCH 06/20] Fix row --- uebung3/farbenlehre.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index 31b6c82..6c117e4 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -28,7 +28,7 @@ function updateTable() { let table = document.getElementById("farben"); - table.insertRow(0); + let row = table.insertRow(0); let cell1 = row.insertCell(0); let cell2 = row.insertCell(1); let cell3 = row.insertCell(2); From edd77b705ea004556877b1e2bd096e4659538cf1 Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 11:51:28 +0200 Subject: [PATCH 07/20] Update --- uebung3/farbenlehre.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index 6c117e4..9c8fc6d 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -35,9 +35,9 @@ let cell4 = row.insertCell(3); cell1.innerHTML = "rot"; - cell1.innerHTML = "grün"; - cell1.innerHTML = "blau"; - cell1.innerHTML = "farbwert"; + cell2.innerHTML = "grün"; + cell3.innerHTML = "blau"; + cell4.innerHTML = "farbwert"; } From 6eb0bc0b895e095cb9bc46daef58a4cc27183659 Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 11:53:12 +0200 Subject: [PATCH 08/20] Update --- uebung3/farbenlehre.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index 9c8fc6d..80b395c 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -34,9 +34,13 @@ let cell3 = row.insertCell(2); let cell4 = row.insertCell(3); - cell1.innerHTML = "rot"; - cell2.innerHTML = "grün"; - cell3.innerHTML = "blau"; + let r = rot.value; + let g = gruen.value; + let b = blau.value; + + cell1.innerHTML = r; + cell2.innerHTML = g; + cell3.innerHTML = b; cell4.innerHTML = "farbwert"; } From f7d2e67d5d29f3a8599958579307d635bc0f15cb Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 11:58:44 +0200 Subject: [PATCH 09/20] Update --- uebung3/farbenlehre.html | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index 80b395c..e1a50e3 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -26,6 +26,16 @@ btn.addEventListener("click", updateTable); + function toHex(farbstring) { + let tempint = parseInt(farbstring); + let temphex = tempint.toString(16); + if (tempint < 16) { + //hex Zahl hat nur eine Stelle + temphex = "0" + temphex; + } + return temphex; + } + function updateTable() { let table = document.getElementById("farben"); let row = table.insertRow(0); @@ -38,10 +48,10 @@ let g = gruen.value; let b = blau.value; - cell1.innerHTML = r; - cell2.innerHTML = g; - cell3.innerHTML = b; - cell4.innerHTML = "farbwert"; + cell1.innerHTML = toHex(r); + cell2.innerHTML = toHex(g); + cell3.innerHTML = toHex(b); + cell4.innerHTML = "#" + toHex(r) + toHex(g) + toHex(b); } From 0a4c8e2ebdeb49ddf42f92d052aa438b88b6b278 Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 11:59:55 +0200 Subject: [PATCH 10/20] Update --- uebung3/farbenlehre.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index e1a50e3..31efad7 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -33,7 +33,7 @@ //hex Zahl hat nur eine Stelle temphex = "0" + temphex; } - return temphex; + return temphex.toUpperCase(); } function updateTable() { From 83051ba022ab991b17b6e6a7bc556f94502ae5d1 Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 12:02:22 +0200 Subject: [PATCH 11/20] Update --- uebung3/farbenlehre.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index 31efad7..9bb4319 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -51,7 +51,9 @@ cell1.innerHTML = toHex(r); cell2.innerHTML = toHex(g); cell3.innerHTML = toHex(b); - cell4.innerHTML = "#" + toHex(r) + toHex(g) + toHex(b); + let farbcode = "#" + toHex(r) + toHex(g) + toHex(b); + cell4.innerHTML = farbcode; + cell4.style.backgroundColor = farbcode; } From d6c7ddcb579a7b43a00b6b30afa878d9aff97c7a Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 12:04:30 +0200 Subject: [PATCH 12/20] Update farbenlehre --- uebung3/farbenlehre.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/uebung3/farbenlehre.html b/uebung3/farbenlehre.html index 9bb4319..a1607e5 100644 --- a/uebung3/farbenlehre.html +++ b/uebung3/farbenlehre.html @@ -16,7 +16,14 @@
-
+ + + + + + + +
RotGrünBlauFarbwert
From 5418cbd1c30d24715f70e92fc241ad4ffc5feb27 Mon Sep 17 00:00:00 2001 From: structix Date: Sun, 19 May 2019 23:38:31 +0200 Subject: [PATCH 20/20] Update tabellenmanipulation --- uebung3/tabellenmanipulation.html | 74 +++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/uebung3/tabellenmanipulation.html b/uebung3/tabellenmanipulation.html index 06b64a3..d565784 100644 --- a/uebung3/tabellenmanipulation.html +++ b/uebung3/tabellenmanipulation.html @@ -25,13 +25,79 @@