Fix local unit health data reader

Author: szabozoltan69

local_units/management/commands/import_health_data.py

@@ -21,8 +21,12 @@ def handle(self, *args, **options):
         def wash(string):
             return string.lower().replace("/", "").replace("_", "").replace(",", "").replace(" ", "")
 
-        def wash_leave_space(string):
-            return string.lower().replace("/", "").replace("_", "").replace(",", "")
+        # Previously used with m2m rows, but in the latest CSV we changed to "wash_comma_to_space" instead of this:
+        # def wash_leave_space(string):
+        #     return string.lower().replace("/", "").replace("_", "").replace(",", "")
+
+        def wash_comma_to_space(string):
+            return string.lower().replace("/", "").replace("_", "").replace(" ", "").replace(",", " ")
 
         def numerize(value):
             return value if value.isdigit() else 0
@@ -95,10 +99,10 @@ def numerize(value):
                 f_nir = row["Number of isolation rooms"]
                 f_wrh = row["Warehousing"]
                 f_cch = row["Cold chain"]
-                f_gms = wash_leave_space(row["General medical services"])  # m2m
-                f_spm = wash_leave_space(row["Specialized medical beyond primary level"])  # m2m
+                f_gms = wash_comma_to_space(row["General medical services"])  # m2m
+                f_spm = wash_comma_to_space(row["Specialized medical beyond primary level"])  # m2m
                 f_ots = row["Other Services"]
-                f_bls = wash_leave_space(row["Blood Services"])  # m2m
+                f_bls = wash_comma_to_space(row["Blood Services"])  # m2m
                 f_tnh = numerize(row["Total number of Human Resource"])
                 f_gpr = numerize(row["General Practitioner"])
                 f_spt = numerize(row["Specialist"])
@@ -111,7 +115,7 @@ def numerize(value):
                 f_opr = row["Other Profiles"]
                 f_fbk = row["Feedback"]
                 f_oaf = row["Other Affiliation"]
-                f_ptf = wash_leave_space(row["Professional Training Facilities"])  # m2m
+                f_ptf = wash_comma_to_space(row["Professional Training Facilities"])  # m2m
                 f_ata = row["Ambulance Type A"]
                 f_atb = row["Ambulance Type B"]
                 f_atc = row["Ambulance Type C"]

local_units/management/commands/import_local_units_health.py

@@ -64,7 +64,6 @@ def parse_date(date):
                             health_id = existing_health_data.pk
                     except ValueError:
                         pass
-                validated = True
                 level_id = int(row["COVERAGECODE"])  # + 1
                 local_branch_name = row["NAME_LOC"]
                 english_branch_name = row["NAME_EN"]
@@ -87,8 +86,6 @@ def parse_date(date):
                     level_id=level_id,
                     country_id=country,
                     type_id=type,
-                    # is_public=is_public,
-                    validated=validated,
                     local_branch_name=local_branch_name[:255],
                     english_branch_name=english_branch_name[:255],
                     focal_person_loc=focal_person_loc[:255],