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

feat: [ANDROAPP-5952] Update design system and adapt InputAge to new … #3531

Merged
merged 5 commits into from
Mar 14, 2024
Merged

feat: [ANDROAPP-5952] Update design system and adapt InputAge to new … #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cd5ee7
feat: [ANDROAPP-5952] Update design system and adapt InputAge to new …
xavimolloy Mar 12, 2024
6bf8445
fix: [ANDROAPP-5952] take timezone into account for date setting
xavimolloy Mar 12, 2024
bd5dda6
fix: [ANDROAPP-5952] code clean up
xavimolloy Mar 13, 2024
b0566a2
fix: [ANDROAPP-5952] update design system
xavimolloy Mar 13, 2024
21813ae
fix: [ANDROAPP-5952] fix test
xavimolloy Mar 13, 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
17 changes: 17 additions & 0 deletions ...va/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ import org.hisp.dhis.mobile.ui.designsystem.component.SelectableDates
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Date
import java.util.GregorianCalendar
import java.util.Locale
import java.util.TimeZone

class EventDetailsViewModel(
private val configureEventDetails: ConfigureEventDetails,
Expand Down Expand Up @@ -266,7 +268,22 @@ class EventDetailsViewModel(
val calendar = Calendar.getInstance()
calendar[year, month, day, 0, 0] = 0
calendar[Calendar.MILLISECOND] = 0

xavimolloy marked this conversation as resolved.
Show resolved Hide resolved
val currentTimeZone: TimeZone = calendar.getTimeZone()
val currentDt: Calendar = GregorianCalendar(currentTimeZone, Locale.getDefault())

var gmtOffset: Int = currentTimeZone.getOffset(
currentDt[Calendar.ERA],
currentDt[Calendar.YEAR],
currentDt[Calendar.MONTH],
currentDt[Calendar.DAY_OF_MONTH],
currentDt[Calendar.DAY_OF_WEEK],
currentDt[Calendar.MILLISECOND],
)
gmtOffset /= (60 * 60 * 1000)
calendar.add(Calendar.HOUR_OF_DAY, +gmtOffset)
val selectedDate = calendar.time

setUpEventReportDate(selectedDate)
}

Expand Down
194 changes: 194 additions & 0 deletions form/src/androidTest/kotlin/org/dhis2/form/ui/provider/inputfield/AgeProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
package org.dhis2.form.ui.provider.inputfield

import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertTextEquals
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performTextInput
import androidx.compose.ui.test.printToLog
import androidx.test.platform.app.InstrumentationRegistry
import org.dhis2.form.di.Injector
import org.hisp.dhis.android.core.common.ValueType
import org.hisp.dhis.mobile.ui.designsystem.component.InputStyle
import org.junit.Rule
import org.junit.Test


class AgeProviderTest {
val resourceManager = Injector.provideResourcesManager(InstrumentationRegistry.getInstrumentation().getContext())
companion object {

const val AGE_VALUE = "2023-01-19"
const val INPUT_AGE_RESET_BUTTON = "INPUT_AGE_RESET_BUTTON"
const val INPUT_AGE = "INPUT_AGE"
const val INPUT_AGE_MODE_SELECTOR = "INPUT_AGE_MODE_SELECTOR"
const val DATE_OF_BIRTH = "DATE OF BIRTH"
const val AGE_BUTTON_TEXT = "AGE"
const val INPUT_AGE_OPEN_CALENDAR_BUTTON = "INPUT_AGE_OPEN_CALENDAR_BUTTON"
const val INPUT_AGE_TIME_UNIT_SELECTOR = "INPUT_AGE_TIME_UNIT_SELECTOR"
const val INPUT_AGE_TEXT_FIELD = "INPUT_AGE_TEXT_FIELD"
const val RADIO_BUTTON_months = "RADIO_BUTTON_months"
const val RADIO_BUTTON_days = "RADIO_BUTTON_days"
const val RADIO_BUTTON_years = "RADIO_BUTTON_years"
const val AGE_SELECTOR_TEXT = "6 years"
const val INPUT_AGE_TEST_TAG = "INPUT_AGE"
const val FIELD_UI_MODEL_UID = "FieldUIModelUid"

}

@get:Rule
val composeTestRule = createComposeRule()

@Test
fun shouldDisplayInputAgeCorrectlyWhenModelHasValue() {

val dateValueTypeFieldUiModel =
generateFieldUiModel(FIELD_UI_MODEL_UID, AGE_VALUE, AGE_VALUE, ValueType.DATE)
composeTestRule.setContent {
ProvideInputAge(
inputStyle = InputStyle.DataInputStyle(),
modifier = Modifier.testTag(INPUT_AGE_TEST_TAG),
fieldUiModel = dateValueTypeFieldUiModel,
intentHandler = {},
resources = resourceManager,
)
}
composeTestRule.onNodeWithTag(INPUT_AGE_TEST_TAG).assertIsDisplayed()

}

@Test
fun shouldDisplayTextButtonSelectorWhenValueIsEmptyString() {

val dateValueTypeFieldUiModel =
generateFieldUiModel(FIELD_UI_MODEL_UID, "", AGE_VALUE, ValueType.DATE)
composeTestRule.setContent {
ProvideInputAge(
inputStyle = InputStyle.DataInputStyle(),
modifier = Modifier.testTag(INPUT_AGE_TEST_TAG),
fieldUiModel = dateValueTypeFieldUiModel,
intentHandler = {},
resources = resourceManager,
)
}
composeTestRule.onNodeWithTag(INPUT_AGE)
composeTestRule.onNodeWithTag(INPUT_AGE_MODE_SELECTOR)

}

@Test
fun shouldDisplayInputDateWhenClickingOnDateButton() {

val dateValueTypeFieldUiModel =
generateFieldUiModel(FIELD_UI_MODEL_UID, "", AGE_VALUE, ValueType.DATE)
composeTestRule.setContent {
ProvideInputAge(
inputStyle = InputStyle.DataInputStyle(),

modifier = Modifier.testTag(INPUT_AGE_TEST_TAG),
fieldUiModel = dateValueTypeFieldUiModel,
intentHandler = {},
resources = resourceManager,
)
}
composeTestRule.onNodeWithTag(INPUT_AGE)
composeTestRule.onNodeWithTag(INPUT_AGE_MODE_SELECTOR)
composeTestRule.onNodeWithText(DATE_OF_BIRTH).performClick()
composeTestRule.onNodeWithTag(INPUT_AGE_OPEN_CALENDAR_BUTTON).assertIsDisplayed()

}


@Test
fun shouldDisplayYearMonthDaySelector() {

val dateValueTypeFieldUiModel =
generateFieldUiModel(FIELD_UI_MODEL_UID, "", AGE_VALUE, ValueType.DATE)
composeTestRule.setContent {
ProvideInputAge(
inputStyle = InputStyle.DataInputStyle(),
modifier = Modifier.testTag(INPUT_AGE_TEST_TAG),
fieldUiModel = dateValueTypeFieldUiModel,
intentHandler = {},
resources = resourceManager,
)

}
composeTestRule.onNodeWithTag(INPUT_AGE)
composeTestRule.onNodeWithTag(INPUT_AGE_MODE_SELECTOR)
composeTestRule.onNodeWithText(AGE_BUTTON_TEXT).performClick()
composeTestRule.onNodeWithTag(INPUT_AGE_TIME_UNIT_SELECTOR).assertIsDisplayed()
}

@Test
fun shouldNotChangeValueWhenUsingAgeSelectorRadioButtons() {

val dateValueTypeFieldUiModel =
generateFieldUiModel(FIELD_UI_MODEL_UID, "", AGE_VALUE, ValueType.DATE)
composeTestRule.setContent {
ProvideInputAge(
inputStyle = InputStyle.DataInputStyle(),
modifier = Modifier.testTag(INPUT_AGE_TEST_TAG),
fieldUiModel = dateValueTypeFieldUiModel,
intentHandler = {},
resources = resourceManager,
)
}
composeTestRule.onNodeWithTag(INPUT_AGE)
composeTestRule.onNodeWithTag(INPUT_AGE_MODE_SELECTOR)
composeTestRule.onNodeWithText(AGE_BUTTON_TEXT).performClick()
composeTestRule.onNodeWithTag(INPUT_AGE_TIME_UNIT_SELECTOR).assertIsDisplayed()
composeTestRule.onNodeWithTag(INPUT_AGE_TEXT_FIELD).performTextInput("6")
composeTestRule.onNodeWithTag(RADIO_BUTTON_months).performClick()
composeTestRule.onNodeWithTag(RADIO_BUTTON_days).performClick()
composeTestRule.onNodeWithTag(RADIO_BUTTON_years).performClick()
composeTestRule.onNodeWithTag(INPUT_AGE_TEXT_FIELD).printToLog("AGE_SELECTOR_TEXT")

composeTestRule.onNodeWithTag(INPUT_AGE_TEXT_FIELD).assertTextEquals(AGE_SELECTOR_TEXT)

}
@Test
fun shouldDisplayTextButtonSelectorWhenTappingResetButton() {

val dateValueTypeFieldUiModel =
generateFieldUiModel(FIELD_UI_MODEL_UID, "", AGE_VALUE, ValueType.DATE)
composeTestRule.setContent {
ProvideInputAge(
inputStyle = InputStyle.DataInputStyle(),
modifier = Modifier.testTag(INPUT_AGE_TEST_TAG),
fieldUiModel = dateValueTypeFieldUiModel,
intentHandler = {},
resources = resourceManager,
)
}
composeTestRule.onNodeWithText(AGE_BUTTON_TEXT).performClick()
composeTestRule.onNodeWithTag(INPUT_AGE_RESET_BUTTON).assertIsDisplayed().performClick()
composeTestRule.onNodeWithTag(INPUT_AGE_MODE_SELECTOR).assertIsDisplayed()

}

@Test
fun shouldDisplayDatePickerWhenTappingOnCalendarButton() {

val dateValueTypeFieldUiModel =
generateFieldUiModel(FIELD_UI_MODEL_UID, AGE_VALUE, AGE_VALUE, ValueType.DATE)
composeTestRule.setContent {
ProvideInputAge(
inputStyle = InputStyle.DataInputStyle(),
modifier = Modifier.testTag(INPUT_AGE_TEST_TAG),
fieldUiModel = dateValueTypeFieldUiModel,
intentHandler = {},
resources = resourceManager,
)
}
composeTestRule.onNodeWithTag(INPUT_AGE_OPEN_CALENDAR_BUTTON).assertIsDisplayed().performClick()
composeTestRule.waitForIdle()
composeTestRule.onNodeWithTag("DATE_PICKER").assertIsDisplayed()

}

}
Loading
Loading