Feature/mifosac 579 client fields

core/database/src/commonMain/kotlin/com/mifos/room/entities/client/ClientEntity.kt

@@ -107,4 +107,10 @@ data class ClientEntity(
     val emailAddress: String? = null,
 
     val legalForm: ClientStatusEntity? = null,
-) : Parcelable
+
+    // New fields added
+    val gender: String? = null,
+    val clientType: String? = null,
+    val clientClassification: String? = null
+
+) : Parcelable

core/model/src/commonMain/kotlin/com/mifos/core/model/objects/databaseobjects/Client.kt

@@ -25,4 +25,10 @@ data class Client(
     var mifosGroup: MifosGroup? = null,
 
     val loans: List<Loan> = ArrayList(),
-) : Parcelable
+
+    // New fields added
+    var gender: String? = null,
+    var clientType: String? = null,
+    var clientClassification: String? = null
+
+) : Parcelable

core/network/src/commonMain/kotlin/com/mifos/core/network/mappers/clients/ClientMapper.kt

@@ -42,6 +42,11 @@ object ClientMapper : AbstractMapper<GetClientsPageItemsResponse, ClientEntity>(
                 value = entity.legalForm?.value,
             ),
             dateOfBirth = entity.dateOfBirth ?: emptyList(),
+
+            // Mapping for new fields added
+            gender = entity.gender,
+            clientType = entity.clientType,
+            clientClassification = entity.clientClassification
         )
     }
 
@@ -67,6 +72,11 @@ object ClientMapper : AbstractMapper<GetClientsPageItemsResponse, ClientEntity>(
                 value = domainModel.legalForm?.value,
             ),
             dateOfBirth = domainModel.dateOfBirth,
+
+            // Reverse mapping for new fields added
+            gender = domainModel.gender,
+            clientType = domainModel.clientType,
+            clientClassification = domainModel.clientClassification
         )
     }
-}
+}

core/network/src/commonMain/kotlin/com/mifos/core/network/model/GetClientsPageItemsResponse.kt

@@ -58,4 +58,10 @@ data class GetClientsPageItemsResponse(
     val savingAccountOptions: List<SavingAccountOption> = emptyList(),
 
     val shareAccounts: List<ShareAccounts> = emptyList(),
-)
+
+    // New fields added
+    val gender: String? = null,
+    val clientType: String? = null,
+    val clientClassification: String? = null
+
+)

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientDetails/ClientDetailsScreen.kt

@@ -395,6 +395,30 @@ private fun MifosClientDetailsScreen(
                 value = it,
             )
         }
+
+        // New fields added
+        client?.gender?.let {
+            MifosClientDetailsText(
+                icon = MifosIcons.Person, // Replace with a more suitable icon if available
+                field = "Gender", // Replace with a string resource e.g., stringResource(Res.string.gender)
+                value = it,
+            )
+        }
+        client?.clientType?.let {
+            MifosClientDetailsText(
+                icon = MifosIcons.Info, // Replace with a more suitable icon if available
+                field = "Client Type", // Replace with a string resource
+                value = it,
+            )
+        }
+        client?.clientClassification?.let {
+            MifosClientDetailsText(
+                icon = MifosIcons.Info, // Replace with a more suitable icon if available
+                field = "Client Classification", // Replace with a string resource
+                value = it,
+            )
+        }
+
         client?.let { Utils.getStringOfDate(it.activationDate) }?.let {
             MifosClientDetailsText(
                 icon = MifosIcons.DateRange,
@@ -881,4 +905,4 @@ private fun ClientDetailsScreenPreview() {
         savingsAccountSelected = { _, _ -> },
         activateClient = {},
     )
-}
+}

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientEditDetails/ClientEditDetailsScreen.kt

