Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import org.smartregister.fhircore.engine.util.extension.extractId
import org.smartregister.fhircore.engine.util.extension.showToast
import org.smartregister.fhircore.quest.OnInActivityListener
import org.smartregister.fhircore.quest.QuestApplication
import org.smartregister.fhircore.quest.ui.patient.profile.PatientProfileViewModel
import retrofit2.HttpException
import timber.log.Timber

Expand Down Expand Up @@ -178,6 +179,14 @@ open class AppMainActivity : BaseMultiLanguageActivity(), OnSyncListener {
if (resultCode == Activity.RESULT_OK)
data?.getStringExtra(QUESTIONNAIRE_BACK_REFERENCE_KEY)?.let {
when {
it.asReference(ResourceType.Task).extractId() ==
PatientProfileViewModel.PATIENT_FINISH_VISIT -> {
/**
* Send a random string to trigger [FhirCarePlanGenerator.completeTask] to invoke
* [PatientProfileViewModel.fetchPatientProfileDataWithChildren]
*/
appMainViewModel.onTaskComplete(System.currentTimeMillis().toString())
}
it.startsWith(ResourceType.Task.name) -> {
lifecycleScope.launch(Dispatchers.IO) {
val encounterStatus =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,10 @@ fun PatientProfileScreen(
shape = RectangleShape,
onClick = {
patientProfileViewModel.onEvent(
PatientProfileEvent.LoadQuestionnaire(
PatientProfileViewModel.PATIENT_FINISH_VISIT,
context
PatientProfileEvent.OpenTaskForm(
context = context,
taskFormId = PatientProfileViewModel.PATIENT_FINISH_VISIT,
taskId = PatientProfileViewModel.PATIENT_FINISH_VISIT
)
)
},
Expand Down