diff --git a/docs/data/histograms/Venezuela, Bolivarian Republic of/FC3113.json b/docs/data/histograms/Venezuela, Bolivarian Republic of/FC3113.json deleted file mode 100644 index aba8d6492ca..00000000000 --- a/docs/data/histograms/Venezuela, Bolivarian Republic of/FC3113.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "FC3113", "histograms": [{"histogram": {"Chorioretinitis": 1, "Nasal obstruction": 1, "Polymerase chain reaction": 1, "Vision blurred": 1, "Walking disability": 1}, "batchcodes": ["FC3113"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Viet Nam/FF4222.json b/docs/data/histograms/Viet Nam/FF4222.json deleted file mode 100644 index 0f6a3dabe48..00000000000 --- a/docs/data/histograms/Viet Nam/FF4222.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "FF4222", "histograms": [{"histogram": {"Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood chloride": 1, "Blood creatine": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "Cardiac arrest": 1, "Catheterisation cardiac": 1, "Circulatory collapse": 1, "Coagulation factor": 1, "Full blood count": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lymphocyte count": 1, "Mean cell volume": 1, "Myocardial infarction": 1, "PO2": 1, "Platelet count": 1, "Prothrombin level": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Troponin I": 1, "Urine analysis": 1, "White blood cell count": 1}, "batchcodes": ["FF4222"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Viet Nam/FF51111.json b/docs/data/histograms/Viet Nam/FF51111.json deleted file mode 100644 index fe4755e4e42..00000000000 --- a/docs/data/histograms/Viet Nam/FF51111.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "FF51111", "histograms": [{"histogram": {"Deafness": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["FF51111"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Viet Nam/FF8871.json b/docs/data/histograms/Viet Nam/FF8871.json deleted file mode 100644 index 6dd0c7423e7..00000000000 --- a/docs/data/histograms/Viet Nam/FF8871.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "FF8871", "histograms": [{"histogram": {"Angina pectoris": 1, "Arteriospasm coronary": 1, "Back pain": 1, "Hypoaesthesia": 1, "Migraine": 1, "Pyrexia": 1}, "batchcodes": ["FF8871"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Virgin Islands, U.S./042L20A.json b/docs/data/histograms/Virgin Islands, U.S./042L20A.json deleted file mode 100644 index ee05392cf43..00000000000 --- a/docs/data/histograms/Virgin Islands, U.S./042L20A.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "042L20A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["042L20A", "KK9895"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Virgin Islands, U.S./ASKU.json b/docs/data/histograms/Virgin Islands, U.S./ASKU.json deleted file mode 100644 index bb4bb0ca7d1..00000000000 --- a/docs/data/histograms/Virgin Islands, U.S./ASKU.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "ASKU", "histograms": [{"histogram": {"Macular degeneration": 1}, "batchcodes": ["ASKU"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Virgin Islands, U.S./EL9266.json b/docs/data/histograms/Virgin Islands, U.S./EL9266.json deleted file mode 100644 index 7ab1954b311..00000000000 --- a/docs/data/histograms/Virgin Islands, U.S./EL9266.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "EL9266", "histograms": [{"histogram": {"Pain": 1, "Pyrexia": 1, "Urinary tract infection": 1, "Vomiting": 1}, "batchcodes": ["EL9266"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Virgin Islands, U.S./KK9895.json b/docs/data/histograms/Virgin Islands, U.S./KK9895.json deleted file mode 100644 index 444a49e4960..00000000000 --- a/docs/data/histograms/Virgin Islands, U.S./KK9895.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "KK9895", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["042L20A", "KK9895"]}, {"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["KK9895"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Western Sahara/EH9899.json b/docs/data/histograms/Western Sahara/EH9899.json deleted file mode 100644 index 36367f30ebb..00000000000 --- a/docs/data/histograms/Western Sahara/EH9899.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "EH9899", "histograms": [{"histogram": {"Back pain": 1, "Blood test": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram pelvis": 1, "Urine analysis": 1}, "batchcodes": ["EH9899"]}]} \ No newline at end of file diff --git a/docs/data/histograms/Yemen/0003226809.json b/docs/data/histograms/Yemen/0003226809.json deleted file mode 100644 index 8936a60d428..00000000000 --- a/docs/data/histograms/Yemen/0003226809.json +++ /dev/null @@ -1 +0,0 @@ -{"batchcode": "0003226809", "histograms": [{"histogram": {"Extra dose administered": 1}, "batchcodes": ["0003226809"]}]} \ No newline at end of file diff --git a/src/BatchCodeTableFactory.py b/src/BatchCodeTableFactory.py index 1808cdb8c5a..ce800bb2db1 100644 --- a/src/BatchCodeTableFactory.py +++ b/src/BatchCodeTableFactory.py @@ -22,7 +22,6 @@ class BatchCodeTableFactory: def _postProcess(self, batchCodeTable, countriesAsList): batchCodeTable = self.companyColumnAdder.addCompanyColumn(batchCodeTable) - BatchCodeTableFactory._convertCountries(batchCodeTable, countriesAsList) batchCodeTable = batchCodeTable[ [ 'Adverse Reaction Reports', @@ -30,17 +29,11 @@ class BatchCodeTableFactory: 'Disabilities', 'Life Threatening Illnesses', 'Company', - 'Countries', 'Severe reports', 'Lethality' ]] return batchCodeTable.sort_values(by = 'Severe reports', ascending = False) - @staticmethod - def _convertCountries(batchCodeTable, countriesAsList): - if not countriesAsList: - batchCodeTable['Countries'] = batchCodeTable['Countries'].apply(', '.join) - def _getBatchCodeTableByCountry(self, country): if country in self.countryBatchCodeTable.index: return self.countryBatchCodeTable.loc[country] diff --git a/src/BatchCodeTableHavingGuessedCountriesFactory.py b/src/BatchCodeTableHavingGuessedCountriesFactory.py index 3da70623545..c83c0a13a14 100644 --- a/src/BatchCodeTableHavingGuessedCountriesFactory.py +++ b/src/BatchCodeTableHavingGuessedCountriesFactory.py @@ -22,4 +22,3 @@ class BatchCodeTableHavingGuessedCountriesFactory: batchCodeTable['Countries'] = CountriesMerger.mergeSrcIntoDst( dst = batchCodeTable['Countries'], src = self.countriesByBatchcodeBeforeDeletion['Countries']) - BatchCodeTableFactory._convertCountries(batchCodeTable, countriesAsList)