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

updated project style guidelines

Browse Source
This commit is contained in:
Elias Müller
2024-04-03 19:18:17 +02:00
parent 27618f4404
commit 4c7f53e309
185 changed files with 505 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/api/webuntis/queries/authenticate/authenticate.dart
View File

@ -14,7 +14,7 @@ class Authenticate extends WebuntisApi {
@override
Future<AuthenticateResponse> run() async {
awaitingResponse = true;
String rawAnswer = await query(this);
var rawAnswer = await query(this);
AuthenticateResponse response = finalize(AuthenticateResponse.fromJson(jsonDecode(rawAnswer)['result']));
_lastResponse = response;
if(!awaitedResponse.isCompleted) awaitedResponse.complete();
@ -46,4 +46,4 @@ class Authenticate extends WebuntisApi {
return _lastResponse!;
}
}
}

2
lib/api/webuntis/queries/authenticate/authenticateParams.dart
View File

@ -14,4 +14,4 @@ class AuthenticateParams extends ApiParams {
factory AuthenticateParams.fromJson(Map<String, dynamic> json) => _$AuthenticateParamsFromJson(json);
Map<String, dynamic> toJson() => _$AuthenticateParamsToJson(this);
}
}

2
lib/api/webuntis/queries/authenticate/authenticateResponse.dart
View File

@ -16,4 +16,4 @@ class AuthenticateResponse extends ApiResponse {
factory AuthenticateResponse.fromJson(Map<String, dynamic> json) => _$AuthenticateResponseFromJson(json);
Map<String, dynamic> toJson() => _$AuthenticateResponseToJson(this);
}
}

8
lib/api/webuntis/queries/getHolidays/getHolidays.dart
View File

@ -8,7 +8,7 @@ class GetHolidays extends WebuntisApi {
@override
Future<GetHolidaysResponse> run() async {
String rawAnswer = await query(this);
var rawAnswer = await query(this);
return finalize(GetHolidaysResponse.fromJson(jsonDecode(rawAnswer)));
}
@ -17,12 +17,12 @@ class GetHolidays extends WebuntisApi {
time = DateTime(time.year, time.month, time.day, 0, 0, 0, 0, 0);
for (var element in holidaysResponse.result) {
DateTime start = DateTime.parse(element.startDate.toString());
DateTime end = DateTime.parse(element.endDate.toString());
var start = DateTime.parse(element.startDate.toString());
var end = DateTime.parse(element.endDate.toString());
if(!start.isAfter(time) && !end.isBefore(time)) return element;
}
return null;
}
}
}

10
lib/api/webuntis/queries/getHolidays/getHolidaysCache.dart
View File

@ -10,12 +10,8 @@ class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
}
@override
Future<GetHolidaysResponse> onLoad() {
return GetHolidays().run();
}
Future<GetHolidaysResponse> onLoad() => GetHolidays().run();
@override
GetHolidaysResponse onLocalData(String json) {
return GetHolidaysResponse.fromJson(jsonDecode(json));
}
}
GetHolidaysResponse onLocalData(String json) => GetHolidaysResponse.fromJson(jsonDecode(json));
}

2
lib/api/webuntis/queries/getHolidays/getHolidaysResponse.dart
View File

@ -26,4 +26,4 @@ class GetHolidaysResponseObject {
factory GetHolidaysResponseObject.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseObjectFromJson(json);
Map<String, dynamic> toJson() => _$GetHolidaysResponseObjectToJson(this);
}
}

4
lib/api/webuntis/queries/getRooms/getRooms.dart
View File

@ -9,7 +9,7 @@ class GetRooms extends WebuntisApi {
@override
Future<GetRoomsResponse> run() async {
String rawAnswer = await query(this);
var rawAnswer = await query(this);
try {
return finalize(GetRoomsResponse.fromJson(jsonDecode(rawAnswer)));
} catch(e, trace) {
@ -20,4 +20,4 @@ class GetRooms extends WebuntisApi {
throw Exception('Failed to parse getRoom server response: $rawAnswer');
}
}
}

10
lib/api/webuntis/queries/getRooms/getRoomsCache.dart
View File

@ -10,13 +10,9 @@ class GetRoomsCache extends RequestCache<GetRoomsResponse> {
}
@override
Future<GetRoomsResponse> onLoad() {
return GetRooms().run();
}
Future<GetRoomsResponse> onLoad() => GetRooms().run();
@override
GetRoomsResponse onLocalData(String json) {
return GetRoomsResponse.fromJson(jsonDecode(json));
}
GetRoomsResponse onLocalData(String json) => GetRoomsResponse.fromJson(jsonDecode(json));
}
}

2
lib/api/webuntis/queries/getRooms/getRoomsResponse.dart
View File

@ -26,4 +26,4 @@ class GetRoomsResponseObject {
factory GetRoomsResponseObject.fromJson(Map<String, dynamic> json) => _$GetRoomsResponseObjectFromJson(json);
Map<String, dynamic> toJson() => _$GetRoomsResponseObjectToJson(this);
}
}

