From 62caa37da257987c9585ac57ab64bb12ea481d0b Mon Sep 17 00:00:00 2001 From: Rasmus Date: Sun, 14 May 2023 16:12:01 +0300 Subject: fixes Former-commit-id: 09885e5cd344caaee9cdc2005b7e88dcc5206213 --- rannak/mangud/arimees/pood/index.html | 20 +++++++++--------- rannak/mangud/arimees/pood/script.js | 23 ++++++++++++++------- rannak/mangud/partorg/plakat/img/malev.jpg | Bin 498451 -> 0 bytes rannak/mangud/partorg/plakat/img/malev.png | Bin 0 -> 4747120 bytes rannak/mangud/partorg/plakat/img/malevBlank.png | Bin 690413 -> 971550 bytes rannak/mangud/partorg/plakat/img/stalin.jpg | Bin 168805 -> 0 bytes rannak/mangud/partorg/plakat/img/stalin.png | Bin 0 -> 29626279 bytes rannak/mangud/partorg/plakat/img/stalinBlank.png | Bin 25149515 -> 29238010 bytes rannak/mangud/partorg/plakat/img/veekogud.jpg | Bin 223291 -> 0 bytes rannak/mangud/partorg/plakat/img/veekogud.png | Bin 0 -> 23796934 bytes rannak/mangud/partorg/plakat/img/veekogudBlank.png | Bin 21683348 -> 22309523 bytes rannak/mangud/partorg/plakat/img/viisAastak.jpg | Bin 13173619 -> 0 bytes rannak/mangud/partorg/plakat/img/viisAastak.png | Bin 0 -> 16730975 bytes .../mangud/partorg/plakat/img/viisAastakBlank.png | Bin 12708001 -> 16607880 bytes rannak/mangud/partorg/plakat/styles.css | 8 +++---- 15 files changed, 30 insertions(+), 21 deletions(-) delete mode 100644 rannak/mangud/partorg/plakat/img/malev.jpg create mode 100644 rannak/mangud/partorg/plakat/img/malev.png delete mode 100644 rannak/mangud/partorg/plakat/img/stalin.jpg create mode 100644 rannak/mangud/partorg/plakat/img/stalin.png delete mode 100644 rannak/mangud/partorg/plakat/img/veekogud.jpg create mode 100644 rannak/mangud/partorg/plakat/img/veekogud.png delete mode 100644 rannak/mangud/partorg/plakat/img/viisAastak.jpg create mode 100644 rannak/mangud/partorg/plakat/img/viisAastak.png (limited to 'rannak') diff --git a/rannak/mangud/arimees/pood/index.html b/rannak/mangud/arimees/pood/index.html index 16233d2..2e72724 100644 --- a/rannak/mangud/arimees/pood/index.html +++ b/rannak/mangud/arimees/pood/index.html @@ -256,70 +256,70 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/rannak/mangud/arimees/pood/script.js b/rannak/mangud/arimees/pood/script.js index 20efbe8..985255e 100644 --- a/rannak/mangud/arimees/pood/script.js +++ b/rannak/mangud/arimees/pood/script.js @@ -35,6 +35,9 @@ for (let i=0;i < cells.length; i++){ let origText = input.parentElement.getAttribute('data-text'); let curText = this.value; + sums = document.querySelectorAll(".summa"); + console.log(sums); + if (origText != curText){ td.removeAttribute('data-clicked'); td.removeAttribute('data-text'); @@ -42,26 +45,32 @@ for (let i=0;i < cells.length; i++){ td.style.cssText = 'padding: .5rem .5rem'; + totalSumma = 0; + sums.forEach(el => { + totalSumma += Number(el.innerHTML); + }); // Can move on? for (cell of cells){ - if (cell.textContent == '') - return; + if (totalSumma >= 12000) + moveOnEnable(); + else if (cell.textContent == '') + return; } moveOnEnable(); } + else { td.removeAttribute('data-clicked'); td.removeAttribute('data-text'); td.innerHTML = origText; td.style.cssText = 'padding: .5rem .5rem'; - } - - // Here Check if Done - //TODO + sums.forEach(el => { + console.log(el); + }); + } - } // onblur func end diff --git a/rannak/mangud/partorg/plakat/img/malev.jpg b/rannak/mangud/partorg/plakat/img/malev.jpg deleted file mode 100644 index d88d950..0000000 Binary files a/rannak/mangud/partorg/plakat/img/malev.jpg and /dev/null differ diff --git a/rannak/mangud/partorg/plakat/img/malev.png b/rannak/mangud/partorg/plakat/img/malev.png new file mode 100644 index 0000000..919e667 Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/malev.png differ diff --git a/rannak/mangud/partorg/plakat/img/malevBlank.png b/rannak/mangud/partorg/plakat/img/malevBlank.png index 85c10f1..b94db71 100644 Binary files a/rannak/mangud/partorg/plakat/img/malevBlank.png and b/rannak/mangud/partorg/plakat/img/malevBlank.png differ diff --git a/rannak/mangud/partorg/plakat/img/stalin.jpg b/rannak/mangud/partorg/plakat/img/stalin.jpg deleted file mode 100644 index bc0a3a5..0000000 Binary files a/rannak/mangud/partorg/plakat/img/stalin.jpg and /dev/null differ diff --git a/rannak/mangud/partorg/plakat/img/stalin.png b/rannak/mangud/partorg/plakat/img/stalin.png new file mode 100644 index 0000000..45cd9ef Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/stalin.png differ diff --git a/rannak/mangud/partorg/plakat/img/stalinBlank.png b/rannak/mangud/partorg/plakat/img/stalinBlank.png index 1f5183e..348df75 100644 Binary files a/rannak/mangud/partorg/plakat/img/stalinBlank.png and b/rannak/mangud/partorg/plakat/img/stalinBlank.png differ diff --git a/rannak/mangud/partorg/plakat/img/veekogud.jpg b/rannak/mangud/partorg/plakat/img/veekogud.jpg deleted file mode 100644 index 23f04ab..0000000 Binary files a/rannak/mangud/partorg/plakat/img/veekogud.jpg and /dev/null differ diff --git a/rannak/mangud/partorg/plakat/img/veekogud.png b/rannak/mangud/partorg/plakat/img/veekogud.png new file mode 100644 index 0000000..0e48af9 Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/veekogud.png differ diff --git a/rannak/mangud/partorg/plakat/img/veekogudBlank.png b/rannak/mangud/partorg/plakat/img/veekogudBlank.png index 85570b1..6589adc 100644 Binary files a/rannak/mangud/partorg/plakat/img/veekogudBlank.png and b/rannak/mangud/partorg/plakat/img/veekogudBlank.png differ diff --git a/rannak/mangud/partorg/plakat/img/viisAastak.jpg b/rannak/mangud/partorg/plakat/img/viisAastak.jpg deleted file mode 100644 index 20be6ed..0000000 Binary files a/rannak/mangud/partorg/plakat/img/viisAastak.jpg and /dev/null differ diff --git a/rannak/mangud/partorg/plakat/img/viisAastak.png b/rannak/mangud/partorg/plakat/img/viisAastak.png new file mode 100644 index 0000000..c099089 Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/viisAastak.png differ diff --git a/rannak/mangud/partorg/plakat/img/viisAastakBlank.png b/rannak/mangud/partorg/plakat/img/viisAastakBlank.png index fc0215c..b9a83ad 100644 Binary files a/rannak/mangud/partorg/plakat/img/viisAastakBlank.png and b/rannak/mangud/partorg/plakat/img/viisAastakBlank.png differ diff --git a/rannak/mangud/partorg/plakat/styles.css b/rannak/mangud/partorg/plakat/styles.css index bc7ee44..0ebe5f2 100644 --- a/rannak/mangud/partorg/plakat/styles.css +++ b/rannak/mangud/partorg/plakat/styles.css @@ -159,7 +159,7 @@ input:disabled{ /*Plakatid*/ .stalin { - background: url("img/stalin.jpg") no-repeat center; + background: url("img/stalin.png") no-repeat center; background-size: 100% 100%; text-align: center; color: black; @@ -167,7 +167,7 @@ input:disabled{ .veekogud { - background: url("img/veekogud.jpg") no-repeat center; + background: url("img/veekogud.png") no-repeat center; background-size: 100% 100%; text-align: center; color: black; @@ -175,7 +175,7 @@ input:disabled{ .malev { - background: url("img/malev.jpg") no-repeat center; + background: url("img/malev.png") no-repeat center; background-size: 100% 100%; text-align: center; color: black; @@ -183,7 +183,7 @@ input:disabled{ .viisAastak { - background: url("img/viisAastak.jpg") no-repeat center; + background: url("img/viisAastak.png") no-repeat center; background-size: 100% 100%; text-align: center; color: black; -- cgit v1.2.3