Erlaube Arbeitszeiten über Mitternacht hinaus

master
Niko Diamadis 3 years ago
parent 21d900c917
commit 577bcad1e6
Signed by: niko
GPG Key ID: BE53B0B17B1B142E

@ -19,6 +19,12 @@ data class HourMinute(
} }
} }
fun hoursUntil(b: HourMinute): Float {
var difference = (b.millis - millis)
if (difference < 0) difference += 86400000
return difference / 3600000f
}
companion object { companion object {
internal fun fromString(hourMinute: String): HourMinute { internal fun fromString(hourMinute: String): HourMinute {
val parts = hourMinute.split(":") val parts = hourMinute.split(":")

@ -67,13 +67,12 @@ internal class TimePickerBuilder {
end = HourMinute(picker2.hour, picker2.minute) end = HourMinute(picker2.hour, picker2.minute)
if (missionEnd != null && end > missionEnd) { if (missionEnd != null && end > missionEnd) {
activity.showWarningToast("Ende muss im Einsatz-Zeitraum liegen") activity.showWarningToast("Ende muss im Einsatz-Zeitraum liegen")
} else if (start >= end) { } else if (start == end) {
activity.showWarningToast("Ungültige Arbeitszeit erkannt") activity.showWarningToast("Ungültige Arbeitszeit erkannt")
} else { } else {
val time = "$start - $end" val time = "$start - $end"
val duration = ((end.millis - start.millis).toFloat() / 3600000f)
val floatFormat = DecimalFormat("#.#", DecimalFormatSymbols(Locale.ENGLISH)) val floatFormat = DecimalFormat("#.#", DecimalFormatSymbols(Locale.ENGLISH))
val roundedDuration = floatFormat.format(duration) val roundedDuration = floatFormat.format(start.hoursUntil(end))
action(time, roundedDuration.toFloat()) action(time, roundedDuration.toFloat())
} }
} }

Loading…
Cancel
Save