fix: Display Client Group Name and enable navigation (#2571)

kartikey004 · web-flow · commit f384d91946c9 · 2026-01-13T11:44:33.000-05:00
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/ClientDetailsRepositoryImp.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/ClientDetailsRepositoryImp.kt
@@ -94,7 +94,17 @@ class ClientDetailsRepositoryImp(
     }
 
     override suspend fun getClient(clientId: Int): ClientEntity {
-        return dataManagerClient.getClient(clientId)
+        val client = dataManagerClient.getClient(clientId)
+
+        if (client.groupName.isNullOrBlank() && !client.groups.isNullOrEmpty()) {
+            client.groups?.firstOrNull()?.let { firstGroup ->
+                return client.copy(
+                    groupName = firstGroup.name,
+                    groupId = firstGroup.id,
+                )
+            }
+        }
+        return client
     }
 
     override fun getImage(clientId: Int): Flow<DataState<String>> {
diff --git a/core/database/src/commonMain/kotlin/com/mifos/room/entities/client/ClientEntity.kt b/core/database/src/commonMain/kotlin/com/mifos/room/entities/client/ClientEntity.kt
@@ -58,6 +58,8 @@ data class ClientEntity(
 
     val groupId: Int? = 0,
 
+    val groupName: String? = null,
+
     val accountNo: String? = null,
 
     val clientId: Int? = null,
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/mappers/clients/ClientMapper.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/mappers/clients/ClientMapper.kt
@@ -28,6 +28,8 @@ object ClientMapper : AbstractMapper<GetClientsPageItemsResponse, ClientEntity>(
             displayName = entity.displayName,
             officeId = entity.officeId!!.toInt(),
             officeName = entity.officeName,
+            groupId = entity.groupId,
+            groupName = entity.groupName,
             active = entity.active!!,
             status = ClientStatusEntity(
                 id = entity.status?.id!!.toInt(),
@@ -53,6 +55,8 @@ object ClientMapper : AbstractMapper<GetClientsPageItemsResponse, ClientEntity>(
             displayName = domainModel.displayName,
             officeId = domainModel.officeId.toLong(),
             officeName = domainModel.officeName,
+            groupId = domainModel.groupId,
+            groupName = domainModel.groupName,
             active = domainModel.active,
             status = GetClientStatus(
                 id = domainModel.status?.id?.toLong(),
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/GetClientsPageItemsResponse.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/GetClientsPageItemsResponse.kt
@@ -45,6 +45,10 @@ data class GetClientsPageItemsResponse(
 
     val officeName: String? = null,
 
+    val groupId: Int? = null,
+
+    val groupName: String? = null,
+
     val status: GetClientStatus? = null,
 
     val externalId: String? = null,
diff --git a/feature/client/build.gradle.kts b/feature/client/build.gradle.kts
@@ -30,6 +30,7 @@ kotlin {
             implementation(projects.feature.loan)
             implementation(projects.feature.document)
             implementation(projects.feature.recurringDeposit)
+            implementation(projects.feature.groups)
 
             implementation(compose.ui)
             implementation(compose.material3)
diff --git a/feature/client/src/commonMain/composeResources/values/strings.xml b/feature/client/src/commonMain/composeResources/values/strings.xml
@@ -388,6 +388,8 @@
     <string name="mobile_na">Mobile: N/A</string>
     <string name="email_na">Email: N/A</string>
     <string name="office_na">Office: N/A</string>
+    <string name="group_na">N/A</string>
+    <string name="group_label">Group:</string>
 
     <!-- Titles -->
     <string name="title_client_assign_staff">Client Assign Staff</string>
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/ClientProfileNavigation.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/ClientProfileNavigation.kt
@@ -28,6 +28,7 @@ fun NavGraphBuilder.clientProfileDestination(
     documents: (Int) -> Unit,
     identifiers: (Int) -> Unit,
     navigateToClientDetailsScreen: (Int) -> Unit,
+    navigateToGroupDetails: (Int) -> Unit,
     viewAddress: (Int) -> Unit,
     viewAssociatedAccounts: (Int) -> Unit,
     navigateToAddCharge: (Int) -> Unit,
@@ -40,6 +41,7 @@ fun NavGraphBuilder.clientProfileDestination(
             identifiers = identifiers,
             onNavigateBack = onNavigateBack,
             navigateToClientDetailsScreen = navigateToClientDetailsScreen,
+            navigateToGroupDetails = navigateToGroupDetails,
             viewAddress = viewAddress,
             viewAssociatedAccounts = viewAssociatedAccounts,
             pinpointLocation = pinpointLocation,
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/ClientProfileScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/ClientProfileScreen.kt
@@ -13,6 +13,7 @@ import androidclient.feature.client.generated.resources.Res
 import androidclient.feature.client.generated.resources.client_profile_actions
 import androidclient.feature.client.generated.resources.client_profile_profile
 import androidclient.feature.client.generated.resources.client_profile_title
+import androidclient.feature.client.generated.resources.group_na
 import androidclient.feature.client.generated.resources.name_na
 import androidclient.feature.client.generated.resources.office_na
 import androidclient.feature.client.generated.resources.string_not_available
@@ -56,6 +57,7 @@ internal fun ClientProfileScreen(
     identifiers: (Int) -> Unit,
     onNavigateBack: () -> Unit,
     navigateToClientDetailsScreen: (Int) -> Unit,
+    navigateToGroupDetails: (Int) -> Unit,
     viewAddress: (Int) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: ClientProfileViewModel = koinViewModel(),
@@ -101,6 +103,10 @@ internal fun ClientProfileScreen(
             ClientProfileEvent.NavigateToClientDetailsScreen -> {
                 navigateToClientDetailsScreen(state.client?.id ?: -1)
             }
+
+            is ClientProfileEvent.NavigateToGroupDetails -> {
+                navigateToGroupDetails(event.groupId)
+            }
         }
     }
 
@@ -159,6 +165,12 @@ private fun ClientProfileScaffold(
                         accountNo = state.client?.accountNo
                             ?: stringResource(Res.string.string_not_available),
                         office = state.client?.officeName ?: stringResource(Res.string.office_na),
+                        groupName = state.client?.groupName ?: stringResource(Res.string.group_na),
+                        onGroupClick = {
+                            state.client?.groupId?.let { groupId ->
+                                onAction(ClientProfileAction.OnGroupClick(groupId))
+                            }
+                        },
                         onClick = {
                             onAction(
                                 ClientProfileAction.NavigateToClientDetailsScreen,
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/ClientProfileViewModel.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/ClientProfileViewModel.kt
@@ -141,6 +141,10 @@ internal class ClientProfileViewModel(
             ClientProfileAction.NavigateToClientDetailsScreen -> sendEvent(
                 ClientProfileEvent.NavigateToClientDetailsScreen,
             )
+
+            is ClientProfileAction.OnGroupClick -> sendEvent(
+                ClientProfileEvent.NavigateToGroupDetails(action.groupId),
+            )
         }
     }
 }
@@ -176,6 +180,8 @@ sealed interface ClientProfileEvent {
     data class OnActionClick(val action: ClientProfileActionItem) : ClientProfileEvent
 
     data object NavigateToClientDetailsScreen : ClientProfileEvent
+
+    data class NavigateToGroupDetails(val groupId: Int) : ClientProfileEvent
 }
 
 /**
@@ -192,4 +198,6 @@ sealed interface ClientProfileAction {
     data object OnRetry : ClientProfileAction
 
     data object NavigateToClientDetailsScreen : ClientProfileAction
+
+    data class OnGroupClick(val groupId: Int) : ClientProfileAction
 }
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/components/ProfileCard.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/components/ProfileCard.kt
@@ -9,12 +9,18 @@
  */
 package com.mifos.feature.client.clientProfile.components
 
+import androidclient.feature.client.generated.resources.Res
+import androidclient.feature.client.generated.resources.group_label
+import androidclient.feature.client.generated.resources.group_na
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -25,13 +31,16 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.font.FontWeight
 import com.mifos.core.designsystem.component.MifosCard
 import com.mifos.core.designsystem.icon.MifosIcons
 import com.mifos.core.designsystem.theme.AppColors
 import com.mifos.core.designsystem.theme.DesignToken
 import com.mifos.core.designsystem.theme.MifosTheme
 import com.mifos.core.designsystem.theme.MifosTypography
 import com.mifos.core.ui.components.MifosUserImage
+import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
 @Composable
@@ -40,12 +49,12 @@ fun ProfileCard(
     name: String,
     accountNo: String,
     office: String,
+    groupName: String? = null,
+    onGroupClick: () -> Unit = {},
     onClick: () -> Unit,
 ) {
     MifosCard(
-        modifier = Modifier.clickable {
-            onClick()
-        },
+        modifier = Modifier.clickable { onClick() },
         colors = CardColors(
             containerColor = MaterialTheme.colorScheme.primary,
             contentColor = AppColors.customWhite,
@@ -54,7 +63,8 @@ fun ProfileCard(
         ),
     ) {
         Row(
-            Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
                 .padding(DesignToken.padding.largeIncreasedExtra),
             verticalAlignment = Alignment.CenterVertically,
         ) {
@@ -64,7 +74,7 @@ fun ProfileCard(
             )
             Spacer(Modifier.width(DesignToken.padding.medium))
             Column(
-                Modifier.weight(1f),
+                modifier = Modifier.weight(1f),
                 verticalArrangement = Arrangement.spacedBy(DesignToken.padding.extraExtraSmall),
             ) {
                 Text(
@@ -75,19 +85,64 @@ fun ProfileCard(
                 Text(
                     text = "Acc. No. $accountNo",
                     style = MifosTypography.bodySmall,
-                    color = MaterialTheme.colorScheme.secondaryContainer,
+                    color = MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.8f),
                 )
                 Text(
                     text = office,
                     style = MifosTypography.bodySmall,
-                    color = MaterialTheme.colorScheme.secondaryContainer,
+                    color = MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.8f),
+                )
+
+                Spacer(Modifier.height(DesignToken.padding.small))
+
+                val displayGroupName = groupName ?: stringResource(Res.string.group_na)
+                val isClickable = !groupName.isNullOrBlank() && groupName != stringResource(Res.string.group_na)
+                val groupLabel = stringResource(Res.string.group_label)
+
+                GroupChip(
+                    text = "$groupLabel $displayGroupName",
+                    isClickable = isClickable,
+                    onClick = onGroupClick,
                 )
             }
             Spacer(Modifier.width(DesignToken.padding.medium))
             Icon(
                 imageVector = MifosIcons.ChevronRight,
                 contentDescription = null,
                 modifier = Modifier.size(DesignToken.sizes.iconSmall),
+                tint = MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.6f),
+            )
+        }
+    }
+}
+
+@Composable
+private fun GroupChip(
+    text: String,
+    isClickable: Boolean,
+    onClick: () -> Unit,
+) {
+    Box(
+        modifier = Modifier
+            .clip(DesignToken.shapes.small)
+            .background(
+                color = MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.15f),
+            )
+            .clickable(enabled = isClickable, onClick = onClick)
+            .padding(horizontal = DesignToken.padding.small, vertical = DesignToken.padding.extraSmall),
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Icon(
+                imageVector = MifosIcons.Group,
+                contentDescription = null,
+                modifier = Modifier.size(DesignToken.sizes.iconSmall),
+                tint = MaterialTheme.colorScheme.onPrimary,
+            )
+            Spacer(modifier = Modifier.width(DesignToken.padding.extraSmall))
+            Text(
+                text = text,
+                style = MifosTypography.bodySmall.copy(fontWeight = FontWeight.Medium),
+                color = MaterialTheme.colorScheme.onPrimary,
             )
         }
     }
@@ -102,6 +157,7 @@ fun ProfileCardPreview() {
             name = "John",
             accountNo = "2344",
             office = "Head Office",
+            groupName = "Finance",
             onClick = {},
         )
     }
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt
@@ -88,6 +88,7 @@ import com.mifos.feature.client.shareAccounts.navigateToShareAccountsScreen
 import com.mifos.feature.client.shareAccounts.shareAccountsDestination
 import com.mifos.feature.dataTable.navigation.navigateToDataTable
 import com.mifos.feature.document.navigation.navigateToDocumentListScreen
+import com.mifos.feature.groups.navigation.navigateToGroupDetailsScreen
 import com.mifos.feature.loan.loanAccount.navigateToLoanAccountScreen
 import com.mifos.feature.loan.loanAccountSummary.navigateToLoanAccountSummaryScreen
 import com.mifos.feature.loan.navigation.loanDestination
@@ -193,6 +194,7 @@ fun NavGraphBuilder.clientNavGraph(
             navigateToAddCharge = {
                 navController.navigateToChargesRoute(it, Constants.ENTITY_TYPE_CLIENTS)
             },
+            navigateToGroupDetails = navController::navigateToGroupDetailsScreen,
         )
 
         clientAddressNavigation(

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,10 @@ internal class ClientProfileViewModel(`
`141`	`141`	`ClientProfileAction.NavigateToClientDetailsScreen -> sendEvent(`
`142`	`142`	`ClientProfileEvent.NavigateToClientDetailsScreen,`
`143`	`143`	`)`
	`144`	`+`
	`145`	`+ is ClientProfileAction.OnGroupClick -> sendEvent(`
	`146`	`+ ClientProfileEvent.NavigateToGroupDetails(action.groupId),`
	`147`	`+ )`
`144`	`148`	`}`
`145`	`149`	`}`
`146`	`150`	`}`
`@@ -176,6 +180,8 @@ sealed interface ClientProfileEvent {`
`176`	`180`	`data class OnActionClick(val action: ClientProfileActionItem) : ClientProfileEvent`
`177`	`181`
`178`	`182`	`data object NavigateToClientDetailsScreen : ClientProfileEvent`
	`183`	`+`
	`184`	`+ data class NavigateToGroupDetails(val groupId: Int) : ClientProfileEvent`
`179`	`185`	`}`
`180`	`186`
`181`	`187`	`/**`
`@@ -192,4 +198,6 @@ sealed interface ClientProfileAction {`
`192`	`198`	`data object OnRetry : ClientProfileAction`
`193`	`199`
`194`	`200`	`data object NavigateToClientDetailsScreen : ClientProfileAction`
	`201`	`+`
	`202`	`+ data class OnGroupClick(val groupId: Int) : ClientProfileAction`
`195`	`203`	`}`