Merge branch 'develop' into search-ui-for-discharge-patients

ohcnetwork · Dec 15, 2024 · 89be10a · 89be10a
2 parents 4d27d99 + f82dfa8
commit 89be10a
Show file tree

Hide file tree

Showing 37 changed files with 264 additions and 3,146 deletions.
diff --git a/cypress/e2e/sample_test_spec/SampleTestAdvanceFilters.cy.ts b/cypress/e2e/sample_test_spec/SampleTestAdvanceFilters.cy.ts
diff --git a/cypress/e2e/sample_test_spec/SampleTestHomepage.cy.ts b/cypress/e2e/sample_test_spec/SampleTestHomepage.cy.ts
diff --git a/cypress/e2e/sample_test_spec/SampleTestRequest.cy.ts b/cypress/e2e/sample_test_spec/SampleTestRequest.cy.ts
diff --git a/cypress/e2e/users_spec/UsersManage.cy.ts b/cypress/e2e/users_spec/UsersManage.cy.ts
@@ -66,7 +66,7 @@ describe("Manage User", () => {
     manageUserPage.verifyEditUserDetails(
       "Devo",
       "Districto",
-      "8/11/1999",
+      "11/08/1999",
       "Female",
     );
   });

diff --git a/cypress/fixtures/external-result-sample.csv b/cypress/fixtures/external-result-sample.csv
diff --git a/cypress/pageobject/Sample/SampleTestCreate.ts b/cypress/pageobject/Sample/SampleTestCreate.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.0.4",
     "cross-env": "^7.0.3",
-    "cypress": "^13.16.1",
+    "cypress": "^13.16.0",
     "dayjs": "^1.11.13",
     "echarts": "^5.5.1",
     "echarts-for-react": "^3.0.2",

diff --git a/public/External-Results-Template.csv b/public/External-Results-Template.csv
diff --git a/public/locale/en.json b/public/locale/en.json
@@ -181,14 +181,6 @@
   "ROUNDS_TYPE__NORMAL": "Brief Update",
   "ROUNDS_TYPE__TELEMEDICINE": "Tele-medicine Log",
   "ROUNDS_TYPE__VENTILATOR": "Detailed Update",
-  "SAMPLE_TEST_HISTORY__APPROVED": "Approved",
-  "SAMPLE_TEST_HISTORY__COMPLETED": "Completed",
-  "SAMPLE_TEST_HISTORY__RECEIVED_AT_LAB": "Received At Lab",
-  "SAMPLE_TEST_HISTORY__REQUEST_SUBMITTED": "Request Submitted",
-  "SAMPLE_TEST_RESULT__AWAITING": "Awaiting",
-  "SAMPLE_TEST_RESULT__INVALID": "Invalid",
-  "SAMPLE_TEST_RESULT__NEGATIVE": "Negative",
-  "SAMPLE_TEST_RESULT__POSITIVE": "Positive",
   "SLEEP__EXCESSIVE": "Excessive",
   "SLEEP__NO_SLEEP": "No sleep",
   "SLEEP__SATISFACTORY": "Satisfactory",
@@ -354,7 +346,6 @@
   "asset_type": "Asset Type",
   "assets": "Assets",
   "assign": "Assign",
-  "unassign":"Unassign",
   "assign_a_volunteer_to": "Assign a volunteer to {{name}}",
   "assign_bed": "Assign Bed",
   "assign_to_volunteer": "Assign to a Volunteer",
@@ -1444,6 +1435,7 @@
   "type_your_comment": "Type your comment",
   "type_your_reason_here": "Type your reason here",
   "unable_to_get_current_position": "Unable to get current position.",
+  "unassign": "Unassign",
   "unconfirmed": "Unconfirmed",
   "unique_id": "Unique Id",
   "unknown": "Unknown",
@@ -1558,8 +1550,8 @@
   "voice_autofill": "Voice Autofill",
   "volunteer_assigned": "Volunteer assigned successfully",
   "volunteer_contact": "Volunteer Contact",
-  "volunteer_update" : "Volunteer updated successfully",
   "volunteer_unassigned": "Volunteer unassigned successfully",
+  "volunteer_update": "Volunteer updated successfully",
   "ward": "Ward",
   "warranty_amc_expiry": "Warranty / AMC Expiry",
   "weekly_working_hours_error": "Average weekly working hours must be a number between 0 and 168",

diff --git a/public/locale/hi.json b/public/locale/hi.json
@@ -106,7 +106,6 @@
   "SORT_OPTIONS__name": "मरीज़ का नाम AZ",
   "SORT_OPTIONS__review_time": "सबसे पुरानी समीक्षा तिथि पहले",
   "SORT_OPTIONS__taken_at": "सबसे पुरानी ली गई तारीख पहले",
-  "Sample Test": "नमूना परीक्षण",
   "Shifting": "स्थानांतरण",
   "Submit": "जमा करना",
   "TELEMEDICINE": "सुदूर",