updates to field names, added org_id to some more tables

ge-tbs · ge-tbs · commit a53f72e6aa46 · 2025-02-03T19:15:02.000Z
diff --git a/src/process.py b/src/process.py
@@ -260,7 +260,7 @@ def process_files(si, ss):
     maf8['yrs_since_last_service_improvement'] = maf8['report_yr']-maf8['last_service_improvement_yr']
     maf8['last_service_improvement_within_1_yr'] = maf8['yrs_since_last_service_improvement'] <= 1
     
-    maf8 = maf8.groupby(['fiscal_yr', 'department_en', 'org_id']).agg(
+    maf8 = maf8.groupby(['fiscal_yr', 'department_en','department_fr', 'org_id']).agg(
         improved_services_count=('last_service_improvement_within_1_yr', 'sum'),
         service_count=('service_id', 'nunique')
     ).reset_index()
diff --git a/src/utils.py b/src/utils.py
@@ -60,6 +60,8 @@ def sid_list(si):
         ]
     ]
 
+    sid_list = sid_list.rename(columns={'fiscal_yr': 'latest_fiscal_yr'})
+
     export_to_csv(
         data_dict={'sid_list': sid_list},
         output_dir=UTILS_DIR

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ def sid_list(si):`
`60`	`60`	`]`
`61`	`61`	`]`
`62`	`62`
	`63`	`+ sid_list = sid_list.rename(columns={'fiscal_yr': 'latest_fiscal_yr'})`
	`64`	`+`
`63`	`65`	`export_to_csv(`
`64`	`66`	`data_dict={'sid_list': sid_list},`
`65`	`67`	`output_dir=UTILS_DIR`