diff --git a/Data/TEMPLATE heute morgen.html b/Data/TEMPLATE heute morgen.html index b542ca8..1cbcb27 100644 --- a/Data/TEMPLATE heute morgen.html +++ b/Data/TEMPLATE heute morgen.html @@ -15,11 +15,11 @@ else { window.scrollTo(0, 0); - if (reloadcounter < 4) + if (reloadcounter < 5) reloadcounter = reloadcounter + 1; else { - window.history.go(0); + location.reload(true); reloadcounter = 0; } } @@ -35,18 +35,18 @@ Vertretungsplan - + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestBackup/TEMPLATE laufschrift.html b/TestBackup/TEMPLATE laufschrift.html new file mode 100644 index 0000000..fb89264 --- /dev/null +++ b/TestBackup/TEMPLATE laufschrift.html @@ -0,0 +1,17 @@ + + + Vertretungsplan - Laufschrift + + + + + + + + + + +
Gymnasium Antonianum - LogoTEXT
+ + + diff --git a/TestBackup/VERTRETUNGSPLAN.html b/TestBackup/VERTRETUNGSPLAN.html new file mode 100644 index 0000000..a602d8d --- /dev/null +++ b/TestBackup/VERTRETUNGSPLAN.html @@ -0,0 +1,14 @@ + + + Vertretungsplan - Gymnasium Antonianum + + + + + + + + + + + \ No newline at end of file diff --git a/TestBackup/antonianumLogo.png b/TestBackup/antonianumLogo.png new file mode 100644 index 0000000..ec2a52f Binary files /dev/null and b/TestBackup/antonianumLogo.png differ diff --git a/TestBackup/heute.html b/TestBackup/heute.html new file mode 100644 index 0000000..625acb8 --- /dev/null +++ b/TestBackup/heute.html @@ -0,0 +1,1223 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestBackup/laufschrift.html b/TestBackup/laufschrift.html new file mode 100644 index 0000000..3eb2e34 --- /dev/null +++ b/TestBackup/laufschrift.html @@ -0,0 +1,17 @@ + + + Vertretungsplan - Laufschrift + + + + + + + + + + +
Gymnasium Antonianum - LogoDies ist ein Text
+ + + \ No newline at end of file diff --git a/TestBackup/morgen.html b/TestBackup/morgen.html new file mode 100644 index 0000000..95ceb23 --- /dev/null +++ b/TestBackup/morgen.html @@ -0,0 +1,878 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestBackup/settings.ini b/TestBackup/settings.ini new file mode 100644 index 0000000..847c625 --- /dev/null +++ b/TestBackup/settings.ini @@ -0,0 +1,65 @@ +pathDest1: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel1" +pathDest2: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel2" +pathDest3: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel3" +pathSource: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestDateien" +pathBackup: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestBackup" +sqlUse: "false" +sqlMode: "lesen" +sqlHost: "www.antonianum.de" +sqlPort: "1433" +sqlName: "database" +sqlUser: "root" +sqlPassw: "rootpw" +sqlTableName: "table" +lessonUse: "true" +lesson1: "25:00" +lesson2: "25:00" +lesson3: "25:00" +lesson4: "25:00" +lesson5: "25:00" +lesson6: "25:00" +lesson7: "25:00" +lesson8: "25:00" +lesson9: "25:00" +lesson10: "25:00" +colorAntonsblau: "#026398" +colorSchrift: "#517c94" +colorTabelle: "#e7e7e7" +colorRahmen: "#011a28" +colorSchwarz: "#000000" +colorTabRaum: "#d1d1d1" +customWeek: "B" +customDate: "true" +customToday: "17.11." +customTomorrow: "18.11." +autoBackup: "false" +autoDeleteSources: "false" +planSpeed: "100" +planColor: "Antonsblau" +motdSpeed: "100" +motdColor: "Schrift" +motdText: "Dies ist ein Text" +tableColor: "Tabelle" +borderColor: "Rahmen" +überschriftFontColor: "Schwarz" +überschriftFontStyle: "bold" +überschriftFontSize: "40" +überschriftFontFamily: "calibri" +stufennameFontColor: "Schwarz" +stufennameFontStyle: "bold" +stufennameFontSize: "30" +stufennameFontFamily: "calibri" +laufschriftFontColor: "Schwarz" +laufschriftFontStyle: "bold" +laufschriftFontSize: "50" +laufschriftFontFamily: "calibri" +tabelleFontColor: "Schwarz" +tabelleFontStyle: "" +tabelleFontSize: "16" +tabelleFontFamily: "calibri" +artRaum-VtrFontColor: "Schwarz" +artRaum-VtrFontStyle: "" +artRaum-VtrFontSize: "16" +artRaum-VtrFontFamily: "calibri" +artRaum-VtrBackColor: "TabRaum" +lessonOrder: "0,1,2,3,4,5,6" \ No newline at end of file diff --git a/TestBackup/style.css b/TestBackup/style.css new file mode 100644 index 0000000..2079d6f --- /dev/null +++ b/TestBackup/style.css @@ -0,0 +1,61 @@ +.datum +{ + font: bold 40px calibri; + color: #000000; + text-align: center; + width: 100%; +} + +.body1 +{ + background-color: #026398; +} + +.body2 +{ + background-color: #517c94; +} + +.stufe +{ + font: bold 30px calibri; + color: #000000; +} + +.stufeTab +{ + font: 16px calibri; + color: #000000; + width: 99.5%; + border-width: 3px; + border-style: groove; + border-color: #474747; + background-color: #e7e7e7; +} + +.stufeTab .Raum-Vtr +{ + font: 16px calibri; + color: #000000; + background-color: #d1d1d1; +} + +.stufeTab tr td +{ + text-align: center; +} + +.laufschrift +{ + font: bold 50px calibri; + color: #000000; + width: 100%; + vertical-align: top; + padding-left: 50px; +} + +.frames frame +{ + border-style: groove; + border-color: #011a28; +} \ No newline at end of file diff --git a/TestDateien/Druck_Klasse.htm b/TestDateien/Druck_Klasse.htm new file mode 100644 index 0000000..cb1597d --- /dev/null +++ b/TestDateien/Druck_Klasse.htm @@ -0,0 +1,17 @@ + + + + + +Untis 2015 Gymnasium Antonianum 1 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22