@@ -421,7 +421,7 @@ private fun UpdateClientDetailsContent(
                         updateClient,
                         isActive,
                         staffInOffices,
-                        selectedClientId = selectedClientTypeId,
+                        selectedClientTypeId = selectedClientTypeId,
                         selectedClientClassificationId,
                         genderId,
                         selectedStaffId,
@@ -919,7 +919,7 @@ private fun handleSubmitClick(
     updateClient: (clientPayload: ClientPayloadEntity) -> Unit,
     isActive: Boolean,
     staffInOffices: List<StaffEntity>,
-    selectedClientId: Int,
+    selectedClientTypeId: Int,
     selectedClientClassificationId: Int,
     genderId: Int,
     selectedStaffId: Int?,
@@ -962,7 +962,7 @@ private fun handleSubmitClick(
         clientTemplate,
         genderId,
         selectedStaffId,
-        selectedClientId,
+        selectedClientTypeId,
         selectedClientClassificationId,
         selectedLegalFormId,
     )
@@ -986,7 +986,7 @@ private fun createClientPayload(
     clientTemplate: ClientsTemplateEntity,
     genderId: Int,
     selectedStaffId: Int?,
-    selectedClientId: Int,
+    selectedClientTypeId: Int,
     selectedClientClassificationId: Int,
     legalFormId: Int?,
 ): ClientPayloadEntity {
@@ -1025,7 +1025,7 @@ private fun createClientPayload(
         clientPayload = clientPayload.copy(staffId = selectedStaffId)
     }
     if (clientTemplate.clientTypeOptions?.isNotEmpty() == true) {
-        clientPayload = clientPayload.copy(clientTypeId = selectedClientId)
+        clientPayload = clientPayload.copy(clientTypeId = selectedClientTypeId)
     }
     if (clientTemplate.clientClassificationOptions?.isNotEmpty() == true) {
         clientPayload = clientPayload.copy(clientClassificationId = selectedClientClassificationId)

feature/client/src/commonMain/kotlin/com/mifos/feature/client/createNewClient/CreateNewClientScreen.kt

@@ -734,7 +734,7 @@ private fun handleSubmitClick(
     staffInOffices: List<StaffEntity>,
     hasDatatables: Boolean,
     selectedOfficeId: Int?,
-    selectedClientId: Int,
+    selectedClientTypeId: Int,
     selectedClientClassificationId: Int,
     genderId: Int,
     selectedStaffId: Int?,
@@ -779,7 +779,7 @@ private fun handleSubmitClick(
         clientTemplate,
         genderId,
         selectedStaffId,
-        selectedClientId,
+        selectedClientTypeId,
         selectedClientClassificationId,
         isAddressEnabled,
         isAddressActive,
@@ -820,7 +820,7 @@ private fun createClientPayload(
     clientTemplate: ClientsTemplateEntity,
     genderId: Int,
     selectedStaffId: Int?,
-    selectedClientId: Int,
+    selectedClientTypeId: Int,
     selectedClientClassificationId: Int,
     isAddressEnabled: Boolean,
     isAddressActive: Boolean,
@@ -882,7 +882,7 @@ private fun createClientPayload(
         clientPayload = clientPayload.copy(staffId = selectedStaffId)
     }
     if (clientTemplate.clientTypeOptions?.isNotEmpty() == true) {
-        clientPayload = clientPayload.copy(clientTypeId = selectedClientId)
+        clientPayload = clientPayload.copy(clientTypeId = selectedClientTypeId)
     }
     if (clientTemplate.clientClassificationOptions?.isNotEmpty() == true) {
         clientPayload = clientPayload.copy(clientClassificationId = selectedClientClassificationId)

gradle/libs.versions.toml

@@ -116,7 +116,7 @@ kotlinxCoroutines = "1.10.1"
 kotlinxDatetime = "0.7.1"
 kotlinxImmutable = "0.3.8"
 kotlinxSerializationJson = "1.7.3"
-ksp = "2.1.0-1.0.29"
+ksp = "2.1.10-1.0.30"
 
 # Ktor & Ktorfit
 ktorVersion = "3.1.3"
@@ -131,7 +131,6 @@ koinAnnotationsVersion = "1.4.0-RC4"
 compose-plugin = "1.9.0"
 coil = "3.2.0"
 backHandlerVersion = "2.1.0"
-constraintLayout = "0.4.0"
 multiplatformSettings = "1.2.0"
 qroseVersion = "1.0.1"
 okioVersion = "3.9.1"

version.txt

@@ -1 +1 @@
-2025.9.2-beta.0.59
+2025.10.1-beta.0.5