Update Racial Equity to use full Evaluation Panel data

competitions/RacialEquity2030/etl/compose-and-upload

@@ -173,16 +173,23 @@ def main():
     )
 
     comp.add_supplemental_information(
-        competition.LinkedSecondSheet(
-            expert_panel_review_csv, "Review #", ["Overall Rank"], {}
+        competition.EvaluationAdder(
+            "Peer to Peer",
+            peer_to_peer_review_csv,
+            app_col_name="Application #",
+            score_rank_normalized_col_name="Overall Score Rank Normalized ",
+            sum_of_scores_normalized_col_name="Sum Of Scores Normalized ",
+            trait_col_name="Trait",
+            score_normalized_col_name="Trait Score Normalized",
+            comments_col_name="Trait Judge Comment ",
+            comments_score_normalized_col_name="Trait Score Normalized",
         )
     )
-    comp.process_cells_special("Overall Rank", competition.DefaultValueSetter("9999"))
 
     comp.add_supplemental_information(
         competition.EvaluationAdder(
-            "Peer to Peer",
-            peer_to_peer_review_csv,
+            "Panel",
+            expert_panel_review_csv,
             app_col_name="Application #",
             score_rank_normalized_col_name="Overall Score Rank Normalized ",
             sum_of_scores_normalized_col_name="Sum Of Scores Normalized ",
@@ -216,7 +223,7 @@ def main():
         comp.sorted_proposal_keys, attachments_dir
     )
     comp.add_supplemental_information(attachments)
-    comp.sort("Overall Rank", True)
+    comp.sort("Panel Overall Score Rank Normalized", True)
 
     list_toc = toc.ListToc("All_Proposals")
     list_toc.proposal_formatter = toc.WikiTableTocProposalFormatter(

competitions/RacialEquity2030/etl/deploy

@@ -30,7 +30,7 @@ python3 -V > /dev/null 2>&1 || { echo "python3 required, aborting" ; exit 1; }
 
 PROPOSALS_CSV="RE2020_Registration_Application_2021-03-24_06-29-20.csv"
 P2P_RANKING_CSV="RE2020_Peer_Review_2021-05-13_14-27-30_No_Judge_Names.csv"
-EP_RANKING_CSV="RE2030-EP-Ranking.csv"
+EP_RANKING_CSV="RE2020_Evaluation_Panel_2021-06-14_07-31-58.csv"
 BASE_ATTACHMENTS="RE2020_Registration_Application_exports_2021-03-24_08-08-31.zip"
 CORRECTION_FILE="OTS_Corrections.csv"
 ADMIN_REVIEW_CSV="Kellogg-AdminReview.csv"