Skip to content

Commit

Permalink
0-0-0.nl versie 0.8.63
Browse files Browse the repository at this point in the history
  • Loading branch information
@PJvanDiepen
PJvanDiepen committed Sep 19, 2024
1 parent 2f34800 commit daf6248
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cool_backend",
"version": "0.8.62",
"version": "0.8.63",
"description": "Backend for 0-0-0.nl",
"main": "app.js",
"scripts": {
Expand Down
14 changes: 7 additions & 7 deletions public/js/o_o_o.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,14 @@ export function laatsteRonde() {

export function vorigeRonde() {
const ronde = db.tak(o_o_o.club, o_o_o.seizoen, o_o_o.team).ronde;
return ronde[indexRondeTotDatum(ronde)].rondeNummer;
const i = indexRondeTotDatum(ronde);
return ronde[i > 0 ? i - 1 : 0].rondeNummer; // vorige of eerste ronde
}

export function volgendeRonde() {
const ronde = db.tak(o_o_o.club, o_o_o.seizoen, o_o_o.team).ronde;
const i = indexRondeTotDatum(ronde);
return ronde[i === ronde.length - 1 ? i : i + 1].rondeNummer; // laatste of volgende ronde
return i < 0 ? 0 : ronde[i].rondeNummer; // geen of volgende ronde
}

/**
Expand All @@ -180,16 +181,15 @@ export function volgendeRonde() {
*
* @param ronde rondenlijst
* @param jsonDatum gegeven datum
* @returns {number} index
* @returns {number} index of -1
*/
function indexRondeTotDatum(ronde, jsonDatum = null) {
const peilDatum = jsonDatum ? new Date(jsonDatum) : new Date();
const laatste = ronde.length - 1;
if (peilDatum >= new Date(ronde[laatste].datum)) { // alle ronden zijn na peilDatum
return laatste;
if (peilDatum >= new Date(ronde[ronde.length - 1].datum)) { // alle ronden zijn na peilDatum
return -1;
}
let index = 0;
while (new Date(ronde[index].datum) > peilDatum) { // zoek eerste ronde na peildatum
while (new Date(ronde[index].datum) < peilDatum) { // eerste ronde voor peildatum
index++;
}
return index;
Expand Down
4 changes: 2 additions & 2 deletions public/js/ranglijst.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as html from "./html.js";
import * as db from "./db.js";
import { o_o_o, init, competitieTitel, teamSelecteren, rondeSelecteren } from "./o_o_o.js"
import { o_o_o, init, competitieTitel, teamSelecteren, rondeSelecteren, vorigeRonde } from "./o_o_o.js"
import { ranglijst } from "./reglement.js";

import * as zyq from "./zyq.js";
Expand All @@ -15,7 +15,7 @@ import * as zyq from "./zyq.js";
(async function() {
await init();
competitieTitel();
const rondeNummer = Number(html.params.get("ronde")) || o_o_o.vorigeRonde || 1;
const rondeNummer = Number(html.params.get("ronde")) || vorigeRonde() || 1;
await html.menu(zyq.gebruiker.mutatieRechten,[db.WEDSTRIJDLEIDER, "Rondenlijst", function () {
html.anderePagina("rondenlijst.html");
}]);
Expand Down
4 changes: 1 addition & 3 deletions public/js/start.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ import * as zyq from "./zyq.js";
const menuKeuzes = [
[db.IEDEREEN, `Ranglijst na ronde ${vorigeRonde()}`,"ranglijst.html"], // menu0
[db.IEDEREEN, `Uitslagen ronde ${vorigeRonde()}`,"ronde.html"]]; // menu1
if (volgendeRonde() && false) { // indeling zonder resultaten TODO o_o_o.ronde[volgendeRonde()].resultaten === 0)
menuKeuzes.push([db.GEREGISTREERD, `Definitieve indeling ronde ${volgendeRonde()}`, `ronde.html?ronde=${volgendeRonde()}`]); // menu2
} else if (vorigeRonde() < laatsteRonde()) {
if (volgendeRonde()) { // menu2 TODO Definitieve indeling
menuKeuzes.push([db.GEREGISTREERD, `Voorlopige indeling ronde ${volgendeRonde()}`, "indelen.html"]); // menu2
}
if (zyq.gebruiker.mutatieRechten === db.IEDEREEN) { // indien niet geregistreerd
Expand Down
116 changes: 59 additions & 57 deletions sql/WaagtorenInsert2425.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ update uitslag set partij = "p", datum = @datum where seizoen = @seizoen and tea
set @seizoen = '2425';
set @team = 'int';
set @competitie = 'int';
set @ronde = 33;
set @bord = 19;
set @ronde = 2;
set @bord = 22;

select naam, u.* from uitslag u join persoon p on p.knsbNummer = u.knsbNummer
where seizoen = @seizoen and teamCode = @competitie and rondeNummer = @ronde and bordNummer = @bord;
Expand All @@ -86,8 +86,8 @@ where seizoen = @seizoen and teamCode = @competitie and rondeNummer = @ronde;
select naam, u.* from uitslag u join persoon p on p.knsbNummer = u.knsbNummer
where seizoen = @seizoen and teamCode = @competitie and rondeNummer = @ronde and partij = "e";

set @wit = 7321534; -- Ronald Kamps
set @zwart = 9001586; -- Abdul Rashid
set @wit = 189; -- Jan
set @zwart = 7691728; -- Karel

set @oneven = 6212404; -- Peter
set @afwezig = 9001586; -- Abdul Rashid
Expand Down Expand Up @@ -368,59 +368,61 @@ select * from uitslag where clubCode = 0 and seizoen = "2425" and teamCode = "in
delete from uitslag where clubCode = 0 and seizoen = "2425" and teamCode = "int" and rondeNUmmer = @ronde;

insert into uitslag (clubCode, seizoen, teamCode, rondeNummer, bordNummer, knsbNummer, partij, witZwart, tegenstanderNummer, resultaat, datum, competitie) values
(0, "2425", "int", 2, 0, 103, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 6192098, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 6207520, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 6212404, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 6565801, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 6572511, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 6930957, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 6951362, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7099950, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7101193, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7282033, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7321534, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7386060, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7399469, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7419621, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7518203, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7529522, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7535396, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7544438, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7546506, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7582102, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7699010, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7758014, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7771665, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7777715, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8073978, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8112654, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8224502, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8243312, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8350738, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8372881, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8485059, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8750093, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8886625, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8950876, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 9056674, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 9077651, "m", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7649213, "n", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 9023234, "n", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 9065100, "n", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 189, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7129991, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7210137, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7441346, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7519930, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7613166, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7691728, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7731812, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7824674, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8358966, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8611922, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8617367, "p", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8795941, "p", "", 0, "", '2024-09-17', "int");
(0, "2425", "int", 2, 0, 6207520, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7441346, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7546506, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7649213, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7824674, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8358966, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8795941, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 8886625, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 9023234, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 9065100, "a", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 0, 7321534, "o", "", 0, "", '2024-09-17', "int"),
(0, "2425", "int", 2, 1, 7099950, "i", "w", 6930957, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 1, 6930957, "i", "z", 7099950, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 2, 7758014, "i", "w", 6572511, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 2, 6572511, "i", "z", 7758014, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 3, 8485059, "i", "w", 7399469, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 3, 7399469, "i", "z", 8485059, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 4, 7771665, "i", "w", 7282033, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 4, 7282033, "i", "z", 7771665, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 5, 8224502, "i", "w", 6192098, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 5, 6192098, "i", "z", 8224502, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 6, 7535396, "i", "w", 8073978, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 6, 8073978, "i", "z", 7535396, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 7, 7519930, "i", "w", 7129991, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 7, 7129991, "i", "z", 7519930, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 8, 7731812, "i", "w", 7582102, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 8, 7582102, "i", "z", 7731812, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 9, 8112654, "i", "w", 7613166, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 9, 7613166, "i", "z", 8112654, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 10, 8617367, "i", "w", 8611922, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 10, 8611922, "i", "z", 8617367, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 11, 7529522, "i", "w", 7544438, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 11, 7544438, "i", "z", 7529522, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 12, 7699010, "i", "w", 6565801, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 12, 6565801, "i", "z", 7699010, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 13, 7210137, "i", "w", 7386060, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 13, 7386060, "i", "z", 7210137, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 14, 7419621, "i", "w", 6951362, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 14, 6951362, "i", "z", 7419621, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 15, 8276752, "i", "w", 6212404, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 15, 6212404, "i", "z", 8276752, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 16, 7518203, "i", "w", 7101193, "½", '2024-09-17', "int"),
(0, "2425", "int", 2, 16, 7101193, "i", "z", 7518203, "½", '2024-09-17', "int"),
(0, "2425", "int", 2, 17, 8335415, "i", "w", 8243312, "½", '2024-09-17', "int"),
(0, "2425", "int", 2, 17, 8243312, "i", "z", 8335415, "½", '2024-09-17', "int"),
(0, "2425", "int", 2, 18, 8950876, "i", "w", 9056674, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 18, 9056674, "i", "z", 8950876, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 19, 8750093, "i", "w", 8372881, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 19, 8372881, "i", "z", 8750093, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 20, 9077651, "i", "w", 8350738, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 20, 8350738, "i", "z", 9077651, "1", '2024-09-17', "int"),
(0, "2425", "int", 2, 21, 103, "i", "w", 7777715, "½", '2024-09-17', "int"),
(0, "2425", "int", 2, 21, 7777715, "i", "z", 103, "½", '2024-09-17', "int"),
(0, "2425", "int", 2, 22, 189, "i", "w", 7691728, "0", '2024-09-17', "int"),
(0, "2425", "int", 2, 22, 7691728, "i", "z", 189, "1", '2024-09-17', "int");

-- ronde 3 TODO local
set @ronde = 3;
Expand Down

0 comments on commit daf6248

Please sign in to comment.