Revenue Adjustments Update

- Attempted to remove all school districts in our data that are not in the edbuild data
KVSRoyal · May 3, 2019 · 9df1162 · 9df1162
1 parent 6f235cf
commit 9df1162
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 79 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/funding_analysis/edbuild_data/__pycache__/edbuild_district_data.cpython-37.pyc b/funding_analysis/edbuild_data/__pycache__/edbuild_district_data.cpython-37.pyc
diff --git a/funding_analysis/edbuild_data/edbuild_district_data.py b/funding_analysis/edbuild_data/edbuild_district_data.py
@@ -30,15 +30,29 @@ def select_column(self, variable):
         :param variable: The variable / column title for which all available data is being selected
         :return: All data for this variable / column item in a series
         """
-        return self.district_data_df[variable]
+        # Ensure the variable is upper case
+        variable = variable.upper()
+
+        try:
+            return self.district_data_df[variable]
+        except KeyError:
+            return None
 
     def select_columns(self, variables):
         """
         Returns a pandas dataframe of all data for the given list of variables / column titles
         :param variables: A list of variables / column titles for which all available data is being selected
         :return: All data for these variables / column titles in a pandas dataframe
         """
-        return self.district_data_df[variables]
+        selected_columns = pandas.DataFrame()
+
+        for variable in variables:
+            # Ensure the variable is upper case
+            variable = variable.upper()
+
+            selected_columns[variable] = self.select_column(variable)
+
+        return selected_columns
 
     def __abbreviate_column_titles(self):
         """