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

Remove old Server logic, cleanup

Browse Source
This commit is contained in:
Elias Müller
2023-02-22 12:58:42 +01:00
parent bc24ca24cb
commit abad04554c
22 changed files with 36 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/screen/pages/files/files.dart
View File

@ -1,13 +1,5 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/queries/listFiles/listFilesCache.dart';
import 'package:marianum_mobile/data/files/filesProps.dart';
import 'package:marianum_mobile/widget/loadingPacket.dart';
import 'package:nextcloud/nextcloud.dart';
import 'package:provider/provider.dart';
import 'package:webdav/webdav.dart';
class Files extends StatefulWidget {
const Files({Key? key}) : super(key: key);

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

@ -1,145 +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/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';
import '../../../api/webuntis/queries/getTimetable/getTimetableParams.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetableResponse.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetable.dart';
class TestTimeTable extends StatefulWidget {
const TestTimeTable({Key? key}) : super(key: key);
@override
State<TestTimeTable> createState() => _TestTimeTableState();
}
class _TestTimeTableState extends State<TestTimeTable> {
late Future<GetTimetableResponse> data;
@override
void initState() {
data = GetTimetable(
GetTimetableParams(
options: GetTimetableParamsOptions(
element: GetTimetableParamsOptionsElement(
id: 92,
type: 5,
keyType: GetTimetableParamsOptionsElementKeyType.id,
),
startDate: 20230206,
endDate: 20230212,
)
)
).run();
GetRooms().run().then((value) => {
log(value.rawResponse.body)
});
super.initState();
}
@override
Widget build(BuildContext context) {
return FutureBuilder(
builder: (BuildContext context, AsyncSnapshot<GetTimetableResponse> snapshot) {
if(snapshot.hasData) {
return Center(
child: TimetableView(
laneEventsList: _buildLaneEvents(snapshot.data!),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
),
);
} else if(snapshot.hasError) {
return const OfflineBanner(text: "Der Stundenplan konnte nicht geladen werden!");
} else {
return const Center(
child: CircularProgressIndicator(),
);
}
},
future: data,
);
}
List<LaneEvents> _buildLaneEvents(GetTimetableResponse data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
Jiffy.locale("de");
List<int> dayList = data.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(
data.result.where((element) => element.date == day).length,
(index) {
GetTimetableResponseObject tableEvent = data.result.where((element) => element.date == day).elementAt(index);
return TableEvent(
title: "${tableEvent.substText}",
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${tableEvent.statflags}",
);
}
)
)
);
});
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/timetableOld.dart
View File

@ -1,104 +0,0 @@
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);
for (var day in data.timeTable.days) {
List<TableEvent> tableEvents = List<TableEvent>.empty(growable: true);
for (var element in day.entries) {
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(context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(context).primaryColor;
@override
// TODO: implement timeItemHeight
double get timeItemHeight => 60;
}

23
lib/screen/pages/timetable/weekView.dart
View File

@ -14,20 +14,12 @@ import '../../../data/timetable/timetableProps.dart';
extension DateHelpers on DateTime {
bool isToday() {
final now = DateTime.now();
return now.day == this.day &&
now.month == this.month &&
now.year == this.year;
}
bool isYesterday() {
final yesterday = DateTime.now().subtract(Duration(days: 1));
return yesterday.day == this.day &&
yesterday.month == this.month &&
yesterday.year == this.year;
return now.day == day &&
now.month == month &&
now.year == year;
}
}
class WeekView extends StatefulWidget {
final TimetableProps value;
const WeekView(this.value, {Key? key}) : super(key: key);
@ -51,13 +43,13 @@ class _WeekViewState extends State<WeekView> {
showModalBottomSheet(context: context, builder: (context) => Column(
children: [
Padding(
padding: EdgeInsets.symmetric(vertical: 30),
padding: const EdgeInsets.symmetric(vertical: 30),
child: Center(
child: Column(
children: [
const Icon(Icons.info),
Icon(Icons.info, color: event.backgroundColor),
const SizedBox(height: 10),
Text("${subject.alternateName} - (${subject.longName})", style: const TextStyle(fontSize: 30)),
Text("${getEventPrefix(timetableData.code)}${subject.alternateName} - (${subject.longName})", style: const TextStyle(fontSize: 30)),
Text("${Jiffy(event.startTime).format("HH:mm")} - ${Jiffy(event.endTime).format("HH:mm")}", style: const TextStyle(fontSize: 15)),
],
),
@ -69,7 +61,7 @@ class _WeekViewState extends State<WeekView> {
children: [
ListTile(
leading: const Icon(Icons.notifications_active),
title: Text("Status: ${timetableData.code != null ? "Entfällt" : "Findet statt"}"),
title: Text("Status: ${timetableData.code != null ? "Geändert" : "Regulär"}"),
),
ListTile(
leading: const Icon(Icons.room),
@ -109,7 +101,6 @@ class _WeekViewState extends State<WeekView> {
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;