diff --git a/lib/consts.dart b/lib/consts.dart index e0abfb2..942803f 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -9,7 +9,7 @@ class TTConsts { static get SESSION_SERVER => "https://api.zontreck.com/timetrack/$UPDATE_CHANNEL/timetrack.php"; - static const VERSION = "1.0.0-beta.15"; + static const VERSION = "1.0.0-beta.16"; static bool UPDATE_AVAILABLE = false; static UpdateChannel UPDATE_CHANNEL = UpdateChannel.beta; diff --git a/lib/data.dart b/lib/data.dart index f3e4632..05f8902 100644 --- a/lib/data.dart +++ b/lib/data.dart @@ -70,10 +70,15 @@ class SessionData { static String GetUnpaidHours() { // This is the inverted value of paid hours. We get total hours and subtract it from the paid hours. This gives us the unpaid hours. - Duration totalTime = EndTime.difference(StartTime); - Duration unpaid = _GetPaidHours() - totalTime; + Time totalHoursWorked = Time.fromNotation(GetPaidHours()); - return Duration2Notation(unpaid); + Duration totalDuration = EndTime.difference(StartTime); + Time totalTime = Time.fromDuration(totalDuration); + + Time unpaid = totalTime.copy(); + unpaid.subtract(totalHoursWorked); + + return unpaid.toString(); } static String GetTotalMilesAsString() { diff --git a/pubspec.yaml b/pubspec.yaml index 85fa00d..f8f56b8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.0-beta.15 +version: 1.0.0-beta.16 environment: sdk: ^3.7.2