MarianumMobile/Client
5
1
Fork 0
Code Issues 34 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Added Nextcloud base

Browse Source
This commit is contained in:
Elias Müller
2023-02-20 10:56:51 +01:00
parent e54ae9c2ff
commit fea36b9a6d
63 changed files with 1863 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
lib/screen/pages/timetable/dayListView.dart Normal file
View File

@ -0,0 +1,139 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/webuntis/queries/getHolidays/getHolidaysResponse.dart';
import 'package:timetable_view/timetable_view.dart';
import '../../../api/webuntis/queries/getHolidays/getHolidays.dart';
import '../../../api/webuntis/queries/getRooms/getRoomsResponse.dart';
import '../../../api/webuntis/queries/getSubjects/getSubjectsResponse.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetableResponse.dart';
import '../../../data/timetable/timetableProps.dart';
class DayListView extends StatefulWidget {
final TimetableProps value;
const DayListView(this.value, {Key? key}) : super(key: key);
@override
State<DayListView> createState() => _DayListViewState();
}
class _DayListViewState extends State<DayListView> {
@override
Widget build(BuildContext context) {
return TimetableView(
laneEventsList: _buildLaneEvents(widget.value),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
);
}
List<LaneEvents> _buildLaneEvents(TimetableProps data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
Jiffy.locale("de"); // todo move outwards
GetTimetableResponse timetable = data.getTimetableResponse;
GetRoomsResponse rooms = data.getRoomsResponse;
GetSubjectsResponse subjects = data.getSubjectsResponse;
GetHolidaysResponse holidays = data.getHolidaysResponse;
GetHolidaysResponseObject? holidayInfo = GetHolidays.find(holidays, time: data.queryDate);
if(holidayInfo != null) {
laneEvents.add(
LaneEvents(
lane: Lane(
laneIndex: data.queryDate.millisecondsSinceEpoch,
name: "${Jiffy(data.queryDate.toString()).format("dd.MM.yy")}\n${Jiffy(data.queryDate.toString()).format("EEEE")}",
textStyle: TextStyle(
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.bold,
fontSize: 14
)
),
events: List<TableEvent>.of([
TableEvent(
title: holidayInfo.name,
eventId: holidayInfo.id,
laneIndex: data.queryDate.millisecondsSinceEpoch,
startTime: parseTime(0800),
endTime: parseTime(1500),
padding: const EdgeInsets.all(5),
backgroundColor: Theme.of(context).disabledColor,
location: "\n${holidayInfo.longName}",
)
]),
)
);
}
List<int> dayList = timetable.result.map((e) => e.date).toSet().toList();
dayList.sort((a, b) => a-b);
dayList.forEach((day) {
//Every Day
laneEvents.add(
LaneEvents(
lane: Lane(
laneIndex: day,
name: "${Jiffy(day.toString()).format("dd.MM.yy")}\n${Jiffy(day.toString()).format("EEEE")}",
textStyle: TextStyle(
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.bold,
fontSize: 14
)
),
events: List<TableEvent>.generate(
timetable.result.where((element) => element.date == day).length,
(index) {
GetTimetableResponseObject tableEvent = timetable.result.where((element) => element.date == day).elementAt(index);
GetSubjectsResponseObject subject = subjects.result.firstWhere((subject) => subject.id == tableEvent.su[0]['id']);
return TableEvent(
title: "${subject.alternateName} (${subject.longName})",
eventId: tableEvent.id,
laneIndex: day,
startTime: parseTime(tableEvent.startTime),
endTime: parseTime(tableEvent.endTime),
padding: const EdgeInsets.all(5),
backgroundColor: Theme.of(context).primaryColor,
location: "\n${rooms.result.firstWhere((room) => room.id == tableEvent.ro[0]['id']).name} - ${tableEvent.te[0]['longname']} (${tableEvent.te[0]['name']})",
);
}
)
)
);
});
return laneEvents;
}
TableEventTime parseTime(int input) {
String time = input.toString().length < 4 ? "0$input" : input.toString();
return TableEventTime(hour: int.parse(time.substring(0, 2)), minute: int.parse(time.substring(2, 4)));
}
}
class CustomTableStyle extends TimetableStyle {
dynamic context;
CustomTableStyle(this.context);
@override
int get startHour => 07;
@override
int get endHour => 17;
@override
Color get cornerColor => Theme.of(context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(context).primaryColor;
@override
double get timeItemHeight => 70;
@override
double get timeItemWidth => 50;
@override
double get laneWidth => MediaQuery.of(context).size.width - timeItemWidth;
}

104
lib/screen/pages/timetable/storedTimetable.dart
View File

@ -1,104 +0,0 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/webuntis/queries/getRooms/getRoomsResponse.dart';
import 'package:marianum_mobile/api/webuntis/queries/getSubjects/getSubjectsResponse.dart';
import 'package:marianum_mobile/data/timetable/timetable.dart';
import 'package:marianum_mobile/screen/pages/timetable/testTimetable.dart';
import 'package:marianum_mobile/widget/loadingSpinner.dart';
import 'package:provider/provider.dart';
import 'package:timetable_view/timetable_view.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetableResponse.dart';
class StoredTimetable extends StatefulWidget {
const StoredTimetable({Key? key}) : super(key: key);
@override
State<StoredTimetable> createState() => _StoredTimetableState();
}
class _StoredTimetableState extends State<StoredTimetable> {
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<Timetable>(context, listen: false).run();
});
}
@override
Widget build(BuildContext context) {
return Consumer<Timetable>(
builder: (context, value, child) {
if(value.getTimetableResponse == null) {
return const LoadingSpinner();
}
return TimetableView(
laneEventsList: _buildLaneEvents(value),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
);
},
);
}
List<LaneEvents> _buildLaneEvents(Timetable data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
Jiffy.locale("de"); // todo move outwards
GetTimetableResponse timetable = data.getTimetableResponse!;
GetRoomsResponse rooms = data.getRoomsResponse!;
GetSubjectsResponse subjects = data.getSubjectsResponse!;
List<int> dayList = timetable.result.map((e) => e.date).toSet().toList();
dayList.sort((a, b) => a-b);
dayList.forEach((day) {
//Every Day
laneEvents.add(
LaneEvents(
lane: Lane(
laneIndex: day,
name: "${Jiffy(day.toString()).format("dd.MM.yy")}\n${Jiffy(day.toString()).format("EEEE")}",
textStyle: TextStyle(
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.bold,
fontSize: 14
)
),
events: List<TableEvent>.generate(
timetable.result.where((element) => element.date == day).length,
(index) {
GetTimetableResponseObject tableEvent = timetable.result.where((element) => element.date == day).elementAt(index);
return TableEvent(
title: subjects.result.firstWhere((subject) => subject.id == tableEvent.su[0]['id']).longName,
eventId: tableEvent.id,
laneIndex: day,
startTime: parseTime(tableEvent.startTime),
endTime: parseTime(tableEvent.endTime),
padding: const EdgeInsets.all(5),
backgroundColor: Theme.of(context).primaryColor,
location: "\n${rooms.result.firstWhere((room) => room.id == tableEvent.ro[0]['id']).name}",
);
}
)
)
);
});
return laneEvents;
}
TableEventTime parseTime(int input) {
String time = input.toString().length < 4 ? "0$input" : input.toString();
return TableEventTime(hour: int.parse(time.substring(0, 2)), minute: int.parse(time.substring(2, 4)));
}
}

