diff options
| author | Aldrik Ramaekers <aldrik@amftech.nl> | 2023-02-06 19:04:25 +0100 |
|---|---|---|
| committer | Aldrik Ramaekers <aldrik@amftech.nl> | 2023-02-06 19:04:25 +0100 |
| commit | e37d74527e03b6a804a35cbfb0956d4e0100889f (patch) | |
| tree | 837bcf2aec9c3593ebb0ee6d53197a21d069a4c1 /lib/services | |
| parent | bab2bf926e2102713c12faded32a1b26f1911d91 (diff) | |
1.13.7
Diffstat (limited to 'lib/services')
| -rw-r--r-- | lib/services/settings_service.dart | 9 | ||||
| -rw-r--r-- | lib/services/storegear_api_service.dart | 53 |
2 files changed, 9 insertions, 53 deletions
diff --git a/lib/services/settings_service.dart b/lib/services/settings_service.dart index 8f3ea61..1241405 100644 --- a/lib/services/settings_service.dart +++ b/lib/services/settings_service.dart @@ -6,27 +6,30 @@ import 'package:training_planner/services/log_service.dart'; class Settings { double salary; + String version; - Settings({required this.salary}); + Settings({required this.salary, required this.version}); Settings.fromJson(Map<String, dynamic> json) - : salary = double.parse(json['salary']); + : salary = double.parse(json['salary']), version = json['version']; Map<String, dynamic> toJson() { return { 'salary': salary.toStringAsFixed(2), + 'version': version, }; } } class DefaultSettings extends Settings { - DefaultSettings() : super(salary: 13.75); + DefaultSettings() : super(salary: 13.75, version: '1.13.7-prod'); DefaultSettings.fromJson(Map<String, dynamic> json) : super.fromJson(json); Map<String, dynamic> toJson() { return { 'salary': salary.toStringAsFixed(2), + 'version': version, }; } } diff --git a/lib/services/storegear_api_service.dart b/lib/services/storegear_api_service.dart index 55a9042..f4d96b1 100644 --- a/lib/services/storegear_api_service.dart +++ b/lib/services/storegear_api_service.dart @@ -38,56 +38,7 @@ class StoregearApiService extends IStoregearApiService { _getMockRouteList() { return RouteList.fromJson(jsonDecode(''' -{ - "routes": [ - { - "timeframe_key": "96870", - "trip_key": "18996870", - "trip_number": "9", - "trip_pda_status": "5", - "trip_pda_status_description": "Rit overgedragen", - "trip_sequence_number": "1", - "number_in_trip": "139", - "plate": "VND-37-B", - "damage_registration": true, - "eva": "11:11", - "trip_date": "4/11/2022", - "first_address_lat": "50.8996568140536", - "first_address_lng": "5.75238472757395", - "started": "true", - "all_tasks_finished": "false", - "start_km": "24704", - "end_km": null, - "tasks_enriched": "true", - "in_trip_scan_finished": "true", - "eva_added": "true", - "trip_start_request_sent": "true" - }, - { - "timeframe_key": "96870", - "trip_key": "18996871", - "trip_number": "10", - "trip_pda_status": "5", - "trip_pda_status_description": "Rit overgedragen", - "trip_sequence_number": "1", - "number_in_trip": "139", - "plate": "VND-37-B", - "damage_registration": true, - "eva": "11:11", - "trip_date": "4/11/2022", - "first_address_lat": "50.8996568140536", - "first_address_lng": "5.75238472757395", - "started": "true", - "all_tasks_finished": "false", - "start_km": "24704", - "end_km": null, - "tasks_enriched": "true", - "in_trip_scan_finished": "true", - "eva_added": "true", - "trip_start_request_sent": "true" - } - ] -} +{ "routes": [ { "timeframe_key": "62395", "trip_key": "19762395", "trip_number": "1", "trip_pda_status": "5", "trip_pda_status_description": "Rit overgedragen", "trip_sequence_number": "1", "number_in_trip": "2", "plate": "VTG-69-R", "damage_registration": true, "eva": "09:04", "trip_date": "6/2/2023", "first_address_lat": "50.9182446706206", "first_address_lng": "5.79150644329668", "started": "true", "all_tasks_finished": "true", "start_km": "458", "end_km": "511", "tasks_enriched": "true", "in_trip_scan_finished": "true", "eva_added": "true", "trip_start_request_sent": "true" }, { "timeframe_key": "62410", "trip_key": "19762410", "trip_number": "10", "trip_pda_status": "5", "trip_pda_status_description": "Rit overgedragen", "trip_sequence_number": "1", "number_in_trip": "120", "plate": "VTG-69-R", "damage_registration": true, "eva": "11:04", "trip_date": "6/2/2023", "first_address_lat": "50.8987460739383", "first_address_lng": "5.73347116865626", "started": "true", "all_tasks_finished": "false", "start_km": "511", "end_km": null, "tasks_enriched": "true", "in_trip_scan_finished": "true", "eva_added": "true", "trip_start_request_sent": "true" } ] } ''')); } @@ -105,6 +56,8 @@ class StoregearApiService extends IStoregearApiService { // If the server did return a 200 OK response, // then parse the JSON. + + var content = jsonDecode(response.body); if (content["message"] != null) { return RouteList(routes: []); |
