Collection Sheet Enhancement #2406
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,12 +66,12 @@ import com.mifos.core.designsystem.component.MifosDatePickerTextField | |
| import com.mifos.core.designsystem.component.MifosScaffold | ||
| import com.mifos.core.designsystem.component.MifosTextFieldDropdown | ||
| import com.mifos.core.network.model.RequestCollectionSheetPayload | ||
| import com.mifos.room.entities.collectionsheet.IndividualCollectionSheet | ||
| import com.mifos.room.entities.organisation.OfficeEntity | ||
| import com.mifos.room.entities.organisation.StaffEntity | ||
| import kotlinx.datetime.Clock | ||
| import org.jetbrains.compose.resources.stringResource | ||
| import org.jetbrains.compose.ui.tooling.preview.Preview | ||
| import org.koin.compose.viewmodel.koinViewModel | ||
|
|
||
| @Composable | ||
|
|
@@ -120,7 +120,11 @@ internal fun NewIndividualCollectionSheetScreen( | |
| var showCollectionSheetDialog by rememberSaveable { mutableStateOf(false) } | ||
|
|
||
| var showDatePicker by rememberSaveable { mutableStateOf(false) } | ||
| var repaymentDate by rememberSaveable { | ||
| mutableLongStateOf( | ||
| Clock.System.now().toEpochMilliseconds(), | ||
| ) | ||
| } | ||
| val datePickerState = rememberDatePickerState( | ||
| initialSelectedDateMillis = repaymentDate, | ||
| selectableDates = object : SelectableDates { | ||
|
|
@@ -229,12 +233,24 @@ internal fun NewIndividualCollectionSheetScreen( | |
| selectedStaff = "" | ||
| }, | ||
| onOptionSelected = { index, value -> | ||
| println("DEBUG: Office selection - Index: $index, List size: ${state.officeList.size}, Value: $value") | ||
|
||
| try { | ||
| if (index >= 0 && index < state.officeList.size) { | ||
| val selectedOfficeEntity = state.officeList[index] | ||
| selectedOfficeEntity.id?.let { | ||
| getStaffList(it) | ||
| officeId = it | ||
| } | ||
| selectedOffice = value | ||
| selectedStaff = "" | ||
| println("DEBUG: Office selection successful") | ||
| } else { | ||
| println("DEBUG: Office index out of bounds: $index for size ${state.officeList.size}") | ||
| } | ||
| } catch (e: Exception) { | ||
| println("DEBUG: Error in office selection: ${e.message}") | ||
| println("DEBUG: Full error: ${e.stackTraceToString()}") | ||
| } | ||
| }, | ||
| label = stringResource(Res.string.feature_collection_sheet_office), | ||
| options = state.officeList.map { it.name.toString() }, | ||
|
|
@@ -254,10 +270,21 @@ internal fun NewIndividualCollectionSheetScreen( | |
| selectedStaff = it | ||
| }, | ||
| onOptionSelected = { index, value -> | ||
| try { | ||
| if (index >= 0 && index < state.staffList.size) { | ||
|
||
| val selectedStaffEntity = state.staffList[index] | ||
| selectedStaffEntity.id?.let { | ||
| staffId = it | ||
| } | ||
| selectedStaff = value | ||
| println("DEBUG: Staff selection successful") | ||
| } else { | ||
| println("DEBUG: Staff index out of bounds: $index for size ${state.staffList.size}") | ||
| } | ||
| } catch (e: Exception) { | ||
| println("DEBUG: Error in staff selection: ${e.message}") | ||
| println("DEBUG: Full error: ${e.stackTraceToString()}") | ||
| } | ||
| }, | ||
| label = stringResource(Res.string.feature_collection_sheet_staff), | ||
| options = state.staffList.map { it.displayName.toString() }, | ||
|
|
@@ -388,7 +415,7 @@ private fun CollectionSheetDialogContent( | |
| ) | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun NewIndividualCollectionSheetPreview() { | ||
| Column { | ||
|
|
@@ -438,7 +465,7 @@ val sampleOfficeList = List(10) { | |
| OfficeEntity(id = it, name = "Name") | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun CollectionSheetDialogContentPreview() { | ||
| CollectionSheetDialogContent(date = "19 June 2024", member = "5", fillNow = {}, onDismiss = {}) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove this as u already defined in
dependencies {}blockThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i mentioned remove it from
commonMainbut keep thedependencies{}:KMP wizardthis way it is done by default maybe they have sth in mind where in future the previews will work for all platform if we have it here