Template updates as issues found when adding Democracy 22

competitions/template/README.md

@@ -203,7 +203,8 @@ more secret information
     - Will usually involve copying from another competition
     - Add the columns from `<DATADIR>/$SHORTNAME/tdcconfig/AllColumns`
     - Add the proposals from `<DATADIR>/$SHORTNAME/tdcconfig/AllProposals`
-25. Complete the checklist below
+25. Add to Global View
+26. Complete the checklist below
 
 ## Post-installation checklist for new competition instances
 

competitions/template/etl/compose-and-upload

@@ -69,10 +69,6 @@ def main():
             [
                 "proposals-csv=",
                 "tdc-config-dir=",
-                "judge-evaluation-csv=",
-                "expert-panel-evaluation-csv=",
-                "application-data=",
-                "financial-sheets-dir=",
                 "attachments-dir=",
                 "pare=",
                 "csv-only",
@@ -131,6 +127,22 @@ def main():
     comp.process_cells_special("Priority Populations", competition.MultiLineProcessor())
     comp.process_cells_special("Total Projected Costs", competition.NumberCommaizer())
     comp.process_cells_special("Budget data", competition.BudgetTableProcessor())
+    comp.process_cells_special(
+        "Annual Operating Budget",
+        competition.AnnualBudgetProcessor(
+            {
+                competition.AnnualBudget.LESS_THAN_1_MIL: "Less than $1 Million",
+                competition.AnnualBudget.BETWEEN_1_MIL_AND_5_MIL: "$1.0 to 5.0 Million",
+                competition.AnnualBudget.BETWEEN_5_MIL_AND_10_MIL: "$5.1 to 10 Million",
+                competition.AnnualBudget.BETWEEN_10_MIL_AND_25_MIL: "$10.1 to 25 Million",
+                competition.AnnualBudget.BETWEEN_25_MIL_AND_50_MIL: "$25.1 to 50 Million",
+                competition.AnnualBudget.BETWEEN_50_MIL_AND_100_MIL: "$50.1 to 100 Million",
+                competition.AnnualBudget.BETWEEN_100_MIL_AND_500_MIL: "$100.1 to 500 Million",
+                competition.AnnualBudget.BETWEEN_500_MIL_AND_1_BIL: "$500.1 Million to $1 Billion",
+                competition.AnnualBudget.MORE_THAN_1_BIL: "$1 Billion +",
+            }
+        ),
+    )
 
     attachments = competition.BasicAttachments(
         comp.sorted_proposal_keys, attachments_dir
@@ -161,24 +173,7 @@ def main():
 
     comp.add_toc(toc.GenericMultiLineToc("Populations", "Priority Populations"))
     comp.add_toc(toc.GenericToc("Regions", "Application Data Region"))
-
-    comp.add_toc(
-        toc.GenericToc(
-            "Annual_Budgets",
-            "Annual Operating Budget",
-            [
-                "Less than $1 Million",
-                "$1.0 to 5.0 Million",
-                "$5.1 to 10 Million",
-                "$10.1 to 25 Million",
-                "$25.1 to 50 Million",
-                "$50.1 to 100 Million",
-                "$100.1 to 500 Million",
-                "$500.1 Million to $1 Billion",
-                "$1 Billion +",
-            ],
-        )
-    )
+    comp.add_toc(toc.AnnualBudgetToc("Annual Operating Budget"))
 
     comp.add_toc(
         toc.GenericToc(