diff --git a/app/build.gradle b/app/build.gradle index 2e9068d..e035742 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,11 +16,11 @@ android { // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production defaultConfig { - applicationId "in.sminnovations.hpostesting.dev" + applicationId "in.sminnovations.hpostesting.quality" minSdk 21 targetSdk 34 - versionCode 114 - versionName "2.1.114" + versionCode 112 + versionName "2.1.112" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt b/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt index 1165024..b192d44 100644 --- a/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt +++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt @@ -11,11 +11,11 @@ interface MolbioAuthApi { @POST("deviceManagement/device/provision") suspend fun deviceProvision( - @Body deviceProvisionRequest: DeviceProvisionRequest + @Body deviceProvisionRequest: DeviceProvisionRequest, ): DeviceProvisionResponse @POST("deviceService/device/login") suspend fun login( - @Body loginRequest: LoginRequest + @Body loginRequest: LoginRequest, ): LoginResponse } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt b/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt index 92d3091..57d8625 100644 --- a/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt +++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt @@ -7,11 +7,9 @@ import com.example.hpostesting.data.model.updates.CheckUpdateRequest import com.example.hpostesting.data.model.updates.CheckUpdateResponse import com.example.hpostesting.data.model.updates.DeviceUpdateRequest import okhttp3.MultipartBody -import okhttp3.Response import okhttp3.ResponseBody import retrofit2.http.Body import retrofit2.http.GET -import retrofit2.http.Header import retrofit2.http.Multipart import retrofit2.http.POST import retrofit2.http.PUT @@ -21,17 +19,17 @@ interface MolbioResultApi { @PUT("deviceService/results/HPOS") suspend fun uploadResults( - @Body molbioV2ResultRequest: MolbioV2ResultRequest + @Body molbioV2ResultRequest: MolbioV2ResultRequest, ): MolbioV2ResultResponse @POST("deviceService/device/checkUpdate") suspend fun checkUpdate( - @Body checkUpdateRequest: CheckUpdateRequest + @Body checkUpdateRequest: CheckUpdateRequest, ): CheckUpdateResponse @POST("deviceService/device/getUpdate") suspend fun deviceUpdate( - @Body deviceUpdateRequest: DeviceUpdateRequest + @Body deviceUpdateRequest: DeviceUpdateRequest, ): ResponseBody @GET("deviceService/device/getClientCertificate") @@ -41,6 +39,6 @@ interface MolbioResultApi { @Multipart @POST("deviceService/device/uploadLogs") suspend fun uploadLogs( - @Part logFile: MultipartBody.Part + @Part logFile: MultipartBody.Part, ): UploadLogsResponse } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt index 2a01103..6b4141c 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt @@ -186,19 +186,6 @@ object Constants { const val BUFFER_LED_LOWER_BOUND = 21000 const val BUFFER_LED_UPPER_BOUND = 23500 - const val TEST_STATUS_CODE_TEST_STARTED = 1.0 - const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0 - const val TEST_STATUS_CODE_CONFIG_COMPLETED = 3.0 - const val TEST_STATUS_CODE_BUFFER_STARTED = 4.0 - const val TEST_STATUS_CODE_BUFFER_COMPLETED = 5.0 - const val TEST_STATUS_CODE_BUFFER_PRINT_STARTED = 6.0 - const val TEST_STATUS_CODE_BUFFER_PRINT_COMPLETED = 7.0 - const val TEST_STATUS_CODE_SAMPLE_STARTED = 8.0 - const val TEST_STATUS_CODE_SAMPLE_COMPLETED = 9.0 - const val TEST_STATUS_CODE_SAMPLE_PRINT_STARTED = 10.0 - const val TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED = 11.0 - const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0 - val DEVICE_CONFIGURATION: Map>> = mapOf>>( "HCV-000-3001" to listOf( listOf(1.0, 0.0), // LED1, 435nm @@ -1665,8 +1652,8 @@ object Constants { val COEFFICIENTS: Map>> = mapOf( "HC-V1-005" to listOf( - listOf(1.5,0.0), - listOf(0.0,0.0) + listOf(1.5, 0.0), + listOf(0.0, 0.0) ) ) diff --git a/app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt b/app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt index 85d6a7c..fb167ea 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt @@ -19,12 +19,14 @@ object LanguageManager { } fun persistLanguagePreference(context: Context, languageCode: String) { - val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE) + val prefs: SharedPreferences = + context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE) prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply() } fun getSavedLanguage(context: Context): String { - val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE) + val prefs: SharedPreferences = + context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE) return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en" } } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt b/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt index d49838f..195e783 100644 --- a/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt +++ b/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt @@ -16,6 +16,7 @@ class Converters { null } } + @TypeConverter fun toString(location: UserData.Location?): String? { return if (location != null) { diff --git a/app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.kt b/app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.kt index 96b4eab..9194f3a 100644 --- a/app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.kt +++ b/app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.kt @@ -7,7 +7,7 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import com.example.hpostesting.data.model.patient.DeviceData import com.example.hpostesting.data.model.patient.HemoCubeTestData -import com.example.hpostesting.data.model.patient.UserData + @Dao interface DeviceDao { @Query("SELECT * from device_table") diff --git a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt index fcfc0cc..c9e4d5f 100644 --- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt +++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt @@ -8,7 +8,11 @@ import com.example.hpostesting.data.model.patient.DeviceData import com.example.hpostesting.data.model.patient.HemoCubeTestData import com.example.hpostesting.data.model.patient.UserData -@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 26, exportSchema = false) +@Database( + entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], + version = 26, + exportSchema = false +) @TypeConverters(Converters::class) abstract class MyDatabase : RoomDatabase() { abstract fun userDao(): UserDao diff --git a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt index 91b5807..4983c11 100644 --- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt +++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt @@ -1,11 +1,6 @@ package com.example.hpostesting.data.datasource -import android.os.Environment import com.example.hpostesting.data.model.patient.HemoCubeTestData -import com.opencsv.CSVWriter -import java.io.File -import java.io.FileWriter -import java.io.IOException interface LocalFileDataSource { @@ -14,6 +9,6 @@ interface LocalFileDataSource { fun saveTextToDisk(filepath: String, contents: String) fun exportDataToCSV( - fileName: String, dataList: List + fileName: String, dataList: List, ): Boolean } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt index aadc75a..a388503 100644 --- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt +++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt @@ -8,7 +8,7 @@ import java.io.FileWriter import java.io.IOException import javax.inject.Inject -class LocalFileDataSourceImpl @Inject constructor(): LocalFileDataSource { +class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource { override fun saveCsvToDisk(filepath: String, contents: ArrayList>) { val writer = CSVWriter(FileWriter(filepath)) @@ -25,10 +25,13 @@ class LocalFileDataSourceImpl @Inject constructor(): LocalFileDataSource { } override fun exportDataToCSV( - fileName: String, dataList: List + fileName: String, dataList: List, ): Boolean { try { - val formattedFileName = fileName.replace(Regex("[^a-zA-Z0-9.-]"), "_") // Replace special characters with underscores + val formattedFileName = fileName.replace( + Regex("[^a-zA-Z0-9.-]"), + "_" + ) // Replace special characters with underscores val filePath = File(getExternalStorageDirectory(), formattedFileName) val writer = FileWriter(filePath) val csvWriter = CSVWriter(writer) diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt index f2ae2b4..939f724 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt @@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.deviceprovision data class Credentials( val password: String? = "", - val username: String? = "" + val username: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt index c3cf0f7..fd05c57 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt @@ -13,5 +13,5 @@ data class Device( val serialNumber: String? = "", val uid: String? = "", val updatedAt: String? = "", - val updatedBy: Int? = 0 + val updatedBy: Int? = 0, ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt index 62cb97b..19e473e 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt @@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.deviceprovision data class DeviceProvisionData( val credentials: Credentials? = Credentials(), - val device: Device? = Device() + val device: Device? = Device(), ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt index 2f618e3..7e9f605 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt @@ -5,5 +5,5 @@ data class DeviceProvisionRequest( val email: String? = "", val password: String? = "", val serialNumber: String? = "", - val uid: String? = "" + val uid: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt index 821fea5..2485455 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt @@ -8,5 +8,5 @@ data class DeviceProvisionResponse( @SerializedName("Message") val message: String? = "", @SerializedName("Result") - val result: String? = "" + val result: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt index 096a0e4..1d5fad8 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt @@ -8,5 +8,5 @@ data class DeviceType( val id: Int? = 0, val name: String? = "", val updatedAt: String? = "", - val updatedBy: Int? = 0 + val updatedBy: Int? = 0, ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt index 488fd08..c2ecdd6 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt @@ -11,5 +11,5 @@ data class DeviceUser( val natsTokenExpiry: String? = "", val updatedAt: String? = "", val updatedBy: Int? = 0, - val username: String? = "" + val username: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt index 179ea33..e735c99 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt @@ -1,8 +1,8 @@ package com.example.hpostesting.data.model.deviceprovision data class ProvisionData( -val username: String?, -val password: String?, -val natsToken: String? + val username: String?, + val password: String?, + val natsToken: String?, ) diff --git a/app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt b/app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt index d482597..d9e15dd 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt @@ -1,6 +1,6 @@ package com.example.hpostesting.data.model.diagnostics -data class DiagnosticsData ( +data class DiagnosticsData( var deviceId: String = "", var appVersion: String? = "", var deviceType: String = "HEMOCUBE", @@ -8,5 +8,5 @@ data class DiagnosticsData ( var devicePassword: String = "", var deviceNatsToken: String = "", var accessToken: String = "", - var runTime: String = "" + var runTime: String = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt b/app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt index 91426b2..916c2ba 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt @@ -1,9 +1,9 @@ package com.example.hpostesting.data.model.jig -data class JigData ( +data class JigData( var deviceId: String = "", var appVersion: String? = "", var deviceType: String = "JIG", var scanData: String = "", - var createdAt: String = "" + var createdAt: String = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt index f1ad239..6a12e9f 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt @@ -1,5 +1,5 @@ package com.example.hpostesting.data.model.log data class UploadLogsData( - val filename: String? = "" + val filename: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt index 3544696..f28f653 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt @@ -8,5 +8,5 @@ data class UploadLogsResponse( @SerializedName("Message") val message: String? = "", @SerializedName("Result") - val result: String? = "" + val result: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt b/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt index 8f67ed1..2416732 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt @@ -12,5 +12,5 @@ data class Device( val serialNumber: String? = "", val uid: String? = "", val updatedAt: String? = "", - val updatedBy: Int? = 0 + val updatedBy: Int? = 0, ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt index 6ce0dca..2a178cc 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt @@ -8,5 +8,5 @@ data class DeviceType( val id: Int? = 0, val name: String? = "", val updatedAt: String? = "", - val updatedBy: Int? = 0 + val updatedBy: Int? = 0, ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt index acb57ae..15249b9 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt @@ -12,5 +12,5 @@ data class DeviceUser( val natsTokenExpiry: String? = "", val updatedAt: String? = "", val updatedBy: Int? = 0, - val username: String? = "" + val username: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt b/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt index 37af05f..af0d58e 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt @@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.login data class LoginData( val accessToken: String? = "", - val deviceUser: DeviceUser? = DeviceUser() + val deviceUser: DeviceUser? = DeviceUser(), ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt index df696b0..5b7d6df 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt @@ -9,5 +9,5 @@ data class LoginRequest( val password: String? = "", val serialNumber: String? = "", val username: String? = "", - val version: String? = "" + val version: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt index fa4eeba..873531e 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt @@ -8,5 +8,5 @@ data class LoginResponse( @SerializedName("Message") val message: String? = "", @SerializedName("Result") - val result: String? = "" + val result: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt index ab01bec..137a627 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt @@ -34,5 +34,5 @@ data class MolbioV2Result( val testType: String? = "", val thresholds: String? = "", val underMedication: Boolean? = false, - val volume: Int? = 2 + val volume: Int? = 2, ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt index c6168b4..38ee70b 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt @@ -38,5 +38,5 @@ data class MolbioV2ResultData( val underMedication: Boolean? = false, val updatedAt: String? = "", val updatedBy: Int? = 0, - val volume: Int? = 0 + val volume: Int? = 0, ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt index 59638c5..3473613 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt @@ -1,5 +1,5 @@ package com.example.hpostesting.data.model.molbioresult data class MolbioV2ResultRequest( - val results: MutableList? = mutableListOf() + val results: MutableList? = mutableListOf(), ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt index 806b446..bcc00f5 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt @@ -8,5 +8,5 @@ data class MolbioV2ResultResponse( @SerializedName("Message") val message: String? = "", @SerializedName("Result") - val result: String? = "" + val result: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt index e28811d..75c1406 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt @@ -19,7 +19,7 @@ data class RawData( var gender: String = "", var localFlag: Boolean = false, var deviceId: String? = "", - var appVersion:String? = "", + var appVersion: String? = "", var deviceSerialNumber: String = "", var deviceType: String = "HEMOCUBE", var kitSerial: String = "", diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt index 8345956..9b12f38 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt @@ -9,7 +9,7 @@ data class BufferCheckData( var _id: String = "", var kitno: String = "", var deviceId: String? = "", - var appVersion:String? = "", + var appVersion: String? = "", var deviceSerialNumber: String = "", var deviceType: String = "HEMOCUBE", var localFlag: Boolean = false, diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/DeviceData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/DeviceData.kt index 79b3834..3b4fc77 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/patient/DeviceData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/patient/DeviceData.kt @@ -15,9 +15,9 @@ data class DeviceData( @get:PropertyName("coefficients") @set:PropertyName("coefficients") var coefficients: List = emptyList(), @get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt") - var calibratedAt: String = "" , + var calibratedAt: String = "", @get:PropertyName("deviceProvisionResponse") @set:PropertyName("deviceProvisionResponse") - var deviceProvisionResponse: String = "" , + var deviceProvisionResponse: String = "", @get:PropertyName("username") @set:PropertyName("username") var username: String = "", @get:PropertyName("password") @set:PropertyName("password") @@ -25,5 +25,5 @@ data class DeviceData( @get:PropertyName("natsToken") @set:PropertyName("natsToken") var natsToken: String = "", @get:PropertyName("natsTokenExpiry") @set:PropertyName("natsTokenExpiry") - var natsTokenExpiry: String = "" + var natsTokenExpiry: String = "", ) \ No newline at end of file diff --git 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 index 1c30e74..8e2ed0e 100644 --- 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 @@ -22,7 +22,7 @@ data class HemoCubeTestData( var gender: String = "", var localFlag: Boolean = false, var deviceId: String? = "", - var appVersion:String? = "", + var appVersion: String? = "", var deviceSerialNumber: String = "", var deviceType: String = "HEMOCUBE", var kitSerial: String = "", @@ -89,5 +89,5 @@ data class HemoCubeTestData( var solution: String? = "", var concentration: String? = "", var volume: String? = "", - var isCSVCreated: Boolean = false + var isCSVCreated: Boolean = false, ) diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/PatientData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/PatientData.kt index 9d0408c..ea66c7f 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/patient/PatientData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/patient/PatientData.kt @@ -18,7 +18,7 @@ data class PatientDetails( var address: Address?, var category: Category?, var registerDate: Date?, - var uploadDate: Date? + var uploadDate: Date?, ) { constructor() : this( "", diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt index bbd246d..260c447 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt @@ -29,7 +29,7 @@ data class UserData( var reportPath: String = "", var result: TestRightResultType? = null, var resultRatio: Double? = null, - var prdClassification: String = "" + var prdClassification: String = "", ) { enum class Gender { MALE, @@ -39,7 +39,7 @@ data class UserData( data class Location( var latitude: Double? = null, - var longitude: Double? = null + var longitude: Double? = null, ) } diff --git a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt index d8cd502..4461026 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt @@ -1,5 +1,5 @@ package com.example.hpostesting.data.model.updates data class CheckUpdateData( - val version: String? = "" + val version: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt index 7d1d503..4a91e2e 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt @@ -1,5 +1,5 @@ package com.example.hpostesting.data.model.updates data class CheckUpdateRequest( - val currentVersion: String? = "" + val currentVersion: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt index 95fb791..ebe9a0f 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt @@ -8,5 +8,5 @@ data class CheckUpdateResponse( @SerializedName("Message") val message: String? = "", @SerializedName("Result") - val result: String? = "" + val result: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt index 75551a6..a087bd4 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt @@ -1,5 +1,5 @@ package com.example.hpostesting.data.model.updates data class DeviceUpdateRequest( - val serial_no: String? = "" + val serial_no: String? = "", ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt b/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt index 971dcc3..215ca1d 100644 --- a/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt +++ b/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt @@ -1,10 +1,10 @@ package com.example.hpostesting.domain import android.util.Log -import com.example.hpostesting.data.repository.LocalFileRepository import com.example.hpostesting.data.constant.Constants import com.example.hpostesting.data.model.patient.UserData import com.example.hpostesting.data.model.test.TestRightCalculationData +import com.example.hpostesting.data.repository.LocalFileRepository import java.util.Collections.sort class SaveRawData(private val localFileRepository: LocalFileRepository) { @@ -98,7 +98,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) { folderPath: String, fileName: String, calculationData: TestRightCalculationData, - testDetails: UserData? + testDetails: UserData?, ) { // val fileObj = File(folderPath, fileName) // val writer = FileWriter(fileObj) @@ -116,7 +116,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) { private fun getLogStringFromObjWithPatientData( calculationData: TestRightCalculationData, - testDetails: UserData? + testDetails: UserData?, ): String { var outputString = "Test calculation logs ==>\n" outputString += "Name = ${testDetails?.name}\n"