9
lib/screen/pages/timetable/testTimetable.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/webuntis/queries/getRooms/getRooms.dart';
import 'package:marianum_mobile/data/timetable/timetableProps.dart';
import 'package:marianum_mobile/widget/loadingSpinner.dart';
import 'package:marianum_mobile/widget/offlineError.dart';
import 'package:timetable_view/timetable_view.dart';
@ -131,14 +132,14 @@ class CustomTableStyle extends TimetableStyle {
@override
int get endHour => 17;
@override
double get laneWidth => 300;
@override
Color get cornerColor => Theme.of(context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(context).primaryColor;
@override
double get timeItemHeight => 80;
double get timeItemHeight => 70;
@override
double get timeItemWidth => 70;
double get timeItemWidth => 50;
@override
double get laneWidth => MediaQuery.of(context).size.width - timeItemWidth;
}

142
lib/screen/pages/timetable/timetable.dart
View File

@ -1,13 +1,18 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:marianum_mobile/widget/loadingPacket.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/webuntis/queries/getRooms/getRoomsResponse.dart';
import 'package:marianum_mobile/api/webuntis/queries/getSubjects/getSubjectsResponse.dart';
import 'package:marianum_mobile/data/timetable/timetableProps.dart';
import 'package:marianum_mobile/screen/pages/timetable/dayListView.dart';
import 'package:marianum_mobile/screen/pages/timetable/testTimetable.dart';
import 'package:marianum_mobile/widget/loadingSpinner.dart';
import 'package:provider/provider.dart';
import 'package:timetable_view/timetable_view.dart';
import '../../../dataOld/incommingPackets/timetablePacket.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetableResponse.dart';
class Timetable extends StatefulWidget {
const Timetable({Key? key}) : super(key: key);
@ -17,90 +22,69 @@ class Timetable extends StatefulWidget {
}
class _TimetableState extends State<Timetable> {
@override
void initState() {
Provider.of<TimetablePacket>(context, listen: false).invoke();
super.initState();
}
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<TimetableProps>(context, listen: false).run();
});
}
@override
Widget build(BuildContext context) {
return Consumer<TimetablePacket>(
builder: (context, data, child) {
return Consumer<TimetableProps>(
builder: (context, value, child) {
if(value.primaryLoading()) {
return const Center(child: CircularProgressIndicator());
}
return LoadingPacket(packet: data, child: TimetableView(
laneEventsList: _buildLaneEvents(context, data),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
));
TimetableProps timetable = Provider.of<TimetableProps>(context, listen: false);
return Column(
children: [
Flexible(
child: DayListView(value),
),
Container(
padding: const EdgeInsets.only(top: 5, bottom: 5),
decoration: BoxDecoration(
border: Border(
top: BorderSide(width: 2, color: Theme.of(context).disabledColor)
)
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
IconButton(
onPressed: () => timetable.next(previous: true),
icon: const Icon(Icons.navigate_before_sharp),
color: Theme.of(context).primaryColor,
iconSize: 30,
),
Row(
children: [
IconButton(
onPressed: () => timetable.nearest(),
icon: const Icon(Icons.home),
color: Theme.of(context).primaryColor,
iconSize: 30,
),
],
),
IconButton(
onPressed: () => timetable.next(),
icon: const Icon(Icons.navigate_next_sharp),
color: Theme.of(context).primaryColor,
iconSize: 30,
)
],
),
)
],
);
},
);
}
List<LaneEvents> _buildLaneEvents(context, TimetablePacket data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
data.timeTable.days.forEach((day) {
List<TableEvent> tableEvents = List<TableEvent>.empty(growable: true);
day.entries.forEach((element) {
tableEvents.add(
TableEvent(
backgroundColor: Theme.of(context).primaryColor,
padding: const EdgeInsets.all(5),
title: element.subject,
location: "\n${element.room}",
eventId: tableEvents.length,
laneIndex: tableEvents.length,
startTime: TableEventTime(hour: element.start.hour, minute: element.start.minute),
endTime: TableEventTime(hour: element.end.hour, minute: element.end.minute)
)
);
});
laneEvents.add(
LaneEvents(
lane: Lane(laneIndex: laneEvents.length, name: day.name, textStyle: TextStyle(color: Theme.of(context).primaryColor, fontWeight: FontWeight.bold)),
events: tableEvents
)
);
});
return laneEvents;
}
void onEventTapCallBack(TableEvent event) {
print(
"Event Clicked!! LaneIndex ${event.laneIndex} Title: ${event.title} StartHour: ${event.startTime.hour} EndHour: ${event.endTime.hour}");
}
void onTimeSlotTappedCallBack(
int laneIndex, TableEventTime start, TableEventTime end) {
print(
"Empty Slot Clicked !! LaneIndex: $laneIndex StartHour: ${start.hour} EndHour: ${end.hour}");
}
}
class CustomTableStyle extends TimetableStyle {
dynamic context;
CustomTableStyle(context) {
this.context = context;
}
@override
int get startHour => 07;
@override
int get endHour => 17;
@override
double get laneWidth => 200;
@override
Color get cornerColor => Theme.of(this.context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(this.context).primaryColor;
@override
// TODO: implement timeItemHeight
double get timeItemHeight => 60;
}

106
lib/screen/pages/timetable/timetableOld.dart Normal file
View File

@ -0,0 +1,106 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:marianum_mobile/widget/loadingPacket.dart';
import 'package:provider/provider.dart';
import 'package:timetable_view/timetable_view.dart';
import '../../../dataOld/incommingPackets/timetablePacket.dart';
class TimetableOld extends StatefulWidget {
const TimetableOld({Key? key}) : super(key: key);
@override
State<TimetableOld> createState() => _TimetableOldState();
}
class _TimetableOldState extends State<TimetableOld> {
@override
void initState() {
Provider.of<TimetablePacket>(context, listen: false).invoke();
super.initState();
}
@override
Widget build(BuildContext context) {
return Consumer<TimetablePacket>(
builder: (context, data, child) {
return LoadingPacket(packet: data, child: TimetableView(
laneEventsList: _buildLaneEvents(context, data),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
));
},
);
}
List<LaneEvents> _buildLaneEvents(context, TimetablePacket data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
data.timeTable.days.forEach((day) {
List<TableEvent> tableEvents = List<TableEvent>.empty(growable: true);
day.entries.forEach((element) {
tableEvents.add(
TableEvent(
backgroundColor: Theme.of(context).primaryColor,
padding: const EdgeInsets.all(5),
title: element.subject,
location: "\n${element.room}",
eventId: tableEvents.length,
laneIndex: tableEvents.length,
startTime: TableEventTime(hour: element.start.hour, minute: element.start.minute),
endTime: TableEventTime(hour: element.end.hour, minute: element.end.minute)
)
);
});
laneEvents.add(
LaneEvents(
lane: Lane(laneIndex: laneEvents.length, name: day.name, textStyle: TextStyle(color: Theme.of(context).primaryColor, fontWeight: FontWeight.bold)),
events: tableEvents
)
);
});
return laneEvents;
}
void onEventTapCallBack(TableEvent event) {
print(
"Event Clicked!! LaneIndex ${event.laneIndex} Title: ${event.title} StartHour: ${event.startTime.hour} EndHour: ${event.endTime.hour}");
}
void onTimeSlotTappedCallBack(
int laneIndex, TableEventTime start, TableEventTime end) {
print(
"Empty Slot Clicked !! LaneIndex: $laneIndex StartHour: ${start.hour} EndHour: ${end.hour}");
}
}
class CustomTableStyle extends TimetableStyle {
dynamic context;
CustomTableStyle(context) {
this.context = context;
}
@override
int get startHour => 07;
@override
int get endHour => 17;
@override
double get laneWidth => 200;
@override
Color get cornerColor => Theme.of(this.context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(this.context).primaryColor;
@override
// TODO: implement timeItemHeight
double get timeItemHeight => 60;
}