diff --git a/app/src/main/java/org/piramalswasthya/sakhi/adapters/NcdReferListAdapter.kt b/app/src/main/java/org/piramalswasthya/sakhi/adapters/NcdReferListAdapter.kt index 204741a87..3a30770b5 100644 --- a/app/src/main/java/org/piramalswasthya/sakhi/adapters/NcdReferListAdapter.kt +++ b/app/src/main/java/org/piramalswasthya/sakhi/adapters/NcdReferListAdapter.kt @@ -88,6 +88,10 @@ import org.piramalswasthya.sakhi.R } } + // Keep referral classification available to both the button label and click handler. + val isGcReferral = item.referalCac.type == GeneralCheckupFormViewModel.REFERRAL_TYPE || + item.referalCac.referralReason?.startsWith(GeneralCheckupFormViewModel.REASON_PREFIX) == true + if (item.ben.isDeath) { binding.contstraintLayoutV.setBackgroundColor( ContextCompat.getColor(binding.root.context, R.color.md_theme_dark_outline) @@ -101,13 +105,10 @@ import org.piramalswasthya.sakhi.R binding.btnFollowUp.visibility = if (visible) View.VISIBLE else View.GONE // binding.btnFollowUp.setBackgroundColor(binding.root.resources.getColor(if (item.tbrefferalFollowUp == null || item.tbrefferalFollowUp.isEmpty()) android.R.color.holo_red_dark else android.R.color.holo_green_dark)) - // Same General Check-up rule as the follow-up screen (type, or reason prefix when the type is missing). - val isGcReferral = item.referalCac.type == GeneralCheckupFormViewModel.REFERRAL_TYPE || - item.referalCac.referralReason?.startsWith(GeneralCheckupFormViewModel.REASON_PREFIX) == true val isFollowUpPending = when { isGcReferral -> item.gcReferralFollowUp.isEmpty() isPresumptiveTbReferral -> item.tbSuspectedCases.isEmpty() - else -> item.tbrefferalFollowUp.isNullOrEmpty() + else -> item.ncdFollowUpForms.isEmpty() } binding.btnFollowUp.apply { @@ -130,7 +131,12 @@ import org.piramalswasthya.sakhi.R binding.executePendingBindings() binding.btnFollowUp.setOnClickListener { - listener.onClickedFollowUp(item.ben,item.referalCac) + val hasFollowUp = when { + isGcReferral -> item.gcReferralFollowUp.isNotEmpty() + isPresumptiveTbReferral -> item.tbSuspectedCases.isNotEmpty() + else -> item.ncdFollowUpForms.isNotEmpty() + } + listener.onClickedFollowUp(item.ben, item.referalCac, hasFollowUp) } binding.age.text = getLocalizedAge(binding.root.context, item.ben.dob) @@ -156,11 +162,15 @@ import org.piramalswasthya.sakhi.R class NcdReferallickListener( - val goToFollowUp: (benId: Long,hhId:Long,referReason:String?,referredDate:Long,referralType:String?) -> Unit + val goToFollowUp: (benId: Long, hhId: Long, referReason: String?, referredDate: Long, referralType: String?, isViewMode: Boolean) -> Unit ) { - fun onClickedFollowUp(item: BenBasicDomain, referalCac: ReferalCache) = goToFollowUp( - item.benId,item.hhId,referalCac.referralReason,referalCac.revisitDate,referalCac.type + // Preserve the two-argument entry point used by the row's data-binding expression. + fun onClickedFollowUp(item: BenBasicDomain, referalCac: ReferalCache) = + onClickedFollowUp(item, referalCac, isViewMode = false) + + fun onClickedFollowUp(item: BenBasicDomain, referalCac: ReferalCache, isViewMode: Boolean) = goToFollowUp( + item.benId, item.hhId, referalCac.referralReason, referalCac.revisitDate, referalCac.type, isViewMode ) } diff --git a/app/src/main/java/org/piramalswasthya/sakhi/configuration/IconDataset.kt b/app/src/main/java/org/piramalswasthya/sakhi/configuration/IconDataset.kt index 961db3357..1e9341bc9 100644 --- a/app/src/main/java/org/piramalswasthya/sakhi/configuration/IconDataset.kt +++ b/app/src/main/java/org/piramalswasthya/sakhi/configuration/IconDataset.kt @@ -563,7 +563,7 @@ class IconDataset @Inject constructor( ), Icon( R.drawable.ncd_icon, - resources.getString(R.string.icon_title_non_communicable), + "NCD", null, DiseaseControlFragmentDirections.actionDiseaseControlFragmentToNcdFragment() ), diff --git a/app/src/main/java/org/piramalswasthya/sakhi/database/room/dao/BenDao.kt b/app/src/main/java/org/piramalswasthya/sakhi/database/room/dao/BenDao.kt index f4d4f8455..fad8d50d8 100644 --- a/app/src/main/java/org/piramalswasthya/sakhi/database/room/dao/BenDao.kt +++ b/app/src/main/java/org/piramalswasthya/sakhi/database/room/dao/BenDao.kt @@ -1014,8 +1014,8 @@ GROUP BY b.benId (t.benId IS NOT NULL AND b.tbsnFilled = 1 AND (t.bloodInSputum = 1 OR t.coughMoreThan2Weeks = 1 OR t.feverMoreThan2Weeks = 1 OR t.nightSweats = 1 OR t.lossOfWeight = 1 OR t.historyOfTb = 1) - AND (ts.benId IS NULL OR (IFNULL(ts.isConfirmed, 0) = 0 AND IFNULL(ts.isRecommendedForTpt, 0) = 0))) - OR (ts.benId IS NOT NULL AND IFNULL(ts.isConfirmed, 0) = 0 AND IFNULL(ts.isRecommendedForTpt, 0) = 0) + AND (ts.benId IS NULL + OR (ts.isTBConfirmed IS NULL AND ts.isRecommendedForTpt IS NULL))) ) """ + BenListOrder.LIFO_B) fun getTbScreeningList(villageId: Int): Flow> diff --git a/app/src/main/java/org/piramalswasthya/sakhi/model/CBAC.kt b/app/src/main/java/org/piramalswasthya/sakhi/model/CBAC.kt index d884d7bcd..97b8738da 100644 --- a/app/src/main/java/org/piramalswasthya/sakhi/model/CBAC.kt +++ b/app/src/main/java/org/piramalswasthya/sakhi/model/CBAC.kt @@ -15,6 +15,7 @@ import org.piramalswasthya.sakhi.database.room.SyncState import org.piramalswasthya.sakhi.helpers.Konstants import org.piramalswasthya.sakhi.model.dynamicEntity.TBReferralFollowUpEntity import org.piramalswasthya.sakhi.model.dynamicEntity.GCReferralFollowUpEntity +import org.piramalswasthya.sakhi.model.dynamicEntity.NCDReferalFormResponseJsonEntity import java.text.SimpleDateFormat import java.util.Locale import java.util.TimeZone @@ -695,7 +696,12 @@ data class BenWithCbacAndReferalCache( parentColumn = "benId", entityColumn = "benId" ) - val gcFollowUp : List = emptyList() + val gcFollowUp : List = emptyList(), + @Relation( + parentColumn = "benId", + entityColumn = "benId" + ) + val ncdFollowUpForms: List = emptyList() ) { fun asDomainModel(): BenWithCbacReferDomain { @@ -704,7 +710,8 @@ data class BenWithCbacAndReferalCache( // The relation is per beneficiary; keep only this card's referral (same reason, same month). gcReferralFollowUp = gcFollowUp.filter { it.referralReason == referral.referralReason && it.referralMonth == monthKey(referral.revisitDate) - } + }, + ncdFollowUpForms = ncdFollowUpForms ) } } @@ -718,7 +725,8 @@ data class BenWithCbacReferDomain( val allSynced: SyncState? = if (savedCbacRecords.isEmpty()) null else if (savedCbacRecords.map { it.syncState } .all { it == SyncState.SYNCED }) SyncState.SYNCED else SyncState.UNSYNCED, - val gcReferralFollowUp : List = emptyList() + val gcReferralFollowUp : List = emptyList(), + val ncdFollowUpForms: List = emptyList() ) data class BenWithCbacDomain( diff --git a/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/maternal_health/hwc/list/HwcReferredFragment.kt b/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/maternal_health/hwc/list/HwcReferredFragment.kt index 3ee1e6f42..f72cfc0c0 100644 --- a/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/maternal_health/hwc/list/HwcReferredFragment.kt +++ b/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/maternal_health/hwc/list/HwcReferredFragment.kt @@ -80,7 +80,7 @@ class HwcReferredFragment : Fragment() { // referral follow-up form. Other rows stay as before. val benAdapter = NcdReferListAdapter( viewModel.userName, - NcdReferListAdapter.NcdReferallickListener { benId, hhId, referReason, referredDate, referralType -> + NcdReferListAdapter.NcdReferallickListener { benId, hhId, referReason, referredDate, referralType, isViewMode -> if (findNavController().currentDestination?.id == R.id.hwcReferredFragment) { findNavController().navigate( HwcReferredFragmentDirections.actionHwcReferredFragmentToNCDReferalFormFragment( @@ -88,7 +88,8 @@ class HwcReferredFragment : Fragment() { hhId = hhId, referReason = referReason.toString(), referredDate = referredDate, - referralType = referralType + referralType = referralType, + isViewMode = isViewMode ) ) } @@ -151,4 +152,4 @@ class HwcReferredFragment : Fragment() { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormFragment.kt b/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormFragment.kt index 8e95e37ce..7b7656eb5 100644 --- a/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormFragment.kt +++ b/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormFragment.kt @@ -297,8 +297,9 @@ class NCDReferalFormFragment : Fragment() { binding.fabEdit.setOnClickListener { binding.fabEdit.isGone = true binding.btnSave.isVisible = true - - viewModel.schema.value?.let { formAdapter.updateFields(viewModel.getVisibleFields()) } + viewModel.enableFormEditing() + formAdapter.setViewMode(false) + formAdapter.updateFields(viewModel.getVisibleFields()) } } @@ -317,7 +318,7 @@ class NCDReferalFormFragment : Fragment() { formAdapter.updateFields(visibleFields) binding.btnSave.isVisible = !viewModel.isViewMode && !viewModel.isTbFormAlreadyFilled - binding.fabEdit.isVisible = viewModel.isViewMode && !viewModel.isTbFormAlreadyFilled + binding.fabEdit.isVisible = viewModel.isViewMode binding.followupHeading.isGone = true binding.includeBottleTable.root.isGone = true diff --git a/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormViewModel.kt b/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormViewModel.kt index 367e25bc1..db101dc4e 100644 --- a/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormViewModel.kt +++ b/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormViewModel.kt @@ -61,7 +61,7 @@ class NCDReferalFormViewModel @Inject constructor( var visitNo = 1 var followUpNo = 0 var isFollowUpMode = false - var isViewMode = false + var isViewMode = NCDReferalFormFragmentArgs.fromSavedStateHandle(savedStateHandle).isViewMode var isTbFormAlreadyFilled = false private var isTreatmentSavedInDb = false private val formId = FormConstants.CDTF_001 @@ -550,6 +550,22 @@ class NCDReferalFormViewModel @Inject constructor( } ?: emptyList() } + fun enableFormEditing() { + isViewMode = false + val currentSchema = _schema.value ?: return + currentSchema.sections.forEach { section -> + section.fields.forEach { field -> + field.isEditable = when { + isReferralFollowUpForm -> field.fieldId != "referred_on_date" + field.fieldId == "visit_label" -> false + field.fieldId == "follow_up_date" -> field.visible + isFollowUpMode && field.fieldId in setOf("diagnosis", "treatment_start_date") -> false + else -> true + } + } + } + } + private fun parseUiDateStrict(dateStr: String?): Date? { if (dateStr.isNullOrBlank()) return null return try { diff --git a/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/list/NcdRefferedList.kt b/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/list/NcdRefferedList.kt index 3d9463b00..0c9dcf061 100644 --- a/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/list/NcdRefferedList.kt +++ b/app/src/main/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/list/NcdRefferedList.kt @@ -66,7 +66,7 @@ class NcdRefferedList : Fragment() { binding.filterText.visibility = View.VISIBLE val benAdapter = - NcdReferListAdapter(viewModel.userName, NcdReferListAdapter.NcdReferallickListener { benId ,hhId,referReason,referredDate,referralType-> + NcdReferListAdapter(viewModel.userName, NcdReferListAdapter.NcdReferallickListener { benId ,hhId,referReason,referredDate,referralType,isViewMode-> if (findNavController().currentDestination?.id == R.id.ncdRefferedList) { if (isPresumptiveTbReferral(referReason)) { findNavController().navigate( @@ -81,7 +81,8 @@ class NcdRefferedList : Fragment() { hhId = hhId, referReason = referReason.toString(), referredDate = referredDate, - referralType = referralType + referralType = referralType, + isViewMode = isViewMode ) ) } diff --git a/app/src/main/res/navigation/nav_home.xml b/app/src/main/res/navigation/nav_home.xml index 86ed068e5..1f90993a8 100644 --- a/app/src/main/res/navigation/nav_home.xml +++ b/app/src/main/res/navigation/nav_home.xml @@ -2392,6 +2392,10 @@ android:defaultValue="@null" app:argType="string" app:nullable="true" /> + diff --git a/app/src/test/java/org/piramalswasthya/sakhi/adapters/NcdReferListAdapterTest.kt b/app/src/test/java/org/piramalswasthya/sakhi/adapters/NcdReferListAdapterTest.kt index 92703b118..8cc873ac7 100644 --- a/app/src/test/java/org/piramalswasthya/sakhi/adapters/NcdReferListAdapterTest.kt +++ b/app/src/test/java/org/piramalswasthya/sakhi/adapters/NcdReferListAdapterTest.kt @@ -82,11 +82,13 @@ class NcdReferListAdapterTest { var capturedHhId: Long? = null var capturedReason: String? = null var capturedReferredDate: Long? = null - val listener = NcdReferListAdapter.NcdReferallickListener { benId, hhId, referReason, referredDate, _ -> + var capturedIsViewMode: Boolean? = null + val listener = NcdReferListAdapter.NcdReferallickListener { benId, hhId, referReason, referredDate, _, isViewMode -> capturedBenId = benId capturedHhId = hhId capturedReason = referReason capturedReferredDate = referredDate + capturedIsViewMode = isViewMode } val referral = referalCache(benId = 7L).apply { referralReason = "TB Screening Form" @@ -97,6 +99,19 @@ class NcdReferListAdapterTest { assertEquals(11L, capturedHhId) assertEquals("TB Screening Form", capturedReason) assertEquals(123L, capturedReferredDate) + assertEquals(false, capturedIsViewMode) + } + + @Test + fun clickListener_passesViewFollowUpMode() { + var capturedIsViewMode: Boolean? = null + val listener = NcdReferListAdapter.NcdReferallickListener { _, _, _, _, _, isViewMode -> + capturedIsViewMode = isViewMode + } + + listener.onClickedFollowUp(benBasic(), referalCache(), isViewMode = true) + + assertEquals(true, capturedIsViewMode) } @Test @@ -106,7 +121,7 @@ class NcdReferListAdapterTest { try { val adapter = NcdReferListAdapter( userName = "ASHA", - listener = NcdReferListAdapter.NcdReferallickListener { _, _, _, _, _ -> }, + listener = NcdReferListAdapter.NcdReferallickListener { _, _, _, _, _, _ -> }, visible = true ) assertEquals(0, adapter.itemCount) diff --git a/app/src/test/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormFragmentNavigationTest.kt b/app/src/test/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormFragmentNavigationTest.kt index 8e91ca097..a2452ef3c 100644 --- a/app/src/test/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormFragmentNavigationTest.kt +++ b/app/src/test/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormFragmentNavigationTest.kt @@ -32,7 +32,14 @@ class NCDReferalFormFragmentNavigationTest { unmockkConstructor(Bundle::class) } - private fun args() = NCDReferalFormFragmentArgs(benId = 10L, hhId = 20L, referReason = "TB Screening Form", referredDate = 30L) + private fun args(isViewMode: Boolean = false) = NCDReferalFormFragmentArgs( + benId = 10L, + hhId = 20L, + referReason = "TB Screening Form", + referredDate = 30L, + referralType = null, + isViewMode = isViewMode + ) @Test fun constructor_exposesEveryArgument() { @@ -41,6 +48,7 @@ class NCDReferalFormFragmentNavigationTest { assertEquals(20L, a.hhId) assertEquals("TB Screening Form", a.referReason) assertEquals(30L, a.referredDate) + assertFalse(a.isViewMode) } @Test @@ -72,9 +80,17 @@ class NCDReferalFormFragmentNavigationTest { assertEquals(10L, handle.get("benId")) assertEquals(20L, handle.get("hhId")) assertEquals("TB Screening Form", handle.get("referReason")) + assertEquals(false, handle.get("isViewMode")) assertEquals(args(), NCDReferalFormFragmentArgs.fromSavedStateHandle(handle)) } + @Test + fun fromSavedStateHandle_preservesViewFollowUpMode() { + val handle = args(isViewMode = true).toSavedStateHandle() + + assertTrue(NCDReferalFormFragmentArgs.fromSavedStateHandle(handle).isViewMode) + } + @Test fun fromSavedStateHandle_throws_whenRequiredArgumentMissing() { assertThrows(IllegalArgumentException::class.java) { @@ -105,6 +121,7 @@ class NCDReferalFormFragmentNavigationTest { every { bundle.getLong("hhId") } returns 20L every { bundle.getString("referReason") } returns "TB Screening Form" every { bundle.getLong("referredDate") } returns 30L + every { bundle.getBoolean("isViewMode") } returns false // Optional, nullable (General Check-up referrals pass GENERAL_CHECKUP); the relaxed mock would return "". every { bundle.getString("referralType") } returns null assertEquals(args(), NCDReferalFormFragmentArgs.fromBundle(bundle)) @@ -119,6 +136,16 @@ class NCDReferalFormFragmentNavigationTest { assertEquals("GENERAL_CHECKUP", NCDReferalFormFragmentArgs.fromBundle(bundle).referralType) } + @Test + fun fromBundle_readsViewFollowUpMode() { + every { bundle.containsKey(any()) } returns true + every { bundle.getLong(any()) } returns 10L + every { bundle.getString("referReason") } returns "TB Screening Form" + every { bundle.getBoolean("isViewMode") } returns true + + assertTrue(NCDReferalFormFragmentArgs.fromBundle(bundle).isViewMode) + } + @Test fun fromBundle_throws_whenRequiredArgumentMissing() { every { bundle.containsKey(any()) } returns false diff --git a/app/src/test/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormViewModelTest.kt b/app/src/test/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormViewModelTest.kt index c57bed486..78614cacf 100644 --- a/app/src/test/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormViewModelTest.kt +++ b/app/src/test/java/org/piramalswasthya/sakhi/ui/home_activity/non_communicable_diseases/ncd_referred/followUp/NCDReferalFormViewModelTest.kt @@ -54,14 +54,20 @@ class NCDReferalFormViewModelTest : BaseViewModelTest() { viewModel = buildViewModel("Suspected NCD case") } - private fun buildViewModel(referReason: String) = NCDReferalFormViewModel( + private fun buildViewModel(referReason: String, isViewMode: Boolean = false) = NCDReferalFormViewModel( repository, tbReferralFollowUpRepository, gcReferralFollowUpRepository, tbRepo, benRepo, context, - SavedStateHandle(mapOf("benId" to 1L, "hhId" to 2L, "referReason" to referReason, "referredDate" to 0L)) + SavedStateHandle(mapOf( + "benId" to 1L, + "hhId" to 2L, + "referReason" to referReason, + "referredDate" to 0L, + "isViewMode" to isViewMode + )) ) @Test @@ -287,6 +293,24 @@ class NCDReferalFormViewModelTest : BaseViewModelTest() { assertFalse(viewModel.isViewMode) } + @Test + fun `edit enables saved referral fields while keeping referred date locked`() = runTest { + viewModel = buildViewModel("TB Screening Form", isViewMode = true) + stubNcd(ncdSchema(ncdField("referred_on_date"), ncdField("follow_up_date"))) + + viewModel.loadFormSchema(1L) + advanceUntilIdle() + + assertTrue(viewModel.isViewMode) + assertFalse(ncdFieldOf("follow_up_date").isEditable) + + viewModel.enableFormEditing() + + assertFalse(viewModel.isViewMode) + assertFalse(ncdFieldOf("referred_on_date").isEditable) + assertTrue(ncdFieldOf("follow_up_date").isEditable) + } + @Test fun `visitHistory is initially empty`() { assertTrue(viewModel.visitHistory.value.isEmpty())