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.

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-6104] do not allow futures dates in age by default #268

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ import org.hisp.dhis.mobile.ui.designsystem.resource.provideStringResource
import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2LightColorScheme
import org.hisp.dhis.mobile.ui.designsystem.theme.Outline
import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
import java.text.SimpleDateFormat
import java.util.Calendar

/**
* DHIS2 Input Age component wraps DHIS2 [InputShell].
Expand Down Expand Up @@ -71,6 +73,7 @@ fun InputAge(
is Age -> HelperStyle.WITH_HELPER_AFTER
}
}
val selectableDates = uiModel.selectableDates

val focusRequester = remember { FocusRequester() }
val datePickerState = rememberDatePickerState()
Expand Down Expand Up @@ -112,10 +115,15 @@ fun InputAge(
}
}

val supportingText = provideSupportingText(uiModel, selectableDates)

InputShell(
modifier = modifier.testTag("INPUT_AGE").focusRequester(focusRequester),
title = uiModel.title,
state = uiModel.state,
state = when (supportingText) {
uiModel.supportingText -> uiModel.state
else -> InputShellState.ERROR
},
isRequiredField = uiModel.isRequired,
inputField = {
when (uiModel.inputType) {
Expand Down Expand Up @@ -187,7 +195,7 @@ fun InputAge(
},
secondaryButton = calendarButton,
supportingText = {
uiModel.supportingText?.forEach { label ->
supportingText?.forEach { label ->
SupportingText(
label.text,
label.state,
Expand Down Expand Up @@ -306,6 +314,34 @@ private fun updateDateOfBirth(inputType: DateOfBirth, newText: TextFieldValue):
}
}

@Composable
private fun provideSupportingText(
uiModel: InputAgeModel,
selectableDates: SelectableDates,
): List<SupportingTextData>? =
(uiModel.inputType as? DateOfBirth)?.value?.text?.let {
if (
it.length == DATE_FORMAT.length &&
!dateIsInRange(parseStringDateToMillis(it), selectableDates)
) {
val dateOutOfRangeText = "${provideStringResource("date_out_of_range")} (" +
formatStringToDate(selectableDates.initialDate) + " - " +
formatStringToDate(selectableDates.endDate) + ")"

listOf(
SupportingTextData(
text = dateOutOfRangeText,
SupportingTextState.ERROR,
),
).plus(uiModel.supportingText ?: listOf())
} else {
uiModel.supportingText
}
} ?: uiModel.supportingText

internal const val MIN_DATE = "10111901"
internal const val DATE_FORMAT = "ddMMYYYY"

sealed interface AgeInputType {
data object None : AgeInputType

Expand Down Expand Up @@ -361,5 +397,8 @@ data class InputAgeModel(
val acceptText: String? = null,
val cancelText: String? = null,
val onValueChanged: (AgeInputType) -> Unit,
val selectableDates: SelectableDates = SelectableDates("10111901", "12112124"),
val selectableDates: SelectableDates = SelectableDates(
MIN_DATE,
SimpleDateFormat(DATE_FORMAT).format(Calendar.getInstance().time),
),
)
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ fun InputDateTime(
}
}

private fun getSupportingTextList(uiModel: InputDateTimeModel, dateOutOfRangeItem: SupportingTextData, incorrectHourFormatItem: SupportingTextData): List<SupportingTextData> {
fun getSupportingTextList(uiModel: InputDateTimeModel, dateOutOfRangeItem: SupportingTextData, incorrectHourFormatItem: SupportingTextData): List<SupportingTextData> {
val supportingTextList = mutableListOf<SupportingTextData>()

uiModel.supportingText?.forEach { item ->
Expand Down Expand Up @@ -537,7 +537,7 @@ private fun getTime(timePickerState: TimePickerState, format: String? = "HHmm"):
return formater.format(cal.time)
}

private fun parseStringDateToMillis(dateString: String, pattern: String = "ddMMyyyy", locale: Locale = Locale.getDefault()): Long {
fun parseStringDateToMillis(dateString: String, pattern: String = "ddMMyyyy", locale: Locale = Locale.getDefault()): Long {
return if (dateString.isNotEmpty()) {
val cal = Calendar.getInstance()
val sdf = SimpleDateFormat(pattern, locale)
Expand All @@ -554,7 +554,7 @@ data class SelectableDates(
val endDate: String,
)

private fun formatStringToDate(dateString: String): String {
fun formatStringToDate(dateString: String): String {
return if (dateString.length == 8) {
dateString.substring(0, 2) + "/" + dateString.substring(2, 4) + "/" + dateString.substring(4, 8)
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performTextInput
import org.junit.Rule
import org.junit.Test
import java.text.SimpleDateFormat
import java.util.Calendar

class InputAgeTest {

Expand Down Expand Up @@ -148,4 +150,30 @@ class InputAgeTest {
rule.onNodeWithTag("INPUT_AGE_OPEN_CALENDAR_BUTTON").assertDoesNotExist()
rule.onNodeWithTag("INPUT_AGE_TIME_UNIT_SELECTOR").assertDoesNotExist()
}

@Test
fun shouldShowErrorMessageWhenAgeIsOnFuture() {
val calendar = Calendar.getInstance().apply {
add(Calendar.DAY_OF_MONTH, 1)
}
val futureDate = SimpleDateFormat(DATE_FORMAT).format(calendar.time)
var inputType by mutableStateOf<AgeInputType>(AgeInputType.DateOfBirth.EMPTY)

rule.setContent {
InputAge(
InputAgeModel(
title = "Label",
inputType = inputType,
onValueChanged = {
inputType = it
},
),

)
}

rule.onNodeWithTag("INPUT_AGE_TEXT_FIELD").performTextInput(futureDate)

rule.onNodeWithTag("INPUT_AGE_SUPPORTING_TEXT").assertExists()
}
}
Loading