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

Fix response not showing in summary mode #3670

Merged
merged 16 commits into from
Jan 16, 2025
Merged

Fix response not showing in summary mode #3670

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
44b092c
Remove save draft dialog in summary mode
hamza-vd Jan 6, 2025
ca13f7d
Fix answers in Summary mode
hamza-vd Jan 6, 2025
0b95a43
Add test
hamza-vd Jan 6, 2025
881a2e3
Merge branch 'main' into fixes-to-save-draft
pld Jan 7, 2025
f921158
Merge branch 'main' into fixes-to-save-draft
hamza-vd Jan 8, 2025
0bf1c85
Merge branch 'main' into fixes-to-save-draft
FikriMilano Jan 10, 2025
0f4897e
Ignore failing test
ellykits Jan 15, 2025
ac7ab09
Merge branch 'fixes-to-save-draft' of github.com:opensrp/fhircore int…
ellykits Jan 15, 2025
4774e2f
Merge branch 'main' into fixes-to-save-draft
hamza-vd Jan 15, 2025
3210263
Merge branch 'main' into fixes-to-save-draft
pld Jan 15, 2025
66e00b3
Merge branch 'main' into fixes-to-save-draft
hamza-vd Jan 16, 2025
c7e3613
Fix spotless check
hamza-vd Jan 16, 2025
5095b35
Fix spotless check 2
hamza-vd Jan 16, 2025
be3811e
Delete test case
ellykits Jan 16, 2025
b4afd32
Replace runBlocking with runTest with timeouts
ellykits Jan 16, 2025
a1d89bc
Fix spotless error
hamza-vd Jan 16, 2025
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
6 changes: 4 additions & 2 deletions .../src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import org.smartregister.fhircore.engine.domain.model.ActionParameterType
import org.smartregister.fhircore.engine.domain.model.RuleConfig
import org.smartregister.fhircore.engine.domain.model.isEditable
import org.smartregister.fhircore.engine.domain.model.isReadOnly
import org.smartregister.fhircore.engine.domain.model.isSummary
import org.smartregister.fhircore.engine.util.castToType

fun QuestionnaireResponse.QuestionnaireResponseItemComponent.asLabel() =
Expand Down Expand Up @@ -298,10 +299,11 @@ suspend fun Questionnaire.prepopulateUniqueIdAssignment(
* Determines the [QuestionnaireResponse.Status] depending on the [saveDraft] and [isEditable]
* values contained in the [QuestionnaireConfig]
*
* returns [COMPLETED] when [isEditable] is [true] returns [INPROGRESS] when [saveDraft] is [true]
* returns [COMPLETED] when [isEditable] or [isSummary] is [true] returns [INPROGRESS] when
* [saveDraft] is [true]
*/
fun QuestionnaireConfig.questionnaireResponseStatus(): String? {
return if (this.isEditable()) {
return if (this.isEditable() || this.isSummary()) {
QuestionnaireResponseStatus.COMPLETED.toCode()
} else if (this.saveDraft) {
QuestionnaireResponseStatus.INPROGRESS.toCode()
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
}

private fun handleBackPress() {
if (questionnaireConfig.isReadOnly()) {
if (questionnaireConfig.isReadOnly() || questionnaireConfig.isSummary()) {
finish()
} else if (questionnaireConfig.saveDraft) {
AlertDialogue.showThreeButtonAlert(
Expand Down
Loading