mirror of
https://github.com/szkolny-eu/szkolny-android.git
synced 2025-03-14 05:53:59 +01:00
[UI/Event] Make use of default values in event manual dialog.
This commit is contained in:
parent
0a2f252405
commit
9bc7f9ac11
@ -88,19 +88,12 @@ class EventManualV2Dialog(
|
|||||||
show()
|
show()
|
||||||
}
|
}
|
||||||
|
|
||||||
event = editingEvent?.clone() ?: Event().also { event ->
|
|
||||||
event.profileId = profileId
|
|
||||||
/*defaultDate?.let {
|
|
||||||
event.eventDate = it
|
|
||||||
b.date = it
|
|
||||||
}
|
|
||||||
defaultTime?.let {
|
|
||||||
event.startTime = it
|
|
||||||
b.time = it
|
|
||||||
}
|
|
||||||
defaultType?.let {
|
defaultType?.let {
|
||||||
event.type = it
|
event.type = it
|
||||||
}*/
|
}
|
||||||
|
|
||||||
|
event = editingEvent?.clone() ?: Event().also { event ->
|
||||||
|
event.profileId = profileId
|
||||||
b.shareSwitch.isChecked = event.sharedBy != null
|
b.shareSwitch.isChecked = event.sharedBy != null
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -304,6 +297,16 @@ class EventManualV2Dialog(
|
|||||||
val dates = deferred.await()
|
val dates = deferred.await()
|
||||||
b.dateDropdown.clear().append(dates)
|
b.dateDropdown.clear().append(dates)
|
||||||
|
|
||||||
|
defaultDate?.let {
|
||||||
|
event.eventDate = it
|
||||||
|
if (b.dateDropdown.select(it) == null)
|
||||||
|
b.dateDropdown.select(TextInputDropDown.Item(
|
||||||
|
it.value.toLong(),
|
||||||
|
it.formattedString,
|
||||||
|
tag = it
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
editingEvent?.eventDate?.let {
|
editingEvent?.eventDate?.let {
|
||||||
b.dateDropdown.select(TextInputDropDown.Item(
|
b.dateDropdown.select(TextInputDropDown.Item(
|
||||||
it.value.toLong(),
|
it.value.toLong(),
|
||||||
@ -441,6 +444,16 @@ class EventManualV2Dialog(
|
|||||||
b.teacherDropdown.deselect()
|
b.teacherDropdown.deselect()
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
defaultTime?.let {
|
||||||
|
event.startTime = it
|
||||||
|
if (b.timeDropdown.select(it) == null)
|
||||||
|
b.timeDropdown.select(TextInputDropDown.Item(
|
||||||
|
it.value.toLong(),
|
||||||
|
it.stringHM,
|
||||||
|
tag = it
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
editingEvent?.let {
|
editingEvent?.let {
|
||||||
b.timeDropdown.select(it.startTime?.value?.toLong())
|
b.timeDropdown.select(it.startTime?.value?.toLong())
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user