Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [ANDROAPP-6628] input date on schedule dialog #3902

Merged
merged 2 commits into from
Nov 29, 2024
Merged

fix: [ANDROAPP-6628] input date on schedule dialog #3902

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e790931
fix: [ANDROAPP-6628] input date on schedule dialog
mmmateos Nov 25, 2024
13aa7c3
fix: [ANDROAPP-6628] input date on schedule dialog
mmmateos Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 25 additions & 35 deletions ...g/dhis2/usescases/eventsWithoutRegistration/eventDetails/providers/InputFieldsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@ import org.hisp.dhis.mobile.ui.designsystem.component.DropdownInputField
import org.hisp.dhis.mobile.ui.designsystem.component.DropdownItem
import org.hisp.dhis.mobile.ui.designsystem.component.InputCoordinate
import org.hisp.dhis.mobile.ui.designsystem.component.InputDateTime
import org.hisp.dhis.mobile.ui.designsystem.component.InputDateTimeModel
import org.hisp.dhis.mobile.ui.designsystem.component.InputDropDown
import org.hisp.dhis.mobile.ui.designsystem.component.InputOrgUnit
import org.hisp.dhis.mobile.ui.designsystem.component.InputPolygon
import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState
import org.hisp.dhis.mobile.ui.designsystem.component.SelectableDates
import org.hisp.dhis.mobile.ui.designsystem.component.model.DateTransformation
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import org.hisp.dhis.mobile.ui.designsystem.component.state.InputDateTimeData
import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberInputDateTimeState
import java.time.format.DateTimeParseException

@Composable
Expand All @@ -70,46 +69,40 @@ fun ProvideInputDate(
} else {
IntRange(1924, 2124)
}
InputDateTime(
InputDateTimeModel(
val inputState = rememberInputDateTimeState(
InputDateTimeData(
title = uiModel.eventDate.label ?: "",
allowsManualInput = uiModel.allowsManualInput,
inputTextFieldValue = value,
actionType = DateTimeActionType.DATE,
state = state,
visualTransformation = DateTransformation(),
onValueChanged = {
value = it ?: TextFieldValue()
state = getInputShellStateBasedOnValue(it?.text)
it?.let { it1 -> manageActionBasedOnValue(uiModel, it1.text) }
},
isRequired = uiModel.required,
onFocusChanged = { focused ->
if (!focused && !isValid(value.text)) {
state = InputShellState.ERROR
}
},
is24hourFormat = uiModel.is24HourFormat,
selectableDates = uiModel.selectableDates ?: SelectableDates("01011924", "12312124"),
yearRange = yearRange,
),
inputTextFieldValue = value,
inputState = state,
)
InputDateTime(
state = inputState,
modifier = modifier.testTag(INPUT_EVENT_INITIAL_DATE),
onValueChanged = {
value = it ?: TextFieldValue()
state = getInputShellStateBasedOnValue(it?.text)
it?.let { it1 -> manageActionBasedOnValue(uiModel, it1.text) }
},
onFocusChanged = { focused ->
if (!focused && !isValid(value.text) && state == InputShellState.FOCUSED) {
state = InputShellState.ERROR
}
},
)
}
}

fun isValidDateFormat(dateString: String): Boolean {
val year = dateString.substring(4, 8)
val month = dateString.substring(2, 4)
val day = dateString.substring(0, 2)

val formattedDate = "$year-$month-$day"

val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")

return try {
LocalDate.parse(formattedDate, formatter)
when (ValueType.DATE.validator.validate(formattedDate)) {
when (ValueType.DATE.validator.validate(dateString)) {
is Result.Failure -> false
is Result.Success -> true
}
Expand All @@ -120,7 +113,7 @@ fun isValidDateFormat(dateString: String): Boolean {

fun getInputShellStateBasedOnValue(dateString: String?): InputShellState {
dateString?.let {
return if (isValid(it) && !isValidDateFormat(it)) {
return if (!isValidDateFormat(it)) {
InputShellState.ERROR
} else {
InputShellState.FOCUSED
Expand All @@ -132,7 +125,7 @@ fun getInputShellStateBasedOnValue(dateString: String?): InputShellState {
fun manageActionBasedOnValue(uiModel: EventInputDateUiModel, dateString: String) {
if (dateString.isEmpty()) {
uiModel.onClear?.invoke()
} else if (isValid(dateString) && isValidDateFormat(dateString)) {
} else if (isValidDateFormat(dateString)) {
formatUIDateToStored(dateString)?.let { dateValues ->
uiModel.onDateSelected(dateValues)
}
Expand Down Expand Up @@ -163,14 +156,11 @@ private fun formatStoredDateToUI(dateValue: String): String? {
}

fun formatUIDateToStored(dateValue: String?): InputDateValues? {
return if (dateValue?.length != 8) {
return if (dateValue?.length != 10) {
null
} else {
val year = dateValue.substring(4, 8).toInt()
val month = dateValue.substring(2, 4).toInt()
val day = dateValue.substring(0, 2).toInt()

InputDateValues(day, month, year)
val date = kotlinx.datetime.LocalDate.Formats.ISO.parse(dateValue)
InputDateValues(date.dayOfMonth, date.monthNumber, date.year)
}
}

Expand Down