Skip to content
Snippets Groups Projects
Unverified Commit 54ab791e authored by BMItter's avatar BMItter Committed by GitHub
Browse files

Checkin - Adjusted international timeformat (EXPOSUREAPP-6467) (#2887)


* fix timeformats for Events

* Fix wrong time format in CheckinVH

Co-authored-by: default avatarharambasicluka <64483219+harambasicluka@users.noreply.github.com>
parent fda3d46f
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ import org.joda.time.Duration ...@@ -12,6 +12,7 @@ import org.joda.time.Duration
import org.joda.time.DurationFieldType import org.joda.time.DurationFieldType
import org.joda.time.Instant import org.joda.time.Instant
import org.joda.time.PeriodType import org.joda.time.PeriodType
import org.joda.time.format.DateTimeFormat
import org.joda.time.format.PeriodFormat import org.joda.time.format.PeriodFormat
import org.joda.time.format.PeriodFormatterBuilder import org.joda.time.format.PeriodFormatterBuilder
...@@ -62,11 +63,12 @@ class ActiveCheckInVH(parent: ViewGroup) : ...@@ -62,11 +63,12 @@ class ActiveCheckInVH(parent: ViewGroup) :
it.toPeriod(periodType) it.toPeriod(periodType)
} }
val startDate = checkInStartUserTZ.toLocalDate() val startDate = checkInStartUserTZ.toString(DateTimeFormat.shortDate())
val startTime = checkInStartUserTZ.toString(DateTimeFormat.shortTime())
context.getString( context.getString(
R.string.trace_location_checkins_card_automatic_checkout_info_format, R.string.trace_location_checkins_card_automatic_checkout_info_format,
startDate.toString("dd.MM.yy"), startDate,
checkInStartUserTZ.toLocalTime().toString("HH:mm"), startTime,
hourPeriodFormatter.print(checkoutIn) hourPeriodFormatter.print(checkoutIn)
) )
} }
......
...@@ -9,6 +9,7 @@ import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation ...@@ -9,6 +9,7 @@ import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.BaseCheckInVH.Companion.setupMenu import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.BaseCheckInVH.Companion.setupMenu
import de.rki.coronawarnapp.ui.presencetracing.organizer.list.TraceLocationsAdapter import de.rki.coronawarnapp.ui.presencetracing.organizer.list.TraceLocationsAdapter
import de.rki.coronawarnapp.util.list.SwipeConsumer import de.rki.coronawarnapp.util.list.SwipeConsumer
import org.joda.time.format.DateTimeFormat
class TraceLocationVH(parent: ViewGroup) : class TraceLocationVH(parent: ViewGroup) :
TraceLocationsAdapter.ItemVH<TraceLocationVH.Item, TraceLocationOrganizerTraceLocationsItemBinding>( TraceLocationsAdapter.ItemVH<TraceLocationVH.Item, TraceLocationOrganizerTraceLocationsItemBinding>(
...@@ -35,18 +36,21 @@ class TraceLocationVH(parent: ViewGroup) : ...@@ -35,18 +36,21 @@ class TraceLocationVH(parent: ViewGroup) :
duration.isGone = false duration.isGone = false
duration.text = if (startTime.toLocalDate() == endTime.toLocalDate()) { duration.text = if (startTime.toLocalDate() == endTime.toLocalDate()) {
val dateFormat = DateTimeFormat.shortDate()
val timeFormat = DateTimeFormat.shortTime()
context.getString( context.getString(
R.string.trace_location_organizer_list_item_duration_same_day, R.string.trace_location_organizer_list_item_duration_same_day,
startTime.toString("dd.MM.yy"), startTime.toString(dateFormat),
startTime.toString("HH:mm"), startTime.toString(timeFormat),
endTime.toString("HH:mm") endTime.toString(timeFormat)
) )
} else { } else {
icon.setCaption(null) icon.setCaption(null)
val dateTimeFormat = DateTimeFormat.shortDateTime()
context.getString( context.getString(
R.string.trace_location_organizer_list_item_duration, R.string.trace_location_organizer_list_item_duration,
startTime.toString("dd.MM.yy HH:mm"), startTime.toString(dateTimeFormat),
endTime.toString("dd.MM.yy HH:mm"), endTime.toString(dateTimeFormat)
) )
} }
} else { } else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment