diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt index 1edc549..8dcf4dd 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt @@ -123,7 +123,7 @@ class HomeFragment : Fragment() { } binding.btnSaveLocal.setOnClickListener { - context?.let { it1 -> showDownloadDialog(context = it1) } + showDownloadDialog(requireContext()) } binding.btnNewKit.setOnClickListener { with(sharedPreference.edit()) { diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt index 5f4d77e..3c99e63 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt @@ -19,10 +19,12 @@ import com.example.hpostesting.data.model.patient.DeviceData import com.example.hpostesting.data.model.patient.HemoCubeTestData import com.example.hpostesting.data.model.patient.toHemoCubeTestData import com.example.hpostesting.data.repository.DatabaseRepository +import com.example.hpostesting.data.repository.LocalFileRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import java.text.SimpleDateFormat import java.util.Calendar +import java.util.Date import java.util.Locale import javax.inject.Inject @@ -30,7 +32,7 @@ import javax.inject.Inject class HemoCubeViewModel @Inject constructor( private val hemoCubeDao: HemoCubeDao, private val repository: DatabaseRepository, - private val localFileDataSource: LocalFileDataSource, + private val localFileDataSource: LocalFileRepository, context: Context, ) : ViewModel() { var isServiceConnected = false @@ -227,6 +229,11 @@ class HemoCubeViewModel @Inject constructor( return true // Assuming success, you might want to modify this based on your actual logic } + private fun getCurrentDate(): String { + val dateFormat = SimpleDateFormat("dd-MM-yy", Locale.getDefault()) + val currentDate = Date() + return dateFormat.format(currentDate) + } fun deleteById(userId: String) = viewModelScope.launch { hemoCubeDao.deleteById(id = userId) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ec5b9d3..6f9bd9f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -188,6 +188,10 @@ Do you want to upload the local DB tests to the cloud? Upload Cancel + + Download CSV + Download DB Tests + Do you want to download the local DB tests in CSV format? Upload done successfully Test Completed Select Blood Group