L command for limit switch is added and now testing is completed

L command for limit switch is added and now testing is on going
separated buttons for buffer and sample , in the result screen, instead of dialogue box of existing buffer, it will changes the color of butter button, if it buffer is already available into green , if not the button will be red
2024-03-15 17:20:32 +05:30 · 2024-03-15 17:01:15 +05:30 · 2024-03-13 16:34:17 +05:30 · 2024-03-12 16:52:24 +05:30 · 2024-03-12 16:32:21 +05:30 · 2024-03-12 16:31:31 +05:30
81 changed files with 774 additions and 381 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,12 +65,14 @@
        <activity
            android:name="com.example.hpostesting.presentation.assurance.AssuranceControlsActivity"
            android:exported="false"
+            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar"/>

        <activity
            android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
            android:exported="false"
            android:noHistory="true"
+            android:screenOrientation="portrait"
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
            android:theme="@style/Theme.HPOS.NoActionBar"
            android:windowSoftInputMode="adjustPan" />
@@ -114,7 +116,7 @@


        <service
-            android:name="com.example.hpostesting.presentation.testRight.UsbService"
+            android:name="com.example.hpostesting.util.UsbService"
            android:enabled="true"
            android:exported="false" />

--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -55,6 +55,7 @@ object Constants {
    const val USER_ID = "usernameId"

    const val QUICK_CAPTURE_SOLUTION = "SOLUTION"
+    const val QUICK_CAPTURE_FOR_ADMIN = "ADMIN"
    const val QUICK_CAPTURE_CONCENTRATION = "CONCENTRATION"
    const val QUICK_CAPTURE_VOLUME = "VOLUME"
    const val QUICK_CAPTURE_READING_PER_SAMPLE = "READING_PER_SAMPLE"
--- a/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.data.constant

 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
--- a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt
@@ -15,4 +15,5 @@ enum class HemoCubeCommands(val command: String) {
    SECOND_GAIN_COMMAND("U\r"),
    THIRD_GAIN_COMMAND("V\r"),
    FORTH_GAIN_COMMAND("W\r"),
+    CHECK_CUVETTE_COMMAND("L\r"),
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
@@ -10,8 +10,12 @@ enum class TestStatus(val code: Double) {
    FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
    EPROM_ADC_RETRIEVAL_STARTED(4.5),
    EPROM_ADC_RETRIEVAL_COMPLETED(4.6),
-    BUFFER_STARTED(4.7),
-    BUFFER_COMPLETED(5.0),
+    CUVETTE_ABSENT(4.7),
+    CUVETTE_PRESENT(4.8),
+    CUVETTE_ABSENTS(7.7),
+    CUVETTE_PRESENTS(7.8),
+    BUFFER_STARTED(4.9),
+    BUFFER_COMPLETED(5.1),
    BUFFER_PRINT_STARTED(6.0),
    BUFFER_PRINT_COMPLETED(7.0),
    SAMPLE_STARTED(8.0),
--- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
@@ -5,6 +5,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Update
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
@Dao
@@ -30,7 +31,7 @@ interface HemoCubeDao {
    @Query("UPDATE hemo_cube_test_table SET isCSVCreated = :newValue WHERE _id = :id")
    suspend fun updateCSVFieldById(id: String, newValue: Boolean)

-    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag = :status")
-    suspend fun getPendingUser(status: Boolean): List<HemoCubeTestData>
+    @Query("SELECT * from hemo_cube_test_table WHERE localFlag = 0")
+    fun getPendingUser(): LiveData<List<HemoCubeTestData>>

 }
--- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
@@ -10,7 +10,7 @@ import com.example.hpostesting.data.model.patient.UserData

@Database(
    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 28,
+    version = 30,
    exportSchema = false
 )
@TypeConverters(Converters::class)
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt
@@ -11,4 +11,6 @@ interface LocalFileDataSource {
    fun exportDataToCSV(
        fileName: String, dataList: List<HemoCubeTestData>,
    ): Boolean
+    fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>)
+
 }
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
@@ -89,8 +89,9 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
            )
            csvWriter.writeNext(header)

-            // Write data rows
-            for (data in dataList) {
+            // Filter and write data rows where testStatus is true
+            val filteredDataList = dataList.filter { it.testStatus == true }
+            for (data in filteredDataList) {
                val row = arrayOf(
                    data._id,
                    data.name,
@@ -152,6 +153,127 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
        }
    }

+    override fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>) {
+        try {
+            val filePath = File(getExternalStorageDirectory(), fileName)
+            val writer = FileWriter(filePath)
+            val csvWriter = CSVWriter(writer)
+            // Write CSV header
+            val header = arrayOf(
+                "_id",
+                "name",
+                "incubationTime",
+                "bloodGroup",
+                "birthYear", // Include other fields from the data class
+                "state",
+                "abhaId",
+                "userImageURL",
+                "location",
+                "reportUploadTime",
+                "testType",
+                "testTime",
+                "testStatus",
+                "gender",
+                "localFlag", // Add more fields as necessary
+                "deviceId",
+                "appVersion",
+                "deviceSerialNumber",
+                "deviceType",
+                "kitSerial",
+                "resultData",
+                "led1Buffer",
+                "led2Buffer",
+                "led3Buffer",
+                "led4Buffer",
+                "led1Sample",
+                "led2Sample",
+                "led3Sample",
+                "led4Sample",
+                "led1Average",
+                "led2Average",
+                "led3Average",
+                "led4Average",
+                "abs1",
+                "abs2",
+                "abs3",
+                "abs4",
+                "deviceRatio",
+                "calculatedRatio",
+                "predictedDenovixRatio",
+                "coefficients",
+                "classificationResult",
+                "prdClassification",
+                "errorMessages",
+                "batteryLevel",
+                "batteryCapacity",
+                "batteryMaxCapacity",
+                "batteryTemperature",
+                "batteryVoltage"
+            )
+            csvWriter.writeNext(header)
+
+            // Filter and write data rows where testStatus is true
+            val filteredDataList = dataList.filter { it.testStatus == true }
+            for (data in filteredDataList) {
+                val row = arrayOf(
+                    data._id,
+                    data.name,
+                    data.incubationTime,
+                    data.bloodGroup,
+                    data.birthYear, // Include other fields similarly
+                    data.state,
+                    data.abhaId,
+                    data.userImageURL,
+                    data.location?.toString(),
+                    data.reportUploadTime ?: "",
+                    data.testType ?: "",
+                    data.testTime ?: "",
+                    data.testStatus?.toString() ?: "",
+                    data.gender,
+                    data.localFlag.toString(),
+                    data.deviceId ?: "",
+                    data.appVersion ?: "",
+                    data.deviceSerialNumber,
+                    data.deviceType,
+                    data.kitSerial,
+                    data.resultData,
+                    data.led1Buffer?.toString() ?: "",
+                    data.led2Buffer?.toString() ?: "",
+                    data.led3Buffer?.toString() ?: "",
+                    data.led4Buffer?.toString() ?: "",
+                    data.led1Sample?.toString() ?: "",
+                    data.led2Sample?.toString() ?: "",
+                    data.led3Sample?.toString() ?: "",
+                    data.led4Sample?.toString() ?: "",
+                    data.led1Average?.toString() ?: "",
+                    data.led2Average?.toString() ?: "",
+                    data.led3Average?.toString() ?: "",
+                    data.led4Average?.toString() ?: "",
+                    data.abs1?.toString() ?: "",
+                    data.abs2?.toString() ?: "",
+                    data.abs3?.toString() ?: "",
+                    data.abs4?.toString() ?: "",
+                    data.deviceRatio?.toString() ?: "",
+                    data.calculatedRatio?.toString() ?: "",
+                    data.predictedDenovixRatio?.toString() ?: "",
+                    data.coefficients ?: "",
+                    data.classificationResult,
+                    data.prdClassification,
+                    data.errorMessages,
+                    data.batteryLevel,
+                    data.batteryCapacity,
+                    data.batteryMaxCapacity,
+                    data.batteryTemperature,
+                    data.batteryVoltage
+                )
+                csvWriter.writeNext(row)
+            }
+            writer.close()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+
    private fun getExternalStorageDirectory(): File {
        val folder = File(Environment.getExternalStorageDirectory(), "HposFolder")

--- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
@@ -5,7 +5,8 @@ import androidx.room.PrimaryKey

@Entity(tableName = "hemo_cube_test_table")
 data class HemoCubeTestData(
-    @PrimaryKey
+    @PrimaryKey(autoGenerate = true)
+    var sampleid: Int = 0,
    var _id: String = "",
    var name: String = "",
    var incubationTime: String = "",
@@ -89,6 +90,7 @@ data class HemoCubeTestData(
    var quickCapture: Boolean = false,
    var solution: String? = "",
    var concentration: String? = "",
+    var filter: String? = "",
    var volume: String? = "",
    var isCSVCreated: Boolean = false,
 )
--- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
@@ -1,7 +1,7 @@
 package com.example.hpostesting.data.repository

 import android.net.Uri
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
--- a/app/src/main/java/com/example/hpostesting/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/Repository.kt
@@ -1,6 +1,6 @@
 package com.example.hpostesting.data.repository

-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
--- a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.domain.di
+package com.example.hpostesting.di

 import android.app.Application
 import android.content.Context
@@ -7,7 +7,7 @@ import android.content.res.AssetManager
 import androidx.room.Room
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
-import com.example.hpostesting.data.api.PropertyProvider
+import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
@@ -22,8 +22,8 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.UsbServiceListenerImpl
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
 import com.example.hpostesting.util.PropertyProviderImpl
 import dagger.Module
 import dagger.Provides
@@ -147,7 +147,7 @@ object AppModule {
    @Provides
    @Singleton
    fun provideRetrofit(
-        propertyProvider: PropertyProvider,@Named("Auth") client: OkHttpClient
+        propertyProvider: PropertyProvider, @Named("Auth") client: OkHttpClient
    ): Retrofit {
        return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
            .addConverterFactory(GsonConverterFactory.create()).build()
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -10,7 +10,7 @@ import android.view.View
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
--- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
@@ -17,7 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.data.model.patient.UserData
--- a/app/src/main/java/com/example/hpostesting/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainViewModel.kt
@@ -1,7 +0,0 @@
-package com.example.hpostesting.presentation
-
-import androidx.lifecycle.ViewModel
-
-class MainViewModel : ViewModel() {
-
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt
@@ -13,7 +13,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.util.MyUtils
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt
@@ -11,7 +11,7 @@ import androidx.navigation.findNavController
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
@@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
--- a/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt
@@ -13,9 +13,8 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
 import android.widget.Toast
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
@@ -45,7 +44,6 @@ class AssuranceControlsFragment : Fragment() {

    private fun initViews() {
 //        binding.btnSubmit.visibility = View.GONE
-
        val solutionSpinner: Spinner = binding.spinnerSolutions
        val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red")
        val solutionAdapter =
@@ -124,6 +122,27 @@ class AssuranceControlsFragment : Fragment() {
            }
        }

+
+        val adminspinner: Spinner = binding.spinnerAdmin
+        val adminOptions = arrayOf("Select options", "Sickle-Cert-Buffer", "1 Abs Holo Filter", "0.25 Abs Holo Filter", "Air Blank")
+        val adminAdapter =
+            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, adminOptions)
+        adminAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        adminspinner.adapter =adminAdapter
+        adminspinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long,
+            ) {
+                val selectedValue: String = adminOptions[position]
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+        }
        // load saved values
        val savedSolution =
            sharedPreferences.getString(Constants.QUICK_CAPTURE_SOLUTION, "").toString()
@@ -140,18 +159,30 @@ class AssuranceControlsFragment : Fragment() {
        val volumePosition = getPositionOfValue(savedVolume, volumeOptions.toList())
        volumeSpinner.setSelection(volumePosition)

+
+        val foradmin =
+            sharedPreferences.getString(Constants.QUICK_CAPTURE_FOR_ADMIN, "").toString()
+        val adminPosition = getPositionOfValue(foradmin, adminOptions.toList())
+        adminspinner.setSelection(adminPosition)
+
        binding.btnSubmit.setOnClickListener {
            val selectedSolution = binding.spinnerSolutions.selectedItem.toString()
            val selectedConcentration = binding.spinnerConcentration.selectedItem.toString()
+            val selectedadminOption = binding.spinnerAdmin.selectedItem.toString()

            // Check if any of the selections are default values
-            if (selectedSolution == "Select solution") {
-                Toast.makeText(requireContext(), "Please select a solution", Toast.LENGTH_LONG).show()
-                return@setOnClickListener // Prevent further execution
-            }
+//            if (selectedSolution == "Select solution") {
+//                Toast.makeText(requireContext(), "Please select a solution", Toast.LENGTH_LONG).show()
+//                return@setOnClickListener // Prevent further execution
+//            }
+//
+//            if (selectedConcentration == "Select concentration") {
+//                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
+//                return@setOnClickListener // Prevent further execution
+//            }

-            if (selectedConcentration == "Select concentration") {
-                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
+            if (selectedadminOption == "Select options") {
+                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
                return@setOnClickListener // Prevent further execution
            }
            DataHolder.hemoCubeTestData!!.quickCapture = true
@@ -163,7 +194,14 @@ class AssuranceControlsFragment : Fragment() {
            DataHolder.hemoCubeTestData!!._id = currentUnixTime.toString() + "SMI"
            DataHolder.hemoCubeTestData!!.solution = binding.spinnerSolutions.selectedItem.toString()
            DataHolder.hemoCubeTestData!!.concentration = binding.spinnerConcentration.selectedItem.toString()
-            DataHolder.hemoCubeTestData!!.name = "${DataHolder.hemoCubeTestData!!.solution} ${DataHolder.hemoCubeTestData!!.concentration} ${DataHolder.hemoCubeTestData!!.volume}"
+            DataHolder.hemoCubeTestData!!.filter = binding.spinnerAdmin.selectedItem.toString()
+            if(binding.spinnerAdmin.selectedItem.toString().equals("Select options")){
+                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
+            }else {
+                DataHolder.hemoCubeTestData!!.name = DataHolder.hemoCubeTestData!!.filter.toString()
+            }
+
+

            DataHolder.selectedTest = UserData()
            DataHolder.selectedTest?._id = DataHolder.hemoCubeTestData!!._id
@@ -176,6 +214,7 @@ class AssuranceControlsFragment : Fragment() {
                    DataHolder.hemoCubeTestData!!.concentration
                )
                putString(Constants.QUICK_CAPTURE_VOLUME, DataHolder.hemoCubeTestData!!.volume)
+                putString(Constants.QUICK_CAPTURE_FOR_ADMIN, DataHolder.hemoCubeTestData!!.filter)
                apply()
            }

--- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt
@@ -20,10 +20,10 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt
@@ -14,7 +14,7 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding
--- a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt
@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankActivity {
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt
@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankFragment {
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt
@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankViewModel {
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
@@ -15,7 +15,7 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
--- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt
@@ -20,11 +20,11 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationActivity.kt
@@ -20,10 +20,10 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt
@@ -17,7 +17,7 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.calibration.CalibrationData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt
@@ -0,0 +1,59 @@
+package com.example.hpostesting.presentation.dashboard
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.BatteryManager
+import android.os.Bundle
+import android.util.Log
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
+import com.example.hpostesting.presentation.adapter.UserListAdapter
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.testRight.TestRightViewModel
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
+import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
+
+class ActivitiesFragment : Fragment() {
+    private lateinit var binding: FragmentActivitiesBinding
+    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private lateinit var adapter: OfflineUserListAdapter
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentActivitiesBinding.inflate(inflater, container, false)
+
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        hemoCubeViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->
+
+            if (userData.isNotEmpty()) {
+                binding.rvOrderOffline.visibility = View.VISIBLE
+                binding.noDataText.visibility = View.GONE
+                val bm =
+                    requireContext().getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+                val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+                adapter = OfflineUserListAdapter(binding.root, batLevel)
+                adapter.differ.submitList(userData)
+                binding.rvOrderOffline.adapter = adapter
+            }else{
+                binding.rvOrderOffline.visibility = View.GONE
+                binding.noDataText.visibility = View.VISIBLE
+                Log.d("Activities","Nothing to show")
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -3,8 +3,8 @@ package com.example.hpostesting.presentation.dashboard
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.SharedPreferences
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -20,30 +20,22 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.presentation.NatsManager
+import com.example.hpostesting.presentation.utils.NatsManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.jig.JigActivity
 import com.google.android.material.navigation.NavigationView
 import com.google.firebase.appdistribution.FirebaseAppDistribution
 import com.google.firebase.appdistribution.FirebaseAppDistributionException
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.firestore.ktx.firestore
-import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.BuildConfig
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
-import okhttp3.ResponseBody
-import java.io.BufferedInputStream
 import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.io.InputStream
-import java.util.zip.ZipInputStream

 interface NatsMessageCallback {
    fun onMessageReceived(topic: String, message: String)
@@ -92,6 +84,9 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            nats.connect()
        }
+        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) + " ]"
+        binding.appBarDashboard.versionName.text = versionName
+

        val deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")

@@ -142,7 +137,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {

        appBarConfiguration = AppBarConfiguration(
            setOf(
-                R.id.nav_home, R.id.nav_profile, R.id.nav_settings
+                R.id.nav_home, R.id.nav_profile, R.id.nav_activity,R.id.nav_settings
            ), drawerLayout
        )
        setupActionBarWithNavController(navController, appBarConfiguration)
@@ -260,4 +255,20 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
            serial_no = sharedPreference.getString(Constants.DEVICE_ID, "")
        )
    }
+    private fun getAppVersion(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.versionName
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
+    }
+    private fun getAppEnvironment(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.packageName.substringAfterLast('.')
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
+    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -26,9 +26,8 @@ import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.login.LoginRequest
@@ -40,8 +39,9 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
+import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
 import com.example.hpostesting.presentation.KitScanActivity
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
@@ -56,7 +56,6 @@ import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
-import kotlinx.coroutines.tasks.await
 import okhttp3.ResponseBody
 import org.json.JSONObject
 import java.io.BufferedOutputStream
@@ -122,6 +121,8 @@ class HomeFragment : Fragment() {
                userData.forEach {
                    if (it.testStatus == false) {
                        userList.add(it)
+                    }else if(it.testStatus == true){
+                        userList.removeAll(userData)
                    }
                }
                val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
@@ -157,14 +158,16 @@ class HomeFragment : Fragment() {

                    val resultList = MolbioV2ResultRequest(mutableListOf())
                    originalUserDataList.forEach { userData ->
-                        Log.d(
-                            ": USER DATA",
-                            originalUserDataList.count().toString() + " : " + userData._id
-                        )
+                        Log.d(": USER DATA", originalUserDataList.count().toString() + " : " + userData._id)
                        var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
                        // Upload results after processing all userData to avoid duplicates and ensure all modifications are done
                        if(accessToken.isNotEmpty()) {
-                            if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
+
+                            if (!userData.localFlag && userData.testStatus == true) {
+                                hemoCubeViewModel.bulkAddResultTestToDb(userData)
+                            }
+
+                            if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION && userData.testStatus == true) {
                                val currentTimeFormatted = SimpleDateFormat(
                                    "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
                                    Locale.getDefault()
@@ -177,11 +180,9 @@ class HomeFragment : Fragment() {
                                        rawData = userData,
                                        analysisId = userData._id,
                                        analysisDate = currentTimeFormatted,
-                                        analysisStatus = userData.classificationResult
-                                            ?: "defaultStatus", // Handle possible nulls
+                                        analysisStatus = userData.classificationResult ?: "defaultStatus", // Handle possible nulls
                                        thresholds = bufferIntensityThreshold,
-                                        interpretation = userData.classificationResult
-                                            ?: "defaultInterpretation", // Handle possible nulls
+                                        interpretation = userData.classificationResult ?: "defaultInterpretation", // Handle possible nulls
                                        testId = userData._id,
                                        testTime = currentTimeFormatted,
                                        collectionTime = currentTimeFormatted,
@@ -191,23 +192,19 @@ class HomeFragment : Fragment() {
                            }
                        }
                    }
+
                    Log.d("USER DATA LIST SIZE", resultList.results?.count().toString())

                    resultList.results?.forEach { result ->
                        val userData = result.rawData
                        Log.d("UserData", userData.toString())
-                        if (userData != null) {
-                            if (!userData.localFlag) {
-                                hemoCubeViewModel.bulkAddResultTestToDb(userData)

-                            }
-                        }
                    }
                    resultList.results?.forEach { result ->
                        result.rawData?.let { sanitizeDoubleValues(it) }
                    }

-// Then, check if there are any results to upload.
+                    // Then, check if there are any results to upload.
                    if (resultList.results?.isNotEmpty() == true) {
                        hemoCubeViewModel.uploadResult(resultList)
                        Log.d("resultcount1", "Uploading sanitized results")
@@ -244,27 +241,28 @@ class HomeFragment : Fragment() {
        binding.uploadData.setOnClickListener {
 //            showUploadDialog(requireContext())
        }
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-//
-//            val btnSaveLocalVisibility =
-//                if (userData.any { it.testStatus == true }) View.GONE else View.GONE
-//
-//            binding.downloadCSV.visibility = btnSaveLocalVisibility
-//
-//            binding.downloadCSV.setOnClickListener {
-//                if (btnSaveLocalVisibility == View.VISIBLE) {
-//                    // Execute the action when the button is visible (testStatus is true for at least one user)
-//                    showDownloadDialog(requireContext())
-//                } else {
-//                    // Handle the case when the button is not visible
-//                    Toast.makeText(
-//                        requireContext(),
-//                        "No test details stored locally",
-//                        Toast.LENGTH_SHORT
-//                    ).show()
-//                }
-//            }
-//        }
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
+            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+                val btnSaveLocalVisibility =
+                    if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
+                binding.downloadCSV.visibility = btnSaveLocalVisibility
+                binding.downloadCSV.setOnClickListener {
+                    if (btnSaveLocalVisibility == View.VISIBLE) {
+                        // Execute the action when the button is visible (testStatus is true for at least one user)
+                        showDownloadDialog(requireContext())
+                    } else {
+                        // Handle the case when the button is not visible
+                        Toast.makeText(
+                            requireContext(),
+                            "No test details stored locally",
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                }
+            }else{
+                binding.downloadCSV.visibility = View.GONE
+            }
+        }


        binding.btnNewKit.setOnClickListener {
@@ -274,7 +272,7 @@ class HomeFragment : Fragment() {
                apply()
            }
            startActivity(Intent(requireContext(), KitScanActivity::class.java))
-            requireActivity().finish()
+           // requireActivity().finish()
        }


@@ -285,7 +283,7 @@ class HomeFragment : Fragment() {
                apply()
            }
            startActivity(Intent(requireContext(), KitScanActivity::class.java))
-            requireActivity().finish()
+           // requireActivity().finish()
        }
        binding.btnQuickCapture.setOnClickListener {
            DataHolder.hemoCubeTestData = HemoCubeTestData()
@@ -881,11 +879,15 @@ class HomeFragment : Fragment() {
    }

    private fun checkUnprocessedCSVData() {
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            val downloadDataVisibility =
-//                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE
-//            binding.downloadCSV.visibility = downloadDataVisibility
-//        }
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+                val downloadDataVisibility =
+                    if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE
+                binding.downloadCSV.visibility = downloadDataVisibility
+            }else{
+                binding.downloadCSV.visibility = View.GONE
+            }
+        }
    }

    private fun sanitizeDoubleValues(hemoCubeTestData: HemoCubeTestData): HemoCubeTestData {
@@ -920,22 +922,22 @@ class HomeFragment : Fragment() {
        dialog.show()
    }

-//    private fun showDownloadDialog(context: Context) {
-//        val builder = AlertDialog.Builder(context)
-//        builder.setTitle(R.string.download_db_registration_title)
-//        builder.setMessage(R.string.download_db_registration_message)
-//
-//        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
-//            downloadLocalDBData(dialog)
-//        }
-//
-//        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
-//            dialog.dismiss()
-//        }
-//
-//        val dialog = builder.create()
-//        dialog.show()
-//    }
+    private fun showDownloadDialog(context: Context) {
+        val builder = AlertDialog.Builder(context)
+        builder.setTitle(R.string.download_db_registration_title)
+        builder.setMessage(R.string.download_db_registration_message)
+
+        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
+            downloadLocalDBData(dialog)
+        }
+
+        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
+            dialog.dismiss()
+        }
+
+        val dialog = builder.create()
+        dialog.show()
+    }

    private fun uploadLocalDBData(dialog: DialogInterface) {
 //        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
@@ -997,27 +999,25 @@ class HomeFragment : Fragment() {
        }
    }

-//    private fun downloadLocalDBData(dialog: DialogInterface) {
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            val downloadList = mutableListOf<HemoCubeTestData>()
-//
-//            userDataList.forEach { userData ->
-//                if (!userData.isCSVCreated) {
-//                    downloadList.add(userData) // Add the userData to downloadList
-//                }
-//            }
-//
-//            if (downloadList.isNotEmpty()) {
-//                // Call ViewModel function to create CSV with filtered data
-//                hemoCubeViewModel.createCSV(downloadList, requireContext())
-//                Toast.makeText(requireContext(), "Done", Toast.LENGTH_SHORT).show()
-//            } else {
-//                Toast.makeText(requireContext(), "Failed", Toast.LENGTH_SHORT).show()
-//            }
-//
-//            dialog.dismiss()
-//        }
-//    }
+    private fun downloadLocalDBData(dialog: DialogInterface) {
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+            val downloadList = mutableListOf<HemoCubeTestData>()
+
+            userDataList.forEach { userData ->
+                if (!userData.isCSVCreated) {
+                    downloadList.add(userData) // Add the userData to downloadList
+                }
+            }
+
+            if (downloadList.isNotEmpty()) {
+                // Call ViewModel function to create CSV with filtered data
+                hemoCubeViewModel.createCSV(downloadList, requireContext())
+                Toast.makeText(requireContext(), "Done", Toast.LENGTH_SHORT).show()
+            }
+
+            dialog.dismiss()
+        }
+    }

    private fun deleteIncompleteRegistrations(userDataList: List<UserData>) {
        userDataList.forEach { userData ->
@@ -1053,22 +1053,22 @@ class HomeFragment : Fragment() {
        }
    }

-    private fun showDownloadDialog(context: Context) {
-        val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.download_db_registration_title)
-        builder.setMessage(R.string.download_db_registration_message)
-
-        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
+//    private fun showDownloadDialog(context: Context) {
+//        val builder = AlertDialog.Builder(context)
+//        builder.setTitle(R.string.download_db_registration_title)
+//        builder.setMessage(R.string.download_db_registration_message)
+//
+//        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
 //            downloadLocalDBData(dialog)
-        }
-
-        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
-            dialog.dismiss()
-        }
-
-        val dialog = builder.create()
-        dialog.show()
-    }
+//        }
+//
+//        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
+//            dialog.dismiss()
+//        }
+//
+//        val dialog = builder.create()
+//        dialog.show()
+//    }

 //    private fun downloadLocalDBData(dialog: DialogInterface) {
 //        var csvDownloaded = false
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt
@@ -21,13 +21,13 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt
@@ -12,7 +12,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionActivity.kt
@@ -20,13 +20,13 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt
@@ -12,12 +12,12 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionViewModel.kt
@@ -3,7 +3,7 @@ package com.example.hpostesting.presentation.deviceprovision
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
--- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsActivity.kt
@@ -20,10 +20,10 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt
@@ -13,15 +13,15 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.Result.Success
+import com.example.hpostesting.util.Result
+import com.example.hpostesting.util.Result.Success
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.devicediagnostics.AdditionalDetails
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDiagnosticsBinding
--- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt
@@ -3,7 +3,7 @@ package com.example.hpostesting.presentation.diagnostics
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
@@ -25,7 +25,7 @@ class DiagnosticsViewModel @Inject constructor(

    val deviceData = MutableLiveData<DeviceData?>()
    val fireBaseUpload = MutableLiveData<String>()
-    val deviceDiagnosticsResponse = MutableLiveData<com.example.hpostesting.data.Result<DeviceDiagnosticsResponse>>()
+    val deviceDiagnosticsResponse = MutableLiveData<Result<DeviceDiagnosticsResponse>>()
 //    private val batteryStatus: Intent? =
 //        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
 //            context.registerReceiver(null, ifilter)
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt
@@ -10,7 +10,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import `in`.sminnovations.hpostesting.databinding.FragmentDigitalCardBinding
 import java.text.SimpleDateFormat
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -14,15 +15,15 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestStatus
 import com.example.hpostesting.data.model.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
@@ -35,7 +36,9 @@ import kotlin.math.log10

@Suppress("MemberVisibilityCanBePrivate")
 class HemoCubeFragment : Fragment() {
-
+    private var checkCuvette = false
+    private var checkCuvetteSam = false
+    private var sampleClick = false
    private lateinit var binding: FragmentHemoCubeReferenceBinding
    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
    private lateinit var sharedPreferences: SharedPreferences
@@ -111,33 +114,63 @@ class HemoCubeFragment : Fragment() {
        binding.nameEditText.visibility = View.GONE
        binding.tvTitle.visibility = View.GONE
        binding.btnGo.visibility = View.GONE
-        binding.btnPlacebuffer.visibility = View.GONE
+//        binding.btnPlacebuffer.visibility = View.GONE

        binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
        binding.tvSubtitle4.text = "Config"

-        binding.btnSamplestart.setOnClickListener {
-            activity?.runOnUiThread {
-                binding.tvSubtitle4.visibility = View.VISIBLE
-//                binding.tvSubtitle4.text = "Sample Started"
+
+        if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
+            binding.btnPlacebuffer.apply {
+                setBackgroundColor(Color.GREEN) // Set button background color to green
+                text = "Fresh Buffer" // Change button text to "Buffer Exists"
+            }
+        }else if(!isBufferValueAvailable() || Constants.BLANK_EVERY_TEST){
+            binding.btnPlacebuffer.apply {
+                setBackgroundColor(Color.RED) // Set button background color to green
+                text = "No Buffer" // Change button text to "Buffer Exists"
            }
-            startSampleProcess()
-            it.visibility = View.GONE
        }

-        binding.btnPlacebuffer.setOnClickListener {
-            if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
-                showBufferAlertDialog()
-            } else {
+
+        binding.btnSamplestart.setOnClickListener {
+            sampleClick = true
+            if(checkCuvetteSam){
                activity?.runOnUiThread {
                    binding.tvSubtitle4.visibility = View.VISIBLE
-//                    binding.tvSubtitle4.text = "Buffer Started"
+//                binding.tvSubtitle4.text = "Sample Started"
                }
-
-                checkAndStartProcess()
-                it.visibility = View.GONE
+                startSampleProcess()
+//                it.visibility = View.GONE
+            }else{
+                checkCuvettePresence()
            }
        }
+        binding.btnRetryCheckCuvette.setOnClickListener {
+
+            checkCuvettePresence()
+        }
+        binding.btnPlacebuffer.setOnClickListener {
+            if(checkCuvette){
+
+                startBufferProcess()
+//                if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
+////                    showBufferAlertDialog()
+//                } else {
+                    activity?.runOnUiThread {
+                        binding.tvSubtitle4.visibility = View.VISIBLE
+//                    binding.tvSubtitle4.text = "Buffer Started"
+                    }
+
+                    //  checkAndStartProcess()
+
+//                    it.visibility = View.GONE
+//                }
+            }else{
+                checkCuvettePresence()
+            }
+
+        }

        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
            activity?.runOnUiThread {
@@ -261,9 +294,9 @@ class HemoCubeFragment : Fragment() {
        currentResultData = ""
    }

-    private fun checkAndStartProcess() {
-        startBufferProcess()
-    }
+//    private fun checkAndStartProcess() {
+//        startBufferProcess()
+//    }

    private fun isBufferValueAvailable(): Boolean {
        return try {
@@ -314,7 +347,7 @@ class HemoCubeFragment : Fragment() {

                override fun onClickPositiveButton() {
                    activity?.runOnUiThread {
-                        binding.btnPlacebuffer.visibility = View.GONE
+//                        binding.btnPlacebuffer.visibility = View.GONE
                        binding.btnSamplestart.visibility = View.VISIBLE
                        binding.tvSubtitle4.text = getString(R.string.place_sample)
                    }
@@ -391,7 +424,7 @@ class HemoCubeFragment : Fragment() {
        resultData += stringData
        currentResultData += stringData
        hemoCubeViewModel.deviceMessages.postValue(currentResultData)
-
+        Log.e("testStatus",this.testStatusCode.toString())
        when {
            resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
                processV2HardwareId(resultData)
@@ -418,20 +451,51 @@ class HemoCubeFragment : Fragment() {
            (resultData.contains("#RC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> {
                this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
                hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
-                showStartBufferButton()
+                //checkCuvettePresence()
+            }
+            resultData.contains("#CIN") && sampleClick && this.testStatusCode < TestStatus.CUVETTE_PRESENTS.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
+                this.testStatusCode = TestStatus.CUVETTE_PRESENTS.code
+                activity?.runOnUiThread {
+                    checkCuvetteSam = true
+                    binding.btnRetryCheckCuvette.visibility = View.GONE
+                }
+            }
+            resultData.contains("#AIN") && sampleClick && this.testStatusCode <= TestStatus.CUVETTE_ABSENTS.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
+                this.testStatusCode = TestStatus.CUVETTE_ABSENTS.code
+                showRetryButtonForCuvette()
            }

+            resultData.contains("#CIN") && this.testStatusCode < TestStatus.CUVETTE_PRESENT.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
+                this.testStatusCode = TestStatus.CUVETTE_PRESENT.code
+                activity?.runOnUiThread {
+                    checkCuvette = true
+                    binding.btnRetryCheckCuvette.visibility = View.GONE
+                }
+            }
+            resultData.contains("#AIN") && this.testStatusCode <= TestStatus.CUVETTE_ABSENT.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
+                this.testStatusCode = TestStatus.CUVETTE_ABSENT.code
+                showRetryButtonForCuvette()
+            }
            resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
                hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
                this.testStatusCode = TestStatus.BUFFER_STARTED.code
            }

            resultData.contains("#BC") && this.testStatusCode < TestStatus.BUFFER_COMPLETED.code -> {
-                this.testStatusCode = TestStatus.BUFFER_COMPLETED.code
                activity?.runOnUiThread {
+                    resultData = ""
+                   // resultData.replace("#AIN","#BAIN",false)
+                    Log.d("resultDataBC",resultData)
                    binding.tvSubtitle4.text = getString(R.string.buffer_completed)
-                    binding.btnSamplestart.visibility = View.VISIBLE
+//                    binding.btnSamplestart.visibility = View.VISIBLE
+                    binding.btnPlacebuffer.visibility = View.GONE
                }
+                this.testStatusCode = TestStatus.BUFFER_COMPLETED.code
+
            }

            (resultData.contains("#SS") || resultData.contains("#SS1")) && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
@@ -439,11 +503,15 @@ class HemoCubeFragment : Fragment() {
                activity?.runOnUiThread {
                    binding.tvSubtitle4.text = getString(R.string.sample_started)
                    binding.btnSamplestart.visibility = View.GONE
+                    binding.btnPlacebuffer.visibility = View.GONE
                }
            }

            (resultData.contains("#SC") || resultData.contains("#SC1")) && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
                this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
+                activity?.runOnUiThread {
+                    binding.btnSamplestart.visibility = View.GONE
+                }
                hemoCubeViewModel.messages.postValue(
                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
                )
@@ -600,6 +668,13 @@ class HemoCubeFragment : Fragment() {
        }
    }

+    private fun showRetryButtonForCuvette() {
+        activity?.runOnUiThread {
+//            binding.btnPlacebuffer.visibility = View.GONE
+            binding.btnRetryCheckCuvette.visibility = View.VISIBLE
+        }
+    }
+
    fun finishReading() {
        repeatReadingCount += 1
        isTestOngoing = false
@@ -686,9 +761,20 @@ class HemoCubeFragment : Fragment() {

    fun showStartBufferButton() {
        activity?.runOnUiThread {
+            binding.btnRetryCheckCuvette.visibility = View.GONE
+
            binding.btnPlacebuffer.visibility = View.VISIBLE
        }
-        hemoCubeViewModel.messages.postValue(getString(R.string.start))
+//        hemoCubeViewModel.messages.postValue(getString(R.string.start))
+    }
+
+    fun showStartSampleButton() {
+        activity?.runOnUiThread {
+            binding.btnRetryCheckCuvette.visibility = View.GONE
+
+            binding.btnSamplestart.visibility = View.VISIBLE
+        }
+//        hemoCubeViewModel.messages.postValue(getString(R.string.start))
    }

    fun extractV1HardwareId(input: String): String? {
@@ -1138,13 +1224,29 @@ class HemoCubeFragment : Fragment() {
        Toast.makeText(requireContext(), getString(messageResId), Toast.LENGTH_SHORT).show()
    }

-    private fun startBufferProcess() {
-        hemoCubeViewModel.progressBar.postValue(true)
+    private fun checkCuvettePresence() {
+        Toast.makeText(requireContext(),"Please wait...",Toast.LENGTH_LONG).show()

        activity?.runOnUiThread {
-            binding.btnPlacebuffer.visibility = View.GONE
+            binding.btnRetryCheckCuvette.visibility = View.GONE
        }

+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.CHECK_CUVETTE_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+    private fun startBufferProcess() {
+        hemoCubeViewModel.progressBar.postValue(true)
+//        activity?.runOnUiThread {
+//            binding.btnPlacebuffer.visibility = View.GONE
+//        }
        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_BUFFER_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1156,16 +1258,17 @@ class HemoCubeFragment : Fragment() {
    }

    private fun startSampleProcess() {
-        hemoCubeViewModel.progressBar.postValue(true)
+            hemoCubeViewModel.progressBar.postValue(true)

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+            (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE,
+                object : UsbServiceListener {
+                    override fun onUsbRead(data: ByteArray?) {}
+
+                    override fun onUsbError(e: Exception?) {
+                        hemoCubeViewModel.progressBar.postValue(false)
+                    }
+                })

-                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
-                }
-            })
    }

    private fun sendFirstGainCommand() {
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -12,10 +12,10 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.data.CsvWriter
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
@@ -37,7 +37,6 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
-import com.google.gson.GsonBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -90,7 +89,7 @@ class HemoCubeViewModel @Inject constructor(
    private val _networkStatusLiveData = NetworkStatusLiveData(context)
    val allUserData = hemoCubeDao.getAll()
    val allLocalData = hemoCubeDao.getAll()
-    val allPendingUserToUpload = MutableLiveData<List<HemoCubeTestData>>()
+    val allPendingUserToUpload = hemoCubeDao.getPendingUser()
    val allKitTestData = hemoCubeBufferDao.getAll()
    val deviceData = MutableLiveData<DeviceData?>()

@@ -113,7 +112,7 @@ class HemoCubeViewModel @Inject constructor(
            testDetails?.kitSerial = kitSerial
        }
        testDetails?.testStatus = testStatus
-
+       // localFileDataSource.backUpDataToCSV("",testDetails)
        try {
            if (isOnline) {
                parseData()
@@ -197,9 +196,9 @@ class HemoCubeViewModel @Inject constructor(
            }
        }
    }
-    fun uploadPendingUser() = viewModelScope.launch {
-        allPendingUserToUpload.postValue(hemoCubeDao.getPendingUser(false))
-    }
+//    fun getPendingUser() = viewModelScope.launch {
+//        allPendingUserToUpload.postValue(hemoCubeDao.getPendingUser(true))
+//    }

    fun uploadHemoCubeResultToDatabaseForBufferCheck(
        isOnline: Boolean,
@@ -315,6 +314,8 @@ class HemoCubeViewModel @Inject constructor(
        testDetails?.solution = DataHolder.hemoCubeTestData?.solution
        testDetails?.concentration = DataHolder.hemoCubeTestData?.concentration
        testDetails?.volume = DataHolder.hemoCubeTestData?.volume
+        testDetails?.filter = DataHolder.hemoCubeTestData?.filter
+
    }

    private fun addResultTestToDb() {
@@ -560,7 +561,7 @@ class HemoCubeViewModel @Inject constructor(
            val fileName = "HPOS${getCurrentDate()}.csv"
            if (localFileDataSource.exportDataToCSV(fileName, hemoCubeTestData)) {
                hemoCubeTestData.forEach { data ->
-                    data.localFlag = true
+                   // data.localFlag = true
                    hemoCubeDao.updateCSVFieldById(
                        data._id,
                        true
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt
@@ -22,10 +22,10 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/jig/JigActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/jig/JigActivity.kt
@@ -21,10 +21,10 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt
@@ -19,8 +19,9 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
@@ -132,7 +133,7 @@ class TestRightActivity : AppCompatActivity() {
                this,
                0,
                Intent(Constants.ACTION_USB_PERMISSION),
-                PendingIntent.FLAG_MUTABLE
+                PendingIntent.FLAG_IMMUTABLE
            )
        } else {
            mPendingIntent = PendingIntent.getBroadcast(
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
@@ -10,11 +10,11 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.TestRightCommands
 import com.example.hpostesting.data.model.ErrorMessage
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt
@@ -10,13 +10,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.TestRightCommands
 import com.example.hpostesting.data.model.ErrorMessage
 import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.MainActivity
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.test.TestRightResultType
 import com.example.hpostesting.data.model.test.TestType
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
@@ -5,8 +5,8 @@ import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.model.CalculationVariableForTest
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeActivity.kt
@@ -20,12 +20,12 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -13,15 +14,15 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestStatus
 import com.example.hpostesting.data.model.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
@@ -1155,6 +1156,8 @@ class TrueHemeFragment : Fragment() {
    }

    private fun reconnect() {
-        (activity as HemocubeActivity).reconnectDevice()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            (activity as HemocubeActivity).reconnectDevice()
+        }
    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
@@ -12,10 +12,10 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.data.CsvWriter
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/DeviceCommunicationHandler.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/DeviceCommunicationHandler.kt
@@ -1,12 +1,6 @@
-package com.example.hpostesting.data.api
+package com.example.hpostesting.presentation.utils

 import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.UsbServiceListener
-
-interface PropertyProvider {
-
-    fun getProperty(key: String): String
-}

 interface DeviceCommunicationHandler {
    fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener)
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils

 import android.content.Context
 import android.os.Build
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListener.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListener.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils

 interface UsbServiceListener {
    fun onUsbRead(data: ByteArray?)
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListenerImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListenerImpl.kt
@@ -1,8 +1,9 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils

 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import com.example.hpostesting.presentation.utils.UsbServiceListener

 class UsbServiceListenerImpl(private val context: Context): UsbServiceListener {
    override fun onUsbRead(data: ByteArray?) {
--- a/app/src/main/java/com/example/hpostesting/test.kt
+++ b/app/src/main/java/com/example/hpostesting/test.kt
@@ -1,11 +0,0 @@
-package com.example.hpostesting
-
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-fun main(){
-    val dateFormat = SimpleDateFormat("MM:HHddMMyyyy", Locale.getDefault())
-    val currentDate = Date()
-    print(dateFormat.format(currentDate))
-}
--- a/app/src/main/java/com/example/hpostesting/util/CsvWriter.kt
+++ b/app/src/main/java/com/example/hpostesting/util/CsvWriter.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util

 import android.content.Context
 import android.os.Environment
--- a/app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util


 import android.content.Context
--- a/app/src/main/java/com/example/hpostesting/util/PreferenceUtility.kt
+++ b/app/src/main/java/com/example/hpostesting/util/PreferenceUtility.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util

 import android.content.Context
 import android.content.SharedPreferences
--- a/app/src/main/java/com/example/hpostesting/util/PropertyProvider.kt
+++ b/app/src/main/java/com/example/hpostesting/util/PropertyProvider.kt
@@ -0,0 +1,7 @@
+package com.example.hpostesting.util
+
+interface PropertyProvider {
+
+    fun getProperty(key: String): String
+}
+
--- a/app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt
@@ -1,7 +1,6 @@
 package com.example.hpostesting.util

 import android.content.res.AssetManager
-import com.example.hpostesting.data.api.PropertyProvider
 import java.io.InputStream
 import java.util.Properties

--- a/app/src/main/java/com/example/hpostesting/util/Result.kt
+++ b/app/src/main/java/com/example/hpostesting/util/Result.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util

 sealed class Result<out T : Any> {
    data class Success<out T : Any>(val data: T) : Result<T>()
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation.testRight
+package com.example.hpostesting.util

 import android.app.Service
 import android.content.Intent
@@ -9,7 +9,7 @@ import android.util.Log
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestRightCommands
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialPort
 import com.hoho.android.usbserial.util.SerialInputOutputManager
--- a/app/src/main/res/drawable/shows_activity_24.xml
+++ b/app/src/main/res/drawable/shows_activity_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
+    
+</vector>
--- a/app/src/main/res/layout/app_bar_dashboard.xml
+++ b/app/src/main/res/layout/app_bar_dashboard.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    tools:context=".presentation.dashboard.DashboardActivity">
+    >

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
@@ -16,7 +16,17 @@
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.HPOS.PopupOverlay" />
+            app:popupTheme="@style/Theme.HPOS.PopupOverlay" >
+            <TextView
+                android:id="@+id/version_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="--"
+                android:textStyle="bold"
+                android:layout_gravity="end"
+                android:textSize="18sp"
+                android:layout_marginEnd="15dp"/>
+        </androidx.appcompat.widget.Toolbar>

    </com.google.android.material.appbar.AppBarLayout>

--- a/app/src/main/res/layout/fragment_activities.xml
+++ b/app/src/main/res/layout/fragment_activities.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/titleText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:gravity="center"
+        android:text="Upload Pending List(Local data)"
+        android:layout_marginTop="5dp"
+        android:textSize="21sp"
+        android:textColor="@color/black"
+        />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_order_offline"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/titleText"
+        android:layout_alignParentStart="true"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/offline_user_list_view" />
+
+    <TextView
+        android:id="@+id/noDataText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="All up-to-date"
+        android:textSize="22sp"
+        android:textColor="@color/black"
+        />
+
+</RelativeLayout>
--- a/app/src/main/res/layout/fragment_assurance_controls.xml
+++ b/app/src/main/res/layout/fragment_assurance_controls.xml
@@ -39,6 +39,7 @@
    <Spinner
        android:id="@+id/spinner_solutions"
        android:layout_width="0dp"
+        android:visibility="gone"
        android:layout_height="wrap_content"
        android:layout_marginTop="40dp"
        android:background="@drawable/spinner_border"
@@ -50,6 +51,7 @@
    <Spinner
        android:id="@+id/spinner_concentration"
        android:layout_width="0dp"
+        android:visibility="gone"
        android:layout_height="wrap_content"
        android:layout_marginTop="48dp"
        android:background="@drawable/spinner_border"
@@ -59,6 +61,20 @@
        app:layout_constraintTop_toBottomOf="@id/spinner_solutions" />


+
+    <Spinner
+        android:id="@+id/spinner_admin"
+        android:layout_width="0dp"
+        android:visibility="visible"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="52dp"
+        android:background="@drawable/spinner_border"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/spinner_concentration" />
+
+
    <Spinner
        android:id="@+id/spinner_volume"
        android:layout_width="0dp"
@@ -71,6 +87,7 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/spinner_concentration" />

+
    <Button
        android:id="@+id/btn_submit"
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -147,51 +147,67 @@
            app:layout_constraintHorizontal_bias="1.0"
            app:layout_constraintStart_toEndOf="@id/et_abha_id"
            app:layout_constraintTop_toTopOf="@id/et_abha_id" />
-        <Button
-            android:visibility="gone"
-            android:id="@+id/btn_samplestart"
+        <LinearLayout
+            android:id="@+id/ll_btns"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/Start_Sample"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
+            android:orientation="vertical"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_placebuffer" />
+            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4">

+            <Button
+                android:id="@+id/btn_placebuffer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="24dp"
+                android:visibility="visible"
+                android:clickable="false"
+                android:text="@string/place_buffer"
+                android:textColor="@color/white"
+                app:cornerRadius="16dp"
+                />

+            <Button
+                android:id="@+id/btn_samplestart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="5dp"
+                android:clickable="false"
+                android:text="@string/Start_Sample"
+                android:textColor="@color/white"
+                app:cornerRadius="16dp"
+              />

-        <Button
-            android:id="@+id/btn_placebuffer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/place_buffer"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+            <Button
+                android:id="@+id/btn_retry_check_cuvette"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="24dp"
+                android:clickable="false"
+                android:text="@string/retry"
+                android:textColor="@color/white"
+                app:cornerRadius="16dp"
+              />

-        <Button
-            android:id="@+id/btn_submit"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/submit"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
+            <Button
+                android:id="@+id/btn_submit"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="24dp"
+                android:clickable="false"
+                android:text="@string/submit"
+                android:textColor="@color/white"
+                app:cornerRadius="16dp"
+                 />
+
+        </LinearLayout>

        <TextView
            android:id="@+id/error_message"
@@ -206,7 +222,7 @@
            android:textSize="12sp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+            app:layout_constraintTop_toBottomOf="@id/ll_btns" />

        <TextView
            android:id="@+id/tv_device_messages"
@@ -217,9 +233,9 @@
            android:text="no device message"
            android:textColor="@color/black"
            android:textSize="11sp"
-            android:visibility="gone"
+            android:visibility="visible"
            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/error_message" />
+            app:layout_constraintTop_toBottomOf="@id/ll_btns" />

        <Button
            android:visibility="gone"
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -12,6 +12,10 @@
            android:id="@+id/nav_profile"
            android:icon="@drawable/control_panel"
            android:title="@string/profile" />
+        <item
+            android:id="@+id/nav_activity"
+            android:icon="@drawable/shows_activity_24"
+            android:title="@string/action_activity" />
        <item
            android:id="@+id/nav_settings"
            android:icon="@drawable/baseline_settings_24"
--- a/app/src/main/res/navigation/dashboard_navigation.xml
+++ b/app/src/main/res/navigation/dashboard_navigation.xml
@@ -32,6 +32,11 @@
        android:name="com.example.hpostesting.presentation.dashboard.SlideshowFragment"
        android:label="@string/action_settings"
        tools:layout="@layout/fragment_slideshow" />
+    <fragment
+        android:id="@+id/nav_activity"
+        android:name="com.example.hpostesting.presentation.dashboard.ActivitiesFragment"
+        android:label="@string/action_activity"
+        tools:layout="@layout/fragment_activities" />
    <activity
        android:id="@+id/mainActivity"
        android:name="com.example.hpostesting.presentation.MainActivity"
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -271,4 +271,9 @@
    <string name="deviceinfo">डिवाइस जानकारी</string>

    <string name="downloadcsv">सीएसवी डाउनलोड करें</string>
+    <string name="action_activity">Activities</string>
+    <string name="check_cuvette">Checking cuvette presence</string>
+    <string name="cuvette_present">Cuvette present</string>
+    <string name="cuvette_absent">Cuvette absent</string>
+    <string name="retry">Retry</string>
 </resources>
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -270,6 +270,11 @@
    <string name="add_blood_group">ರಕ್ತ ಗುಂಡನ್ನು ಸೇರಿಸಿ</string>
    <string name="ok">ಸರಿ</string>
    <string name="downloadcsv">CSV ಡೌನ್ಲೋಡ್ ಮಾಡಿ</string>
+    <string name="action_activity">Activities</string>
+    <string name="check_cuvette">Checking cuvette presence</string>
+    <string name="cuvette_present">Cuvette present</string>
+    <string name="cuvette_absent">Cuvette absent</string>
+    <string name="retry">Retry</string>
    <!-- Add translations for other strings -->

 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,7 +118,7 @@
    <string name="Firefox">Firefox</string>
    <string name="Files">Files</string>
    <string name="deviceinfo">Device Information</string>
-    <string name="place_buffer">Start</string>
+    <string name="place_buffer">Start Buffer</string>
    <string name="Start_Sample">Start Sample</string>
    <string name="new_kit">New Kit</string>
    <string name="new_buffer">New Buffer</string>
@@ -273,4 +273,9 @@
    <string name="select_language">Select your preferred language</string>
    <string name="app_language">App Language</string>
    <string name="ok">OK</string>
+    <string name="action_activity">Activities</string>
+    <string name="check_cuvette">Checking cuvette presence</string>
+    <string name="cuvette_present">Cuvette present , you can start the test</string>
+    <string name="cuvette_absent">Cuvette is absent , please place the cuvette and retry again</string>
+    <string name="retry">Retry again</string>
 </resources>
--- a/app/src/test/java/com/example/hpostesting/AutoDacViewModelTest.kt
+++ b/app/src/test/java/com/example/hpostesting/AutoDacViewModelTest.kt
@@ -3,18 +3,15 @@ package com.example.hpostesting
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.lifecycle.Observer
-import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.presentation.autodac.AutoDacViewModel
 import io.mockk.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.setMain
--- a/app/src/test/java/com/example/hpostesting/CsvWriterTest.kt
+++ b/app/src/test/java/com/example/hpostesting/CsvWriterTest.kt
@@ -1,7 +1,7 @@
 package com.example.hpostesting

 import android.content.Context
-import com.example.hpostesting.data.CsvWriter
+import com.example.hpostesting.util.CsvWriter
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
--- a/app/src/test/java/com/example/hpostesting/DeviceFragmentTest.kt
+++ b/app/src/test/java/com/example/hpostesting/DeviceFragmentTest.kt
@@ -1,26 +1,5 @@
 package com.example.hpostesting

-import android.content.Context
-import android.content.SharedPreferences
-import androidx.fragment.app.testing.FragmentScenario
-import androidx.fragment.app.testing.launchFragmentInContainer
-import androidx.lifecycle.MutableLiveData
-import androidx.test.core.app.ApplicationProvider
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.databinding.FragmentDeviceBinding
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.*
-import org.mockito.MockitoAnnotations
-
 class DeviceFragmentTest {
 //
 //    @Mock
--- a/app/src/test/java/com/example/hpostesting/DeviceProvisionViewModelTest.kt
+++ b/app/src/test/java/com/example/hpostesting/DeviceProvisionViewModelTest.kt
@@ -2,7 +2,7 @@ package com.example.hpostesting

 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.repository.Repository
--- a/app/src/test/java/com/example/hpostesting/HemocubeViewModelTest.kt
+++ b/app/src/test/java/com/example/hpostesting/HemocubeViewModelTest.kt
@@ -3,7 +3,7 @@ package com.example.hpostesting
 import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.login.LoginResponse
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.LogFileManager
--- a/app/src/test/java/com/example/hpostesting/TestRightViewModelTest.kt
+++ b/app/src/test/java/com/example/hpostesting/TestRightViewModelTest.kt
@@ -1,22 +1,5 @@
 package com.example.hpostesting

-import android.content.Context
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.UserDao
-import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.domain.SaveRawData
-import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.testRight.TestRightViewModel
-import junit.framework.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.MockitoAnnotations
-import java.math.RoundingMode
-import java.text.DecimalFormat
-
 class TestRightViewModelTest {
 //    private val viewModel = TestRightViewModel()
 //    private val data = InputData()
Author	SHA1	Message	Date
Mariya	b8721b7f27	L command for limit switch is added and now testing is completed	2024-03-15 17:20:32 +05:30
Mariya	ab26d0228d	L command for limit switch is added and now testing is on going	2024-03-15 17:01:15 +05:30
Mariya	d012b9edda	separated buttons for buffer and sample , in the result screen, instead of dialogue box of existing buffer, it will changes the color of butter button, if it buffer is already available into green , if not the button will be red	2024-03-13 16:34:17 +05:30
Mariya	721ac5d53c	changes related to Limit switch added for start buffer only	2024-03-12 16:52:24 +05:30
chandrashekhar reddy	75acfc34bd	testing L command changed the flow in HemoCubeFragment	2024-03-12 16:32:21 +05:30
Mariya	d365bbcfe0	added changes related to new listed features for v2.0 admin AssuranceControlsFragment	2024-03-12 16:31:31 +05:30
chandrashekhar reddy	31ed1edd0b	testing L command changed the TestStatus	2024-03-12 14:05:52 +05:30
chandrashekhar reddy	d62fafb129	changed the usb service location	2024-03-12 13:53:22 +05:30
chandrashekhar reddy	8ba574aeac	Added L command testing in HemoCubeFragment	2024-03-11 13:34:00 +05:30
chandrashekhar reddy	d8cb0bd96e	Added L command testing ain in HemoCubeFragment	2024-03-11 13:14:27 +05:30
chandrashekhar reddy	75c6269e4a	Added L command in HemoCubeFragment	2024-03-11 13:04:42 +05:30
chandrashekhar reddy	1e4f801774	Added L command in HemoCubeFragment	2024-03-11 13:01:22 +05:30
chandrashekhar reddy	d701ee4f6d	removed the finish for btnNewKit in HomeFragment	2024-03-09 16:20:29 +05:30
chandrashekhar reddy	e4b237bb9a	Added new screen ActivitiesFragment to check upload pending list and added version name in DashboardActivity, so it will be easy to know which version currently in use	2024-03-09 16:13:54 +05:30
chandrashekhar reddy	372489330a	Added new screen ActivitiesFragment to check upload pending list and added version name in DashboardActivity, so it will be easy to know which version currently in use	2024-03-09 15:20:49 +05:30
chandrashekhar reddy	0c10e5a920	Merge remote-tracking branch 'origin/dev' into dev	2024-03-09 12:27:22 +05:30
chandrashekhar reddy	045bda26ff	Rearranging the project structure, so it will east to understand and following proper clean code rules	2024-03-09 12:26:59 +05:30
Mariya	b31e5e6c06	removed getting null values from result upload	2024-03-07 13:30:38 +05:30
Mariya	53c36d3cf9	added different id and set as primary key for testing twice with same sample Id and uploading the result, offline ,issue fixed, and set ADMIN as user that can only download and export CSV file, for collecting user Data	2024-03-07 12:11:27 +05:30