Skip to content

Commit 8ee5bfd

Browse files
committed
solving issue BU-ISCIII#314 lab_name Keyerror when defining a new laboratory
1 parent 9fa3c2d commit 8ee5bfd

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

core/core_config.py

+2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@
237237

238238
ERROR_SAMPLE_ALREADY_DEFINED = ["Sample", "already exist in the database"]
239239

240+
ERROR_NO_USED_FIELD_ARE_ARE_SET = ["No field is set as used"]
241+
240242
# ###################### Batch file ###############################################
241243
ERROR_EMPTY = [
242244
"The uploaded table or batch file does not have any sample. Upload a valid batch file"

core/utils/common.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -250,26 +250,26 @@ def save_inital_sample_setting_value(apps_name, data):
250250
if "lab_request" in data:
251251
lab_request_data = {}
252252
lab_request_data["apps_name"] = apps_name
253-
lab_request_data["labName"] = data["lab_request"]["labRequestName"]
254-
lab_request_data["labNameCoding"] = data["lab_request"]["labRequesCoding"]
255-
lab_request_data["labUnit"] = data["lab_request"]["department"]
256-
lab_request_data["labContactName"] = data["lab_request"]["contact"]
257-
lab_request_data["labPhone"] = data["lab_request"]["phone"]
258-
lab_request_data["labEmail"] = data["lab_request"]["email"]
253+
lab_request_data["lab_name"] = data["lab_request"]["labRequestName"]
254+
lab_request_data["lab_name_coding"] = data["lab_request"]["labRequesCoding"]
255+
lab_request_data["lab_unit"] = data["lab_request"]["department"]
256+
lab_request_data["lab_contact_name"] = data["lab_request"]["contact"]
257+
lab_request_data["lab_phone"] = data["lab_request"]["phone"]
258+
lab_request_data["lab_email"] = data["lab_request"]["email"]
259259
lab_request_data["address"] = data["lab_request"]["address"]
260260
lab_request_data["city"] = data["lab_request"]["city"]
261261
if core.models.LabRequest.objects.filter(
262-
lab_name_coding__iexact=lab_request_data["labNameCoding"],
262+
lab_name_coding__iexact=lab_request_data["lab_name_coding"],
263263
apps_name__exact=lab_request_data["apps_name"],
264264
).exists():
265265
setting_defined["ERROR"] = [
266266
core.core_config.ERROR_LABORATORY_REQUEST_ALREADY_DEFINED,
267-
lab_request_data["labNameCoding"],
267+
lab_request_data["lab_name_coding"],
268268
]
269269
return setting_defined
270270
core.models.LabRequest.objects.create_lab_request(lab_request_data)
271271
setting_defined["settings"] = "Lab Request"
272-
setting_defined["value"] = lab_request_data["labName"]
272+
setting_defined["value"] = lab_request_data["lab_name"]
273273
if "molecule_type" in data:
274274
molecule_type_data = {}
275275
molecule_type_data["apps_name"] = apps_name

0 commit comments

Comments
 (0)