05a05b05c05d05e05f
06a06b06c06d06e06f
06g07b07c07d07e08a
08b08c08d08e08f09a
09b09c09d09eEFQ1
Q2---
UntisStundenplansoftware +
+ + + diff --git a/TestDateien/Druck_Klasse_05a.htm b/TestDateien/Druck_Klasse_05a.htm new file mode 100644 index 0000000..dff0353 --- /dev/null +++ b/TestDateien/Druck_Klasse_05a.htm @@ -0,0 +1,114 @@ + + + + + +Untis 2015 Gymnasium Antonianum 2 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +05a + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+1 + +18.11. + +Di + +rik + +r004 + +Vertretung + +ER + +jn +   
+5 - 6 + +18.11. + +Di + +re + +info3 + +Betreuung + +FU + +re +   +Raumänderung +
Untis 2015         Verzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_05b.htm b/TestDateien/Druck_Klasse_05b.htm new file mode 100644 index 0000000..cea42e0 --- /dev/null +++ b/TestDateien/Druck_Klasse_05b.htm @@ -0,0 +1,112 @@ + + + + + +Untis 2015 Gymnasium Antonianum 3 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +05b + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 - 4 + +19.11. + +Mi + +tg + +ku2 + +Vertretung + +SP + +beh +   
+1 + +18.11. + +Di + +rik + +r004 + +Vertretung + +ER + +jn +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_05c.htm b/TestDateien/Druck_Klasse_05c.htm new file mode 100644 index 0000000..a4e6140 --- /dev/null +++ b/TestDateien/Druck_Klasse_05c.htm @@ -0,0 +1,85 @@ + + + + + +Untis 2015 Gymnasium Antonianum 4 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +05c + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+1 + +18.11. + +Di + +rik + +r004 + +Vertretung + +ER + +jn +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_05d.htm b/TestDateien/Druck_Klasse_05d.htm new file mode 100644 index 0000000..2e71fb8 --- /dev/null +++ b/TestDateien/Druck_Klasse_05d.htm @@ -0,0 +1,87 @@ + + + + + +Untis 2015 Gymnasium Antonianum 5 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +05d + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+1 - 2 + +21.11. + +Fr + +scu + +mu2 + +Raum-Vtr. + +MU + +scu +   +Raumänderung +
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_05e.htm b/TestDateien/Druck_Klasse_05e.htm new file mode 100644 index 0000000..9b8d946 --- /dev/null +++ b/TestDateien/Druck_Klasse_05e.htm @@ -0,0 +1,139 @@ + + + + + +Untis 2015 Gymnasium Antonianum 6 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +05e + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+6 + +17.11. + +Mo + +re + +r201 + +Vertretung + +M + +now +   
+1 - 2 + +19.11. + +Mi + +re + +r201 + +Vertretung + +M + +now +   
+3 - 4 + +21.11. + +Fr + +jun + +r201 + +Betreuung + +FU + +now +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_05f.htm b/TestDateien/Druck_Klasse_05f.htm new file mode 100644 index 0000000..cff14ee --- /dev/null +++ b/TestDateien/Druck_Klasse_05f.htm @@ -0,0 +1,193 @@ + + + + + +Untis 2015 Gymnasium Antonianum 7 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +05f + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+5 - 6 + +17.11. + +Mo + +brk + +r103 + +Vertretung + +D + +ber +   
+3 - 4 + +18.11. + +Di + +drk + +r103 + +Betreuung + +FU + +ber +   
+1 - 2 + +20.11. + +Do + +sei + +r103 + +Vertretung + +D + +ber +   
+3 - 4 + +20.11. + +Do + +mil + +sp2 + +Vertretung + +SP + +ber +   
+5 - 6 + +21.11. + +Fr + +mil + +sp3 + +Vertretung + +SP + +ber +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_06a.htm b/TestDateien/Druck_Klasse_06a.htm new file mode 100644 index 0000000..16cf757 --- /dev/null +++ b/TestDateien/Druck_Klasse_06a.htm @@ -0,0 +1,112 @@ + + + + + +Untis 2015 Gymnasium Antonianum 8 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +06a + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+5 + +17.11. + +Mo + +ass + +r202 + +Vertretung + +F + +kp +   
+6 + +17.11. + +Mo + +wes + +r202 + +Vertretung + +F + +kp +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_06b.htm b/TestDateien/Druck_Klasse_06b.htm new file mode 100644 index 0000000..f70cea0 --- /dev/null +++ b/TestDateien/Druck_Klasse_06b.htm @@ -0,0 +1,141 @@ + + + + + +Untis 2015 Gymnasium Antonianum 9 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +06b + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+1 - 2 + +21.11. + +Fr + +stm + +r205 + +Statt- + +PH + +nol +   
+5 + +17.11. + +Mo + +bm + +r005 + +Vertretung + +SP + +beh +   
+6 + +19.11. + +Mi + +tgh + +r225 + +Raum-Vtr. + +M + +tgh +   +Raumänderung +
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_06c.htm b/TestDateien/Druck_Klasse_06c.htm new file mode 100644 index 0000000..031dfc6 --- /dev/null +++ b/TestDateien/Druck_Klasse_06c.htm @@ -0,0 +1,87 @@ + + + + + +Untis 2015 Gymnasium Antonianum 10 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +06c + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+5 - 6 + +18.11. + +Di + +fra + +r225 + +Raum-Vtr. + +D + +fra +   +Raumänderung +
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_06d.htm b/TestDateien/Druck_Klasse_06d.htm new file mode 100644 index 0000000..6e0126f --- /dev/null +++ b/TestDateien/Druck_Klasse_06d.htm @@ -0,0 +1,112 @@ + + + + + +Untis 2015 Gymnasium Antonianum 11 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +06d + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+5 + +17.11. + +Mo + +ass + +r202 + +Vertretung + +F + +kp +   
+6 + +17.11. + +Mo + +wes + +r202 + +Vertretung + +F + +kp +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_06e.htm b/TestDateien/Druck_Klasse_06e.htm new file mode 100644 index 0000000..0bd786c --- /dev/null +++ b/TestDateien/Druck_Klasse_06e.htm @@ -0,0 +1,166 @@ + + + + + +Untis 2015 Gymnasium Antonianum 12 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +06e + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+5 + +17.11. + +Mo + +ass + +r202 + +Vertretung + +F + +kp +   
+6 + +17.11. + +Mo + +wes + +r202 + +Vertretung + +F + +kp +   
+5 + +20.11. + +Do + +kp + +r202 + +Statt- + +BI + +rb +   
+6 + +20.11. + +Do + +ue + +r202 + +Vertretung + +BI + +rb +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_06f.htm b/TestDateien/Druck_Klasse_06f.htm new file mode 100644 index 0000000..8fbb3bb --- /dev/null +++ b/TestDateien/Druck_Klasse_06f.htm @@ -0,0 +1,166 @@ + + + + + +Untis 2015 Gymnasium Antonianum 13 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +06f + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+1 - 2 + +18.11. + +Di + +kse + +r105 + +Vertretung + +D + +ber +   
+3 - 4 + +21.11. + +Fr + +rod + +r105 + +Vertretung + +D + +ber +   
+5 - 6 + +19.11. + +Mi + +la + +r105 + +Vertretung + +E + +sur +   
+1 - 2 + +21.11. + +Fr + +scf + +r105 + +Vertretung + +E + +sur +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_06g.htm b/TestDateien/Druck_Klasse_06g.htm new file mode 100644 index 0000000..6c99579 --- /dev/null +++ b/TestDateien/Druck_Klasse_06g.htm @@ -0,0 +1,112 @@ + + + + + +Untis 2015 Gymnasium Antonianum 14 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +06g + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+5 + +17.11. + +Mo + +ass + +r202 + +Vertretung + +F + +kp +   
+6 + +17.11. + +Mo + +wes + +r202 + +Vertretung + +F + +kp +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_07b.htm b/TestDateien/Druck_Klasse_07b.htm new file mode 100644 index 0000000..3b17921 --- /dev/null +++ b/TestDateien/Druck_Klasse_07b.htm @@ -0,0 +1,170 @@ + + + + + +Untis 2015 Gymnasium Antonianum 15 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +07b + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+1 - 2 + +17.11. + +Mo + +ca + +r301 + +Vertretung + +M + +now +   
+1 - 2 + +20.11. + +Do + +rub + +r301 + +Vertretung + +M + +now +   
+6 + +17.11. + +Mo + +wie + +info3 + +Raum-Vtr. + +CH + +wie +   +Raumänderung +
+3 - 4 + +20.11. + +Do + +fra + +info3 + +Raum-Vtr. + +D + +fra +   +Raumänderung +
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_07c.htm b/TestDateien/Druck_Klasse_07c.htm new file mode 100644 index 0000000..f685665 --- /dev/null +++ b/TestDateien/Druck_Klasse_07c.htm @@ -0,0 +1,208 @@ + + + + + +Untis 2015 Gymnasium Antonianum 16 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +07c + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 - 4 + +19.11. + +Mi + +sei + +ku1 + +Raum-Vtr. + +KU + +sei +   +Raumänderung +
+3 + +17.11. + +Mo + +wie + +info1 + +Raum-Vtr. + +CH + +wie +   +Raumänderung +
+1 - 2 + +18.11. + +Di + +scm + +r010 + +Vertretung + +M + +hp +   
+6 + +19.11. + +Mi + +spl + +r010 + +Vertretung + +M + +hp +   
+5 + +19.11. + +Mi + +leh + +r219 + +Sondereins. +     +Klassenarbeit +
          +(Nachschreiber) +
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_07d.htm b/TestDateien/Druck_Klasse_07d.htm new file mode 100644 index 0000000..78e8d69 --- /dev/null +++ b/TestDateien/Druck_Klasse_07d.htm @@ -0,0 +1,139 @@ + + + + + +Untis 2015 Gymnasium Antonianum 17 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +07d + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+7 - 8 + +17.11. + +Mo + +zi + +r011 + +Vertretung + +D + +beh +   
+3 - 4 + +21.11. + +Fr + +zi + +r011 + +Vertretung + +D + +beh +   
+5 + +19.11. + +Mi + +kpk + +r011 + +Vertretung + +M + +hp +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_07e.htm b/TestDateien/Druck_Klasse_07e.htm new file mode 100644 index 0000000..ca79aef --- /dev/null +++ b/TestDateien/Druck_Klasse_07e.htm @@ -0,0 +1,220 @@ + + + + + +Untis 2015 Gymnasium Antonianum 18 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +07e + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+6 + +20.11. + +Do + +scm + +r126 + +Statt- + +E + +loe +   
+5 + +17.11. + +Mo + +pt + +r126 + +Vertretung + +E + +loe +   
+6 + +17.11. + +Mo + +spl + +r126 + +Vertretung + +E + +loe +   
+3 + +18.11. + +Di + +hen + +r126 + +Vertretung + +M + +hp +   
+4 + +18.11. + +Di + +rb + +r126 + +Vertretung + +M + +hp +   
+1 - 2 + +19.11. + +Mi + +krs + +r219 + +Vertretung + +M + +hp +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_08a.htm b/TestDateien/Druck_Klasse_08a.htm new file mode 100644 index 0000000..81ff461 --- /dev/null +++ b/TestDateien/Druck_Klasse_08a.htm @@ -0,0 +1,413 @@ + + + + + +Untis 2015 Gymnasium Antonianum 19 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +08a + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 + +21.11. + +Fr + +brm + +r205 + +Vertretung + +FU + +grm +   
+4 + +21.11. + +Fr + +stm + +r205 + +Statt- + +FU + +grm +   
+3 - 4 + +17.11. + +Mo + +wo + +r303 + +Vertretung + +PK + +vdb +   
+6 + +20.11. + +Do + +kse + +r303 + +Vertretung + +PK + +vdb +   
+7 + +17.11. + +Mo + +--- + +--- + +Entfall + +CH + +rik +   
+8 + +17.11. + +Mo + +--- + +--- + +Entfall + +CH + +rik +   
+5 - 6 + +17.11. + +Mo + +jn + +info2 + +Raum-Vtr. + +ER + +jn +   +Raumänderung +
+5 - 6 + +18.11. + +Di + +bgm + +sp3 + +Vertretung + +SP + +ber +   
+1 - 2 + +21.11. + +Fr + +ehl + +sp3 + +Vertretung + +SP + +ber +   
+5 + +17.11. + +Mo + +smz + +info1 + +Raum-Vtr. + +KR + +smz +   +Raumänderung +
+7 - 8 + +18.11. + +Di + +--- + +--- + +Entfall + +E + +kp +   
+1 - 2 + +19.11. + +Mi + +tew + +r303 + +Vertretung + +S8 + +brm +   
+6 + +19.11. + +Mi + +grm + +r303 + +Vertretung + +D + +stm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_08b.htm b/TestDateien/Druck_Klasse_08b.htm new file mode 100644 index 0000000..d472d47 --- /dev/null +++ b/TestDateien/Druck_Klasse_08b.htm @@ -0,0 +1,253 @@ + + + + + +Untis 2015 Gymnasium Antonianum 20 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +08b + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 + +21.11. + +Fr + +brm + +r205 + +Vertretung + +FU + +grm +   
+4 + +21.11. + +Fr + +stm + +r205 + +Statt- + +FU + +grm +   
+5 - 6 + +17.11. + +Mo + +jn + +info2 + +Raum-Vtr. + +ER + +jn +   +Raumänderung +
+7 - 8 + +19.11. + +Mi + +wie + +info3 + +Raum-Vtr. + +CH + +wie +   +Raumänderung +
+5 + +17.11. + +Mo + +smz + +info1 + +Raum-Vtr. + +KR + +smz +   +Raumänderung +
+1 - 2 + +19.11. + +Mi + +tew + +r303 + +Vertretung + +S8 + +brm +   
+3 - 4 + +19.11. + +Mi + +smz + +r104 + +Vertretung + +F + +brm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_08c.htm b/TestDateien/Druck_Klasse_08c.htm new file mode 100644 index 0000000..54b259a --- /dev/null +++ b/TestDateien/Druck_Klasse_08c.htm @@ -0,0 +1,307 @@ + + + + + +Untis 2015 Gymnasium Antonianum 21 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +08c + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+1 - 2 + +20.11. + +Do + +par + +r204 + +Vertretung + +E + +loe +   
+3 + +21.11. + +Fr + +brm + +r205 + +Vertretung + +FU + +grm +   
+4 + +21.11. + +Fr + +stm + +r205 + +Statt- + +FU + +grm +   
+5 - 6 + +17.11. + +Mo + +jn + +info2 + +Raum-Vtr. + +ER + +jn +   +Raumänderung +
+6 + +20.11. + +Do + +tg + +ku3 + +Statt- + +KU + +stm +   
+3 - 4 + +20.11. + +Do + +wie + +info1 + +Raum-Vtr. + +CH + +wie +   +Raumänderung +
+5 + +17.11. + +Mo + +smz + +info1 + +Raum-Vtr. + +KR + +smz +   +Raumänderung +
+1 - 2 + +19.11. + +Mi + +tew + +r303 + +Vertretung + +S8 + +brm +   
+7 - 8 + +19.11. + +Mi + +--- + +--- + +Entfall + +KU + +stm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_08d.htm b/TestDateien/Druck_Klasse_08d.htm new file mode 100644 index 0000000..217a994 --- /dev/null +++ b/TestDateien/Druck_Klasse_08d.htm @@ -0,0 +1,224 @@ + + + + + +Untis 2015 Gymnasium Antonianum 22 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +08d + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 + +21.11. + +Fr + +brm + +r205 + +Vertretung + +FU + +grm +   
+4 + +21.11. + +Fr + +stm + +r205 + +Statt- + +FU + +grm +   
+5 - 6 + +17.11. + +Mo + +jn + +info2 + +Raum-Vtr. + +ER + +jn +   +Raumänderung +
+5 + +17.11. + +Mo + +smz + +info1 + +Raum-Vtr. + +KR + +smz +   +Raumänderung +
+1 - 2 + +19.11. + +Mi + +tew + +r303 + +Vertretung + +S8 + +brm +   
+3 - 4 + +19.11. + +Mi + +smz + +r104 + +Vertretung + +F + +brm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_08e.htm b/TestDateien/Druck_Klasse_08e.htm new file mode 100644 index 0000000..57bc256 --- /dev/null +++ b/TestDateien/Druck_Klasse_08e.htm @@ -0,0 +1,363 @@ + + + + + +Untis 2015 Gymnasium Antonianum 23 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +08e + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 + +21.11. + +Fr + +brm + +r205 + +Vertretung + +FU + +grm +   
+4 + +21.11. + +Fr + +stm + +r205 + +Statt- + +FU + +grm +   
+5 - 6 + +17.11. + +Mo + +jn + +info2 + +Raum-Vtr. + +ER + +jn +   +Raumänderung +
+6 + +20.11. + +Do + +sck + +r225 + +Raum-Vtr. + +D + +sck +   +Raumänderung +
+1 - 2 + +21.11. + +Fr + +sck + +r225 + +Raum-Vtr. + +D + +sck +   +Raumänderung +
+5 + +17.11. + +Mo + +smz + +info1 + +Raum-Vtr. + +KR + +smz +   +Raumänderung +
+1 - 2 + +17.11. + +Mo + +brk + +sp2 + +Vertretung + +SP + +hp +   
+3 - 4 + +17.11. + +Mo + +vbr + +r203 + +Vertretung + +M + +hp +   
+3 - 4 + +19.11. + +Mi + +pet + +r225 + +Vertretung + +M + +hp +   
+7 - 8 + +19.11. + +Mi + +--- + +--- + +Entfall + +SP + +hp +   
+1 - 2 + +19.11. + +Mi + +tew + +r303 + +Vertretung + +S8 + +brm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_08f.htm b/TestDateien/Druck_Klasse_08f.htm new file mode 100644 index 0000000..b8fb2fc --- /dev/null +++ b/TestDateien/Druck_Klasse_08f.htm @@ -0,0 +1,197 @@ + + + + + +Untis 2015 Gymnasium Antonianum 24 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +08f + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 + +21.11. + +Fr + +brm + +r205 + +Vertretung + +FU + +grm +   
+4 + +21.11. + +Fr + +stm + +r205 + +Statt- + +FU + +grm +   
+5 - 6 + +17.11. + +Mo + +jn + +info2 + +Raum-Vtr. + +ER + +jn +   +Raumänderung +
+5 + +17.11. + +Mo + +smz + +info1 + +Raum-Vtr. + +KR + +smz +   +Raumänderung +
+1 - 2 + +19.11. + +Mi + +tew + +r303 + +Vertretung + +S8 + +brm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_09a.htm b/TestDateien/Druck_Klasse_09a.htm new file mode 100644 index 0000000..82447e2 --- /dev/null +++ b/TestDateien/Druck_Klasse_09a.htm @@ -0,0 +1,222 @@ + + + + + +Untis 2015 Gymnasium Antonianum 25 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +09a + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+7 - 8 + +18.11. + +Di + +--- + +--- + +Entfall + +S8 + +ack +   
+3 - 4 + +19.11. + +Mi + +scu + +a14 + +Vertretung + +S8 + +ack +   
+5 + +17.11. + +Mo + +fra + +r225 + +Vertretung + +BI + +now +   
+5 - 6 + +21.11. + +Fr + +wie + +info1 + +Vertretung + +BI + +now +   
+7 - 8 + +17.11. + +Mo + +hm + +info1 + +Raum-Vtr. + +KR + +hm +   +Raumänderung +
+3 - 4 + +19.11. + +Mi + +eis + +r010 + +Vertretung + +DaGe + +stm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_09b.htm b/TestDateien/Druck_Klasse_09b.htm new file mode 100644 index 0000000..95b3150 --- /dev/null +++ b/TestDateien/Druck_Klasse_09b.htm @@ -0,0 +1,255 @@ + + + + + +Untis 2015 Gymnasium Antonianum 26 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +09b + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+5 - 6 + +21.11. + +Fr + +wb + +r225 + +Raum-Vtr. + +BI + +wb +   +Raumänderung +
+7 - 8 + +18.11. + +Di + +--- + +--- + +Entfall + +S8 + +ack +   
+3 - 4 + +19.11. + +Mi + +scu + +a14 + +Vertretung + +S8 + +ack +   
+1 - 2 + +17.11. + +Mo + +kse + +ch2 + +Raum-Vtr. + +M + +kse +   +Raumänderung +
+6 + +20.11. + +Do + +tgh + +info2 + +Raum-Vtr. + +EK + +tgh +   +Raumänderung +
+7 - 8 + +17.11. + +Mo + +hm + +info1 + +Raum-Vtr. + +KR + +hm +   +Raumänderung +
+3 - 4 + +19.11. + +Mi + +eis + +r010 + +Vertretung + +DaGe + +stm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_09c.htm b/TestDateien/Druck_Klasse_09c.htm new file mode 100644 index 0000000..e499aed --- /dev/null +++ b/TestDateien/Druck_Klasse_09c.htm @@ -0,0 +1,249 @@ + + + + + +Untis 2015 Gymnasium Antonianum 27 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +09c + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+7 - 8 + +18.11. + +Di + +--- + +--- + +Entfall + +S8 + +ack +   
+3 - 4 + +19.11. + +Mi + +scu + +a14 + +Vertretung + +S8 + +ack +   
+4 + +17.11. + +Mo + +hf + +info1 + +Betreuung +     
+7 - 8 + +17.11. + +Mo + +hm + +info1 + +Raum-Vtr. + +KR + +hm +   +Raumänderung +
+6 + +19.11. + +Mi + +tew + +info4 + +Raum-Vtr. + +BI + +tew +   +Raumänderung +
+3 - 4 + +19.11. + +Mi + +eis + +r010 + +Vertretung + +DaGe + +stm +   
+1 - 2 + +20.11. + +Do + +tew + +info4 + +Raum-Vtr. + +BI + +tew +   +Raumänderung +
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_09d.htm b/TestDateien/Druck_Klasse_09d.htm new file mode 100644 index 0000000..33bf848 --- /dev/null +++ b/TestDateien/Druck_Klasse_09d.htm @@ -0,0 +1,249 @@ + + + + + +Untis 2015 Gymnasium Antonianum 28 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +09d + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 - 4 + +18.11. + +Di + +kro + +r225 + +Vertretung + +PK + +vdb +   
+1 - 2 + +20.11. + +Do + +hf + +r302 + +Statt- + +PK + +vdb +   
+7 - 8 + +18.11. + +Di + +--- + +--- + +Entfall + +S8 + +ack +   
+1 - 2 + +19.11. + +Mi + +klh + +r302 + +Vertretung + +E + +ack +   
+3 - 4 + +19.11. + +Mi + +scu + +a14 + +Vertretung + +S8 + +ack +   
+7 - 8 + +17.11. + +Mo + +hm + +info1 + +Raum-Vtr. + +KR + +hm +   +Raumänderung +
+3 - 4 + +19.11. + +Mi + +eis + +r010 + +Vertretung + +DaGe + +stm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_09e.htm b/TestDateien/Druck_Klasse_09e.htm new file mode 100644 index 0000000..5b5f6fe --- /dev/null +++ b/TestDateien/Druck_Klasse_09e.htm @@ -0,0 +1,226 @@ + + + + + +Untis 2015 Gymnasium Antonianum 29 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +09e + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+7 - 8 + +18.11. + +Di + +--- + +--- + +Entfall + +S8 + +ack +   
+3 - 4 + +19.11. + +Mi + +scu + +a14 + +Vertretung + +S8 + +ack +   
+7 - 8 + +17.11. + +Mo + +hm + +info1 + +Raum-Vtr. + +KR + +hm +   +Raumänderung +
+5 - 6 + +19.11. + +Mi + +kro + +info1 + +Raum-Vtr. + +PK + +kro +   +Raumänderung +
+3 - 4 + +19.11. + +Mi + +eis + +r010 + +Vertretung + +DaGe + +stm +   
+3 - 4 + +21.11. + +Fr + +tew + +info3 + +Raum-Vtr. + +BI + +tew +   +Raumänderung +
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_EF.htm b/TestDateien/Druck_Klasse_EF.htm new file mode 100644 index 0000000..eb00d4b --- /dev/null +++ b/TestDateien/Druck_Klasse_EF.htm @@ -0,0 +1,440 @@ + + + + + +Untis 2015 Gymnasium Antonianum 30 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +EF + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+3 - 4 + +18.11. + +Di + ++ + +r104 + +EVA(->Sekr.) + +SA- + +vor +   
+1 - 2 + +17.11. + +Mo + +sck + +r105 + +Vertretung + +D-GK5 + +vdb +   
+3 - 4 + +19.11. + +Mi + +sck + +a20 + +Vertretung + +D-GK5 + +vdb +   
+6 + +19.11. + +Mi + +re + +r203 + +Vertretung + +SW- + +vdb +   
+1 - 2 + +18.11. + +Di + +pet + +r225 + +Raum-Vtr. + +GE- + +pet +   +Raumänderung +
+7 - 8 + +17.11. + +Mo + ++ + +sp1 + +EVA(->Sekr.) + +SP- + +loe +   
+3 - 4 + +17.11. + +Mo + +grm + +a06 + +Vertretung + +M-GK7 + +now +   
+5 + +19.11. + +Mi + +jan + +a06 + +Vertretung + +M-GK2 + +now +   
+1 - 2 + +18.11. + +Di + ++ + +r005 + +EVA(->Sekr.) + +S8- + +sur +   
+3 - 4 + +17.11. + +Mo + ++ + +r208 + +EVA(->Sekr.) + +E5- + +kp +   
+5 - 6 + +18.11. + +Di + ++ + +a18 + +EVA(->Sekr.) + +F6- + +kp +   
+3 - 4 + +18.11. + +Di + +tew + +info2 + +Raum-Vtr. + +EK- + +tew +   +Raumänderung +
+1 - 2 + +19.11. + +Mi + ++ + +ku2 + +EVA(->Sekr.) + +KU- + +stm +   
+5 + +19.11. + +Mi + ++ + +r009 + +EVA(->Sekr.) + +D-GK2 + +stm +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_Q1.htm b/TestDateien/Druck_Klasse_Q1.htm new file mode 100644 index 0000000..e544faa --- /dev/null +++ b/TestDateien/Druck_Klasse_Q1.htm @@ -0,0 +1,642 @@ + + + + + +Untis 2015 Gymnasium Antonianum 31 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +Q1 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+1 - 2 + +18.11. + +Di + ++ + +a14 + +EVA(->Sekr.) + +S8- + +vor +   
+3 - 4 + +21.11. + +Fr + ++ + +ch1 + +EVA(->Sekr.) + +CH- + +rik +   
+3 - 4 + +18.11. + +Di + +pet + +r006 + +Raum-Vtr. + +PL- + +pet +   
+3 - 4 + +18.11. + +Di + +scf + +r204 + +Raum-Vtr. + +KR- + +scf +   
+3 - 4 + +18.11. + +Di + +hz + +r203 + +Raum-Vtr. + +M-GK4 + +hz +   
+7 - 8 + +17.11. + +Mo + +brd + +a30 + +Vertretung + +D-GK1 + +beh +   
+1 - 2 + +19.11. + +Mi + +brd + +a18 + +Vertretung + +D-GK1 + +beh +   
+5 - 6 + +18.11. + +Di + +dor + +info1 + +Raum-Vtr. + +MU- + +dor +   +Raumänderung +
+5 + +20.11. + +Do + ++ + +ku1 + +EVA(->Sekr.) + +KU- + +stm +   
+7 - 8 + +20.11. + +Do + ++ + +sp1 + +EVA(->Sekr.) + +SP- + +ber +   
+3 - 4 + +19.11. + +Mi + ++ + +r201 + +EVA(->Sekr.) + +SA- + +sur +   
+3 - 4 + +21.11. + +Fr + ++ + +r206 + +EVA(->Sekr.) + +SA- + +sur +   +Der Unterricht findet +
          +bei Frau Schulte- +
          +Euler statt +
