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

Jump to bottom

Show submit button in review mode. #1826

Merged
merged 5 commits into from
Feb 6, 2023
Merged

Show submit button in review mode. #1826

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8364c41
Show submit button in review mode
aditya-07 Jan 24, 2023
9ed249a
Added tests
aditya-07 Jan 25, 2023
3b42e9c
Merge branch 'master' into ak/submit-button-in-review-mode
aditya-07 Jan 25, 2023
e9f860f
Review comments: Updated the fragment result listener to check explic…
aditya-07 Jan 30, 2023
d9d747e
Merge branch 'master' into ak/submit-button-in-review-mode
aditya-07 Feb 6, 2023
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
12 changes: 10 additions & 2 deletions datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ open class QuestionnaireFragment : Fragment() {
questionnaireReviewRecyclerView.visibility = View.VISIBLE

// Set button visibility
submitButton.visibility = View.GONE
submitButton.visibility = if (displayMode.showSubmitButton) View.VISIBLE else View.GONE
aditya-07 marked this conversation as resolved.
Show resolved Hide resolved
reviewModeButton.visibility = View.GONE
reviewModeEditButton.visibility =
if (displayMode.showEditButton) {
Expand Down Expand Up @@ -202,7 +202,15 @@ open class QuestionnaireFragment : Fragment() {
requireActivity().supportFragmentManager.setFragmentResultListener(
QuestionnaireValidationErrorMessageDialogFragment.RESULT_CALLBACK,
viewLifecycleOwner
) { _, _ -> setFragmentResult(SUBMIT_REQUEST_KEY, Bundle.EMPTY) }
) { _, bundle ->
when (bundle[QuestionnaireValidationErrorMessageDialogFragment.RESULT_KEY]) {
QuestionnaireValidationErrorMessageDialogFragment.RESULT_VALUE_FIX -> {
// Go back to the Edit mode if currently in the Review mode.
viewModel.setReviewMode(false)
}
else -> setFragmentResult(SUBMIT_REQUEST_KEY, Bundle.EMPTY)
aditya-07 marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

/** Calculates the progress percentage from given [count] and [totalCount] values. */
Expand Down
7 changes: 6 additions & 1 deletion .../com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import android.widget.TextView
import androidx.annotation.VisibleForTesting
import androidx.appcompat.view.ContextThemeWrapper
import androidx.core.content.res.use
import androidx.core.os.bundleOf
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.activityViewModels
import androidx.fragment.app.setFragmentResult
Expand Down Expand Up @@ -51,10 +52,11 @@ internal class QuestionnaireValidationErrorMessageDialogFragment(
return MaterialAlertDialogBuilder(requireContext())
.setView(onCreateCustomView())
.setPositiveButton(R.string.questionnaire_validation_error_fix_button_text) { dialog, _ ->
setFragmentResult(RESULT_CALLBACK, bundleOf(RESULT_KEY to RESULT_VALUE_FIX))
dialog?.dismiss()
}
.setNegativeButton(R.string.questionnaire_validation_error_submit_button_text) { dialog, _ ->
setFragmentResult(RESULT_CALLBACK, Bundle.EMPTY)
setFragmentResult(RESULT_CALLBACK, bundleOf(RESULT_KEY to RESULT_VALUE_SUBMIT))
dialog?.dismiss()
}
.create()
Expand Down Expand Up @@ -90,6 +92,9 @@ internal class QuestionnaireValidationErrorMessageDialogFragment(
companion object {
const val TAG = "QuestionnaireValidationErrorMessageDialogFragment"
const val RESULT_CALLBACK = "QuestionnaireValidationResultCallback"
const val RESULT_KEY = "result"
const val RESULT_VALUE_FIX = "result_fix"
const val RESULT_VALUE_SUBMIT = "result_submit"
}
}

Expand Down
8 changes: 6 additions & 2 deletions datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,11 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
if (isReadOnly || isInReviewModeFlow.value) {
return QuestionnaireState(
items = questionnaireItemViewItems,
displayMode = DisplayMode.ReviewMode(showEditButton = !isReadOnly)
displayMode =
DisplayMode.ReviewMode(
showEditButton = !isReadOnly,
showSubmitButton = !isReadOnly && shouldShowSubmitButton
)
)
}

Expand Down Expand Up @@ -777,7 +781,7 @@ internal data class QuestionnaireState(

internal sealed class DisplayMode {
class EditMode(val pagination: QuestionnairePagination) : DisplayMode()
class ReviewMode(val showEditButton: Boolean) : DisplayMode()
class ReviewMode(val showEditButton: Boolean, val showSubmitButton: Boolean) : DisplayMode()
}

/**
Expand Down