summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/config/defaults.dart2
-rw-r--r--lib/models/route_list.dart2
-rw-r--r--lib/pages/all_routes_page.dart1
-rw-r--r--lib/pages/delivery_login_page.dart13
-rw-r--r--lib/pages/settings_page.dart12
-rw-r--r--lib/services/settings_service.dart9
-rw-r--r--lib/services/storegear_api_service.dart53
7 files changed, 32 insertions, 60 deletions
diff --git a/lib/config/defaults.dart b/lib/config/defaults.dart
index 58e2412..2de00ad 100644
--- a/lib/config/defaults.dart
+++ b/lib/config/defaults.dart
@@ -1,4 +1,4 @@
-String program_version = '0.9';
+String program_version = '0.11 [06/02/2023]';
bool debug_mode = false;
class ShiftType {
diff --git a/lib/models/route_list.dart b/lib/models/route_list.dart
index 399212e..013297d 100644
--- a/lib/models/route_list.dart
+++ b/lib/models/route_list.dart
@@ -38,7 +38,7 @@ class RouteData {
String? started;
String? allTasksFinished;
String? startKm;
- Null? endKm;
+ String? endKm;
String? tasksEnriched;
String? inTripScanFinished;
String? evaAdded;
diff --git a/lib/pages/all_routes_page.dart b/lib/pages/all_routes_page.dart
index 0efe524..d3c1637 100644
--- a/lib/pages/all_routes_page.dart
+++ b/lib/pages/all_routes_page.dart
@@ -27,6 +27,7 @@ class _AllRoutesPageState extends State<AllRoutesPage> {
try {
apiService.getRoutes().then((value) {
+ debugPrint('xddd 2');
setState(() => {routeInfo = value});
});
} catch (e) {
diff --git a/lib/pages/delivery_login_page.dart b/lib/pages/delivery_login_page.dart
index 2ce6524..25cccf3 100644
--- a/lib/pages/delivery_login_page.dart
+++ b/lib/pages/delivery_login_page.dart
@@ -30,7 +30,13 @@ class _DeliveryLoginPageState extends State<DeliveryLoginPage> {
pnumberController.text = '639174';
daycodeController.text = '424';
- versionController.text = "1.12.3-prod";
+ versionController.text = "..";
+
+ settingsService.readSettingsFromFile().then((value) => {
+ setState(() => {
+ versionController.text = value.version
+ })
+ });
}
_attemptLogin() async {
@@ -84,11 +90,8 @@ class _DeliveryLoginPageState extends State<DeliveryLoginPage> {
Padding(padding: EdgeInsets.all(10)),
TextField(
decoration: InputDecoration(labelText: "Versie"),
- keyboardType: TextInputType.number,
+ keyboardType: TextInputType.text,
controller: versionController,
- inputFormatters: <TextInputFormatter>[
- FilteringTextInputFormatter.digitsOnly
- ],
),
Padding(padding: EdgeInsets.all(10)),
OutlinedButton(
diff --git a/lib/pages/settings_page.dart b/lib/pages/settings_page.dart
index 8d35ee7..1dbb01a 100644
--- a/lib/pages/settings_page.dart
+++ b/lib/pages/settings_page.dart
@@ -13,9 +13,13 @@ class SettingsPage extends StatefulWidget {
}
class _SettingsPageState extends State<SettingsPage> {
+ final versionController = TextEditingController();
+
@override
initState() {
super.initState();
+
+ versionController.text = widget.settings.version;
}
Future<void> saveSettings() async {
@@ -45,6 +49,14 @@ class _SettingsPageState extends State<SettingsPage> {
labelText: 'Huidige uurloon',
),
),
+ TextField(
+ decoration: InputDecoration(labelText: "Versie"),
+ keyboardType: TextInputType.text,
+ controller: versionController,
+ onChanged: ((value) => {
+ widget.settings.version = value
+ }),
+ ),
Padding(padding: const EdgeInsets.all(0)),
TextButton(
onPressed: () async => await saveSettings(),
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: []);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-06 12:42:10 +0000