+3 - 4 + +18.11. + +Di + +ehl + +info3 + +Raum-Vtr. + +BI- + +ehl +   +Raumänderung +
+8 + +19.11. + +Mi + +la + +r225 + +Raum-Vtr. + +E5- + +la +   +Raumänderung +
+7 - 8 + +18.11. + +Di + +fra + +info2 + +Raum-Vtr. + +BI- + +fra +   +Raumänderung +
+4 + +20.11. + +Do + +wld + +r225 + +Raum-Vtr. + +E5- + +wld +   +Raumänderung +
+2 + +19.11. + +Mi + +kro + +r225 + +Raum-Vtr. + +E5- + +kro +   +Raumänderung +
+4 + +19.11. + +Mi + +kro + +r206 + +Raum-Vtr. + +E5- + +kro +   +Raumänderung +
+1 + +19.11. + +Mi + +kro + +r225 + +Raum-Vtr. + +E5- + +kro +   +Raumänderung +
+6 + +19.11. + +Mi + +scf + +info3 + +Raum-Vtr. + +KR- + +scf +   
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse_Q2.htm b/TestDateien/Druck_Klasse_Q2.htm new file mode 100644 index 0000000..b5be8fb --- /dev/null +++ b/TestDateien/Druck_Klasse_Q2.htm @@ -0,0 +1,755 @@ + + + + + +Untis 2015 Gymnasium Antonianum 32 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +Q2 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+9 - 10 + +18.11. + +Di + +dor + +info1 + +Raum-Vtr. + +Mu_Pr + +dor +   +Raumänderung +
+5 - 6 + +21.11. + +Fr + ++ + +info4 + +EVA(->Sekr.) + +M-LK1 + +krs +   
+7 - 8 + +18.11. + +Di + ++ + +r206 + +EVA(->Sekr.) + +SA- + +vor +   
+3 - 4 + +20.11. + +Do + ++ + +a15 + +EVA(->Sekr.) + +GE- + +rik +   
+5 - 6 + +21.11. + +Fr + ++ + +a29 + +EVA(->Sekr.) + +E5- + +loe +   
+5 + +20.11. + +Do + ++ + +r207 + +EVA(->Sekr.) + +KR- + +nol +   
+3 - 4 + +21.11. + +Fr + ++ + +a18 + +EVA(->Sekr.) + +KR- + +nol +   
+6 + +20.11. + +Do + ++ + +info1 + +EVA(->Sekr.) + +IF- + +grm +   
+5 - 6 + +18.11. + +Di + +scr + +a29 + +Vertretung + +SZ- + +vdb +   
+1 - 2 + +19.11. + +Mi + ++ + +a05 + +EVA(->Sekr.) + +SZ- + +vdb +   
+5 + +19.11. + +Mi + ++ + +a29 + +EVA(->Sekr.) + +SZ- + +vdb +   
+9 - 10 + +17.11. + +Mo + ++ + +sp2 + +EVA(->Sekr.) + +SP- + +beh +   
+3 - 4 + +17.11. + +Mo + ++ + +a29 + +EVA(->Sekr.) + +E5- + +loe +   
+1 - 2 + +18.11. + +Di + +hwl + +info2 + +Raum-Vtr. + +GE- + +hwl +   +Raumänderung +
+3 - 4 + +21.11. + +Fr + +wie + +info1 + +Raum-Vtr. + +BI- + +wie +   +Raumänderung +
+5 + +20.11. + +Do + +wie + +info1 + +Raum-Vtr. + +BI- + +wie +   +Raumänderung +
+6 + +17.11. + +Mo + +tgh + +r206 + +Raum-Vtr. + +E5- + +tgh +   +Raumänderung +
+7 - 8 + +20.11. + +Do + +tgh + +r206 + +Raum-Vtr. + +E5- + +tgh +   +Raumänderung +
+7 - 8 + +17.11. + +Mo + ++ + +a28 + +EVA(->Sekr.) + +E5- + +kp +   
+1 - 2 + +17.11. + +Mo + +fra + +info3 + +Raum-Vtr. + +BI- + +fra +   +Raumänderung +
+6 + +20.11. + +Do + +fra + +info3 + +Raum-Vtr. + +BI- + +fra +   +Raumänderung +
+7 - 8 + +17.11. + +Mo + +spl + +info4 + +Raum-Vtr. + +GZ- + +spl +   +Raumänderung +
+3 - 4 + +19.11. + +Mi + +spl + +info4 + +Raum-Vtr. + +GZ- + +spl +   +Raumänderung +
+6 + +19.11. + +Mi + ++ + +a14 + +EVA(->Sekr.) + +S8- + +brm +   
+8 + +19.11. + +Mi + +tew + +info4 + +Raum-Vtr. + +EK- + +tew +   +Raumänderung +
Untis 2015         Voriger StundenplanVerzweigung zu IndexNächster Stundenplan         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/Druck_Klasse____.htm b/TestDateien/Druck_Klasse____.htm new file mode 100644 index 0000000..c96fe61 --- /dev/null +++ b/TestDateien/Druck_Klasse____.htm @@ -0,0 +1,167 @@ + + + + + +Untis 2015 Gymnasium Antonianum 33 + + + +
+
Gymnasium Antonianum Untis 2015
D-59590 Geseke, Wichburgastraße 13.12.2014 15:22

+Vertretungen 17.11. - 21.11. + +
+ +--- + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Std + +Datum + +Tag + +Vertreter + +Raum + +Vertretungsart + +(Fach) + +(Lehrer) + +Verl. von + +Hinweise +
+7 - 8 + +21.11. + +Fr + +--- + +--- + +Entfall + +AG + +krs +   
+3 - 4 + +18.11. + +Di + +eis +   +Sondereins. +     +Klausuraufsicht in a29 +
+9 - 10 + +19.11. + +Mi + +rod +   +Sondereins. +     
+7 - 8 + +18.11. + +Di + +re + +r102 + +Sondereins. +     +Hausaufgabenbetreuu +
          +ng +
