Merge pull request #492 from techcomrade/fix/huy

fix(web): fix record response
techcomrade · Jul 16, 2024 · 823fce8 · 823fce8
2 parents da5e809 + 6c0850e
commit 823fce8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/frontend_web/public/locales/vi.json b/frontend_web/public/locales/vi.json
@@ -47,7 +47,7 @@
         "refresh": "Làm mới"
     },
     "modal": {
-        "record-graph": "Đồ thị records"
+        "record-graph": "Đồ thị dữ liệu phiên đo"
     },
     "homepage": {
         "number-of-users-are-using": "Số lượng người dùng đang hoạt động",

diff --git a/frontend_web/src/components/Modal/ModalChart.js b/frontend_web/src/components/Modal/ModalChart.js
@@ -37,7 +37,7 @@ const ModalChart = ({ isOpen, setIsOpen, selectedDevice }) => {
 
   return (
     <Modal
-      title={t("modal-chart.record-graph")}
+      title={t("modal.record-graph")}
       open={isOpen}
       cancelText={t("modal-chart.cancel")}
       onCancel={handleCancel}

diff --git a/server-web/controllers/RecordController.js b/server-web/controllers/RecordController.js
@@ -290,7 +290,7 @@ class RecordController {
       });
     }
 
-    const filepath = await RecordService.getFilePathById(req.params.id);
+    const filepath = record[0].dataValues.data_rec_url;
     if (!fs.existsSync(filepath)) {
       return res.status(404).json({
         message: "record file not found",

diff --git a/server-web/services/RecordService.js b/server-web/services/RecordService.js
@@ -150,11 +150,11 @@ class RecordService extends CommonService {
         });
       });
       let arrayValue = {
+        ECG: { frequency: null, data: [] },
         PPG: { frequency: null, data: [] },
         PCG: { frequency: null, data: [] },
-        heartRate: { frequency: null, data: [] },
       };
-      let fieldNames = ["PPG", "PCG", "heartRate"];
+      let fieldNames = ["ECG", "PPG", "PCG"];
       for (let i = 6; i < 9; i++) {
         let field = fieldNames[i - 6];
         arrayValue[field].frequency = device_freq_value;