Skip to content

Commit

Permalink
v2.7.3
Browse files Browse the repository at this point in the history
Stundenzeiten wieder hinzugefügt
Probleme mit der Raumanzeige bei Fächern, die Lehrerkürzel im Namen haben behoben
  • Loading branch information
lkwslr committed Oct 14, 2024
1 parent b2ba161 commit b3fae8c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
6 changes: 4 additions & 2 deletions lib/helper/networking/stundenplan.php.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ saveStundenplan(dom.Element gesamtplan) async {
String zeiten = tage[0].getElementsByClassName("VonBis")[0].text.trim();
stundenZeiten.add(zeiten);

StorageProvider.timelist = stundenZeiten;

tage.removeAt(0);

int wochentagVerschiebung = 0;
Expand Down Expand Up @@ -92,7 +94,7 @@ saveStundenplan(dom.Element gesamtplan) async {
..gruppenId = "TUT"
..fullName = getDefaultName("TUT")
..generatedName = getDefaultName("TUT")
..name = "TUT"
..name = getDefaultName("TUT")
..halbjahr = ""
..zweig = ""
..farbe = getDefaultColor("TUT") ?? 4294967295
Expand All @@ -117,8 +119,8 @@ saveStundenplan(dom.Element gesamtplan) async {
if (lerngruppe != null) {
for (int iRowspan = 0; iRowspan < rowspan; iRowspan++) {
String raum = moeglichesFach.text
.replaceAll(fach, "")
.replaceAll(lehrkraft, "")
.replaceAll(fach, "")
.trim();
Schulstunde schulstunde = Schulstunde()
..wochentag = iTag + wochentagVerschiebung
Expand Down
3 changes: 2 additions & 1 deletion lib/routes/lerngruppen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ class _LerngruppenViewerState extends State<LerngruppenViewer> {
maxLines: 1)),
],
),
if (lerngruppen[index].halbjahr != "")
Row(
children: [
const Expanded(
Expand Down Expand Up @@ -138,7 +139,7 @@ class _LerngruppenViewerState extends State<LerngruppenViewer> {
children: [
Expanded(
flex: 1,
child: Text(leistungskontrolle.art ?? "Klausur",
child: Text("${leistungskontrolle.art ?? "Klausur"}:",
style: TextStyle(
fontWeight: FontWeight.bold))),
Expanded(
Expand Down
21 changes: 10 additions & 11 deletions lib/routes/stundenplan.dart
Original file line number Diff line number Diff line change
Expand Up @@ -545,29 +545,26 @@ class _StundenplanState extends State<Stundenplan> {
4294967295),
),
]),
Row(
children: [
Expanded(
child: Text(
"Fach laut Stundenplan:",
style: Theme.of(context)
.textTheme
.titleMedium,
textAlign: TextAlign.center,
)),
],
Text(
"Fach laut Stundenplan:",
style: Theme.of(context)
.textTheme
.titleMedium,
textAlign: TextAlign.center,
),
SizedBox(
height: 8,
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Expanded(
child: Text("Fachname: ")),
Expanded(child: Text(subject))
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Expanded(
child: Text(
Expand All @@ -578,6 +575,7 @@ class _StundenplanState extends State<Stundenplan> {
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Expanded(
child: Text("Raum: ")),
Expand All @@ -587,6 +585,7 @@ class _StundenplanState extends State<Stundenplan> {
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Expanded(
child: Text("Lehrer: ")),
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 2.7.2-beta+20702
version: 2.7.3+20703

environment:
sdk: ">=2.17.0-0 <3.0.0"
Expand Down

0 comments on commit b3fae8c

Please sign in to comment.