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

Add summary mode #3500

Merged
merged 4 commits into from
Sep 26, 2024
Merged

Add summary mode #3500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9456382
Add summary mode
FikriMilano Sep 13, 2024
79e085e
Merge branch 'main' into 3494-add-summary-mode
FikriMilano Sep 16, 2024
e53d72e
Merge branch 'main' into 3494-add-summary-mode
ellykits Sep 19, 2024
402af15
Merge branch 'main' into 3494-add-summary-mode
FikriMilano Sep 26, 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
4 changes: 4 additions & 0 deletions .../engine/src/main/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ enum class QuestionnaireType {
DEFAULT,
EDIT,
READ_ONLY,
SUMMARY,
}

fun QuestionnaireConfig.isDefault() =
Expand All @@ -32,3 +33,6 @@ fun QuestionnaireConfig.isEditable() =

fun QuestionnaireConfig.isReadOnly() =
QuestionnaireType.valueOf(this.type) == QuestionnaireType.READ_ONLY

fun QuestionnaireConfig.isSummary() =
QuestionnaireType.valueOf(this.type) == QuestionnaireType.SUMMARY
2 changes: 2 additions & 0 deletions .../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 @@ -49,6 +49,7 @@
import org.smartregister.fhircore.engine.configuration.app.LocationLogOptions
import org.smartregister.fhircore.engine.domain.model.ActionParameter
import org.smartregister.fhircore.engine.domain.model.isReadOnly
import org.smartregister.fhircore.engine.domain.model.isSummary
import org.smartregister.fhircore.engine.ui.base.AlertDialogue
import org.smartregister.fhircore.engine.ui.base.BaseMultiLanguageActivity
import org.smartregister.fhircore.engine.util.DispatcherProvider
Expand Down Expand Up @@ -282,6 +283,7 @@
)
.showAsterisk(this.questionnaireConfig.showRequiredTextAsterisk)
.showRequiredText(this.questionnaireConfig.showRequiredText)
.setIsReadOnly(questionnaireConfig.isSummary())

Check warning on line 286 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt#L286 

Added line #L286 was not covered by tests
FikriMilano marked this conversation as resolved.
Show resolved Hide resolved
.apply {
if (questionnaireResponse != null) {
questionnaireResponse
Expand Down
Loading