diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt index cc9bb56..9ee2c8d 100644 --- a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt +++ b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt @@ -241,10 +241,8 @@ class UserListFragment : BaseFragment() { val downloadList = mutableListOf() userDataList.forEach { userData -> - // Log details for debugging Log.d("DownloadDebug", "userData: $userData, isCSVCreated: ${userData.isCSVCreated}") - - if (userData.isCSVCreated) { + if (!userData.isCSVCreated) { downloadList.add(userData) } } diff --git a/app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt b/app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt index f9ead41..e1fa3a9 100644 --- a/app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt +++ b/app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt @@ -83,7 +83,7 @@ class RegistrationViewModel @Inject constructor( fun createCSV(userData: List, appContext: Context) = viewModelScope.launch { - val fileName = "${getCurrentDate()}.csv" + val fileName = "${getCurrentDateTime()}.csv" if (localFileDataSource.exportDataToCSV(fileName, userData)) { userData.forEach { data -> data.localFlag = true @@ -95,9 +95,10 @@ class RegistrationViewModel @Inject constructor( } } - private fun getCurrentDate(): String { - val dateFormat = SimpleDateFormat("dd-MM-yy", Locale.getDefault()) - val currentDate = Date() - return dateFormat.format(currentDate) + private fun getCurrentDateTime(): String { + val dateFormat = SimpleDateFormat("dd-MM-yy HH:mm:ss", Locale.getDefault()) + val currentDateTime = Date() + return dateFormat.format(currentDateTime) } + } \ No newline at end of file