Remove everything to do with pay and only track miles and hours worked.

This commit is contained in:
zontreck 2025-05-17 00:33:41 -07:00
parent 9b50945e3b
commit ee0fed6d6b
6 changed files with 44 additions and 110 deletions

View file

@ -18,7 +18,7 @@ class SessionData {
static Delivery? currentDelivery;
static Trip? currentTrip;
static List<Position> positions = [];
static List<SmallPosition> positions = [];
static late StreamSubscription<Position> _listener;
static Callbacks Calls = Callbacks();
static String LastSessionID = "";
@ -27,30 +27,6 @@ class SessionData {
/// This flag is usually set when data is loaded from a saved state. Or when accessed using the Web version of the app.
static bool IsReadOnly = false;
static double GetTotalBasePay() {
double total = 0;
for (var trip in Trips) {
total += trip.BasePay;
}
return total;
}
static double GetTotalTips() {
double total = 0;
for (var trip in Trips) {
for (var drop in trip.deliveries) {
total += drop.TipAmount;
}
}
return total;
}
static double GetTotalPay() {
return GetTotalBasePay() + GetTotalTips();
}
static double GetTotalMiles() {
double total = 0;
total = _totalMilesTraveled(
@ -106,7 +82,7 @@ class SessionData {
/// * [minDistanceMeters] drop segments shorter than this (jitter).
/// * [maxDistanceMeters] drop segments longer than this (impossible jump).
static double _totalMilesTraveled(
List<Position> positions, {
List<SmallPosition> positions, {
double minDistanceMeters = 5,
double? maxDistanceMeters,
}) {
@ -171,7 +147,7 @@ class SessionData {
_listener.cancel();
return;
}
positions.add(pos);
positions.add(SmallPosition.fromPosition(pos));
SessionData.Calls.dispatch();
});
@ -214,7 +190,7 @@ class SessionData {
List<Map<String, dynamic>> _pos = [];
for (var pos in positions) {
_pos.add(pos.toJson());
_pos.add(pos.toMap());
}
saveData["trips"] = _trips;
@ -252,7 +228,7 @@ class SessionData {
}
for (var position in _pos) {
positions.add(Position.fromMap(position));
positions.add(SmallPosition.fromMap(position));
}
IsReadOnly = true;
@ -266,8 +242,8 @@ class SessionData {
return pos;
}
static Trip GetNewTrip({required double basePay}) {
currentTrip = Trip(BasePay: basePay);
static Trip GetNewTrip() {
currentTrip = Trip();
Trips.add(currentTrip!);
return currentTrip!;
}
@ -290,7 +266,6 @@ class SessionData {
}
class Delivery {
double TipAmount = 0;
Position? endLocation;
DateTime StartTime = DateTime.now();
@ -305,7 +280,6 @@ class Delivery {
Map<String, dynamic> toJsonMap() {
return {
"tip": TipAmount,
"start": StartTime.toString(),
"endPos": endLocation?.toJson() ?? "incomplete",
};
@ -314,7 +288,6 @@ class Delivery {
static Delivery fromMap(Map<String, dynamic> jsx) {
Delivery delivery = Delivery();
delivery.StartTime = DateTime.parse(jsx['start'] as String);
delivery.TipAmount = jsx['tip'] as double;
if (jsx['endPos'] as String == "incomplete")
delivery.endLocation = null;
else
@ -329,9 +302,7 @@ class Trip {
DateTime StartTime = DateTime(0);
double BasePay = 0.0;
Trip({required this.BasePay}) {
Trip() {
StartTime = DateTime.now();
}
@ -343,7 +314,7 @@ class Trip {
}
Map<String, dynamic> toJsonMap() {
Map<String, Object> _trip = {"start": StartTime.toString(), "pay": BasePay};
Map<String, Object> _trip = {"start": StartTime.toString()};
List<Map<String, dynamic>> _dropOffs = [];
for (var delivery in deliveries) {
_dropOffs.add(delivery.toJsonMap());
@ -355,8 +326,7 @@ class Trip {
}
static Trip fromJsonMap(Map<String, dynamic> jsx) {
Trip trip = Trip(BasePay: 0);
trip.BasePay = jsx['pay'] as double;
Trip trip = Trip();
trip.StartTime = DateTime.parse(jsx['start'] as String);
trip.deliveries = [];
List<Map<String, dynamic>> _dropOffs =
@ -383,3 +353,29 @@ class Callbacks {
if (WorkDataCallback != null) WorkDataCallback!();
}
}
/// A simple wrapper for a position that strips away unnecessary information to create a more compact piece of save data
class SmallPosition {
double latitude;
double longitude;
SmallPosition({required this.latitude, required this.longitude});
static SmallPosition fromPosition(Position position) {
return SmallPosition(
latitude: position.latitude,
longitude: position.longitude,
);
}
Map<String, dynamic> toMap() {
return {"latitude": latitude, "longitude": longitude};
}
static SmallPosition fromMap(Map<String, dynamic> map) {
return SmallPosition(
latitude: map['latitude'] as double,
longitude: map['longitude'] as double,
);
}
}