Cleaned up code

Author: icaoberg

braininventory/get.py

@@ -71,45 +71,15 @@ def __get_technique(df):
 def __get_locations(df):
     return df['locations'].value_counts().to_dict()
 
-def report():
-    # Get today's date
-	tdate = date.today()
-
-	# Convert date to string
-	tdate = tdate.strftime("%Y-%m-%d")
-        
-	df = today()
-
-	report = {}
-	report['date'] = tdate
-	report['number_of_datasets'] = __get_number_of_datasets(df)
-	report['completeness_score'] = __get_completeness_score(df)
-	report['metadata_version'] = __get_metadata_version(df)
-    report['contributor'] =  __get_contributor(df)
-    report['affiliation'] =  __get_affilation(df)
-    report['award_number'] = __get_award_number(df)
-    report['species'] = __get_species(df)
-    report['cnbtaxonomy'] = __get_cnbtaxonomy(df)
-    report['samplelocalid'] = __get_samplelocalid(df)
-    report['genotype'] = __get_genotype(df)
-    report['generalmodality'] = __get_generalmodality(df)
-    report['technique'] = __get_technique(df)
-    report['locations'] = __get_locations(df)
-     
-	report['is_reachable'] = df['URL'].apply(__is_reachable)
-
-	return report
 def __get_project_names(df):
 	'''
 	Gets the unique list of project names.
 
- 	Input: dataframe
-  	Output: list 
- 	'''
+    Input: dataframe
+    Output: list 
+    '''
 	return df['project'].unique()
-	
 
-#  
 def __get_list_of_projects(df):
     '''
     Get the list of names for unique projects
@@ -120,7 +90,6 @@ def __get_list_of_projects(df):
 
     return df['project'].unique().to_dict()
 
-# 
 def __get_number_of_projects(df):
     '''
     Get the number of unique projects
@@ -130,3 +99,32 @@ def __get_number_of_projects(df):
     '''
 
     return len(df['project'].unique())
+
+def report():
+    # Get today's date
+	tdate = date.today()
+
+	# Convert date to string
+	tdate = tdate.strftime("%Y-%m-%d")
+        
+	df = today()
+
+	report = {}
+	report['date'] = tdate
+	report['number_of_datasets'] = __get_number_of_datasets(df)
+	report['completeness_score'] = __get_completeness_score(df)
+	report['metadata_version'] = __get_metadata_version(df)
+    report['contributor'] =  __get_contributor(df)
+    report['projects'] = __get_list_of_projects(df)
+    report['affiliation'] =  __get_affilation(df)
+    report['award_number'] = __get_award_number(df)
+    report['species'] = __get_species(df)
+    report['cnbtaxonomy'] = __get_cnbtaxonomy(df)
+    report['samplelocalid'] = __get_samplelocalid(df)
+    report['genotype'] = __get_genotype(df)
+    report['generalmodality'] = __get_generalmodality(df)
+    report['technique'] = __get_technique(df)
+    report['locations'] = __get_locations(df)
+	#report['is_reachable'] = df['URL'].apply(__is_reachable)
+
+	return report