Merge pull request #624 from mozzy11/2.8

Minor fixes
I-TECH-UW · Dec 4, 2023 · a0f07a6 · a0f07a6
2 parents ec48f57 + 2652e37
commit a0f07a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -227,6 +227,7 @@
     "referral.testresult.pastnote":"Past Notes",
     "referral.label.sentdate":"Sent Date",
     "referral.label.reason":"Referral Reason",
+    "referral.label.testtoperform":"Test to Perform",
     "new.patient.label": "New Patient",
     "sample.select.type": "Select sample type",
     "sample.reject.label": "Reject Sample",

diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -357,5 +357,6 @@
     "sidenav.label.admin.menu": "Menu Configuration",
     "sidenav.label.admin.menu.billing": "Billing Menu Configuration",
     "button.label.loadnext": "Charger le lot suivant",
-    "button.label.loadprevious": "Charger le lot précédent"
+    "button.label.loadprevious": "Charger le lot précédent",
+    "referral.label.testtoperform":"Test à effectuer"
 }
diff --git a/install/installerTemplate/linux/initDB/OpenELIS-Global.sql b/install/installerTemplate/linux/initDB/OpenELIS-Global.sql
@@ -17832,7 +17832,7 @@ COPY clinlims.type_of_sample (id, description, domain, lastupdated, local_abbrev
 5	Actual type will be selected by user	H	2013-09-19 14:31:47.008874	Variable	f	2147483647	136	\N
 3	Plasma	H	2012-10-24 11:58:25.215565	Plasma	t	20	137	sample.type.Plasma
 2	Serum	H	2012-10-24 11:58:25.215565	Serum	t	10	139	sample.type.Serum
-4	Whole Blood	H	2012-10-24 11:58:25.215565	Whole Blood	t	50	138	sample.type.Sang
+4	Whole Blood	H	2012-10-24 11:58:25.215565	Whole Bld	t	50	138	sample.type.Sang
 1	Urines	H	2012-10-24 11:58:25.215565	Urines	t	30	140	sample.type.Urines
 24	Dry Tube	H	2020-01-22 21:46:41.326636	Dry	t	2147483647	141	sample.type.dryTube
 25	EDTA Tube	H	2020-01-22 21:46:41.326636	EDTA	t	2147483647	142	sample.type.edtaTube

diff --git a/volume/database/dbInit/OpenELIS-Global.sql b/volume/database/dbInit/OpenELIS-Global.sql
@@ -17830,7 +17830,7 @@ COPY clinlims.type_of_sample (id, description, domain, lastupdated, local_abbrev
 5	Actual type will be selected by user	H	2013-09-19 14:31:47.008874	Variable	f	2147483647	136	\N
 3	Plasma	H	2012-10-24 11:58:25.215565	Plasma	t	20	137	sample.type.Plasma
 2	Serum	H	2012-10-24 11:58:25.215565	Serum	t	10	139	sample.type.Serum
-4	Whole Blood	H	2012-10-24 11:58:25.215565	Whole Blood	t	50	138	sample.type.Sang
+4	Whole Blood	H	2012-10-24 11:58:25.215565	Whole Bld	t	50	138	sample.type.Sang
 1	Urines	H	2012-10-24 11:58:25.215565	Urines	t	30	140	sample.type.Urines
 24	Dry Tube	H	2020-01-22 21:46:41.326636	Dry	t	2147483647	141	sample.type.dryTube
 25	EDTA Tube	H	2020-01-22 21:46:41.326636	EDTA	t	2147483647	142	sample.type.edtaTube