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 178ef04..9c8bbd1 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 @@ -42,33 +42,33 @@ class LocalFileDataSource { val csvWriter = CSVWriter(FileWriter(csvFilePath)) // Write CSV header val header = arrayOf( - "_id", - "name", - "bloodGroup", - "birthYear", - "state", - "abhaId", - "testStatus", // Assuming testStatus is a boolean field - "gender", - "appVersion", - "phoneNumber", - "careOf", - "maritalStatus", - "category", - "caste", - "subCaste", - "house", - "city", - "district", - "state", - "pinCode", - "isUnderMedication", - "isUnderTransfusion", - "sickleCellHistory", - "registeredBy", - "createdAt", - "registrationCenterName", - "userImageURL" + "Sample ID", + "Name", + "ABHA ID", + "Aadhaar ID", + "BirthYear", + "Gender", + "Caste", + "Category", + "Marital Status", + "Address", + "District", + "State", + "PinCode", + "Mobile Number", + "Date", + "BloodGroup", + "Center Name", + "City", + "TestStatus", // Assuming testStatus is a boolean field + "AppVersion", + "CareOf", + "SubCaste", + "IsUnderMedication", + "IsUnderTransfusion", + "SickleCellHistory", + "RegisteredBy", + "UserImageURL" ) csvWriter.writeNext(header) val imagesFolder = File(getExternalStorageDirectory(), "images${getCurrentDateTime()}") @@ -88,30 +88,30 @@ class LocalFileDataSource { val row = arrayOf( data._id, data.name, - data.bloodGroup, - data.birthYear, - data.state, data.abhaId, - data.testStatus?.toString() ?: "", + data.aadharId, + data.birthYear, data.gender, - data.appVersion ?: "", - data.phoneNumber, - data.careOf, - data.maritalStatus, - data.category, data.caste, - data.subCaste ?: "", + data.category, + data.maritalStatus, data.house, - data.city, - data.district, data.state, + data.district, data.pinCode, + data.phoneNumber, + data.createdAt ?: "", + data.bloodGroup, + data.registrationCenterName ?: "", + data.city, + data.testStatus?.toString() ?: "", + data.appVersion ?: "", + data.careOf, + data.subCaste ?: "", data.isUnderMedication?.toString() ?: "", data.isUnderTransfusion?.toString() ?: "", data.sickleCellHistory ?: "", data.registeredBy ?: "", - data.createdAt ?: "", - data.registrationCenterName ?: "", localImageFile?.absolutePath ?: "" // Use the local image file path in the CSV ) csvWriter.writeNext(row) diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt index 92c8cbd..821c3c5 100644 --- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt +++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt @@ -180,6 +180,11 @@ class AbhaRegistrationFragment : BaseFragment() { aadharID.error = getString(R.string.invalid_aadhar_id) return false } + + if (aadharId.length.equals("0") || aadharId.isEmpty() || aadharId.equals(null) || aadharID.equals("")) { + aadharID.error = getString(R.string.invalid_aadhar_id) + return false + } if (!checkUserName(userName)) { etName.error = getString(R.string.name_field_error) return false