From 545542b5784090f46def505d0617aba776501748 Mon Sep 17 00:00:00 2001 From: Wolfgang Lezius Date: Sun, 19 Apr 2026 13:02:48 +0200 Subject: [PATCH] Anpassungen an das neue Konzept --- doc/lerngruppe.md | 2 ++ src/devices/a4.css | 4 +-- src/devices/a5.css | 4 +-- src/devices/a6.css | 4 +-- src/devices/air13-7.css | 4 +-- src/devices/air4567.css | 4 +-- src/devices/css/blackwhite.css | 18 ---------- src/devices/css/color-paperpro.css | 27 --------------- src/devices/css/color.css | 27 --------------- src/devices/css/large.css | 54 ++---------------------------- src/devices/css/small.css | 54 ++---------------------------- src/devices/ipad1011.css | 4 +-- src/devices/ipad789.css | 4 +-- src/devices/mini2345.css | 4 +-- src/devices/mini67.css | 4 +-- src/devices/move-links.css | 4 +-- src/devices/move-rechts.css | 4 +-- src/devices/move.css | 4 +-- src/devices/paperpro-links.css | 5 +-- src/devices/paperpro-rechts.css | 5 +-- src/devices/paperpro.css | 5 +-- src/devices/pro13-3456.css | 4 +-- src/devices/pro13-78.css | 4 +-- src/devices/pro234.css | 4 +-- src/devices/pro56.css | 4 +-- src/devices/rm2-links.css | 4 +-- src/devices/rm2-rechts.css | 4 +-- src/devices/rm2.css | 4 +-- src/pages/checkliste.py | 12 ++++++- src/pages/ha.py | 11 +++++- src/pages/header.py | 2 -- src/pages/korrektur.py | 12 ++++++- src/pages/somi.py | 11 +++++- src/pages/uebersicht.py | 11 +++++- 34 files changed, 82 insertions(+), 250 deletions(-) delete mode 100644 src/devices/css/blackwhite.css delete mode 100644 src/devices/css/color-paperpro.css delete mode 100644 src/devices/css/color.css diff --git a/doc/lerngruppe.md b/doc/lerngruppe.md index a6c5873..5e0f79c 100644 --- a/doc/lerngruppe.md +++ b/doc/lerngruppe.md @@ -48,3 +48,5 @@ Die Parameter sind zwar selbsterklärend, werden hier aber dennoch einmal kurz e - In der Notenübersicht des zweiten Halbjahres kann optional eine Spalte für die Note des ersten Halbjahres angelegt werden. - Bei der Erfassung von Hausaufgaben bzw. deren Nichterledigung können eine oder mehrere Zeilen pro SchülerIn angelegt werden. Die Anzahl 0 sorgt dafür, dass Hausaufgabenlisten ganz weggelassen werden. - Abschließend kann die Anzahl der Checklisten für diese Lerngruppe festgelegt werden. + +*Tipp:* Die zusätzliche versteckte Option 'enger = ja' besetzt die Schriftgröße bei den SchülerInnen minimal kleiner. Das ist dann hilfreich, wenn eine Klasse oder ein Kurs einen Tick zu groß ist, so dass sich für alle Tabellen ein Zeilenumbruch ergibt. diff --git a/src/devices/a4.css b/src/devices/a4.css index 3c80d67..510cc85 100644 --- a/src/devices/a4.css +++ b/src/devices/a4.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/a5.css b/src/devices/a5.css index 0e89c0e..ff43d8b 100644 --- a/src/devices/a5.css +++ b/src/devices/a5.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/small.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/small.css"); \ No newline at end of file diff --git a/src/devices/a6.css b/src/devices/a6.css index 1ee6716..dd7f2ba 100644 --- a/src/devices/a6.css +++ b/src/devices/a6.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/small.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/small.css"); \ No newline at end of file diff --git a/src/devices/air13-7.css b/src/devices/air13-7.css index d7dd288..b412b0a 100644 --- a/src/devices/air13-7.css +++ b/src/devices/air13-7.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/air4567.css b/src/devices/air4567.css index a1d505e..a3aece5 100644 --- a/src/devices/air4567.css +++ b/src/devices/air4567.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/css/blackwhite.css b/src/devices/css/blackwhite.css deleted file mode 100644 index 93be4ae..0000000 --- a/src/devices/css/blackwhite.css +++ /dev/null @@ -1,18 +0,0 @@ - -/* Primäre Navileiste: aktuell ohne Schattierung */ - -.n1, .n2, .n3, .n4, .n5, .n6, .n7, .n8 { -} - - -/* Überschrift unter sekundärer Kurs-Navileiste: aktuell ohne Schattierung */ - -.h1, .h2, .h3, .h4, .h5, .h6, .h7, .h8 { -} - - -/* Stundenplan: Links einheitlich grau schattiert */ - -.t1, .t2, .t3, .t4, .t5, .t6, .t7, .t8 { - background-color: #f2f2f2; -} diff --git a/src/devices/css/color-paperpro.css b/src/devices/css/color-paperpro.css deleted file mode 100644 index 40fce94..0000000 --- a/src/devices/css/color-paperpro.css +++ /dev/null @@ -1,27 +0,0 @@ - -/* Navizelle, Titel und Stundenplanlink einheitlich eingefärbt */ - -.n1, .h1, .t1 { - background-color: dodgerblue; -} -.n2, .h2, .t2 { - background-color: limegreen; -} -.n3, .h3, .t3 { - background-color: lightcoral; -} -.n4, .h4, .t4 { - background-color: orange; -} -.n5, .h5, .t5 { - background-color: yellow; -} -.n6, .h6, .t6 { - background-color: orchid; -} -.n7, .h7, .t7 { - background-color: cyan; -} -.n8, .h8, .t8 { - background-color: teal; -} diff --git a/src/devices/css/color.css b/src/devices/css/color.css deleted file mode 100644 index 26f8cca..0000000 --- a/src/devices/css/color.css +++ /dev/null @@ -1,27 +0,0 @@ - -/* Navizelle, Titel und Stundenplanlink einheitlich eingefärbt */ - -.n1, .h1, .t1 { - background-color: lightpink; -} -.n2, .h2, .t2 { - background-color: powderblue; -} -.n3, .h3, .t3 { - background-color: lightgreen; -} -.n4, .h4, .t4 { - background-color: peachpuff; -} -.n5, .h5, .t5 { - background-color: lavender; -} -.n6, .h6, .t6 { - background-color: lightgoldenrodyellow; -} -.n7, .h7, .t7 { - background-color: darkseagreen; -} -.n8, .h8, .t8 { - background-color: cadetblue; -} diff --git a/src/devices/css/large.css b/src/devices/css/large.css index 77871ee..4c12b61 100644 --- a/src/devices/css/large.css +++ b/src/devices/css/large.css @@ -7,6 +7,9 @@ h1, th, td, h1 { th, td { font-size: 140%; } +tr.enger td { + font-size: 135% !important; +} th { font-weight: 500; } @@ -73,57 +76,6 @@ th.name, td.name { tr.header, tr.muster { border-bottom: 1px solid black; } - - -/* Startseite inkl. Stundenplan */ -h1.start { - margin-top: 60pt; - font-size: 200%; - margin-bottom: 10pt; - text-align: center; -} -table.timetable { - border: none; - width: 100%; -} -table.timetable tr { - border: none; -} -table.timetable a { - text-decoration: none; - color: black; -} -th.stunde, td.stunde { - width: 7.5%; - text-align: center; - border: 0.5px solid black; - border-right: 1px solid black; -} -th.tag, td.tag { - width: 18.5%; - text-align: center; - border: 0.5px solid black; -} -table.timetable th.stunde, th.tag { - border-bottom: 1px solid black; -} -table.timetable div { - padding-top: 4pt; - padding-bottom: -3pt; - padding-left: 2pt; - padding-right: 2pt; - margin-left: 0pt; - margin-right: 2pt; - border: 0.5px solid black; -} -table.timetable td.tag { - padding-top: 3pt; - padding-bottom: 1pt; -} -table.timetable td.stunde { - padding-top: 5pt; - padding-bottom: 1pt; -} /* Übersichtstabelle */ diff --git a/src/devices/css/small.css b/src/devices/css/small.css index 4919df1..8d4846a 100644 --- a/src/devices/css/small.css +++ b/src/devices/css/small.css @@ -7,6 +7,9 @@ h1, th, td, h1 { th, td { font-size: 120%; } +tr.enger td { + font-size: 115% !important; +} th { font-weight: 500; } @@ -84,57 +87,6 @@ tr.header, tr.muster { } -/* Startseite inkl. Stundenplan */ -h1.start { - margin-top: 40pt; - font-size: 170%; - margin-bottom: 10pt; - text-align: center; -} -table.timetable { - border: none; - width: 100%; -} -table.timetable tr { - border: none; -} -table.timetable a { - text-decoration: none; - color: black; -} -th.stunde, td.stunde { - width: 7.5%; - text-align: center; - border: 0.5px solid black; - border-right: 1px solid black; -} -th.tag, td.tag { - width: 18.5%; - text-align: center; - border: 0.5px solid black; -} -table.timetable th.stunde, th.tag { - border-bottom: 1px solid black; -} -table.timetable div { - padding-top: 4pt; - padding-bottom: -3pt; - padding-left: 2pt; - padding-right: 2pt; - margin-left: 0pt; - margin-right: 2pt; - border: 0.5px solid black; -} -table.timetable td.tag { - padding-top: 3pt; - padding-bottom: 1pt; -} -table.timetable td.stunde { - padding-top: 5pt; - padding-bottom: 1pt; -} - - /* Übersichtstabelle */ table.overview th.nr, th.name, th.endnote { vertical-align: bottom; diff --git a/src/devices/ipad1011.css b/src/devices/ipad1011.css index a1d505e..a3aece5 100644 --- a/src/devices/ipad1011.css +++ b/src/devices/ipad1011.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/ipad789.css b/src/devices/ipad789.css index a44ac55..d9a02f6 100644 --- a/src/devices/ipad789.css +++ b/src/devices/ipad789.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/mini2345.css b/src/devices/mini2345.css index 3f12713..bad53b0 100644 --- a/src/devices/mini2345.css +++ b/src/devices/mini2345.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/small.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/small.css"); \ No newline at end of file diff --git a/src/devices/mini67.css b/src/devices/mini67.css index 32705fd..c88ba11 100644 --- a/src/devices/mini67.css +++ b/src/devices/mini67.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/small.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/small.css"); \ No newline at end of file diff --git a/src/devices/move-links.css b/src/devices/move-links.css index 694c855..ae1e806 100644 --- a/src/devices/move-links.css +++ b/src/devices/move-links.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/small.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/small.css"); \ No newline at end of file diff --git a/src/devices/move-rechts.css b/src/devices/move-rechts.css index 41067b7..996400a 100644 --- a/src/devices/move-rechts.css +++ b/src/devices/move-rechts.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/small.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/small.css"); \ No newline at end of file diff --git a/src/devices/move.css b/src/devices/move.css index c9fef6b..d6c9bbf 100644 --- a/src/devices/move.css +++ b/src/devices/move.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/small.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/small.css"); \ No newline at end of file diff --git a/src/devices/paperpro-links.css b/src/devices/paperpro-links.css index 9d42f9c..11142aa 100644 --- a/src/devices/paperpro-links.css +++ b/src/devices/paperpro-links.css @@ -6,7 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color-paperpro.css"); - +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/paperpro-rechts.css b/src/devices/paperpro-rechts.css index 600be5f..24c8ced 100644 --- a/src/devices/paperpro-rechts.css +++ b/src/devices/paperpro-rechts.css @@ -6,7 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color-paperpro.css"); - +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/paperpro.css b/src/devices/paperpro.css index c56b5da..5ff5e9a 100644 --- a/src/devices/paperpro.css +++ b/src/devices/paperpro.css @@ -6,7 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color-paperpro.css"); - +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/pro13-3456.css b/src/devices/pro13-3456.css index d7dd288..b412b0a 100644 --- a/src/devices/pro13-3456.css +++ b/src/devices/pro13-3456.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/pro13-78.css b/src/devices/pro13-78.css index 3ebae4b..cafb80b 100644 --- a/src/devices/pro13-78.css +++ b/src/devices/pro13-78.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/pro234.css b/src/devices/pro234.css index 0c671c5..66a6b22 100644 --- a/src/devices/pro234.css +++ b/src/devices/pro234.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/pro56.css b/src/devices/pro56.css index dc4d0ea..0997296 100644 --- a/src/devices/pro56.css +++ b/src/devices/pro56.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/color.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/rm2-links.css b/src/devices/rm2-links.css index 5571e31..c2b24a6 100644 --- a/src/devices/rm2-links.css +++ b/src/devices/rm2-links.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/blackwhite.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/rm2-rechts.css b/src/devices/rm2-rechts.css index 6403ac7..886cd2c 100644 --- a/src/devices/rm2-rechts.css +++ b/src/devices/rm2-rechts.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/blackwhite.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/devices/rm2.css b/src/devices/rm2.css index 3ef8bd3..7afa74e 100644 --- a/src/devices/rm2.css +++ b/src/devices/rm2.css @@ -6,6 +6,4 @@ margin-bottom: 0.25cm; } -@import url("devices/css/large.css"); - -@import url("devices/css/blackwhite.css"); \ No newline at end of file +@import url("devices/css/large.css"); \ No newline at end of file diff --git a/src/pages/checkliste.py b/src/pages/checkliste.py index c3fb9f8..1fe7ad9 100644 --- a/src/pages/checkliste.py +++ b/src/pages/checkliste.py @@ -14,6 +14,11 @@ def erstelleCheckliste(kursid, klassekurs_name, dateien, path, namen, gebdaten, exit(0) if (check_seiten==0): check_seiten = 1 + + enger = False + if ("enger" in kurs_inputs): + if (kurs_inputs["enger"]=='ja'): + enger = True check_anzahl = int(config["Checkliste"]["anzahl_checks"]) @@ -51,7 +56,12 @@ def erstelleCheckliste(kursid, klassekurs_name, dateien, path, namen, gebdaten, count = 0 for name in namen: count = count + 1 - table += ''+str(count)+''+name+'' + + cssenger = '' + if (enger): + cssenger = ' class="enger"' + + table += ''+str(count)+''+name+'' for i in range(check_anzahl): table += '' table += '' diff --git a/src/pages/ha.py b/src/pages/ha.py index c1c618c..f0f4042 100644 --- a/src/pages/ha.py +++ b/src/pages/ha.py @@ -19,6 +19,11 @@ def erstelleHABogen(kursid, klassekurs_name, dateien, path, namen, gebdaten, con print('Der Schlüssel "ha_zeilen" existiert nicht für die Lerngruppe in der Input-Datei!') exit(0) + enger = False + if ("enger" in kurs_inputs): + if (kurs_inputs["enger"]=='ja'): + enger = True + try: namen_kurzlang = config["Namen"]["form"] except KeyError: @@ -58,7 +63,11 @@ def erstelleHABogen(kursid, klassekurs_name, dateien, path, namen, gebdaten, con for zeile in range(0, ha_zeilen): - table += '' + cssenger = '' + if (enger): + cssenger = ' class="enger"' + + table += '' if zeile==0: table += ''+str(count)+'' diff --git a/src/pages/header.py b/src/pages/header.py index 9c3620b..1522466 100644 --- a/src/pages/header.py +++ b/src/pages/header.py @@ -1,8 +1,6 @@ import os - - def erstelleKursnavigation(kursid, line, current, klassekurs_name, gebdaten, lerngruppen, path, config, inputs, kurs_inputs): # 1. Teil Navigationsleiste diff --git a/src/pages/korrektur.py b/src/pages/korrektur.py index 53fcdab..f569385 100644 --- a/src/pages/korrektur.py +++ b/src/pages/korrektur.py @@ -19,6 +19,11 @@ def erstelleKorrekturbogen(kursid, klassekurs_name, dateien, path, namen, gebdat print('Ein Parameter "schriftlich_XYZ" fehlt für die Lerngruppe in der Input-Datei!') exit(0) + enger = False + if ("enger" in kurs_inputs): + if (kurs_inputs["enger"]=='ja'): + enger = True + try: device = inputs["Allgemein"]["device"] except KeyError: @@ -69,7 +74,12 @@ def erstelleKorrekturbogen(kursid, klassekurs_name, dateien, path, namen, gebdat count = 0 for name in namen: count = count + 1 - table += ''+str(count)+''+name+'' + + cssenger = '' + if (enger): + cssenger = ' class="enger"' + + table += ''+str(count)+''+name+'' for i in range(aufgaben_anzahl): table += '' table += '' diff --git a/src/pages/somi.py b/src/pages/somi.py index 2d361fa..fd0ded5 100644 --- a/src/pages/somi.py +++ b/src/pages/somi.py @@ -18,6 +18,11 @@ def erstelleSoMiBogen(kursid, klassekurs_name, dateien, path, namen, gebdaten, c print('Ein Parameter "somi_XYZ" fehlt für die Lerngruppe in der Input-Datei!') exit(0) + enger = False + if ("enger" in kurs_inputs): + if (kurs_inputs["enger"]=='ja'): + enger = True + noten_anzahl = int(config["SoMiNoten"]["anzahl_noten"]) kompakt = config["SoMiNoten"]["kompakt"] @@ -88,7 +93,11 @@ def erstelleSoMiBogen(kursid, klassekurs_name, dateien, path, namen, gebdaten, c for zeile in range(0, somi_zeilen): - table += '' + cssenger = '' + if (enger): + cssenger = ' class="enger"' + + table += '' if zeile==0: if (kompakt!="ja"): diff --git a/src/pages/uebersicht.py b/src/pages/uebersicht.py index d56bdd4..8c64c79 100644 --- a/src/pages/uebersicht.py +++ b/src/pages/uebersicht.py @@ -23,6 +23,11 @@ def erstelleUebersicht(kursid, klassekurs_name, dateien, path, namen, gebdaten, if (kurs_inputs["vorjahresnote"]=='ja'): vorjahresnote = True + enger = False + if ("enger" in kurs_inputs): + if (kurs_inputs["enger"]=='ja'): + enger = True + try: namen_kurzlang = config["Namen"]["form"] except KeyError: @@ -86,8 +91,12 @@ def erstelleUebersicht(kursid, klassekurs_name, dateien, path, namen, gebdaten, count = 0 for name in namen: count = count + 1 + + cssenger = '' + if (enger): + cssenger = ' class="enger"' - table += ''+str(count)+''+name+'' + table += ''+str(count)+''+name+'' if (halbjahr=='1' and vorjahresnote): table += ''