Untis 2015         Voriger StundenplanVerzweigung zu Index         Untis Stundenplansoftware
+Periode4 17.11.2014 A (47) - 21.11.2014 A (47) +
+ + + diff --git a/TestDateien/GpIndex.gif b/TestDateien/GpIndex.gif new file mode 100644 index 0000000..231ad13 Binary files /dev/null and b/TestDateien/GpIndex.gif differ diff --git a/TestDateien/GpNext.gif b/TestDateien/GpNext.gif new file mode 100644 index 0000000..a459ef1 Binary files /dev/null and b/TestDateien/GpNext.gif differ diff --git a/TestDateien/GpPrev.gif b/TestDateien/GpPrev.gif new file mode 100644 index 0000000..df35444 Binary files /dev/null and b/TestDateien/GpPrev.gif differ diff --git a/TestZiel1/TEMPLATE heute morgen.html b/TestZiel1/TEMPLATE heute morgen.html new file mode 100644 index 0000000..1cbcb27 --- /dev/null +++ b/TestZiel1/TEMPLATE heute morgen.html @@ -0,0 +1,68 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel1/TEMPLATE laufschrift.html b/TestZiel1/TEMPLATE laufschrift.html new file mode 100644 index 0000000..fb89264 --- /dev/null +++ b/TestZiel1/TEMPLATE laufschrift.html @@ -0,0 +1,17 @@ + + + Vertretungsplan - Laufschrift + + + + + + + + + + +
Gymnasium Antonianum - LogoTEXT
+ + + diff --git a/TestZiel1/VERTRETUNGSPLAN.html b/TestZiel1/VERTRETUNGSPLAN.html new file mode 100644 index 0000000..a602d8d --- /dev/null +++ b/TestZiel1/VERTRETUNGSPLAN.html @@ -0,0 +1,14 @@ + + + Vertretungsplan - Gymnasium Antonianum + + + + + + + + + + + \ No newline at end of file diff --git a/TestZiel1/antonianumLogo.png b/TestZiel1/antonianumLogo.png new file mode 100644 index 0000000..ec2a52f Binary files /dev/null and b/TestZiel1/antonianumLogo.png differ diff --git a/TestZiel1/heute.html b/TestZiel1/heute.html new file mode 100644 index 0000000..625acb8 --- /dev/null +++ b/TestZiel1/heute.html @@ -0,0 +1,1223 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel1/laufschrift.html b/TestZiel1/laufschrift.html new file mode 100644 index 0000000..3eb2e34 --- /dev/null +++ b/TestZiel1/laufschrift.html @@ -0,0 +1,17 @@ + + + Vertretungsplan - Laufschrift + + + + + + + + + + +
Gymnasium Antonianum - LogoDies ist ein Text
+ + + \ No newline at end of file diff --git a/TestZiel1/morgen.html b/TestZiel1/morgen.html new file mode 100644 index 0000000..95ceb23 --- /dev/null +++ b/TestZiel1/morgen.html @@ -0,0 +1,878 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel1/settings.ini b/TestZiel1/settings.ini new file mode 100644 index 0000000..847c625 --- /dev/null +++ b/TestZiel1/settings.ini @@ -0,0 +1,65 @@ +pathDest1: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel1" +pathDest2: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel2" +pathDest3: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel3" +pathSource: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestDateien" +pathBackup: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestBackup" +sqlUse: "false" +sqlMode: "lesen" +sqlHost: "www.antonianum.de" +sqlPort: "1433" +sqlName: "database" +sqlUser: "root" +sqlPassw: "rootpw" +sqlTableName: "table" +lessonUse: "true" +lesson1: "25:00" +lesson2: "25:00" +lesson3: "25:00" +lesson4: "25:00" +lesson5: "25:00" +lesson6: "25:00" +lesson7: "25:00" +lesson8: "25:00" +lesson9: "25:00" +lesson10: "25:00" +colorAntonsblau: "#026398" +colorSchrift: "#517c94" +colorTabelle: "#e7e7e7" +colorRahmen: "#011a28" +colorSchwarz: "#000000" +colorTabRaum: "#d1d1d1" +customWeek: "B" +customDate: "true" +customToday: "17.11." +customTomorrow: "18.11." +autoBackup: "false" +autoDeleteSources: "false" +planSpeed: "100" +planColor: "Antonsblau" +motdSpeed: "100" +motdColor: "Schrift" +motdText: "Dies ist ein Text" +tableColor: "Tabelle" +borderColor: "Rahmen" +überschriftFontColor: "Schwarz" +überschriftFontStyle: "bold" +überschriftFontSize: "40" +überschriftFontFamily: "calibri" +stufennameFontColor: "Schwarz" +stufennameFontStyle: "bold" +stufennameFontSize: "30" +stufennameFontFamily: "calibri" +laufschriftFontColor: "Schwarz" +laufschriftFontStyle: "bold" +laufschriftFontSize: "50" +laufschriftFontFamily: "calibri" +tabelleFontColor: "Schwarz" +tabelleFontStyle: "" +tabelleFontSize: "16" +tabelleFontFamily: "calibri" +artRaum-VtrFontColor: "Schwarz" +artRaum-VtrFontStyle: "" +artRaum-VtrFontSize: "16" +artRaum-VtrFontFamily: "calibri" +artRaum-VtrBackColor: "TabRaum" +lessonOrder: "0,1,2,3,4,5,6" \ No newline at end of file diff --git a/TestZiel1/style.css b/TestZiel1/style.css new file mode 100644 index 0000000..2079d6f --- /dev/null +++ b/TestZiel1/style.css @@ -0,0 +1,61 @@ +.datum +{ + font: bold 40px calibri; + color: #000000; + text-align: center; + width: 100%; +} + +.body1 +{ + background-color: #026398; +} + +.body2 +{ + background-color: #517c94; +} + +.stufe +{ + font: bold 30px calibri; + color: #000000; +} + +.stufeTab +{ + font: 16px calibri; + color: #000000; + width: 99.5%; + border-width: 3px; + border-style: groove; + border-color: #474747; + background-color: #e7e7e7; +} + +.stufeTab .Raum-Vtr +{ + font: 16px calibri; + color: #000000; + background-color: #d1d1d1; +} + +.stufeTab tr td +{ + text-align: center; +} + +.laufschrift +{ + font: bold 50px calibri; + color: #000000; + width: 100%; + vertical-align: top; + padding-left: 50px; +} + +.frames frame +{ + border-style: groove; + border-color: #011a28; +} \ No newline at end of file diff --git a/TestZiel2/TEMPLATE heute morgen.html b/TestZiel2/TEMPLATE heute morgen.html new file mode 100644 index 0000000..1cbcb27 --- /dev/null +++ b/TestZiel2/TEMPLATE heute morgen.html @@ -0,0 +1,68 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel2/TEMPLATE laufschrift.html b/TestZiel2/TEMPLATE laufschrift.html new file mode 100644 index 0000000..fb89264 --- /dev/null +++ b/TestZiel2/TEMPLATE laufschrift.html @@ -0,0 +1,17 @@ + + + Vertretungsplan - Laufschrift + + + + + + + + + + +
Gymnasium Antonianum - LogoTEXT
+ + + diff --git a/TestZiel2/VERTRETUNGSPLAN.html b/TestZiel2/VERTRETUNGSPLAN.html new file mode 100644 index 0000000..a602d8d --- /dev/null +++ b/TestZiel2/VERTRETUNGSPLAN.html @@ -0,0 +1,14 @@ + + + Vertretungsplan - Gymnasium Antonianum + + + + + + + + + + + \ No newline at end of file diff --git a/TestZiel2/antonianumLogo.png b/TestZiel2/antonianumLogo.png new file mode 100644 index 0000000..ec2a52f Binary files /dev/null and b/TestZiel2/antonianumLogo.png differ diff --git a/TestZiel2/heute.html b/TestZiel2/heute.html new file mode 100644 index 0000000..625acb8 --- /dev/null +++ b/TestZiel2/heute.html @@ -0,0 +1,1223 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel2/laufschrift.html b/TestZiel2/laufschrift.html new file mode 100644 index 0000000..3eb2e34 --- /dev/null +++ b/TestZiel2/laufschrift.html @@ -0,0 +1,17 @@ + + + Vertretungsplan - Laufschrift + + + + + + + + + + +
Gymnasium Antonianum - LogoDies ist ein Text
+ + + \ No newline at end of file diff --git a/TestZiel2/morgen.html b/TestZiel2/morgen.html new file mode 100644 index 0000000..95ceb23 --- /dev/null +++ b/TestZiel2/morgen.html @@ -0,0 +1,878 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel2/settings.ini b/TestZiel2/settings.ini new file mode 100644 index 0000000..847c625 --- /dev/null +++ b/TestZiel2/settings.ini @@ -0,0 +1,65 @@ +pathDest1: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel1" +pathDest2: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel2" +pathDest3: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel3" +pathSource: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestDateien" +pathBackup: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestBackup" +sqlUse: "false" +sqlMode: "lesen" +sqlHost: "www.antonianum.de" +sqlPort: "1433" +sqlName: "database" +sqlUser: "root" +sqlPassw: "rootpw" +sqlTableName: "table" +lessonUse: "true" +lesson1: "25:00" +lesson2: "25:00" +lesson3: "25:00" +lesson4: "25:00" +lesson5: "25:00" +lesson6: "25:00" +lesson7: "25:00" +lesson8: "25:00" +lesson9: "25:00" +lesson10: "25:00" +colorAntonsblau: "#026398" +colorSchrift: "#517c94" +colorTabelle: "#e7e7e7" +colorRahmen: "#011a28" +colorSchwarz: "#000000" +colorTabRaum: "#d1d1d1" +customWeek: "B" +customDate: "true" +customToday: "17.11." +customTomorrow: "18.11." +autoBackup: "false" +autoDeleteSources: "false" +planSpeed: "100" +planColor: "Antonsblau" +motdSpeed: "100" +motdColor: "Schrift" +motdText: "Dies ist ein Text" +tableColor: "Tabelle" +borderColor: "Rahmen" +überschriftFontColor: "Schwarz" +überschriftFontStyle: "bold" +überschriftFontSize: "40" +überschriftFontFamily: "calibri" +stufennameFontColor: "Schwarz" +stufennameFontStyle: "bold" +stufennameFontSize: "30" +stufennameFontFamily: "calibri" +laufschriftFontColor: "Schwarz" +laufschriftFontStyle: "bold" +laufschriftFontSize: "50" +laufschriftFontFamily: "calibri" +tabelleFontColor: "Schwarz" +tabelleFontStyle: "" +tabelleFontSize: "16" +tabelleFontFamily: "calibri" +artRaum-VtrFontColor: "Schwarz" +artRaum-VtrFontStyle: "" +artRaum-VtrFontSize: "16" +artRaum-VtrFontFamily: "calibri" +artRaum-VtrBackColor: "TabRaum" +lessonOrder: "0,1,2,3,4,5,6" \ No newline at end of file diff --git a/TestZiel2/style.css b/TestZiel2/style.css new file mode 100644 index 0000000..2079d6f --- /dev/null +++ b/TestZiel2/style.css @@ -0,0 +1,61 @@ +.datum +{ + font: bold 40px calibri; + color: #000000; + text-align: center; + width: 100%; +} + +.body1 +{ + background-color: #026398; +} + +.body2 +{ + background-color: #517c94; +} + +.stufe +{ + font: bold 30px calibri; + color: #000000; +} + +.stufeTab +{ + font: 16px calibri; + color: #000000; + width: 99.5%; + border-width: 3px; + border-style: groove; + border-color: #474747; + background-color: #e7e7e7; +} + +.stufeTab .Raum-Vtr +{ + font: 16px calibri; + color: #000000; + background-color: #d1d1d1; +} + +.stufeTab tr td +{ + text-align: center; +} + +.laufschrift +{ + font: bold 50px calibri; + color: #000000; + width: 100%; + vertical-align: top; + padding-left: 50px; +} + +.frames frame +{ + border-style: groove; + border-color: #011a28; +} \ No newline at end of file diff --git a/TestZiel3/TEMPLATE heute morgen.html b/TestZiel3/TEMPLATE heute morgen.html new file mode 100644 index 0000000..1cbcb27 --- /dev/null +++ b/TestZiel3/TEMPLATE heute morgen.html @@ -0,0 +1,68 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel3/TEMPLATE laufschrift.html b/TestZiel3/TEMPLATE laufschrift.html new file mode 100644 index 0000000..fb89264 --- /dev/null +++ b/TestZiel3/TEMPLATE laufschrift.html @@ -0,0 +1,17 @@ + + + Vertretungsplan - Laufschrift + + + + + + + + + + +
Gymnasium Antonianum - LogoTEXT
+ + + diff --git a/TestZiel3/VERTRETUNGSPLAN.html b/TestZiel3/VERTRETUNGSPLAN.html new file mode 100644 index 0000000..a602d8d --- /dev/null +++ b/TestZiel3/VERTRETUNGSPLAN.html @@ -0,0 +1,14 @@ + + + Vertretungsplan - Gymnasium Antonianum + + + + + + + + + + + \ No newline at end of file diff --git a/TestZiel3/antonianumLogo.png b/TestZiel3/antonianumLogo.png new file mode 100644 index 0000000..ec2a52f Binary files /dev/null and b/TestZiel3/antonianumLogo.png differ diff --git a/TestZiel3/heute.html b/TestZiel3/heute.html new file mode 100644 index 0000000..625acb8 --- /dev/null +++ b/TestZiel3/heute.html @@ -0,0 +1,1223 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel3/laufschrift.html b/TestZiel3/laufschrift.html new file mode 100644 index 0000000..3eb2e34 --- /dev/null +++ b/TestZiel3/laufschrift.html @@ -0,0 +1,17 @@ + + + Vertretungsplan - Laufschrift + + + + + + + + + + +
Gymnasium Antonianum - LogoDies ist ein Text
+ + + \ No newline at end of file diff --git a/TestZiel3/morgen.html b/TestZiel3/morgen.html new file mode 100644 index 0000000..95ceb23 --- /dev/null +++ b/TestZiel3/morgen.html @@ -0,0 +1,878 @@ + + + + + Vertretungsplan + + + + + + + + + \ No newline at end of file diff --git a/TestZiel3/settings.ini b/TestZiel3/settings.ini new file mode 100644 index 0000000..847c625 --- /dev/null +++ b/TestZiel3/settings.ini @@ -0,0 +1,65 @@ +pathDest1: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel1" +pathDest2: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel2" +pathDest3: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestZiel3" +pathSource: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestDateien" +pathBackup: "D:\Meine Dokumente\Facharbeit\Facharbeit\TestBackup" +sqlUse: "false" +sqlMode: "lesen" +sqlHost: "www.antonianum.de" +sqlPort: "1433" +sqlName: "database" +sqlUser: "root" +sqlPassw: "rootpw" +sqlTableName: "table" +lessonUse: "true" +lesson1: "25:00" +lesson2: "25:00" +lesson3: "25:00" +lesson4: "25:00" +lesson5: "25:00" +lesson6: "25:00" +lesson7: "25:00" +lesson8: "25:00" +lesson9: "25:00" +lesson10: "25:00" +colorAntonsblau: "#026398" +colorSchrift: "#517c94" +colorTabelle: "#e7e7e7" +colorRahmen: "#011a28" +colorSchwarz: "#000000" +colorTabRaum: "#d1d1d1" +customWeek: "B" +customDate: "true" +customToday: "17.11." +customTomorrow: "18.11." +autoBackup: "false" +autoDeleteSources: "false" +planSpeed: "100" +planColor: "Antonsblau" +motdSpeed: "100" +motdColor: "Schrift" +motdText: "Dies ist ein Text" +tableColor: "Tabelle" +borderColor: "Rahmen" +überschriftFontColor: "Schwarz" +überschriftFontStyle: "bold" +überschriftFontSize: "40" +überschriftFontFamily: "calibri" +stufennameFontColor: "Schwarz" +stufennameFontStyle: "bold" +stufennameFontSize: "30" +stufennameFontFamily: "calibri" +laufschriftFontColor: "Schwarz" +laufschriftFontStyle: "bold" +laufschriftFontSize: "50" +laufschriftFontFamily: "calibri" +tabelleFontColor: "Schwarz" +tabelleFontStyle: "" +tabelleFontSize: "16" +tabelleFontFamily: "calibri" +artRaum-VtrFontColor: "Schwarz" +artRaum-VtrFontStyle: "" +artRaum-VtrFontSize: "16" +artRaum-VtrFontFamily: "calibri" +artRaum-VtrBackColor: "TabRaum" +lessonOrder: "0,1,2,3,4,5,6" \ No newline at end of file diff --git a/TestZiel3/style.css b/TestZiel3/style.css new file mode 100644 index 0000000..2079d6f --- /dev/null +++ b/TestZiel3/style.css @@ -0,0 +1,61 @@ +.datum +{ + font: bold 40px calibri; + color: #000000; + text-align: center; + width: 100%; +} + +.body1 +{ + background-color: #026398; +} + +.body2 +{ + background-color: #517c94; +} + +.stufe +{ + font: bold 30px calibri; + color: #000000; +} + +.stufeTab +{ + font: 16px calibri; + color: #000000; + width: 99.5%; + border-width: 3px; + border-style: groove; + border-color: #474747; + background-color: #e7e7e7; +} + +.stufeTab .Raum-Vtr +{ + font: 16px calibri; + color: #000000; + background-color: #d1d1d1; +} + +.stufeTab tr td +{ + text-align: center; +} + +.laufschrift +{ + font: bold 50px calibri; + color: #000000; + width: 100%; + vertical-align: top; + padding-left: 50px; +} + +.frames frame +{ + border-style: groove; + border-color: #011a28; +} \ No newline at end of file diff --git a/src/com/facharbeit/io/FileReader.java b/src/com/facharbeit/io/FileReader.java index 069f87f..3a9f6d5 100644 --- a/src/com/facharbeit/io/FileReader.java +++ b/src/com/facharbeit/io/FileReader.java @@ -35,7 +35,7 @@ public FileReader(File f) */ public String read(int line) { - try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) + try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "ISO-8859-1"))) { for(int i = 0; i < line; i++) reader.readLine(); @@ -58,7 +58,7 @@ public String[] readAll() int length = getLines(); String[] data = new String[length]; - try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) + try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "ISO-8859-1"))) { for(int i = 0; i < length; i++) data[i] = reader.readLine(); @@ -126,7 +126,7 @@ public boolean exists() */ public int getLines() { - try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) + try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "ISO-8859-1"))) { int lines = 0; while(reader.readLine() != null) diff --git a/src/com/facharbeit/io/FileWriter.java b/src/com/facharbeit/io/FileWriter.java index f5cbdbe..e82ab9c 100644 --- a/src/com/facharbeit/io/FileWriter.java +++ b/src/com/facharbeit/io/FileWriter.java @@ -45,7 +45,7 @@ public FileWriter(File f) */ public void writeAll(String[] data) { - try(PrintWriter writer = new PrintWriter(new FileOutputStream(file))) + try(PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), "ISO-8859-1"))) { for(int i = 0; i < data.length; i++) if(i + 1 < data.length) diff --git a/src/com/facharbeit/io/HtmlReader.java b/src/com/facharbeit/io/HtmlReader.java index c32db73..6c0a08e 100644 --- a/src/com/facharbeit/io/HtmlReader.java +++ b/src/com/facharbeit/io/HtmlReader.java @@ -7,7 +7,6 @@ public class HtmlReader { - final static String[] extraGrades = { "EF", "Q1", "Q2", "___" @@ -15,18 +14,45 @@ public class HtmlReader public static SchoolClass[] readInToday() { - if(Settings.load("sqlUse").equals("true")) - return readInSql(); - else - return readInHtml(Settings.load("pathSource") + "/heute"); + if(Settings.load("sqlUse").equals("false")) + { + SchoolClass[] scs = readInHtml(Settings.load("pathSource")); + boolean found = false; + for(SchoolClass sc : scs) + { + if(sc.containsEntrysOfDate(Time.forHtmlReading(0))) + found = true; + + sc.onlyDate(Time.forHtmlReading(0)); + } + if(found) + return scs; + } + return null; } public static SchoolClass[] readInTomorrow() { - if(Settings.load("sqlUse").equals("true")) - return readInSql(); - else - return readInHtml(Settings.load("pathSource") + "/morgen"); + if(Settings.load("sqlUse").equals("false")) + { + SchoolClass[] scs = readInHtml(Settings.load("pathSource")); + boolean found = false; + int i = 0; + while(i < 10 && !found) + { + i++; + for(SchoolClass sc : scs) + if(sc.containsEntrysOfDate(Time.forHtmlReading(i))) + found = true; + } + if(found) + { + for(SchoolClass sc : scs) + sc.onlyDate(Time.forHtmlReading(i)); + return scs; + } + } + return null; } private static SchoolClass[] readInHtml(String path) @@ -61,7 +87,7 @@ private static SchoolClass[] readInHtml(String path) { fileAsString = fileAsString.substring(fileAsString.indexOf("") + 4); - String[] thisEntry = new String[8]; + String[] thisEntry = new String[10]; for(int t = 0; t < thisEntry.length; t++) { @@ -81,38 +107,24 @@ private static SchoolClass[] readInHtml(String path) thisEntry[t] = ""; } - boolean nextIsEqual = false; - try - { - Integer.parseInt(thisEntry[0]); - } catch(NumberFormatException ex) - { - nextIsEqual = true; - thisEntry[0] = thisEntry[0].substring(0, thisEntry[0].indexOf("-") - 1); - } - - outcome[i].getEntrys().add(new Entry(nextIsEqual, thisEntry)); + outcome[i].getEntrys().add(new Entry(thisEntry)); fileAsString = fileAsString.substring(fileAsString.indexOf(cellEndsWith) + cellEndsWith.length()); if(!fileAsString.contains("")) endOfFile = true; - } + } } Logger.setProgress(50); return outcome; } - private static SchoolClass[] readInSql() - { - SchoolClass[] outcome = new SchoolClass[1]; - - return outcome; - } - public static SchoolClass[] sortArray(SchoolClass[] p) { + if(p == null) + return null; + for(SchoolClass s : p) { ArrayList out = new ArrayList<>(); @@ -163,51 +175,4 @@ private static ArrayList getFiles(String path) return files; } - - public static String readHeadToday() - { - String path; - if(Settings.load("sourceCustom").equals("true")) - path = (Settings.load("pathSource") + "/" + Settings.load("sourceTodayPath")); - else - path = findPath(true); - - final String beforeHead = "
\n"; - - File theFile = getFiles(path).get(0); - - FileReader read = new FileReader(theFile); - String fileAsString = read.toString(); - - fileAsString = fileAsString.substring(fileAsString.indexOf(beforeHead) + beforeHead.length()); - fileAsString = fileAsString.substring(0, fileAsString.indexOf("")); - - return fileAsString; - } - - public static String readHeadTomorrow() - { - String path; - if(Settings.load("sourceCustom").equals("true")) - path = (Settings.load("pathSource") + "/" + Settings.load("sourceTodayPath")); - else - path = findPath(true); - - final String beforeHead = "
\n"; - - File theFile = getFiles(path).get(0); - - FileReader read = new FileReader(theFile); - String fileAsString = read.toString(); - - fileAsString = fileAsString.substring(fileAsString.indexOf(beforeHead) + beforeHead.length()); - fileAsString = fileAsString.substring(0, fileAsString.indexOf("")); - - return fileAsString; - } - - private static String findPath(boolean today) - { - return Time.forHtmlReading(today); - } } diff --git a/src/com/facharbeit/io/HtmlWriter.java b/src/com/facharbeit/io/HtmlWriter.java index c18219c..b318c4d 100644 --- a/src/com/facharbeit/io/HtmlWriter.java +++ b/src/com/facharbeit/io/HtmlWriter.java @@ -8,7 +8,7 @@ public class HtmlWriter public static void generatePlanToday(SchoolClass[] schoolClasses, int start, int end) { int part = end - start; - String day = generateDay(true); + String day = generateDay(schoolClasses); Logger.setProgress(start + 1 * (part / 6)); String speed = Integer.toString((int)((1.0 / (Double.parseDouble(Settings.load("planSpeed")) / 100.0)) * 12.0)); Logger.setProgress(start + 2 * (part / 6)); @@ -39,7 +39,7 @@ public static void generatePlanToday(SchoolClass[] schoolClasses, int start, int public static void generatePlanTomorrow(SchoolClass[] schoolClasses, int start, int end) { int part = end - start; - String day = generateDay(false); + String day = generateDay(schoolClasses); Logger.setProgress(start + 1 * (part / 6)); String speed = Integer.toString((int)((1.0 / (Double.parseDouble(Settings.load("planSpeed")) / 100.0)) * 12.0)); Logger.setProgress(start + 2 * (part / 6)); @@ -162,11 +162,24 @@ public static void generateStyle() private static String generateClasses(SchoolClass[] schoolClasses) { + if(schoolClasses == null) + return "'Keine Vertretungen

'+"; + String s = ""; for(SchoolClass sc : schoolClasses) { if(Settings.load("lessonUse").equals("true")) sc.cutLessons(); + + String[] or = Settings.load("lessonOrder").split(","); + sc.sortEntrys(Integer.parseInt(or[0]), + Integer.parseInt(or[1]), + Integer.parseInt(or[2]), + Integer.parseInt(or[3]), + Integer.parseInt(or[4]), + Integer.parseInt(or[5]), + Integer.parseInt(or[6])); + s += sc.toString(); } @@ -187,14 +200,12 @@ public static boolean isAfter(int afterHour, int afterMinute, int beforeHour, in return b; } - private static String generateDay(boolean today) + private static String generateDay(SchoolClass[] sc) { - String s; - if(today) - s = HtmlReader.readHeadToday(); - else - s = HtmlReader.readHeadTomorrow(); - return s.substring(s.indexOf("Vertretungen ") + "Vertretungen ".length()) + Time.forHtmlWriting(); + if(sc == null) + return "Keine Vertretungen"; + + return Time.forHtmlWriting(sc[0].getCurDate()); } private static boolean validate(String... test) diff --git a/src/com/facharbeit/main/Application.java b/src/com/facharbeit/main/Application.java index 3435ea5..1b3c128 100644 --- a/src/com/facharbeit/main/Application.java +++ b/src/com/facharbeit/main/Application.java @@ -35,6 +35,7 @@ public class Application */ public Application() { + System.setProperty("file.encoding", "ISO-8859-1"); queue = new ArrayList(); try diff --git a/src/com/facharbeit/main/Frame.form b/src/com/facharbeit/main/Frame.form index 29d82d1..559134d 100644 --- a/src/com/facharbeit/main/Frame.form +++ b/src/com/facharbeit/main/Frame.form @@ -49,10 +49,16 @@ + + + + + + @@ -165,6 +171,7 @@ + @@ -178,6 +185,7 @@ + @@ -186,6 +194,7 @@ + @@ -194,6 +203,7 @@ + @@ -206,18 +216,22 @@ - + + + + + @@ -227,6 +241,7 @@ + @@ -235,6 +250,7 @@ + @@ -245,6 +261,7 @@ + @@ -268,7 +285,7 @@ - + @@ -278,28 +295,44 @@ - - - - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -356,6 +389,11 @@ + + + + + @@ -365,51 +403,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + @@ -421,10 +465,26 @@ + + + + + + + + + + + + + + + + + + - - @@ -439,7 +499,7 @@ - + @@ -449,17 +509,13 @@ - + - - - - - + @@ -475,13 +531,16 @@ - + + + + @@ -489,6 +548,9 @@ + + + @@ -501,20 +563,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -559,6 +645,7 @@ + @@ -569,6 +656,74 @@ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -588,42 +743,29 @@ - - - - + + + + + + - + + + + + + - - - - - - - - - - - - - - - + - - - - + - - - - + @@ -643,29 +785,21 @@ - - - - - - - - - + - + - + - + - + @@ -679,12 +813,16 @@ + + + + @@ -695,6 +833,7 @@ + @@ -705,6 +844,7 @@ + @@ -724,6 +864,7 @@ + @@ -732,6 +873,9 @@ + + + @@ -746,41 +890,12 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1006,6 +1121,7 @@ + @@ -1058,6 +1174,7 @@ + @@ -1066,6 +1183,7 @@ + @@ -1074,6 +1192,7 @@ + @@ -1086,6 +1205,7 @@ + @@ -1110,6 +1230,7 @@ + @@ -1152,6 +1273,7 @@ + @@ -1196,6 +1318,7 @@ + @@ -1204,11 +1327,13 @@ + + @@ -1217,6 +1342,7 @@ + @@ -1256,6 +1382,7 @@ + @@ -1268,7 +1395,7 @@ - + @@ -1289,6 +1416,7 @@ + @@ -1318,7 +1446,7 @@ - + @@ -1330,6 +1458,7 @@ + @@ -1338,6 +1467,7 @@ + @@ -1345,7 +1475,8 @@ - + + @@ -1444,7 +1575,7 @@ - + @@ -1455,6 +1586,7 @@ + @@ -1463,6 +1595,7 @@ + @@ -1471,12 +1604,16 @@ + + + + @@ -1484,6 +1621,9 @@ + + + @@ -1496,6 +1636,9 @@ + + + @@ -1503,10 +1646,13 @@ + + + - + @@ -1516,8 +1662,7 @@ - - + diff --git a/src/com/facharbeit/main/Frame.java b/src/com/facharbeit/main/Frame.java index 686a150..83f4d02 100644 --- a/src/com/facharbeit/main/Frame.java +++ b/src/com/facharbeit/main/Frame.java @@ -59,7 +59,6 @@ private void initComponents() jLabel7 = new javax.swing.JLabel(); speedMotdTxt = new javax.swing.JTextField(); autoBackupCheck = new javax.swing.JCheckBox(); - autoDeleteSourceCheck = new javax.swing.JCheckBox(); jLabel20 = new javax.swing.JLabel(); jLabel21 = new javax.swing.JLabel(); settingsSaveBtn = new javax.swing.JButton(); @@ -86,6 +85,15 @@ private void initComponents() hoursHeadLabel = new javax.swing.JLabel(); useHoursCheck = new javax.swing.JCheckBox(); jSeparator2 = new javax.swing.JSeparator(); + jScrollPane3 = new javax.swing.JScrollPane(); + table = new javax.swing.JTable(); + jLabel18 = new javax.swing.JLabel(); + weekTxt = new javax.swing.JTextField(); + customSourceCheck = new javax.swing.JCheckBox(); + jLabel10 = new javax.swing.JLabel(); + sourceTodayTxt = new javax.swing.JTextField(); + jLabel22 = new javax.swing.JLabel(); + sourceTomorrowTxt = new javax.swing.JTextField(); PathPanel = new javax.swing.JPanel(); jLabel6 = new javax.swing.JLabel(); sourceTxt = new javax.swing.JTextField(); @@ -98,11 +106,6 @@ private void initComponents() jLabel8 = new javax.swing.JLabel(); jLabel9 = new javax.swing.JLabel(); savePathBtn = new javax.swing.JButton(); - customSourceCheck = new javax.swing.JCheckBox(); - jLabel10 = new javax.swing.JLabel(); - sourceTodayTxt = new javax.swing.JTextField(); - sourceTomorrowTxt = new javax.swing.JTextField(); - jLabel22 = new javax.swing.JLabel(); DesignPanel = new javax.swing.JPanel(); jLabel11 = new javax.swing.JLabel(); colorPlanCombo = new javax.swing.JComboBox(); @@ -170,13 +173,19 @@ private void initComponents() setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); setResizable(false); + Tabs.setToolTipText(""); + + ControlPanel.setToolTipText(""); + log.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N + log.setToolTipText("Zeigt den Status des Programms an"); log.setFocusable(false); jScrollPane1.setViewportView(log); jLabel1.setText("Status:"); genTodayBtn.setText("heutigen Plan generieren"); + genTodayBtn.setToolTipText("Generiert nur den heutigen Plan"); genTodayBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -186,6 +195,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); genTomorrowBtn.setText("morgigen Plan generieren"); + genTomorrowBtn.setToolTipText("Generiert nur den morgigen Plan"); genTomorrowBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -195,6 +205,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); genAllBtn.setText("Alles generieren"); + genAllBtn.setToolTipText("Generiert den kompletten Plan"); genAllBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -205,9 +216,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) jLabel2.setText("Vertretungplan:"); - motdTxt.setText("Laufschrift"); + motdTxt.setToolTipText("Text, der als Laufschrift angezeigt werden soll z.B. \"Dies ist eine Laufschrift\""); genMotdBtn.setText("Laufschrift generieren"); + genMotdBtn.setToolTipText("Generiert nur die Laufschrift"); genMotdBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -216,9 +228,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) } }); + progBar.setToolTipText("Zeigt den Fortschritt der Generierung an"); + jLabel4.setText("Fortschritt:"); createBackupBtn.setText("Backup erstellen"); + createBackupBtn.setToolTipText("Erstellt ein Backup des aktuellen Plans"); createBackupBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -228,6 +243,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); deleteSourceBtn.setText("Quellpläne löschen"); + deleteSourceBtn.setToolTipText("Löscht die Quellpläne aus dem eingestellten Ordner"); deleteSourceBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -237,6 +253,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/facharbeit/ressources/antonianumLogo.jpg"))); // NOI18N + jLabel5.setToolTipText("Antonianum Logo"); jSeparator6.setOrientation(javax.swing.SwingConstants.VERTICAL); @@ -318,22 +335,21 @@ public void actionPerformed(java.awt.event.ActionEvent evt) jLabel14.setText("Scrollgeschwindigkeit"); - speedPlanTxt.setText("100"); + speedPlanTxt.setToolTipText("Scrollgeschwindigkeit des Plans in % z.B. \"100\""); jLabel7.setText("Laufschriftgeschw."); - speedMotdTxt.setText("100"); + speedMotdTxt.setToolTipText("Scrollgeschwindigkeit der Laufschrift in % z.B. \"100\""); autoBackupCheck.setText("Automatisches Backup"); - - autoDeleteSourceCheck.setText("Auto Quellen löschen"); + autoBackupCheck.setToolTipText("Soll ein automatisches Backup beim Generieren erstellt werden?"); jLabel20.setText("%"); jLabel21.setText("%"); settingsSaveBtn.setText("speichern"); - settingsSaveBtn.setToolTipText(""); + settingsSaveBtn.setToolTipText("Speichert die Einstellungen der gesamten Seite, wendet sie aber nicht an"); settingsSaveBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -342,12 +358,32 @@ public void actionPerformed(java.awt.event.ActionEvent evt) } }); + hour10Txt.setToolTipText("Zeit, nach der die zehnte Stunde gelöscht wird z.B. \"9:25\""); + hour10Label.setText("10. Stunde"); + hour9Txt.setToolTipText("Zeit, nach der die neunte Stunde gelöscht wird z.B. \"9:25\""); + hour9Label.setText("9. Stunde"); hour7Label.setText("7. Stunde"); + hour7Txt.setToolTipText("Zeit, nach der die siebte Stunde gelöscht wird z.B. \"9:25\""); + + hour8Txt.setToolTipText("Zeit, nach der die achte Stunde gelöscht wird z.B. \"9:25\""); + + hour6Txt.setToolTipText("Zeit, nach der die sechste Stunde gelöscht wird z.B. \"9:25\""); + + hour4Txt.setToolTipText("Zeit, nach der die vierte Stunde gelöscht wird z.B. \"9:25\""); + + hour2Txt.setToolTipText("Zeit, nach der die zweite Stunde gelöscht wird z.B. \"9:25\""); + + hour1Txt.setToolTipText("Zeit, nach der die erste Stunde gelöscht wird z.B. \"9:25\""); + + hour3Txt.setToolTipText("Zeit, nach der die dritte Stunde gelöscht wird z.B. \"9:25\""); + + hour5Txt.setToolTipText("Zeit, nach der die fünfte Stunde gelöscht wird z.B. \"9:25\""); + hour5Label.setText("5. Stunde"); hour3Label.setText("3. Stunde"); @@ -365,6 +401,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) hoursHeadLabel.setText("Stunden ausblenden ab:"); useHoursCheck.setText("Vergangene Vertretungen automatisch ausblenden"); + useHoursCheck.setToolTipText("Sollen vergangene Stunden ausgeblendet werden?"); useHoursCheck.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) @@ -375,6 +412,56 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) jSeparator2.setOrientation(javax.swing.SwingConstants.VERTICAL); + table.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] + { + {null, null, null, null, null, null, null} + }, + new String [] + { + "Vertreter", "Raum", "Art", "Fach", "Lehrer", "Verl. von", "Hinweise" + } + ) + { + boolean[] canEdit = new boolean [] + { + false, false, false, false, false, false, false + }; + + public boolean isCellEditable(int rowIndex, int columnIndex) + { + return canEdit [columnIndex]; + } + }); + table.setToolTipText("Verschieben der Tabellen-Sortierung auf dem Vertretungsplan"); + jScrollPane3.setViewportView(table); + + jLabel18.setText("Gerade Woche"); + + weekTxt.setToolTipText("Buchstaben für die Gerade Woche definieren z.B. \"B\""); + + customSourceCheck.setText("Benutzerdefiniertes Datum"); + customSourceCheck.setToolTipText("Soll ein benutzerdefiniertes Datum für heute und morgen angenommen werden?"); + customSourceCheck.addChangeListener(new javax.swing.event.ChangeListener() + { + public void stateChanged(javax.swing.event.ChangeEvent evt) + { + customSourceCheckStateChanged(evt); + } + }); + + jLabel10.setText("Heute"); + jLabel10.setEnabled(false); + + sourceTodayTxt.setToolTipText("Neues Datum für den heutigen Plan z.B. \"24.12.\""); + sourceTodayTxt.setEnabled(false); + + jLabel22.setText("Morgen"); + jLabel22.setEnabled(false); + + sourceTomorrowTxt.setToolTipText("Neues Datum für den morgigen Plan z.B. \"25.12.\""); + sourceTomorrowTxt.setEnabled(false); + javax.swing.GroupLayout SettingsPanelLayout = new javax.swing.GroupLayout(SettingsPanel); SettingsPanel.setLayout(SettingsPanelLayout); SettingsPanelLayout.setHorizontalGroup( @@ -388,23 +475,35 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) .addGroup(SettingsPanelLayout.createSequentialGroup() .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(SettingsPanelLayout.createSequentialGroup() - .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(autoDeleteSourceCheck, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(autoBackupCheck, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 301, Short.MAX_VALUE)) + .addComponent(autoBackupCheck, javax.swing.GroupLayout.DEFAULT_SIZE, 301, Short.MAX_VALUE) .addGap(6, 6, 6)) .addGroup(SettingsPanelLayout.createSequentialGroup() - .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(speedPlanTxt) - .addComponent(speedMotdTxt, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel20) - .addComponent(jLabel21)) - .addGap(0, 0, Short.MAX_VALUE))) + .addGroup(SettingsPanelLayout.createSequentialGroup() + .addComponent(jLabel10) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(sourceTodayTxt, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(customSourceCheck) + .addGroup(SettingsPanelLayout.createSequentialGroup() + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jLabel18)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(speedPlanTxt) + .addComponent(speedMotdTxt, javax.swing.GroupLayout.DEFAULT_SIZE, 28, Short.MAX_VALUE) + .addComponent(weekTxt)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel20) + .addComponent(jLabel21))) + .addGroup(SettingsPanelLayout.createSequentialGroup() + .addComponent(jLabel22) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(sourceTomorrowTxt, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -446,7 +545,11 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) .addComponent(hour2Txt) .addComponent(hour4Txt, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE))))) .addComponent(useHoursCheck, javax.swing.GroupLayout.DEFAULT_SIZE, 301, Short.MAX_VALUE)) - .addGap(14, 14, 14)))) + .addGap(14, 14, 14)) + .addGroup(SettingsPanelLayout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 377, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap()))) ); SettingsPanelLayout.setVerticalGroup( SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -454,44 +557,48 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) .addContainerGap() .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(SettingsPanelLayout.createSequentialGroup() - .addComponent(useHoursCheck) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(hoursHeadLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(hour1Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour1Label) - .addComponent(hour2Label) - .addComponent(hour2Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(hour3Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour3Label) - .addComponent(hour4Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour4Label)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(hour5Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour5Label) - .addComponent(hour6Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour6Label)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(hour7Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour7Label) - .addComponent(hour8Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour8Label)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(hour9Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour9Label) - .addComponent(hour10Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hour10Label))) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(SettingsPanelLayout.createSequentialGroup() + .addComponent(useHoursCheck) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(hoursHeadLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(hour1Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour1Label) + .addComponent(hour2Label) + .addComponent(hour2Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(hour3Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour3Label) + .addComponent(hour4Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour4Label)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(hour5Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour5Label) + .addComponent(hour6Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour6Label)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(hour7Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour7Label) + .addComponent(hour8Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour8Label)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(hour9Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour9Label) + .addComponent(hour10Txt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hour10Label))) + .addComponent(jSeparator2)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 63, Short.MAX_VALUE) + .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 43, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(40, 40, 40)) .addGroup(SettingsPanelLayout.createSequentialGroup() .addComponent(autoBackupCheck) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(autoDeleteSourceCheck) - .addGap(18, 18, 18) + .addGap(41, 41, 41) .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jLabel14) .addComponent(speedPlanTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -500,9 +607,22 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(speedMotdTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel7) - .addComponent(jLabel21))) - .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 279, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 33, Short.MAX_VALUE) + .addComponent(jLabel21)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel18) + .addComponent(weekTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(18, 18, 18) + .addComponent(customSourceCheck) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel10) + .addComponent(sourceTodayTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(SettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(sourceTomorrowTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel22)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addComponent(settingsSaveBtn) .addContainerGap()) ); @@ -511,7 +631,10 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) jLabel6.setText("Quellpfad"); + sourceTxt.setToolTipText("Quellpfad für die Vertretungs-Dateien"); + selectSourceTodayBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/facharbeit/ressources/ordner.png"))); // NOI18N + selectSourceTodayBtn.setToolTipText("Quellpfad auswählen"); selectSourceTodayBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -521,6 +644,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); selectBackupBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/facharbeit/ressources/ordner.png"))); // NOI18N + selectBackupBtn.setToolTipText("Backuppfad auswählen"); selectBackupBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -530,6 +654,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); selectDestBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/facharbeit/ressources/ordner.png"))); // NOI18N + selectDestBtn.setToolTipText("Zielpfad hinzufügen"); selectDestBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -541,13 +666,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) destArea.setColumns(20); destArea.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N destArea.setRows(5); + destArea.setToolTipText("Zielpfade in die der Plan automatisch kopiert wird"); jScrollPane2.setViewportView(destArea); + backupTxt.setToolTipText("Backuppfad für den generierten Plan"); + jLabel8.setText("Backuppfad"); jLabel9.setText("Zielpfade"); savePathBtn.setText("speichern"); + savePathBtn.setToolTipText("Speichert alle Pfade"); savePathBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -556,25 +685,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) } }); - customSourceCheck.setText("Benutzerdefiniert"); - customSourceCheck.addChangeListener(new javax.swing.event.ChangeListener() - { - public void stateChanged(javax.swing.event.ChangeEvent evt) - { - customSourceCheckStateChanged(evt); - } - }); - - jLabel10.setText("Heute"); - jLabel10.setEnabled(false); - - sourceTodayTxt.setEnabled(false); - - sourceTomorrowTxt.setEnabled(false); - - jLabel22.setText("Morgen"); - jLabel22.setEnabled(false); - javax.swing.GroupLayout PathPanelLayout = new javax.swing.GroupLayout(PathPanel); PathPanel.setLayout(PathPanelLayout); PathPanelLayout.setHorizontalGroup( @@ -584,36 +694,25 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(savePathBtn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(PathPanelLayout.createSequentialGroup() - .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jLabel8, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jLabel9, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 56, Short.MAX_VALUE) + .addComponent(jLabel9, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jLabel8, javax.swing.GroupLayout.DEFAULT_SIZE, 59, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, PathPanelLayout.createSequentialGroup() + .addComponent(backupTxt) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(selectBackupBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(PathPanelLayout.createSequentialGroup() - .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(sourceTxt) - .addGroup(PathPanelLayout.createSequentialGroup() - .addComponent(customSourceCheck) - .addGap(18, 18, 18) - .addComponent(jLabel10) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(sourceTodayTxt, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel22) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(sourceTomorrowTxt, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE))) + .addComponent(sourceTxt) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(selectSourceTodayBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(PathPanelLayout.createSequentialGroup() - .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(backupTxt)) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 519, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(selectDestBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(selectBackupBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)))))) + .addComponent(selectDestBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE))))) .addContainerGap()) ); PathPanelLayout.setVerticalGroup( @@ -625,25 +724,18 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(sourceTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(selectSourceTodayBtn, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(customSourceCheck) - .addComponent(jLabel10) - .addComponent(sourceTodayTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel22) - .addComponent(sourceTomorrowTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGap(18, 18, 18) .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(backupTxt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel8)) .addComponent(selectBackupBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGap(20, 20, 20) .addGroup(PathPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 135, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel9) - .addComponent(selectDestBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 99, Short.MAX_VALUE) + .addComponent(selectDestBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 219, Short.MAX_VALUE)) + .addGap(18, 18, 18) .addComponent(savePathBtn) .addContainerGap()) ); @@ -652,6 +744,7 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) jLabel11.setText("Vertretungplan"); + colorPlanCombo.setToolTipText("Hintergrundfarbe des Vertretungsplans"); colorPlanCombo.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) @@ -687,6 +780,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) ); deleteColor.setText("Farbe löschen"); + deleteColor.setToolTipText("Angegebene Farbe löschen"); deleteColor.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -696,6 +790,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); addColorBtn.setText("Farbe bearbeiten/hinzufügen"); + addColorBtn.setToolTipText("Angegebene Farbe bearbeiten/hinzufügen"); addColorBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -705,9 +800,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); colorNameTxt.setText("Farbenname"); + colorNameTxt.setToolTipText("Name der Farbe, die hinzugefügt/bearbeitet werden soll z.B. \"Antonsblau\""); jLabel13.setText("Laufschrift"); + colorMotdCombo.setToolTipText("Hintergrundfarbe der Laufschrift"); colorMotdCombo.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) @@ -720,6 +817,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) jLabel12.setText("Tabelle"); + colorTableCombo.setToolTipText("Hintergrundfarbe der Tabelle"); colorTableCombo.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) @@ -745,6 +843,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) jLabel16.setText("Rahmen"); + colorBorderCombo.setToolTipText("Farbe des Rahmens, der um die Frames angezeigt wird"); colorBorderCombo.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) @@ -769,6 +868,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) jLabel17.setText("Text"); typeToEditCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Überschrift", "Stufenname", "Laufschrift", "Tabelle" })); + typeToEditCombo.setToolTipText("Bereich des Designs der bearbeitet werden soll"); typeToEditCombo.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) @@ -778,8 +878,10 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) }); typeToEditTxt.setText("Vertretungsart"); + typeToEditTxt.setToolTipText("Name einer neuen, zu differenzierenden, Vertretungsart z.B. \"Raum-Vtr.\""); addTypeBtn.setText("hinzufügen"); + addTypeBtn.setToolTipText("Eine neue, zu differenzierende, Vertretungsart erstellen"); addTypeBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -789,6 +891,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); deleteTypeBtn.setText("löschen"); + deleteTypeBtn.setToolTipText("Eine Vertretungsart löschen"); deleteTypeBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -812,6 +915,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) .addGap(0, 0, Short.MAX_VALUE) ); + fontColorCombo.setToolTipText("Schriftfarbe für den gewählten Bereich festlegen"); fontColorCombo.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) @@ -822,7 +926,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) jLabel23.setText("Schriftart"); - fontTypeTxt.setText("Schriftart"); + fontTypeTxt.setToolTipText("Schriftart für den gewählten Bereich festlegen z.B. \"calibri\""); fontTypeTxt.addMouseListener(new java.awt.event.MouseAdapter() { public void mouseExited(java.awt.event.MouseEvent evt) @@ -835,6 +939,7 @@ public void mouseExited(java.awt.event.MouseEvent evt) backgroundColorLabel.setText("Hintergrundfarbe"); + backgroundColorCombo.setToolTipText("Hintergrundfarbe für den gewählten Bereich festlegen"); backgroundColorCombo.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) @@ -856,7 +961,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) .addGap(0, 20, Short.MAX_VALUE) ); - fontSizeTxt.setText("12"); + fontSizeTxt.setToolTipText("Schriftgröße für den gewählten Bereich festlegen z.B. \"12\""); fontSizeTxt.addMouseListener(new java.awt.event.MouseAdapter() { public void mouseExited(java.awt.event.MouseEvent evt) @@ -866,6 +971,7 @@ public void mouseExited(java.awt.event.MouseEvent evt) }); boldCheck.setText("Fett"); + boldCheck.setToolTipText("Soll die Schrift des gewählten Bereichs fett gedruckt werden?"); boldCheck.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -875,6 +981,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); italicCheck.setText("Kursiv"); + italicCheck.setToolTipText("Soll die Schrift des gewählten Bereichs kursiv gedruckt werden?"); italicCheck.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -883,7 +990,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) } }); - saveDesignBtn.setText("speichern"); + saveDesignBtn.setText("Style anwenden"); + saveDesignBtn.setToolTipText("Den, oben eingestellten, Style für den Plan anwenden"); javax.swing.GroupLayout DesignPanelLayout = new javax.swing.GroupLayout(DesignPanel); DesignPanel.setLayout(DesignPanelLayout); @@ -1056,6 +1164,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) Tabs.addTab("Design", DesignPanel); useSQLCheck.setText("SQL benutzen"); + useSQLCheck.setToolTipText("Soll die SQL-Unterstützung aktiviert werden?"); useSQLCheck.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) @@ -1065,6 +1174,7 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) }); sqlModeBtn.setText("schreiben"); + sqlModeBtn.setToolTipText("SQL Modus, der verwendet werden soll"); sqlModeBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1074,6 +1184,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) }); sqlSaveBtn.setText("speichern"); + sqlSaveBtn.setToolTipText("Speichert die SQL Einstellungen"); sqlSaveBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1082,20 +1193,27 @@ public void actionPerformed(java.awt.event.ActionEvent evt) } }); + dbTableNameTxt.setToolTipText("Tabellen Name z.B. \"Vertretungen\""); + dbTableNameLabel.setText("Tabellenname:"); + dbNameTxt.setToolTipText("Datenbank Name z.B. \"Schuldatenbank\""); + dbNameLabel.setText("Datenbankname:"); dbUserLabel.setText("Benutzername:"); + dbUserTxt.setToolTipText("Benutzername z.B. \"admin\""); + dbPwLabel.setText("Passwort:"); - dbPortTxt.setText("1433"); + dbPwTxt.setToolTipText("Passwort z.B. \"passw\""); + + dbPortTxt.setToolTipText("Datenbank Port z.B. \"1344\""); dbPortLabel.setText("Port:"); - dbHostTxt.setText("www.antonianum.de"); - dbHostTxt.setToolTipText(""); + dbHostTxt.setToolTipText("Datenbank Host z.B. \"www.antonianum.de\""); dbHostLabel.setText("Datenbank Host:"); @@ -1171,7 +1289,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) .addGroup(SQLPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(sqlModeBtn) .addComponent(sqlModeLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 167, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 170, Short.MAX_VALUE) .addComponent(sqlSaveBtn) .addContainerGap()) ); @@ -1216,8 +1334,7 @@ private void selectDestBtnActionPerformed(java.awt.event.ActionEvent evt)//GEN-F private void savePathBtnActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_savePathBtnActionPerformed {//GEN-HEADEREND:event_savePathBtnActionPerformed - Application.addToQueue("savePathBtnActionPerformed", sourceTxt, backupTxt, destArea, sourceTodayTxt, sourceTomorrowTxt, - customSourceCheck); + Application.addToQueue("savePathBtnActionPerformed", sourceTxt, backupTxt, destArea); }//GEN-LAST:event_savePathBtnActionPerformed private void addColorBtnActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_addColorBtnActionPerformed @@ -1287,7 +1404,8 @@ private void settingsSaveBtnActionPerformed(java.awt.event.ActionEvent evt)//GEN {//GEN-HEADEREND:event_settingsSaveBtnActionPerformed Application.addToQueue("settingsSaveBtnActionPerformed", hour1Txt, hour2Txt, hour3Txt, hour4Txt, hour5Txt, hour6Txt, hour7Txt, hour8Txt, hour9Txt, hour10Txt, - useHoursCheck, autoBackupCheck, autoDeleteSourceCheck, speedPlanTxt, speedMotdTxt); + useHoursCheck, autoBackupCheck, speedPlanTxt, speedMotdTxt, + table, weekTxt, sourceTodayTxt, sourceTomorrowTxt, customSourceCheck); }//GEN-LAST:event_settingsSaveBtnActionPerformed private void sqlModeBtnActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_sqlModeBtnActionPerformed @@ -1390,9 +1508,9 @@ public void loadSettings() colorPlanCombo, colorMotdCombo, motdTxt, useSQLCheck, dbHostTxt, dbPortTxt, dbNameTxt, dbUserTxt, dbPwTxt, dbTableNameTxt, hour1Txt, hour2Txt, hour3Txt, hour4Txt, hour5Txt, hour6Txt, hour7Txt, hour8Txt, hour9Txt, hour10Txt, sqlModeBtn, - autoBackupCheck, autoDeleteSourceCheck, useHoursCheck, customSourceCheck, sourceTodayTxt, + autoBackupCheck, useHoursCheck, customSourceCheck, sourceTodayTxt, sourceTomorrowTxt, colorTableCombo, colorBorderCombo, fontColorCombo, backgroundColorCombo, - fontTypeTxt, fontSizeTxt, boldCheck, italicCheck, typeToEditCombo); + fontTypeTxt, fontSizeTxt, boldCheck, italicCheck, typeToEditCombo, table, weekTxt); sourceTodayTxt.setEnabled(customSourceCheck.isSelected()); sourceTomorrowTxt.setEnabled(customSourceCheck.isSelected()); @@ -1419,7 +1537,6 @@ public void loadSettings() private javax.swing.JButton addColorBtn; private javax.swing.JButton addTypeBtn; private javax.swing.JCheckBox autoBackupCheck; - private javax.swing.JCheckBox autoDeleteSourceCheck; private javax.swing.JComboBox backgroundColorCombo; private javax.swing.JLabel backgroundColorLabel; private javax.swing.JPanel backgroundColorPanel; @@ -1494,6 +1611,7 @@ public void loadSettings() private javax.swing.JLabel jLabel15; private javax.swing.JLabel jLabel16; private javax.swing.JLabel jLabel17; + private javax.swing.JLabel jLabel18; private javax.swing.JLabel jLabel19; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel20; @@ -1509,6 +1627,7 @@ public void loadSettings() private javax.swing.JLabel jLabel9; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane2; + private javax.swing.JScrollPane jScrollPane3; private javax.swing.JSeparator jSeparator1; private javax.swing.JSeparator jSeparator2; private javax.swing.JSeparator jSeparator3; @@ -1534,9 +1653,11 @@ public void loadSettings() private javax.swing.JButton sqlModeBtn; private javax.swing.JLabel sqlModeLabel; private javax.swing.JButton sqlSaveBtn; + private javax.swing.JTable table; private javax.swing.JComboBox typeToEditCombo; private javax.swing.JTextField typeToEditTxt; private javax.swing.JCheckBox useHoursCheck; private javax.swing.JCheckBox useSQLCheck; + private javax.swing.JTextField weekTxt; // End of variables declaration//GEN-END:variables } diff --git a/src/com/facharbeit/main/QueueElement.java b/src/com/facharbeit/main/QueueElement.java index ae3cd08..5ccd6b8 100644 --- a/src/com/facharbeit/main/QueueElement.java +++ b/src/com/facharbeit/main/QueueElement.java @@ -22,6 +22,7 @@ public void invoke() } catch(IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) { Logger.log(method.getName() + " konnte nicht ausgeführt werden.", 2); + ex.printStackTrace(); } } } diff --git a/src/com/facharbeit/main/QueueableMethods.java b/src/com/facharbeit/main/QueueableMethods.java index 2f955f2..715f8fa 100644 --- a/src/com/facharbeit/main/QueueableMethods.java +++ b/src/com/facharbeit/main/QueueableMethods.java @@ -23,8 +23,6 @@ public static void genAllBtnActionPerformed() Logger.setProgress(100); if(Settings.load("autoBackup").equals("true")) createBackupBtnActionPerformed(); - if(Settings.load("autoDeleteSources").equals("true")) - deleteSourceBtnActionPerformed(); Logger.setProgress(0); } @@ -36,8 +34,6 @@ public static void genTodayBtnActionPerformed() Logger.setProgress(100); if(Settings.load("autoBackup").equals("true")) createBackupBtnActionPerformed(); - if(Settings.load("autoDeleteSources").equals("true")) - deleteSourceBtnActionPerformed(); Logger.setProgress(0); } @@ -49,8 +45,6 @@ public static void genTomorrowBtnActionPerformed() Logger.setProgress(100); if(Settings.load("autoBackup").equals("true")) createBackupBtnActionPerformed(); - if(Settings.load("autoDeleteSources").equals("true")) - deleteSourceBtnActionPerformed(); Logger.setProgress(0); } @@ -62,8 +56,6 @@ public static void genMotdBtnActionPerformed(JTextField motdTxt) backupToDestPaths(); if(Settings.load("autoBackup").equals("true")) createBackupBtnActionPerformed(); - if(Settings.load("autoDeleteSources").equals("true")) - deleteSourceBtnActionPerformed(); Logger.setProgress(0); } @@ -114,8 +106,9 @@ public static void settingsSaveBtnActionPerformed(JTextField hour1Txt, JTextFiel JTextField hour4Txt, JTextField hour5Txt, JTextField hour6Txt, JTextField hour7Txt, JTextField hour8Txt, JTextField hour9Txt, JTextField hour10Txt, JCheckBox useHoursCheck, JCheckBox autoBackupCheck, - JCheckBox autoDeleteSourceCheck, JTextField speedPlanTxt, - JTextField speedMotdTxt) + JTextField speedPlanTxt, JTextField speedMotdTxt, JTable table, + JTextField weekTxt, JTextField sourceTodayTxt, JTextField sourceTomorrowTxt, + JCheckBox customSourceCheck) { saveIfNotNull(hour1Txt, "lesson1"); saveIfNotNull(hour2Txt, "lesson2"); @@ -129,24 +122,61 @@ public static void settingsSaveBtnActionPerformed(JTextField hour1Txt, JTextFiel saveIfNotNull(hour10Txt, "lesson10"); saveIfNotNull(speedPlanTxt, "planSpeed"); saveIfNotNull(speedMotdTxt, "motdSpeed"); + saveIfNotNull(weekTxt, "customWeek"); + saveIfNotNull(sourceTodayTxt, "customToday"); + saveIfNotNull(sourceTomorrowTxt, "customTomorrow"); + Settings.save("customDate", String.valueOf(customSourceCheck.isSelected())); + + String[] order = new String[7]; + for(int i = 0; i < 7; i++) + switch(table.getColumnName(i)) + { + case "Vertreter": + order[i] = "0"; + break; + case "Raum": + order[i] = "1"; + break; + case "Art": + order[i] = "2"; + break; + case "Fach": + order[i] = "3"; + break; + case "Lehrer": + order[i] = "4"; + break; + case "Verl. von": + order[i] = "5"; + break; + case "Hinweise": + order[i] = "6"; + break; + default: + Logger.log("Fehler beim sortieren der Daten!", 2); + return; + } + + String setting = order[0] + "," + + order[1] + "," + + order[2] + "," + + order[3] + "," + + order[4] + "," + + order[5] + "," + + order[6]; + + Settings.save("lessonOrder", setting); Settings.save("lessonUse", String.valueOf(useHoursCheck.isSelected())); Settings.save("autoBackup", String.valueOf(autoBackupCheck.isSelected())); - Settings.save("autoDeleteSources", String.valueOf(autoDeleteSourceCheck.isSelected())); } // Pfade @SuppressWarnings("empty-statement") - public static void savePathBtnActionPerformed(JTextField sourceTxt, JTextField backupTxt, JTextArea destArea, - JTextField sourceTodayTxt, JTextField sourceTomorrowTxt, - JCheckBox customSourceCheck) + public static void savePathBtnActionPerformed(JTextField sourceTxt, JTextField backupTxt, JTextArea destArea) { - Settings.save("sourceCustom", String.valueOf(customSourceCheck.isSelected())); - saveIfNotNull(sourceTxt, "pathSource"); saveIfNotNull(backupTxt, "pathBackup"); - saveIfNotNull(sourceTodayTxt, "sourceTodayPath"); - saveIfNotNull(sourceTomorrowTxt, "sourceTomorrowPath"); ArrayList destPaths = new ArrayList(); destPaths.addAll(Arrays.asList(destArea.getText().split("\n"))); @@ -408,11 +438,11 @@ public static void loadSettings(JTextField sourceTxt, JTextField backupTxt, JTex JTextField hour1Txt, JTextField hour2Txt, JTextField hour3Txt, JTextField hour4Txt, JTextField hour5Txt, JTextField hour6Txt, JTextField hour7Txt, JTextField hour8Txt, JTextField hour9Txt, JTextField hour10Txt, JButton SQLModeBtn, JCheckBox autoBackupCheck, - JCheckBox autoDeleteSourceCheck, JCheckBox useHoursCheck, JCheckBox customSourceCheck, - JTextField sourceTodayTxt, JTextField sourceTomorrowTxt, JComboBox colorTableCombo, - JComboBox colorBorderCombo, JComboBox fontColorCombo, JComboBox backgroundColorCombo, - JTextField fontTypeTxt, JTextField fontSizeTxt, JCheckBox boldCheck, JCheckBox italicCheck, - JComboBox typeToEditCombo) + JCheckBox useHoursCheck, JCheckBox customSourceCheck, JTextField sourceTodayTxt, + JTextField sourceTomorrowTxt, JComboBox colorTableCombo, JComboBox colorBorderCombo, + JComboBox fontColorCombo, JComboBox backgroundColorCombo, JTextField fontTypeTxt, + JTextField fontSizeTxt, JCheckBox boldCheck, JCheckBox italicCheck, JComboBox typeToEditCombo, + JTable table, JTextField weekTxt) { load(sourceTxt, "pathSource"); load(backupTxt, "pathBackup"); @@ -435,14 +465,14 @@ public static void loadSettings(JTextField sourceTxt, JTextField backupTxt, JTex load(hour8Txt, "lesson8"); load(hour9Txt, "lesson9"); load(hour10Txt, "lesson10"); - load(sourceTodayTxt, "sourceTodayPath"); - load(sourceTomorrowTxt, "sourceTomorrowPath"); + load(sourceTodayTxt, "customToday"); + load(sourceTomorrowTxt, "customTomorrow"); + load(weekTxt, "customWeek"); useSQLCheck.setSelected(Boolean.valueOf(Settings.load("sqlUse"))); autoBackupCheck.setSelected(Boolean.valueOf(Settings.load("autoBackup"))); - autoDeleteSourceCheck.setSelected(Boolean.valueOf(Settings.load("autoDeleteSources"))); useHoursCheck.setSelected(Boolean.valueOf(Settings.load("lessonUse"))); - customSourceCheck.setSelected(Boolean.valueOf(Settings.load("sourceCustom"))); + customSourceCheck.setSelected(Boolean.valueOf(Settings.load("customDate"))); String name = "pathDest1"; if(Settings.getLineOf(name) == -1) @@ -483,6 +513,41 @@ else if(bool.equals("italic")) SQLModeBtn.setText("schreiben"); else SQLModeBtn.setText("lesen"); + + String[] order = Settings.load("lessonOrder").split(","); + if(order.length == 7) + for(int i = 0; i < 7; i++) + switch(order[i]) + { + case "0": + table.getColumnModel().getColumn(i).setHeaderValue("Vertreter"); + table.getColumnModel().getColumn(i).setModelIndex(0); + break; + case "1": + table.getColumnModel().getColumn(i).setHeaderValue("Raum"); + table.getColumnModel().getColumn(i).setModelIndex(1); + break; + case "2": + table.getColumnModel().getColumn(i).setHeaderValue("Art"); + table.getColumnModel().getColumn(i).setModelIndex(2); + break; + case "3": + table.getColumnModel().getColumn(i).setHeaderValue("Fach"); + table.getColumnModel().getColumn(i).setModelIndex(3); + break; + case "4": + table.getColumnModel().getColumn(i).setHeaderValue("Lehrer"); + table.getColumnModel().getColumn(i).setModelIndex(4); + break; + case "5": + table.getColumnModel().getColumn(i).setHeaderValue("Verl. von"); + table.getColumnModel().getColumn(i).setModelIndex(5); + break; + case "6": + table.getColumnModel().getColumn(i).setHeaderValue("Hinweise"); + table.getColumnModel().getColumn(i).setModelIndex(6); + break; + } } private static void loadColors(JComboBox... colorCombos) diff --git a/src/com/facharbeit/ressources/stdData/TEMPLATE heute morgen.html b/src/com/facharbeit/ressources/stdData/TEMPLATE heute morgen.html index 6327bb0..1cbcb27 100644 --- a/src/com/facharbeit/ressources/stdData/TEMPLATE heute morgen.html +++ b/src/com/facharbeit/ressources/stdData/TEMPLATE heute morgen.html @@ -15,11 +15,11 @@ else { window.scrollTo(0, 0); - if (reloadcounter < 4) + if (reloadcounter < 5) reloadcounter = reloadcounter + 1; else { - window.history.go(0); + location.reload(true); reloadcounter = 0; } } diff --git a/src/com/facharbeit/tools/Entry.java b/src/com/facharbeit/tools/Entry.java index 9f7fdb5..f4a3d2a 100644 --- a/src/com/facharbeit/tools/Entry.java +++ b/src/com/facharbeit/tools/Entry.java @@ -2,7 +2,29 @@ public class Entry { - private int hour; + private int hour = -1; + private String date = null; + private String dayOfWeek = null; + + public String getDate() + { + return date; + } + + public void setDate(String date) + { + this.date = date; + } + + public String getDayOfWeek() + { + return dayOfWeek; + } + + public void setDayOfWeek(String dayOfWeek) + { + this.dayOfWeek = dayOfWeek; + } private boolean nextIsEqual; private String[] content; @@ -36,54 +58,70 @@ public void setContent(String[] content) this.content = content; } - public Entry(int hour, boolean nextIsEqual, String... content) - { - this.hour = hour; - this.nextIsEqual = nextIsEqual; - this.content = content; - } - - public Entry(int hour, String... content) - { - this.hour = hour; - this.nextIsEqual = false; - this.content = content; - } - +// public Entry(int hour, boolean nextIsEqual, String... content) +// { +// this.hour = hour; +// this.nextIsEqual = nextIsEqual; +// this.content = content; +// } +// public Entry(int hour, String... content) +// { +// this.hour = hour; +// this.nextIsEqual = false; +// this.content = content; +// } +// public Entry(String... content) +// { +// try +// { +// this.hour = Integer.parseInt(content[0]); +// } catch(NumberFormatException n) +// { +// this.hour = -1; +// } +// +// this.nextIsEqual = false; +// +// this.content = new String[content.length - 1]; +// +// for(int i = 1; i < content.length; i++) +// this.content[i - 1] = content[i]; +// } public Entry(String... content) { - try - { - this.hour = Integer.parseInt(content[0]); - } catch(NumberFormatException n) - { - this.hour = -1; - } - - this.nextIsEqual = false; - - this.content = new String[content.length - 1]; - - for(int i = 1; i < content.length; i++) - this.content[i - 1] = content[i]; - } - public Entry(boolean nextIsEqual, String... content) - { + boolean nextIsEqual = false; try { this.hour = Integer.parseInt(content[0]); - } catch(NumberFormatException n) + } catch(NumberFormatException ex) { - this.hour = -1; + + if(content[0].indexOf("-") > 0) + { + nextIsEqual = true; + try + { + this.hour = Integer.parseInt(content[0].substring(0, content[0].indexOf("-") - 1)); + } catch(NumberFormatException e) + { + } + + } else + { + //Fehler + } } this.nextIsEqual = nextIsEqual; - this.content = new String[content.length - 1]; + this.date = content[1]; + this.dayOfWeek = content[2]; + + this.content = new String[content.length - 3]; - for(int i = 1; i < content.length; i++) - this.content[i - 1] = content[i]; + for(int i = 3; i < content.length; i++) + this.content[i - 3] = content[i]; } public String toString(String cssClass) diff --git a/src/com/facharbeit/tools/SchoolClass.java b/src/com/facharbeit/tools/SchoolClass.java index 3ebe4a1..556b3c3 100644 --- a/src/com/facharbeit/tools/SchoolClass.java +++ b/src/com/facharbeit/tools/SchoolClass.java @@ -5,12 +5,13 @@ public class SchoolClass { + private String name; + private String curDate; private ArrayList entrys; private String[] contentColumms = { "Vertreter", "Raum", "Art", "Fach", "Lehrer", "Verl. von", "Hinweise" }; - private String name; public SchoolClass(String name) { @@ -174,4 +175,27 @@ private int getIndexOfStringInArray(String[] array, String toSearch) return index; } + + public boolean containsEntrysOfDate(String date) + { + for(Entry e : entrys) + if(e.getDate().equals(date)) + return true; + return false; + } + + public void onlyDate(String date) + { + curDate = date; + ArrayList newEntrys = new ArrayList(); + for(Entry e : entrys) + if(e.getDate().equals(date)) + newEntrys.add(e); + entrys = newEntrys; + } + + public String getCurDate() + { + return curDate; + } } diff --git a/src/com/facharbeit/tools/Time.java b/src/com/facharbeit/tools/Time.java index 269eba8..3b69da5 100644 --- a/src/com/facharbeit/tools/Time.java +++ b/src/com/facharbeit/tools/Time.java @@ -1,5 +1,6 @@ package com.facharbeit.tools; +import com.facharbeit.io.*; import java.util.*; public class Time @@ -19,26 +20,30 @@ public static String forLogging() + String.format("%02d", c.get(Calendar.SECOND)) + "] "; } - public static String forHtmlReading(boolean today) + public static String forHtmlReading(int addDays) { instance(); - if(!today) - c.add(Calendar.DAY_OF_MONTH, 1); - - String s = String.format("%02d", c.get(Calendar.YEAR) % 100) - + String.format("%02d", (c.get(Calendar.MONTH) + 1)) - + String.format("%02d", c.get(Calendar.DAY_OF_MONTH)); - - if(!today) - c.add(Calendar.DAY_OF_MONTH, -1); + if(Settings.load("customDate").equals("true")) + if(addDays == 0) + return Settings.load("customToday"); + else + return Settings.load("customTomorrow"); + else if(addDays == 0) + return day() + "\\." + month() + "\\."; + else + return addDays(addDays).get(Calendar.DATE) + "\\." + addDays(1).get(Calendar.MONTH) + "\\."; + } - return s; + public static int month() + { + instance(); + return c.get(Calendar.MONTH); } - public static String forHtmlWriting() + public static int day() { instance(); - return " (" + c.get(Calendar.WEEK_OF_YEAR) + ")"; + return c.get(Calendar.DAY_OF_MONTH); } public static int hour() @@ -53,6 +58,14 @@ public static int minute() return c.get(Calendar.MINUTE); } + public static Calendar addDays(int amount) + { + instance(); + Calendar nc = (Calendar)c.clone(); + nc.add(Calendar.DATE, amount); + return nc; + } + public static boolean isAfter(int afterHour, int afterMinute, int beforeHour, int beforeMinute) { boolean b = false; @@ -66,4 +79,27 @@ public static boolean isAfter(int afterHour, int afterMinute, int beforeHour, in return b; } + + public static String forHtmlWriting(String date) + { + instance(); + c.set(Calendar.DATE, Integer.parseInt(date.split("\\.")[0])); + c.set(Calendar.MONTH, Integer.parseInt(date.split("\\.")[1])); + + String gerade = Settings.load("customWeek"); + String ungerade; + String week; + + if(gerade.equals("A")) + ungerade = "B"; + else + ungerade = "A"; + + if(c.get(Calendar.WEEK_OF_YEAR) % 2 == 0) + week = gerade; + else + week = ungerade; + + return "Vertretungen " + c.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG, Locale.GERMANY) + " " + date + "
Woche-" + week + " (" + c.get(Calendar.WEEK_OF_YEAR) + ")"; + } }