-
Notifications
You must be signed in to change notification settings - Fork 306
Master mk 2790 #2805
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
base: master
Are you sure you want to change the base?
Master mk 2790 #2805
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you give the pr a better title?
if (args.questionnaireTitleKey == "Attachment") { | ||
showReviewPageBeforeSubmit(true) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change this back - this is the attachment widget, and we're not trying to show the review page when the user opens the attachment widget.
but we can add the attachment widget to the review page questionnaire, and i think that's reasonable.
} else if (questionnaireItem.type == Questionnaire.QuestionnaireItemType.ATTACHMENT) { | ||
return context.getString(R.string.answered) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
} else if (questionnaireItem.type == Questionnaire.QuestionnaireItemType.ATTACHMENT) { | |
return context.getString(R.string.answered) | |
} | |
} | |
if (questionnaireItem.type == Questionnaire.QuestionnaireItemType.ATTACHMENT) { | |
return context.getString(R.string.answered) | |
} |
@@ -1003,4 +1003,20 @@ class QuestionnaireViewItemTest { | |||
) | |||
.isTrue() | |||
} | |||
|
|||
@Test | |||
fun `answerString() should return answered with answered`() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fun `answerString() should return answered with answered`() { | |
fun `answerString() should return answered with answered`() { |
fun `answerString() should return answered with answered`() { | ||
val questionnaireViewItem = | ||
QuestionnaireViewItem( | ||
Questionnaire.QuestionnaireItemComponent(), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you need to set the type to attachment
IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).
Fixes #2790
Description
Alternative(s) considered
Have you considered any alternatives? And if so, why have you chosen the approach in this PR?
Type
Choose one: (Bug fix | Feature | Documentation | Testing | Code health | Builds | Releases | Other)
Screenshots (if applicable)
Checklist
./gradlew spotlessApply
and./gradlew spotlessCheck
to check my code follows the style guide of this project../gradlew check
and./gradlew connectedCheck
to test my changes locally.