Pritimay Sarkar
|
8fb504098f
|
resolve conflict
|
2024-01-03 18:13:43 +05:30 |
|
Mariya
|
ae42c96256
|
Toast Message is Added, if the device is connected
|
2024-01-03 15:31:58 +05:30 |
|
Kaif
|
d362a7fa86
|
Merge remote-tracking branch 'origin/preprod-temp' into preprod-temp
|
2024-01-03 12:53:45 +05:30 |
|
Kaif
|
e8b380a4c4
|
Added pending API calls, like upload log, result upload and device update
|
2024-01-03 12:52:27 +05:30 |
|
Mariya
|
4b205185d3
|
error resolved related to previous changing color of text if the result is normal
|
2023-12-29 11:10:38 +05:30 |
|
Kaif
|
00a3124fbf
|
API call for DeviceProvision and Login is completed and tested
|
2023-12-26 14:16:19 +05:30 |
|
Mariya
|
0faf4adbd7
|
ADDED CODE FOR Changing Text color from red to green if the result is normal
|
2023-12-26 12:59:44 +05:30 |
|
Pritimay Sarkar
|
323a76c72a
|
fix merge conflict
|
2023-12-21 16:26:59 +05:30 |
|
Pritimay Sarkar
|
c305635862
|
Merge branch 'hb3-hb4' into preprod-temp
|
2023-12-21 16:25:44 +05:30 |
|
Pritimay Sarkar
|
d1b5ca32bf
|
fix msg fragmentation in app and add log dsiplay for admin
|
2023-12-18 12:48:07 +05:30 |
|
Pritimay Sarkar
|
3e690345c2
|
handle-msg-fragmentation
|
2023-12-15 14:37:41 +05:30 |
|
Pritimay Sarkar
|
4f7aa74314
|
Merge branch 'v2-hardware-config' into preprod
|
2023-12-15 10:32:56 +05:30 |
|
Pritimay Sarkar
|
590abb5c73
|
Merge branch 'preprod'
|
2023-12-15 10:29:48 +05:30 |
|
Pritimay Sarkar
|
7fe8202968
|
add config error msg and v2 usb config
|
2023-12-15 10:22:50 +05:30 |
|
Kaif
|
11d4c99e02
|
Changes for new Arduieno Device
|
2023-12-14 16:56:39 +05:30 |
|
Pritimay Sarkar
|
2e700601fe
|
release 2.1.52 for qa
|
2023-12-14 14:53:53 +05:30 |
|
Mariya
|
41798aa37b
|
Digital Card button removed
|
2023-12-14 13:07:15 +05:30 |
|
Mariya
|
e7600dafec
|
gradle version changed
|
2023-12-14 12:43:10 +05:30 |
|
Mariya
|
d6b3df25f8
|
gradle version changed
|
2023-12-13 20:53:34 +05:30 |
|
Pritimay Sarkar
|
44d5b4f0ba
|
coeffs for hb est
|
2023-12-13 19:03:43 +05:30 |
|
Mariya
|
0d7e8b0cd0
|
Merge remote-tracking branch 'origin/preprod' into preprod
|
2023-12-13 18:57:03 +05:30 |
|
Mariya
|
3c8570c46b
|
gradle version changed
|
2023-12-13 18:56:40 +05:30 |
|
Pritimay Sarkar
|
96f9d4d6da
|
coeffs for dev4
|
2023-12-13 18:55:41 +05:30 |
|
Pritimay Sarkar
|
0b17ea9ab9
|
display hb3 and hb4
|
2023-12-13 18:49:19 +05:30 |
|
Mariya
|
e7505077ce
|
Merge remote-tracking branch 'origin/preprod' into preprod
# Conflicts:
# app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
|
2023-12-12 12:21:52 +05:30 |
|
Kaif
|
41e30cf178
|
Incremented the version number for giving testing release
|
2023-12-08 13:59:07 +05:30 |
|
Pritimay Sarkar
|
a34c095fde
|
Merge remote-tracking branch 'origin/Feature_Develop_the_feature_to_shift_between_multiple_languages_in_testing_app' into preprod
|
2023-12-08 13:55:07 +05:30 |
|
Mariya
|
80fa523ec9
|
String Issues fixed
|
2023-12-05 17:57:32 +05:30 |
|
Mariya
|
7a2e5ead51
|
String Issues fixed
|
2023-12-05 17:53:46 +05:30 |
|
Mariya
|
f109c52288
|
app Build added
|
2023-12-05 17:50:46 +05:30 |
|
Mariya
|
a3a5c0d6fb
|
pending strings added
|
2023-12-04 15:49:39 +05:30 |
|
Kaif
|
fb5e6f3b49
|
Fixed string error
|
2023-12-01 16:22:13 +05:30 |
|
Kaif
|
8a22b44496
|
Added app version
|
2023-12-01 16:10:15 +05:30 |
|
Kaif
|
10d822c5d6
|
Kannada and Hindi language support added
|
2023-12-01 15:55:49 +05:30 |
|
Mariya
|
4a248f7c49
|
deleted unwanted codes
|
2023-12-01 12:23:44 +05:30 |
|
Mariya
|
2123b2a7b4
|
Merge remote-tracking branch 'origin/preprod' into preprod
|
2023-12-01 10:54:05 +05:30 |
|
Pritimay Sarkar
|
704223e403
|
Merge branch 'LanguageTranslation' into 'preprod'
Merge multi-lingual changes to preprod
See merge request sminnovations/hpos!15
|
2023-11-30 08:52:52 +00:00 |
|
Pritimay Sarkar
|
6097a05701
|
Merge branch 'preprod' into 'LanguageTranslation'
# Conflicts:
# app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
# app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
# app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
# app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
|
2023-11-30 08:52:01 +00:00 |
|
Mariya
|
290bf77950
|
Merge remote-tracking branch 'origin/preprod' into preprod
|
2023-11-30 13:38:13 +05:30 |
|
Mariya
|
ad595a6299
|
pending translation strings of hemocube fragment added
|
2023-11-30 13:21:02 +05:30 |
|
Mariya
|
22bf66fc94
|
kannada and hindi version of strings added
|
2023-11-29 15:51:38 +05:30 |
|
Mariya
|
1dd66bcd6e
|
kannada and hindi version of strings added
|
2023-11-28 15:39:57 +05:30 |
|
Pritimay Sarkar
|
a02ba3e9ea
|
release 2.1.39 with updated coeffs for dev2
|
2023-11-28 12:05:06 +05:30 |
|
Pritimay Sarkar
|
457c652161
|
add low Hb check and log errors
|
2023-11-27 10:23:44 +05:30 |
|
Mariya
|
5bebd88dfd
|
Merge remote-tracking branch 'origin/preprod' into preprod
|
2023-11-24 11:36:20 +05:30 |
|
Mariya
|
657b9aea65
|
removed Unwanted code
|
2023-11-22 17:10:40 +05:30 |
|
Mariya
|
90590ee535
|
removed Unwanted code
|
2023-11-22 17:10:06 +05:30 |
|
Mariya
|
3d39c43c22
|
Digital Counselling Card , All is finished
|
2023-11-22 16:31:46 +05:30 |
|
Pritimay Sarkar
|
6fa5e760c1
|
Merge branch 'Bug_Entering_a_new_kit_number_through_the_home_screen_triggers_an_invalid_message' into preprod
|
2023-11-22 10:37:54 +05:30 |
|
Pritimay Sarkar
|
8940352e05
|
prior testing related changes for clinical validation
|
2023-11-22 10:36:59 +05:30 |
|