Skip to content

[MS-585] Add "Wrong age group selection" exit option #816

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

Merged
BurningAXE merged 1 commit into from
Jul 16, 2024
Merged

[MS-585] Add "Wrong age group selection" exit option #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ...re/exit-form/src/main/java/com/simprints/feature/exitform/ExitFormConfigurationBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ fun defaultOptions() = setOf(
ExitFormOption.AppNotWorking,
ExitFormOption.PersonNotPresent,
ExitFormOption.TooYoung,
ExitFormOption.WrongAgeGroupSelected,
ExitFormOption.Other,
)

Expand All @@ -36,6 +37,7 @@ fun scannerOptions() = setOf(
ExitFormOption.ScannerNotWorking,
ExitFormOption.PersonNotPresent,
ExitFormOption.TooYoung,
ExitFormOption.WrongAgeGroupSelected,
ExitFormOption.Other,
)

Expand Down
5 changes: 5 additions & 0 deletions feature/exit-form/src/main/java/com/simprints/feature/exitform/config/ExitFormOption.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ enum class ExitFormOption(
logName = "Too young",
answer = RefusalEvent.RefusalPayload.Answer.REFUSED_YOUNG,
),
WrongAgeGroupSelected(
requiresInfo = false,
logName = "Wrong age group selected",
answer = RefusalEvent.RefusalPayload.Answer.WRONG_AGE_GROUP_SELECTED,
),
Other(
requiresInfo = true,
logName = "Other",
Expand Down
4 changes: 2 additions & 2 deletions feature/exit-form/src/main/java/com/simprints/feature/exitform/screen/ExitFormFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ internal class ExitFormFragment : Fragment(R.layout.fragment_exit_form) {
observeViewModel()
}



private fun setOptionsVisible(options: Set<ExitFormOption>) = with(binding) {
exitFormRadioReligiousConcerns.isVisible = options.contains(ExitFormOption.ReligiousConcerns)
exitFormRadioDataConcerns.isVisible = options.contains(ExitFormOption.DataConcerns)
Expand All @@ -63,6 +61,7 @@ internal class ExitFormFragment : Fragment(R.layout.fragment_exit_form) {
exitFormRadioScannerNotWorking.isVisible = options.contains(ExitFormOption.ScannerNotWorking)
exitFromRadioPersonNotPresent.isVisible = options.contains(ExitFormOption.PersonNotPresent)
exitFormRadioTooYoung.isVisible = options.contains(ExitFormOption.TooYoung)
exitFormRadioWrongAgeGroupSelected.isVisible = options.contains(ExitFormOption.WrongAgeGroupSelected)
exitFormRadioOther.isVisible = options.contains(ExitFormOption.Other)
}

Expand Down Expand Up @@ -93,6 +92,7 @@ internal class ExitFormFragment : Fragment(R.layout.fragment_exit_form) {
R.id.exitFormRadioScannerNotWorking -> ExitFormOption.ScannerNotWorking
R.id.exitFromRadioPersonNotPresent -> ExitFormOption.PersonNotPresent
R.id.exitFormRadioTooYoung -> ExitFormOption.TooYoung
R.id.exitFormRadioWrongAgeGroupSelected -> ExitFormOption.WrongAgeGroupSelected
else -> ExitFormOption.Other
}

Expand Down
7 changes: 7 additions & 0 deletions feature/exit-form/src/main/res/layout-land/fragment_exit_form.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@
android:layout_height="wrap_content"
android:text="@string/exit_form_reason_too_young" />

<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/exitFormRadioWrongAgeGroupSelected"
style="@style/Widget.Simprints.RadioButton.White"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/exit_form_reason_wrong_age_group_selected" />

<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/exitFormRadioOther"
style="@style/Widget.Simprints.RadioButton.White"
Expand Down
7 changes: 7 additions & 0 deletions feature/exit-form/src/main/res/layout/fragment_exit_form.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@
android:layout_height="wrap_content"
android:text="@string/exit_form_reason_too_young" />

<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/exitFormRadioWrongAgeGroupSelected"
style="@style/Widget.Simprints.RadioButton.White"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/exit_form_reason_wrong_age_group_selected" />

<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/exitFormRadioOther"
style="@style/Widget.Simprints.RadioButton.White"
Expand Down
3 changes: 3 additions & 0 deletions ...sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiRefusalPayload.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayloa
import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayload.Answer.REFUSED_RELIGION
import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayload.Answer.REFUSED_YOUNG
import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayload.Answer.SCANNER_NOT_WORKING
import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayload.Answer.WRONG_AGE_GROUP_SELECTED
import com.simprints.infra.eventsync.event.remote.models.ApiRefusalPayload.ApiAnswer

@Keep
Expand All @@ -31,6 +32,7 @@ internal data class ApiRefusalPayload(
APP_NOT_WORKING,
REFUSED_NOT_PRESENT,
REFUSED_YOUNG,
WRONG_AGE_GROUP_SELECTED,
OTHER
}

Expand All @@ -54,5 +56,6 @@ internal fun RefusalPayload.Answer.toApiRefusalEventAnswer() = when (this) {
APP_NOT_WORKING -> ApiAnswer.APP_NOT_WORKING
REFUSED_NOT_PRESENT -> ApiAnswer.REFUSED_NOT_PRESENT
REFUSED_YOUNG -> ApiAnswer.REFUSED_YOUNG
WRONG_AGE_GROUP_SELECTED -> ApiAnswer.WRONG_AGE_GROUP_SELECTED
OTHER -> ApiAnswer.OTHER
}
1 change: 1 addition & 0 deletions infra/events/src/main/java/com/simprints/infra/events/event/domain/models/RefusalEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ data class RefusalEvent(
APP_NOT_WORKING,
REFUSED_NOT_PRESENT,
REFUSED_YOUNG,
WRONG_AGE_GROUP_SELECTED,
OTHER
}
}
Expand Down
1 change: 1 addition & 0 deletions infra/resources/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<string name="exit_form_reason_scanner_not_working">Scanner not working</string>
<string name="exit_form_reason_person_not_present">Person not present</string>
<string name="exit_form_reason_too_young">Too young</string>
<string name="exit_form_reason_wrong_age_group_selected">Wrong age group selected</string>
<string name="exit_form_reason_other">Other</string>

<!-- Fetch subject -->
Expand Down