diff --git a/app/build.gradle b/app/build.gradle index b4632e1..ebb1582 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "in.sminnovations.hposregistration" minSdk 26 targetSdk 34 - versionCode 12 - versionName "1.0.12" + versionCode 13 + versionName "1.0.13" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/hposregistration/data/datasource/LocalFileDataSource.kt b/app/src/main/java/com/example/hposregistration/data/datasource/LocalFileDataSource.kt index 762e90d..178ef04 100644 --- a/app/src/main/java/com/example/hposregistration/data/datasource/LocalFileDataSource.kt +++ b/app/src/main/java/com/example/hposregistration/data/datasource/LocalFileDataSource.kt @@ -71,7 +71,7 @@ class LocalFileDataSource { "userImageURL" ) csvWriter.writeNext(header) - val imagesFolder = File(getExternalStorageDirectory(), "Images${getCurrentDateTime()}") + val imagesFolder = File(getExternalStorageDirectory(), "images${getCurrentDateTime()}") // val imagesFolder = File(getExternalStorageDirectory(), "Images") if (!imagesFolder.exists()) { if (!imagesFolder.mkdirs()) { @@ -149,7 +149,7 @@ class LocalFileDataSource { } private fun getExternalStorageDirectory(): File { - val folder = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "HposRegister") + val folder = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "HposRegistration") if (!folder.exists()) { folder.mkdirs() @@ -158,7 +158,7 @@ class LocalFileDataSource { return folder } private fun getCurrentDateTime(): String { - val dateFormat = SimpleDateFormat("dd-MM-yy", Locale.getDefault()) + val dateFormat = SimpleDateFormat("dd_MM_yy", Locale.getDefault()) val currentDateTime = Date() return dateFormat.format(currentDateTime) } 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 1ed4599..dd4dc13 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 @@ -84,8 +84,8 @@ class RegistrationViewModel @Inject constructor( fun createCSV(userData: List, context: Context) = viewModelScope.launch { - val fileName = "HPOS${getCurrentDate()}.csv" - if (localFileDataSource.exportDataToCSV(fileName, userData,context)) { + val fileName = "hpos${getCurrentDate()}.csv" + if (localFileDataSource.exportDataToCSV(fileName, userData)) { userData.forEach { data -> data.localFlag = true mainRepository.updateCSVFieldById( @@ -97,15 +97,8 @@ class RegistrationViewModel @Inject constructor( } } - private fun getCurrentDateTime(): String { - val dateFormat = SimpleDateFormat("dd-MM-yy", Locale.getDefault()) - val currentDateTime = Date() - return dateFormat.format(currentDateTime) - } - - private fun getCurrentDate(): String { - val dateFormat = SimpleDateFormat("dd-MM-yy", Locale.getDefault()) + val dateFormat = SimpleDateFormat("dd_MM_yy", Locale.getDefault()) val currentDate = Date() return dateFormat.format(currentDate) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 855a734..865c82a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -148,8 +148,8 @@ You have scanned the Abha ID You have scanned the Aadhar ID Download CSV - Download DB Tests - Do you want to download the local DB tests in CSV format? + Download DB Registartion Data + Do you want to download the local DB Registrations in CSV format? Upload done successfully NT-A