4
lib/api/webuntis/queries/getSubjects/getSubjects.dart
View File

@ -8,7 +8,7 @@ class GetSubjects extends WebuntisApi {
@override
Future<GetSubjectsResponse> run() async {
String rawAnswer = await query(this);
var rawAnswer = await query(this);
return finalize(GetSubjectsResponse.fromJson(jsonDecode(rawAnswer)));
}
}
}

10
lib/api/webuntis/queries/getSubjects/getSubjectsCache.dart
View File

@ -10,13 +10,9 @@ class GetSubjectsCache extends RequestCache<GetSubjectsResponse> {
}
@override
Future<GetSubjectsResponse> onLoad() {
return GetSubjects().run();
}
Future<GetSubjectsResponse> onLoad() => GetSubjects().run();
@override
onLocalData(String json) {
return GetSubjectsResponse.fromJson(jsonDecode(json));
}
onLocalData(String json) => GetSubjectsResponse.fromJson(jsonDecode(json));
}
}

2
lib/api/webuntis/queries/getSubjects/getSubjectsResponse.dart
View File

@ -26,4 +26,4 @@ class GetSubjectsResponseObject {
factory GetSubjectsResponseObject.fromJson(Map<String, dynamic> json) => _$GetSubjectsResponseObjectFromJson(json);
Map<String, dynamic> toJson() => _$GetSubjectsResponseObjectToJson(this);
}
}

4
lib/api/webuntis/queries/getTimetable/getTimetable.dart
View File

@ -11,8 +11,8 @@ class GetTimetable extends WebuntisApi {
@override
Future<GetTimetableResponse> run() async {
String rawAnswer = await query(this);
var rawAnswer = await query(this);
return finalize(GetTimetableResponse.fromJson(jsonDecode(rawAnswer)));
}
}
}

10
lib/api/webuntis/queries/getTimetable/getTimetableCache.dart
View File

@ -15,13 +15,10 @@ class GetTimetableCache extends RequestCache<GetTimetableResponse> {
}
@override
GetTimetableResponse onLocalData(String json) {
return GetTimetableResponse.fromJson(jsonDecode(json));
}
GetTimetableResponse onLocalData(String json) => GetTimetableResponse.fromJson(jsonDecode(json));
@override
Future<GetTimetableResponse> onLoad() async {
return GetTimetable(
Future<GetTimetableResponse> onLoad() async => GetTimetable(
GetTimetableParams(
options: GetTimetableParamsOptions(
element: GetTimetableParamsOptionsElement(
@ -38,5 +35,4 @@ class GetTimetableCache extends RequestCache<GetTimetableResponse> {
)
)
).run();
}
}
}

2
lib/api/webuntis/queries/getTimetable/getTimetableParams.dart
View File

@ -91,4 +91,4 @@ enum GetTimetableParamsOptionsElementKeyType {
@JsonValue('id') id,
@JsonValue('name') name,
@JsonValue('externalkey') externalkey
}
}

2
lib/api/webuntis/queries/getTimetable/getTimetableResponse.dart
View File

@ -136,4 +136,4 @@ class GetTimetableResponseObjectRoom {
factory GetTimetableResponseObjectRoom.fromJson(Map<String, dynamic> json) => _$GetTimetableResponseObjectRoomFromJson(json);
Map<String, dynamic> toJson() => _$GetTimetableResponseObjectRoomToJson(this);
}
}

16
lib/api/webuntis/webuntisApi.dart
View File

@ -20,13 +20,13 @@ abstract class WebuntisApi extends ApiRequest {
Future<String> query(WebuntisApi untis) async {
String query = '{"id":"ID","method":"$method","params":${untis._body()},"jsonrpc":"2.0"}';
var query = '{"id":"ID","method":"$method","params":${untis._body()},"jsonrpc":"2.0"}';
String sessionId = '0';
var sessionId = '0';
if(authenticatedResponse) {
sessionId = (await Authenticate.getSession()).sessionId;
}
http.Response data = await post(query, {'Cookie': 'JSESSIONID=$sessionId'});
var data = await post(query, {'Cookie': 'JSESSIONID=$sessionId'});
response = data;
dynamic jsonData = jsonDecode(data.body);
@ -48,16 +48,12 @@ abstract class WebuntisApi extends ApiRequest {
Future<ApiResponse> run();
String _body() {
return genericParam == null ? '{}' : jsonEncode(genericParam);
}
String _body() => genericParam == null ? '{}' : jsonEncode(genericParam);
Future<http.Response> post(String data, Map<String, String>? headers) async {
return await http
Future<http.Response> post(String data, Map<String, String>? headers) async => await http
.post(endpoint, body: data, headers: headers)
.timeout(
const Duration(seconds: 10),
onTimeout: () => throw WebuntisError('Timeout', 1)
);
}
}
}

6
lib/api/webuntis/webuntisError.dart
View File

@ -5,7 +5,5 @@ class WebuntisError implements Exception {
WebuntisError(this.message, this.code);
@override
String toString() {
return 'WebUntis ($code): $message';
}
}
String toString() => 'WebUntis ($code): $message';
}