Commit Graph

499 Commits

Author SHA1 Message Date
Mariya
47888172fd Added Branch for Api call version 2024-01-09 13:45:00 +05:30
Pritimay Sarkar
80911ada0f show environment name 2024-01-08 20:43:56 +05:30
Pritimay Sarkar
67559a292d Merge branch 'preprod-temp' into dev 2024-01-08 12:23:55 +05:30
Pritimay Sarkar
81b1e5899a Merge branch 'preprod-temp' of https://gitlab.com/sminnovations/hpos into preprod-temp 2024-01-08 12:23:38 +05:30
Pritimay Sarkar
8f8fa4e302 fix merge errors 2024-01-06 17:48:22 +05:30
Pritimay Sarkar
15e462d91a fix conflicts 2024-01-06 17:24:57 +05:30
Pritimay Sarkar
fe44b9a465 Merge branch 'preprod-temp' into dev 2024-01-06 16:51:08 +05:30
Pritimay Sarkar
3f47213d95 resolve merge conflict 2024-01-06 16:49:41 +05:30
Pritimay Sarkar
2acf3a08d5 quality screen 2024-01-06 16:44:32 +05:30
Kaif
2c2b4aa9c7 Result API, NATS and work manager 2024-01-06 16:32:00 +05:30
Mariya
cdd372fadc Added device Information and Login Id - Added Labels for it 2024-01-06 16:28:37 +05:30
Mariya
7ba0124f1a Issue fixed related to Toast 2024-01-05 18:24:36 +05:30
Mariya
4dffe4196d Create a button on the panel screen to check device connectivity and hardware configuration - DONE
display logged in user id in app - DONE
2024-01-05 15:05:26 +05:30
Kaif
2642106b32 Removed incubation time, error message and displaying only one HB value 2024-01-05 15:03:23 +05:30
Mariya
3e985bd4d6 Create a button on the panel screen to check device connectivity and hardware configuration - DONE
display logged in user id in app - DONE
2024-01-05 14:40:48 +05:30
Pritimay Sarkar
cddfc4518f add key not found error in config 2024-01-05 01:16:55 +05:30
Pritimay Sarkar
2368ef5a4f support multiple readings automatically 2024-01-05 00:51:50 +05:30
Mariya Varghese
f9b8df970d Merge branch 'preprod-temp' into 'preprod-temp-App-Updation'
# Conflicts:
#   app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
2024-01-04 07:44:40 +00:00
Mariya
46d2c2f57b App update Issue fixed, its updated successfully within one app itself 2024-01-04 13:00:47 +05:30
Mariya
18ed6c4e11 App update using api added 2024-01-04 12:10:20 +05:30
Pritimay Sarkar
02cdc49c9c coefficient screen added 2024-01-04 12:01:59 +05:30
Pritimay Sarkar
6d4adbc222 add auto dac 2024-01-04 01:11:30 +05:30
Pritimay Sarkar
9e88bf9109 change profile screen text to panel 2024-01-03 23:09:28 +05:30
Pritimay Sarkar
8fb504098f resolve conflict 2024-01-03 18:13:43 +05:30
Pritimay Sarkar
8892eaf189 fix db schemaerror 2024-01-03 17:56:01 +05:30
Mariya
ae42c96256 Toast Message is Added, if the device is connected 2024-01-03 15:31:58 +05:30
Mariya
b0d348cf6d Implement - In app update after getting the new update link from check update response 2024-01-03 14:49:41 +05:30
Mariya
214a834740 Merge branch 'preprod-temp' into preprod-temp-App-Updation 2024-01-03 12:55:38 +05:30
Kaif
d362a7fa86 Merge remote-tracking branch 'origin/preprod-temp' into preprod-temp 2024-01-03 12:53:45 +05:30
Mariya
dfbcb4af6a error resolved 2024-01-03 12:52:28 +05:30
Kaif
e8b380a4c4 Added pending API calls, like upload log, result upload and device update 2024-01-03 12:52:27 +05:30
Pritimay Sarkar
039e17a3b8 resolve compile errors since merge 2024-01-03 12:38:13 +05:30
Pritimay Sarkar
f54af3c877 Merge branch 'led-gains-data' into preprod 2024-01-03 12:08:29 +05:30
Pritimay Sarkar
0149ec7111 release 2.1.68 2024-01-03 11:54:21 +05:30
Mariya
ba45346fba Implement - In app update after getting the new update link from check update response 2024-01-02 17:09:22 +05:30
Pritimay Sarkar
c02bd1ba2e release 2.1.65 for pq 2024-01-02 11:38:38 +05:30
Pritimay Sarkar
f6b1b83f24 add gains commands and save gains data 2024-01-02 10:56:38 +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
Kaif
f50a1d8dcd Added all for values and rebase with preprod 2023-12-24 23:16:51 +05:30
Pritimay Sarkar
5db43bf16c display hb3 and hb4 2023-12-24 23:16:51 +05:30
Pritimay Sarkar
21d53cc2b8 fix msg fragmentation in app and add log dsiplay for admin 2023-12-24 23:16:51 +05:30
Pritimay Sarkar
82360b22c8 handle-msg-fragmentation 2023-12-24 23:16:50 +05:30
Pritimay Sarkar
add61d9c65 add config error msg and v2 usb config 2023-12-24 23:15:56 +05:30
Mariya
92a01dbd9f Digital Card button removed 2023-12-24 23:15:21 +05:30
Kaif
bf73ea70b8 Changes for new Arduieno Device 2023-12-24 23:15:21 +05:30
Mariya
dfe39fb460 gradle version changed 2023-12-24 23:14:56 +05:30
Pritimay Sarkar
aa8a991fbb release 2.1.52 for qa 2023-12-24 23:14:11 +05:30
Pritimay Sarkar
3aeb7ef543 coeffs for dev4 2023-12-24 23:13:06 +05:30