Web-M1-Ausbau: JSON-Gaesteliste, GA-Verlauf, Python-Serversteuerung, tische.ini-Upload
- bestellung.xml -> bestellung.json: neuer JSONConfig (loest XMLConfig ab), alle work-Beispiele konvertiert, Doku (CLAUDE/README/dateiformate) umgestellt - ga.py: Beobachtungsobjekt Entwicklung zeichnet den Loesungsverlauf auf, neuer Schalter --show-development erzeugt Entwicklung.svg (beste/mittlere/ schlechteste Wertigkeit ueber die Zyklus-Aktionen) - web/main.py: neuer Endpunkt /tische-datei (tische.ini-Upload, ast.literal_eval), Frontend kann jetzt eine tische.ini laden - libs/webserver.py: plattformunabhaengige start/stop/status-Steuerung der Web-Testinstanz (ersetzt run_web_helper.ps1), raeumt auch verwaiste --reload-Prozessbaeume zuverlaessig auf - Sicherheit/Modernisierung: eval() -> ast.literal_eval in Tische/Strafliste, sicherer Mini-Auswerter fuer die String-Ausdruecke in zyklus.cfg, defaultdict(set) in Plaetze - SVG: Tischnummer fett zentriert im Tischkreis statt "Tisch x" darueber - Tests: JSONConfig, Entwicklung und der Zyklus-Auswerter abgedeckt (9 Tests) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 1, Nummer 2
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 1, Nummer 3
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 1, Nummer 4
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 1, Nummer 5
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 1, Nummer 6
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 2, Nummer 2
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 2, Nummer 3
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 2, Nummer 4
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 2, Nummer 5
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 2, Nummer 6
|
||||
BB, B, Prof. = Hof 1, Tisch 3, Nummer 2
|
||||
BB, B, Prof. = Hof 1, Tisch 3, Nummer 3
|
||||
BB, B, Prof. = Hof 1, Tisch 3, Nummer 4
|
||||
BB, B, Prof. = Hof 1, Tisch 3, Nummer 5
|
||||
CC, C, Dr. = Hof 1, Tisch 4, Nummer 2
|
||||
CC, C, Dr. = Hof 1, Tisch 4, Nummer 3
|
||||
CC, C, Dr. = Hof 1, Tisch 4, Nummer 4
|
||||
CC, C, Dr. = Hof 1, Tisch 4, Nummer 5
|
||||
CC, C, Dr. = Hof 1, Tisch 4, Nummer 6
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 3, Nummer 2
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 3, Nummer 3
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 3, Nummer 4
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 3, Nummer 5
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 3, Nummer 6
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 4, Nummer 2
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 4, Nummer 3
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 4, Nummer 4
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 4, Nummer 5
|
||||
AA, A, Dipl. Ing. = Hof 1, Tisch 4, Nummer 6
|
||||
BB, B, Prof. = Hof 1, Tisch 1, Nummer 2
|
||||
BB, B, Prof. = Hof 1, Tisch 1, Nummer 3
|
||||
BB, B, Prof. = Hof 1, Tisch 1, Nummer 4
|
||||
BB, B, Prof. = Hof 1, Tisch 1, Nummer 5
|
||||
CC, C, Dr. = Hof 1, Tisch 2, Nummer 2
|
||||
CC, C, Dr. = Hof 1, Tisch 2, Nummer 3
|
||||
CC, C, Dr. = Hof 1, Tisch 2, Nummer 4
|
||||
CC, C, Dr. = Hof 1, Tisch 2, Nummer 5
|
||||
CC, C, Dr. = Hof 1, Tisch 2, Nummer 6
|
||||
|
||||
|
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="405.657" height="108.914" viewBox="0 0 405.657 108.914">
|
||||
<rect width="100%" height="100%" fill="white"/>
|
||||
<circle cx="252.286" cy="54.4572" r="44.4572" fill="white" stroke="black" stroke-width="1.5"/>
|
||||
<circle cx="252.286" cy="32" r="12" fill="#e6194b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="274.743" cy="54.4572" r="12" fill="#e6194b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="252.286" cy="76.9144" r="12" fill="#e6194b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="229.829" cy="54.4572" r="12" fill="#e6194b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="252.286" cy="54.4572" r="12" fill="white" fill-opacity="0.75"/>
|
||||
<text x="252.286" y="54.4572" text-anchor="middle" dominant-baseline="central" font-size="13.2" font-weight="bold" fill="black">3</text>
|
||||
<circle cx="54.4572" cy="54.4572" r="44.4572" fill="white" stroke="black" stroke-width="1.5"/>
|
||||
<circle cx="54.4572" cy="32" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="75.8152" cy="47.5175" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="67.6572" cy="72.6254" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="41.2572" cy="72.6254" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="33.0991" cy="47.5175" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="54.4572" cy="54.4572" r="12" fill="white" fill-opacity="0.75"/>
|
||||
<text x="54.4572" y="54.4572" text-anchor="middle" dominant-baseline="central" font-size="13.2" font-weight="bold" fill="black">1</text>
|
||||
<circle cx="153.372" cy="54.4572" r="44.4572" fill="white" stroke="black" stroke-width="1.5"/>
|
||||
<circle cx="153.372" cy="32" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="174.73" cy="47.5175" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="166.572" cy="72.6254" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="140.172" cy="72.6254" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="132.013" cy="47.5175" r="12" fill="#3cb44b" stroke="black" stroke-width="1"/>
|
||||
<circle cx="153.372" cy="54.4572" r="12" fill="white" fill-opacity="0.75"/>
|
||||
<text x="153.372" y="54.4572" text-anchor="middle" dominant-baseline="central" font-size="13.2" font-weight="bold" fill="black">2</text>
|
||||
<circle cx="351.2" cy="54.4572" r="44.4572" fill="white" stroke="black" stroke-width="1.5"/>
|
||||
<circle cx="351.2" cy="32" r="12" fill="#4363d8" stroke="black" stroke-width="1"/>
|
||||
<circle cx="372.558" cy="47.5175" r="12" fill="#4363d8" stroke="black" stroke-width="1"/>
|
||||
<circle cx="364.4" cy="72.6254" r="12" fill="#4363d8" stroke="black" stroke-width="1"/>
|
||||
<circle cx="338" cy="72.6254" r="12" fill="#4363d8" stroke="black" stroke-width="1"/>
|
||||
<circle cx="329.842" cy="47.5175" r="12" fill="#4363d8" stroke="black" stroke-width="1"/>
|
||||
<circle cx="351.2" cy="54.4572" r="12" fill="white" fill-opacity="0.75"/>
|
||||
<text x="351.2" y="54.4572" text-anchor="middle" dominant-baseline="central" font-size="13.2" font-weight="bold" fill="black">4</text>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.0 KiB |
@@ -1,27 +1,27 @@
|
||||
[1]
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 1, Nummer 1
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 1, Nummer 2
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 1, Nummer 3
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 1, Nummer 4
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 1, Nummer 5
|
||||
Prof. B BB = Hof 1, Tisch 1, Nummer 1
|
||||
Prof. B BB = Hof 1, Tisch 1, Nummer 2
|
||||
Prof. B BB = Hof 1, Tisch 1, Nummer 3
|
||||
Prof. B BB = Hof 1, Tisch 1, Nummer 4
|
||||
|
||||
[2]
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 2, Nummer 1
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 2, Nummer 2
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 2, Nummer 3
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 2, Nummer 4
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 2, Nummer 5
|
||||
Dr. C CC = Hof 1, Tisch 2, Nummer 1
|
||||
Dr. C CC = Hof 1, Tisch 2, Nummer 2
|
||||
Dr. C CC = Hof 1, Tisch 2, Nummer 3
|
||||
Dr. C CC = Hof 1, Tisch 2, Nummer 4
|
||||
Dr. C CC = Hof 1, Tisch 2, Nummer 5
|
||||
|
||||
[3]
|
||||
Prof. B BB = Hof 1, Tisch 3, Nummer 1
|
||||
Prof. B BB = Hof 1, Tisch 3, Nummer 2
|
||||
Prof. B BB = Hof 1, Tisch 3, Nummer 3
|
||||
Prof. B BB = Hof 1, Tisch 3, Nummer 4
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 3, Nummer 1
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 3, Nummer 2
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 3, Nummer 3
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 3, Nummer 4
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 3, Nummer 5
|
||||
|
||||
[4]
|
||||
Dr. C CC = Hof 1, Tisch 4, Nummer 1
|
||||
Dr. C CC = Hof 1, Tisch 4, Nummer 2
|
||||
Dr. C CC = Hof 1, Tisch 4, Nummer 3
|
||||
Dr. C CC = Hof 1, Tisch 4, Nummer 4
|
||||
Dr. C CC = Hof 1, Tisch 4, Nummer 5
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 4, Nummer 1
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 4, Nummer 2
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 4, Nummer 3
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 4, Nummer 4
|
||||
Dipl. Ing. A AA = Hof 1, Tisch 4, Nummer 5
|
||||
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
"gruppen": [
|
||||
{
|
||||
"anzahl": 10,
|
||||
"personen": [
|
||||
{
|
||||
"vorname": "A",
|
||||
"nachname": "AA",
|
||||
"titel": "Dipl. Ing."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"anzahl": 4,
|
||||
"personen": [
|
||||
{
|
||||
"vorname": "B",
|
||||
"nachname": "BB",
|
||||
"titel": "Prof."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"anzahl": 5,
|
||||
"personen": [
|
||||
{
|
||||
"vorname": "C",
|
||||
"nachname": "CC",
|
||||
"titel": "Dr."
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
<Bestellung>
|
||||
|
||||
<Gruppe>
|
||||
<Person>
|
||||
<Vorname>A</Vorname>
|
||||
<Nachname>AA</Nachname>
|
||||
<Titel>Dipl. Ing.</Titel>
|
||||
</Person>
|
||||
<Anzahl>10</Anzahl>
|
||||
</Gruppe>
|
||||
|
||||
<Gruppe>
|
||||
<Person>
|
||||
<Vorname>B</Vorname>
|
||||
<Nachname>BB</Nachname>
|
||||
<Titel>Prof.</Titel>
|
||||
</Person>
|
||||
<Anzahl>4</Anzahl>
|
||||
</Gruppe>
|
||||
|
||||
<Gruppe>
|
||||
<Person>
|
||||
<Vorname>C</Vorname>
|
||||
<Nachname>CC</Nachname>
|
||||
<Titel>Dr.</Titel>
|
||||
</Person>
|
||||
<Anzahl>5</Anzahl>
|
||||
</Gruppe>
|
||||
|
||||
</Bestellung>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user