Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Add "Beginning Cash Balance" to total contributions #234

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Add "Beginning Cash Balance" to total contributions #234

wants to merge 1 commit into from

Conversation

tdooner
Copy link
Member

@tdooner tdooner commented Apr 8, 2020

No description provided.

@tdooner tdooner force-pushed the wip-test-out-beginning-cash branch from 12577a5 to b5ac9d3 Compare April 8, 2020 05:38
@tdooner
Copy link
Member Author

tdooner commented Apr 8, 2020

Build diff from Commit b5ac9d3: 
diff --git a/build/_data/candidates/oakland/2016-11-08/barbara-parker.json b/build/_data/candidates/oakland/2016-11-08/barbara-parker.json
index 3bc7655..3517baa 100644
--- a/build/_data/candidates/oakland/2016-11-08/barbara-parker.json
+++ b/build/_data/candidates/oakland/2016-11-08/barbara-parker.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1382679,
   "supporting_money": {
-    "contributions_received": 67209.0,
-    "total_contributions": 67209.0,
+    "contributions_received": 67709.0,
+    "total_contributions": 67709.0,
     "total_expenditures": 34340.47,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -57,7 +57,7 @@
 
     ]
   },
-  "total_contributions": 67209.0,
+  "total_contributions": 67709.0,
   "total_expenditures": 34340.47,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/dan-kalb.json b/build/_data/candidates/oakland/2016-11-08/dan-kalb.json
index 00676a3..cbf2bf2 100644
--- a/build/_data/candidates/oakland/2016-11-08/dan-kalb.json
+++ b/build/_data/candidates/oakland/2016-11-08/dan-kalb.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1382408,
   "supporting_money": {
-    "contributions_received": 103058.0,
-    "total_contributions": 103058.0,
+    "contributions_received": 0.0,
+    "total_contributions": 0.0,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -80,7 +80,7 @@
       }
     ]
   },
-  "total_contributions": 103058.0,
+  "total_contributions": 0.0,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/donald-macleay.json b/build/_data/candidates/oakland/2016-11-08/donald-macleay.json
index 406b2a0..ab55052 100644
--- a/build/_data/candidates/oakland/2016-11-08/donald-macleay.json
+++ b/build/_data/candidates/oakland/2016-11-08/donald-macleay.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1384267,
   "supporting_money": {
-    "contributions_received": 4200.0,
-    "total_contributions": 4200.0,
+    "contributions_received": 5500.0,
+    "total_contributions": 5500.0,
     "total_expenditures": 5244.36,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -62,7 +62,7 @@
 
     ]
   },
-  "total_contributions": 4200.0,
+  "total_contributions": 5500.0,
   "total_expenditures": 5244.36,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/jody-london.json b/build/_data/candidates/oakland/2016-11-08/jody-london.json
index fc0e07c..0608e31 100644
--- a/build/_data/candidates/oakland/2016-11-08/jody-london.json
+++ b/build/_data/candidates/oakland/2016-11-08/jody-london.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1303019,
   "supporting_money": {
-    "contributions_received": 21634.0,
-    "total_contributions": 21634.0,
+    "contributions_received": 23181.0,
+    "total_contributions": 23181.0,
     "total_expenditures": 8684.11,
     "total_loans_received": 0.0,
     "total_supporting_independent": 2690.73,
@@ -63,7 +63,7 @@
 
     ]
   },
-  "total_contributions": 21634.0,
+  "total_contributions": 23181.0,
   "total_expenditures": 8684.11,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/marcie-hodge.json b/build/_data/candidates/oakland/2016-11-08/marcie-hodge.json
index e433c04..eebabe6 100644
--- a/build/_data/candidates/oakland/2016-11-08/marcie-hodge.json
+++ b/build/_data/candidates/oakland/2016-11-08/marcie-hodge.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1388731,
   "supporting_money": {
-    "contributions_received": 7000.0,
-    "total_contributions": 7000.0,
+    "contributions_received": 0.0,
+    "total_contributions": 0.0,
     "total_expenditures": null,
     "total_loans_received": 19857.0,
     "total_supporting_independent": 0.0,
@@ -55,7 +55,7 @@
 
     ]
   },
-  "total_contributions": 7000.0,
+  "total_contributions": 0.0,
   "total_expenditures": null,
   "total_loans_received": 19857.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/nehanda-imara.json b/build/_data/candidates/oakland/2016-11-08/nehanda-imara.json
index 9740a8a..30475bb 100644
--- a/build/_data/candidates/oakland/2016-11-08/nehanda-imara.json
+++ b/build/_data/candidates/oakland/2016-11-08/nehanda-imara.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1386932,
   "supporting_money": {
-    "contributions_received": 16900.0,
-    "total_contributions": 16900.0,
+    "contributions_received": 0.0,
+    "total_contributions": 0.0,
     "total_expenditures": null,
     "total_loans_received": 6500.0,
     "total_supporting_independent": 0.0,
@@ -58,7 +58,7 @@
 
     ]
   },
-  "total_contributions": 16900.0,
+  "total_contributions": 0.0,
   "total_expenditures": null,
   "total_loans_received": 6500.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/noel-gallo.json b/build/_data/candidates/oakland/2016-11-08/noel-gallo.json
index c39d0c1..5f0dfa0 100644
--- a/build/_data/candidates/oakland/2016-11-08/noel-gallo.json
+++ b/build/_data/candidates/oakland/2016-11-08/noel-gallo.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1388641,
   "supporting_money": {
-    "contributions_received": 47200.0,
-    "total_contributions": 47200.0,
+    "contributions_received": 0.0,
+    "total_contributions": 0.0,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -68,7 +68,7 @@
       }
     ]
   },
-  "total_contributions": 47200.0,
+  "total_contributions": 0.0,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/aimee-eng.json b/build/_data/candidates/oakland/2018-11-06/aimee-eng.json
index bd79776..4a7d566 100644
--- a/build/_data/candidates/oakland/2018-11-06/aimee-eng.json
+++ b/build/_data/candidates/oakland/2018-11-06/aimee-eng.json
@@ -18,8 +18,8 @@
   "is_winner": true,
   "filer_id": 1368984,
   "supporting_money": {
-    "contributions_received": -2915.3,
-    "total_contributions": -2915.3,
+    "contributions_received": 2572.0,
+    "total_contributions": 2572.0,
     "total_expenditures": 2200.0,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -53,7 +53,7 @@
 
     ]
   },
-  "total_contributions": -2915.3,
+  "total_contributions": 2572.0,
   "total_expenditures": 2200.0,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/anthony-wilson.json b/build/_data/candidates/oakland/2018-11-06/anthony-wilson.json
index f7fad60..d4abef7 100644
--- a/build/_data/candidates/oakland/2018-11-06/anthony-wilson.json
+++ b/build/_data/candidates/oakland/2018-11-06/anthony-wilson.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1412686,
   "supporting_money": {
-    "contributions_received": 10498.69,
-    "total_contributions": 10498.69,
+    "contributions_received": 0.0,
+    "total_contributions": 0.0,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -58,7 +58,7 @@
 
     ]
   },
-  "total_contributions": 10498.69,
+  "total_contributions": 0.0,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/cat-brooks.json b/build/_data/candidates/oakland/2018-11-06/cat-brooks.json
index c4f80e6..ae60386 100644
--- a/build/_data/candidates/oakland/2018-11-06/cat-brooks.json
+++ b/build/_data/candidates/oakland/2018-11-06/cat-brooks.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1405474,
   "supporting_money": {
-    "contributions_received": 150848.59,
-    "total_contributions": 150848.59,
+    "contributions_received": 0.0,
+    "total_contributions": 0.0,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 2363.34,
@@ -75,7 +75,7 @@
 
     ]
   },
-  "total_contributions": 150848.59,
+  "total_contributions": 0.0,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/desley-brooks.json b/build/_data/candidates/oakland/2018-11-06/desley-brooks.json
index ee2edb3..4808c62 100644
--- a/build/_data/candidates/oakland/2018-11-06/desley-brooks.json
+++ b/build/_data/candidates/oakland/2018-11-06/desley-brooks.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1236617,
   "supporting_money": {
-    "contributions_received": 99121.0,
-    "total_contributions": 99121.0,
+    "contributions_received": 134271.35,
+    "total_contributions": 134271.35,
     "total_expenditures": 66964.41,
     "total_loans_received": -2400.0,
     "total_supporting_independent": 46341.22,
@@ -98,7 +98,7 @@
       }
     ]
   },
-  "total_contributions": 99121.0,
+  "total_contributions": 134271.35,
   "total_expenditures": 66964.41,
   "total_loans_received": -2400.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/nayeli-maxson.json b/build/_data/candidates/oakland/2018-11-06/nayeli-maxson.json
index 75482c1..9369127 100644
--- a/build/_data/candidates/oakland/2018-11-06/nayeli-maxson.json
+++ b/build/_data/candidates/oakland/2018-11-06/nayeli-maxson.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1405187,
   "supporting_money": {
-    "contributions_received": 51259.29,
-    "total_contributions": 51259.29,
+    "contributions_received": 0.0,
+    "total_contributions": 0.0,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -68,7 +68,7 @@
 
     ]
   },
-  "total_contributions": 51259.29,
+  "total_contributions": 0.0,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2020-11-03/esmeralda-cortez-rosales.json b/build/_data/candidates/oakland/2020-11-03/esmeralda-cortez-rosales.json
index 72f50c6..eafc0d6 100644
--- a/build/_data/candidates/oakland/2020-11-03/esmeralda-cortez-rosales.json
+++ b/build/_data/candidates/oakland/2020-11-03/esmeralda-cortez-rosales.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1421466,
   "supporting_money": {
-    "contributions_received": 5270.4,
-    "total_contributions": 5270.4,
+    "contributions_received": 5190.7,
+    "total_contributions": 5190.7,
     "total_expenditures": 1163.72,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -50,7 +50,7 @@
 
     ]
   },
-  "total_contributions": 5270.4,
+  "total_contributions": 5190.7,
   "total_expenditures": 1163.72,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2020-11-03/treva-reid.json b/build/_data/candidates/oakland/2020-11-03/treva-reid.json
index 144e760..8141d39 100644
--- a/build/_data/candidates/oakland/2020-11-03/treva-reid.json
+++ b/build/_data/candidates/oakland/2020-11-03/treva-reid.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1366759,
   "supporting_money": {
-    "contributions_received": 45849.5,
-    "total_contributions": 45849.5,
+    "contributions_received": 58791.85,
+    "total_contributions": 58791.85,
     "total_expenditures": 8790.86,
     "total_loans_received": -50.0,
     "total_supporting_independent": 0.0,
@@ -53,7 +53,7 @@
 
     ]
   },
-  "total_contributions": 45849.5,
+  "total_contributions": 58791.85,
   "total_expenditures": 8790.86,
   "total_loans_received": -50.0
 }
diff --git a/build/_data/totals.json b/build/_data/totals.json
index 27bb301..6e8b328 100644
--- a/build/_data/totals.json
+++ b/build/_data/totals.json
@@ -124,7 +124,7 @@
         "title": "City Council District 7",
         "type": "office",
         "slug": "city-council-district-7",
-        "amount": 57920.86
+        "amount": 70783.51
       },
       {
         "title": "City Council At-Large",
diff --git a/build/_office_elections/oakland/2016-11-08/city-council-district-1.md b/build/_office_elections/oakland/2016-11-08/city-council-district-1.md
index 98df159..08a99d0 100644
--- a/build/_office_elections/oakland/2016-11-08/city-council-district-1.md
+++ b/build/_office_elections/oakland/2016-11-08/city-council-district-1.md
@@ -1,8 +1,8 @@
 ---
 election: _elections/oakland/2016-11-08.md
 candidates:
-- dan-kalb
 - kevin-corbett
+- dan-kalb
 title: City Council District 1
 label: City Council
 ---
diff --git a/build/_office_elections/oakland/2016-11-08/city-council-district-7.md b/build/_office_elections/oakland/2016-11-08/city-council-district-7.md
index 56f5dd6..f4a5580 100644
--- a/build/_office_elections/oakland/2016-11-08/city-council-district-7.md
+++ b/build/_office_elections/oakland/2016-11-08/city-council-district-7.md
@@ -2,8 +2,8 @@
 election: _elections/oakland/2016-11-08.md
 candidates:
 - larry-reid
-- nehanda-imara
 - marcie-hodge
+- nehanda-imara
 title: City Council District 7
 label: City Council
 ---
diff --git a/build/_office_elections/oakland/2018-11-06/city-council-district-4.md b/build/_office_elections/oakland/2018-11-06/city-council-district-4.md
index e13de1e..7732b37 100644
--- a/build/_office_elections/oakland/2018-11-06/city-council-district-4.md
+++ b/build/_office_elections/oakland/2018-11-06/city-council-district-4.md
@@ -5,9 +5,9 @@ candidates:
 - sheng-thao
 - joseph-simmons
 - pamela-harris
-- nayeli-maxson
 - joseph-tanios
 - francis-hummel
+- nayeli-maxson
 title: City Council District 4
 label: City Council
 ---
diff --git a/build/_office_elections/oakland/2018-11-06/mayor.md b/build/_office_elections/oakland/2018-11-06/mayor.md
index 60c556d..39a43c5 100644
--- a/build/_office_elections/oakland/2018-11-06/mayor.md
+++ b/build/_office_elections/oakland/2018-11-06/mayor.md
@@ -2,10 +2,10 @@
 election: _elections/oakland/2018-11-06.md
 candidates:
 - libby-schaaf
-- cat-brooks
 - pamela-price
 - marchon-tatmon
 - saied-karamooz
+- cat-brooks
 - cedric-anthony-troupe
 - jesse-a-j-smith
 - ken-houston

@tdooner tdooner force-pushed the wip-test-out-beginning-cash branch from b5ac9d3 to d8ff16c Compare April 8, 2020 07:27
@tdooner
Copy link
Member Author

tdooner commented Apr 8, 2020

Build diff from Commit d8ff16c: 
diff --git a/build/_data/candidates/oakland/2016-11-08/barbara-parker.json b/build/_data/candidates/oakland/2016-11-08/barbara-parker.json
index 3bc7655..1e33203 100644
--- a/build/_data/candidates/oakland/2016-11-08/barbara-parker.json
+++ b/build/_data/candidates/oakland/2016-11-08/barbara-parker.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1382679,
   "supporting_money": {
-    "contributions_received": 67209.0,
-    "total_contributions": 67209.0,
+    "contributions_received": 68409.0,
+    "total_contributions": 68409.0,
     "total_expenditures": 34340.47,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -57,7 +57,7 @@
 
     ]
   },
-  "total_contributions": 67209.0,
+  "total_contributions": 68409.0,
   "total_expenditures": 34340.47,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/chris-jackson.json b/build/_data/candidates/oakland/2016-11-08/chris-jackson.json
index 355e0e2..81e5dc4 100644
--- a/build/_data/candidates/oakland/2016-11-08/chris-jackson.json
+++ b/build/_data/candidates/oakland/2016-11-08/chris-jackson.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1384926,
   "supporting_money": {
-    "contributions_received": 11757.0,
-    "total_contributions": 11757.0,
+    "contributions_received": 13562.0,
+    "total_contributions": 13562.0,
     "total_expenditures": 30332.96,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -62,7 +62,7 @@
       }
     ]
   },
-  "total_contributions": 11757.0,
+  "total_contributions": 13562.0,
   "total_expenditures": 30332.96,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/dan-kalb.json b/build/_data/candidates/oakland/2016-11-08/dan-kalb.json
index 00676a3..488647f 100644
--- a/build/_data/candidates/oakland/2016-11-08/dan-kalb.json
+++ b/build/_data/candidates/oakland/2016-11-08/dan-kalb.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1382408,
   "supporting_money": {
-    "contributions_received": 103058.0,
-    "total_contributions": 103058.0,
+    "contributions_received": 113160.66,
+    "total_contributions": 113160.66,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -80,7 +80,7 @@
       }
     ]
   },
-  "total_contributions": 103058.0,
+  "total_contributions": 113160.66,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/donald-macleay.json b/build/_data/candidates/oakland/2016-11-08/donald-macleay.json
index 406b2a0..a146d48 100644
--- a/build/_data/candidates/oakland/2016-11-08/donald-macleay.json
+++ b/build/_data/candidates/oakland/2016-11-08/donald-macleay.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1384267,
   "supporting_money": {
-    "contributions_received": 4200.0,
-    "total_contributions": 4200.0,
+    "contributions_received": 6444.0,
+    "total_contributions": 6444.0,
     "total_expenditures": 5244.36,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -62,7 +62,7 @@
 
     ]
   },
-  "total_contributions": 4200.0,
+  "total_contributions": 6444.0,
   "total_expenditures": 5244.36,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/huber-trenado.json b/build/_data/candidates/oakland/2016-11-08/huber-trenado.json
index 8433145..8b97e6a 100644
--- a/build/_data/candidates/oakland/2016-11-08/huber-trenado.json
+++ b/build/_data/candidates/oakland/2016-11-08/huber-trenado.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1386749,
   "supporting_money": {
-    "contributions_received": 18985.48,
-    "total_contributions": 18985.48,
+    "contributions_received": 21685.48,
+    "total_contributions": 21685.48,
     "total_expenditures": 17607.49,
     "total_loans_received": 0.0,
     "total_supporting_independent": 99288.96,
@@ -66,7 +66,7 @@
 
     ]
   },
-  "total_contributions": 18985.48,
+  "total_contributions": 21685.48,
   "total_expenditures": 17607.49,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/james-harris.json b/build/_data/candidates/oakland/2016-11-08/james-harris.json
index b1f1e03..87d5f8d 100644
--- a/build/_data/candidates/oakland/2016-11-08/james-harris.json
+++ b/build/_data/candidates/oakland/2016-11-08/james-harris.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1387803,
   "supporting_money": {
-    "contributions_received": 22386.0,
-    "total_contributions": 22386.0,
+    "contributions_received": 27586.0,
+    "total_contributions": 27586.0,
     "total_expenditures": 17321.95,
     "total_loans_received": 0.0,
     "total_supporting_independent": 122967.01,
@@ -66,7 +66,7 @@
 
     ]
   },
-  "total_contributions": 22386.0,
+  "total_contributions": 27586.0,
   "total_expenditures": 17321.95,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/jody-london.json b/build/_data/candidates/oakland/2016-11-08/jody-london.json
index 62ada54..8531a35 100644
--- a/build/_data/candidates/oakland/2016-11-08/jody-london.json
+++ b/build/_data/candidates/oakland/2016-11-08/jody-london.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1303019,
   "supporting_money": {
-    "contributions_received": 21634.0,
-    "total_contributions": 21634.0,
+    "contributions_received": 23891.0,
+    "total_contributions": 23891.0,
     "total_expenditures": 8734.11,
     "total_loans_received": 0.0,
     "total_supporting_independent": 2690.73,
@@ -63,7 +63,7 @@
 
     ]
   },
-  "total_contributions": 21634.0,
+  "total_contributions": 23891.0,
   "total_expenditures": 8734.11,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/jumoke-hinton-hodge.json b/build/_data/candidates/oakland/2016-11-08/jumoke-hinton-hodge.json
index 06f1c8f..c500727 100644
--- a/build/_data/candidates/oakland/2016-11-08/jumoke-hinton-hodge.json
+++ b/build/_data/candidates/oakland/2016-11-08/jumoke-hinton-hodge.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1386416,
   "supporting_money": {
-    "contributions_received": 17888.0,
-    "total_contributions": 17888.0,
+    "contributions_received": 25391.85,
+    "total_contributions": 25391.85,
     "total_expenditures": 15267.92,
     "total_loans_received": 7125.0,
     "total_supporting_independent": 90423.03,
@@ -63,7 +63,7 @@
 
     ]
   },
-  "total_contributions": 17888.0,
+  "total_contributions": 25391.85,
   "total_expenditures": 15267.92,
   "total_loans_received": 7125.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/kevin-corbett.json b/build/_data/candidates/oakland/2016-11-08/kevin-corbett.json
index 2f5bf5d..c5c751a 100644
--- a/build/_data/candidates/oakland/2016-11-08/kevin-corbett.json
+++ b/build/_data/candidates/oakland/2016-11-08/kevin-corbett.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1386081,
   "supporting_money": {
-    "contributions_received": 39342.0,
-    "total_contributions": 39342.0,
+    "contributions_received": 42542.0,
+    "total_contributions": 42542.0,
     "total_expenditures": 33266.89,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -56,7 +56,7 @@
 
     ]
   },
-  "total_contributions": 39342.0,
+  "total_contributions": 42542.0,
   "total_expenditures": 33266.89,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/kharyshi-wiginton.json b/build/_data/candidates/oakland/2016-11-08/kharyshi-wiginton.json
index 551977c..417fd3d 100644
--- a/build/_data/candidates/oakland/2016-11-08/kharyshi-wiginton.json
+++ b/build/_data/candidates/oakland/2016-11-08/kharyshi-wiginton.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1386929,
   "supporting_money": {
-    "contributions_received": 3980.0,
-    "total_contributions": 3980.0,
+    "contributions_received": 5798.0,
+    "total_contributions": 5798.0,
     "total_expenditures": 2382.67,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -60,7 +60,7 @@
 
     ]
   },
-  "total_contributions": 3980.0,
+  "total_contributions": 5798.0,
   "total_expenditures": 2382.67,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/marcie-hodge.json b/build/_data/candidates/oakland/2016-11-08/marcie-hodge.json
index e433c04..5fccf05 100644
--- a/build/_data/candidates/oakland/2016-11-08/marcie-hodge.json
+++ b/build/_data/candidates/oakland/2016-11-08/marcie-hodge.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1388731,
   "supporting_money": {
-    "contributions_received": 7000.0,
-    "total_contributions": 7000.0,
+    "contributions_received": 24064.0,
+    "total_contributions": 24064.0,
     "total_expenditures": null,
     "total_loans_received": 19857.0,
     "total_supporting_independent": 0.0,
@@ -55,7 +55,7 @@
 
     ]
   },
-  "total_contributions": 7000.0,
+  "total_contributions": 24064.0,
   "total_expenditures": null,
   "total_loans_received": 19857.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/michael-hassid.json b/build/_data/candidates/oakland/2016-11-08/michael-hassid.json
index 72252f2..d6028fd 100644
--- a/build/_data/candidates/oakland/2016-11-08/michael-hassid.json
+++ b/build/_data/candidates/oakland/2016-11-08/michael-hassid.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1388133,
   "supporting_money": {
-    "contributions_received": 7786.0,
-    "total_contributions": 7786.0,
+    "contributions_received": 8486.0,
+    "total_contributions": 8486.0,
     "total_expenditures": 3254.65,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -53,7 +53,7 @@
 
     ]
   },
-  "total_contributions": 7786.0,
+  "total_contributions": 8486.0,
   "total_expenditures": 3254.65,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/nehanda-imara.json b/build/_data/candidates/oakland/2016-11-08/nehanda-imara.json
index 9740a8a..a8af4bc 100644
--- a/build/_data/candidates/oakland/2016-11-08/nehanda-imara.json
+++ b/build/_data/candidates/oakland/2016-11-08/nehanda-imara.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1386932,
   "supporting_money": {
-    "contributions_received": 16900.0,
-    "total_contributions": 16900.0,
+    "contributions_received": 24966.0,
+    "total_contributions": 24966.0,
     "total_expenditures": null,
     "total_loans_received": 6500.0,
     "total_supporting_independent": 0.0,
@@ -58,7 +58,7 @@
 
     ]
   },
-  "total_contributions": 16900.0,
+  "total_contributions": 24966.0,
   "total_expenditures": null,
   "total_loans_received": 6500.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/noel-gallo.json b/build/_data/candidates/oakland/2016-11-08/noel-gallo.json
index c39d0c1..ce13f23 100644
--- a/build/_data/candidates/oakland/2016-11-08/noel-gallo.json
+++ b/build/_data/candidates/oakland/2016-11-08/noel-gallo.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1388641,
   "supporting_money": {
-    "contributions_received": 47200.0,
-    "total_contributions": 47200.0,
+    "contributions_received": 48119.0,
+    "total_contributions": 48119.0,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -68,7 +68,7 @@
       }
     ]
   },
-  "total_contributions": 47200.0,
+  "total_contributions": 48119.0,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/noni-session.json b/build/_data/candidates/oakland/2016-11-08/noni-session.json
index c63d394..565b8bd 100644
--- a/build/_data/candidates/oakland/2016-11-08/noni-session.json
+++ b/build/_data/candidates/oakland/2016-11-08/noni-session.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1386922,
   "supporting_money": {
-    "contributions_received": 10484.0,
-    "total_contributions": 10484.0,
+    "contributions_received": 10634.0,
+    "total_contributions": 10634.0,
     "total_expenditures": 7121.21,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -58,7 +58,7 @@
 
     ]
   },
-  "total_contributions": 10484.0,
+  "total_contributions": 10634.0,
   "total_expenditures": 7121.21,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/peggy-moore.json b/build/_data/candidates/oakland/2016-11-08/peggy-moore.json
index 823b353..8175df1 100644
--- a/build/_data/candidates/oakland/2016-11-08/peggy-moore.json
+++ b/build/_data/candidates/oakland/2016-11-08/peggy-moore.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1388168,
   "supporting_money": {
-    "contributions_received": 83406.0,
-    "total_contributions": 83406.0,
+    "contributions_received": 198167.0,
+    "total_contributions": 198167.0,
     "total_expenditures": 115881.29,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -63,7 +63,7 @@
 
     ]
   },
-  "total_contributions": 83406.0,
+  "total_contributions": 198167.0,
   "total_expenditures": 115881.29,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/rebecca-kaplan.json b/build/_data/candidates/oakland/2016-11-08/rebecca-kaplan.json
index 847d273..175fd33 100644
--- a/build/_data/candidates/oakland/2016-11-08/rebecca-kaplan.json
+++ b/build/_data/candidates/oakland/2016-11-08/rebecca-kaplan.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1381183,
   "supporting_money": {
-    "contributions_received": 65247.99,
-    "total_contributions": 65247.99,
+    "contributions_received": 147422.99,
+    "total_contributions": 147422.99,
     "total_expenditures": 23549.2,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -68,7 +68,7 @@
 
     ]
   },
-  "total_contributions": 65247.99,
+  "total_contributions": 147422.99,
   "total_expenditures": 23549.2,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/roseann-torres.json b/build/_data/candidates/oakland/2016-11-08/roseann-torres.json
index 673da47..3a2534b 100644
--- a/build/_data/candidates/oakland/2016-11-08/roseann-torres.json
+++ b/build/_data/candidates/oakland/2016-11-08/roseann-torres.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1379121,
   "supporting_money": {
-    "contributions_received": 21875.01,
-    "total_contributions": 21875.01,
+    "contributions_received": 28173.01,
+    "total_contributions": 28173.01,
     "total_expenditures": 30858.19,
     "total_loans_received": 9250.0,
     "total_supporting_independent": 6987.5,
@@ -67,7 +67,7 @@
 
     ]
   },
-  "total_contributions": 21875.01,
+  "total_contributions": 28173.01,
   "total_expenditures": 30858.19,
   "total_loans_received": 9250.0
 }
diff --git a/build/_data/candidates/oakland/2016-11-08/viola-gonzales.json b/build/_data/candidates/oakland/2016-11-08/viola-gonzales.json
index 3e9ec6a..1091147 100644
--- a/build/_data/candidates/oakland/2016-11-08/viola-gonzales.json
+++ b/build/_data/candidates/oakland/2016-11-08/viola-gonzales.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1387192,
   "supporting_money": {
-    "contributions_received": 58042.0,
-    "total_contributions": 58042.0,
+    "contributions_received": 69742.41,
+    "total_contributions": 69742.41,
     "total_expenditures": 36864.25,
     "total_loans_received": 6899.83,
     "total_supporting_independent": 0.0,
@@ -59,7 +59,7 @@
 
     ]
   },
-  "total_contributions": 58042.0,
+  "total_contributions": 69742.41,
   "total_expenditures": 36864.25,
   "total_loans_received": 6899.83
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/abel-guillen.json b/build/_data/candidates/oakland/2018-11-06/abel-guillen.json
index a33539c..4668741 100644
--- a/build/_data/candidates/oakland/2018-11-06/abel-guillen.json
+++ b/build/_data/candidates/oakland/2018-11-06/abel-guillen.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1395580,
   "supporting_money": {
-    "contributions_received": 61546.0,
-    "total_contributions": 61546.0,
+    "contributions_received": 200652.0,
+    "total_contributions": 200652.0,
     "total_expenditures": 22254.42,
     "total_loans_received": 0.0,
     "total_supporting_independent": 47523.0,
@@ -73,7 +73,7 @@
       }
     ]
   },
-  "total_contributions": 61546.0,
+  "total_contributions": 200652.0,
   "total_expenditures": 22254.42,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/aimee-eng.json b/build/_data/candidates/oakland/2018-11-06/aimee-eng.json
index 6bc8d23..e0c27ab 100644
--- a/build/_data/candidates/oakland/2018-11-06/aimee-eng.json
+++ b/build/_data/candidates/oakland/2018-11-06/aimee-eng.json
@@ -18,8 +18,8 @@
   "is_winner": true,
   "filer_id": 1368984,
   "supporting_money": {
-    "contributions_received": 27568.65,
-    "total_contributions": 27568.65,
+    "contributions_received": 25830.65,
+    "total_contributions": 25830.65,
     "total_expenditures": 15686.34,
     "total_loans_received": 0.0,
     "total_supporting_independent": 50.63,
@@ -69,7 +69,7 @@
 
     ]
   },
-  "total_contributions": 27568.65,
+  "total_contributions": 25830.65,
   "total_expenditures": 15686.34,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/anthony-wilson.json b/build/_data/candidates/oakland/2018-11-06/anthony-wilson.json
index f7fad60..88b600e 100644
--- a/build/_data/candidates/oakland/2018-11-06/anthony-wilson.json
+++ b/build/_data/candidates/oakland/2018-11-06/anthony-wilson.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1412686,
   "supporting_money": {
-    "contributions_received": 10498.69,
-    "total_contributions": 10498.69,
+    "contributions_received": 12254.69,
+    "total_contributions": 12254.69,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -58,7 +58,7 @@
 
     ]
   },
-  "total_contributions": 10498.69,
+  "total_contributions": 12254.69,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/cat-brooks.json b/build/_data/candidates/oakland/2018-11-06/cat-brooks.json
index c4f80e6..5ae6053 100644
--- a/build/_data/candidates/oakland/2018-11-06/cat-brooks.json
+++ b/build/_data/candidates/oakland/2018-11-06/cat-brooks.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1405474,
   "supporting_money": {
-    "contributions_received": 150848.59,
-    "total_contributions": 150848.59,
+    "contributions_received": 191189.79,
+    "total_contributions": 191189.79,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 2363.34,
@@ -75,7 +75,7 @@
 
     ]
   },
-  "total_contributions": 150848.59,
+  "total_contributions": 191189.79,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/charlie-michelson.json b/build/_data/candidates/oakland/2018-11-06/charlie-michelson.json
index 7edfe5f..6178673 100644
--- a/build/_data/candidates/oakland/2018-11-06/charlie-michelson.json
+++ b/build/_data/candidates/oakland/2018-11-06/charlie-michelson.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1406241,
   "supporting_money": {
-    "contributions_received": 95614.0,
-    "total_contributions": 95614.0,
+    "contributions_received": 95313.0,
+    "total_contributions": 95313.0,
     "total_expenditures": 93392.69,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -63,7 +63,7 @@
 
     ]
   },
-  "total_contributions": 95614.0,
+  "total_contributions": 95313.0,
   "total_expenditures": 93392.69,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/clarissa-doutherd.json b/build/_data/candidates/oakland/2018-11-06/clarissa-doutherd.json
index 598d54a..76d8baa 100644
--- a/build/_data/candidates/oakland/2018-11-06/clarissa-doutherd.json
+++ b/build/_data/candidates/oakland/2018-11-06/clarissa-doutherd.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1404085,
   "supporting_money": {
-    "contributions_received": 28384.77,
-    "total_contributions": 28384.77,
+    "contributions_received": 55131.12,
+    "total_contributions": 55131.12,
     "total_expenditures": 21651.78,
     "total_loans_received": 0.0,
     "total_supporting_independent": 27232.2,
@@ -75,7 +75,7 @@
 
     ]
   },
-  "total_contributions": 28384.77,
+  "total_contributions": 55131.12,
   "total_expenditures": 21651.78,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/courtney-ruby.json b/build/_data/candidates/oakland/2018-11-06/courtney-ruby.json
index d6e01c4..7f66543 100644
--- a/build/_data/candidates/oakland/2018-11-06/courtney-ruby.json
+++ b/build/_data/candidates/oakland/2018-11-06/courtney-ruby.json
@@ -18,8 +18,8 @@
   "is_winner": true,
   "filer_id": 1408075,
   "supporting_money": {
-    "contributions_received": 26609.0,
-    "total_contributions": 26609.0,
+    "contributions_received": 47225.0,
+    "total_contributions": 47225.0,
     "total_expenditures": 8094.02,
     "total_loans_received": 2000.0,
     "total_supporting_independent": 0.0,
@@ -62,7 +62,7 @@
 
     ]
   },
-  "total_contributions": 26609.0,
+  "total_contributions": 47225.0,
   "total_expenditures": 8094.02,
   "total_loans_received": 2000.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/desley-brooks.json b/build/_data/candidates/oakland/2018-11-06/desley-brooks.json
index cd0acb4..d4270fa 100644
--- a/build/_data/candidates/oakland/2018-11-06/desley-brooks.json
+++ b/build/_data/candidates/oakland/2018-11-06/desley-brooks.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1236617,
   "supporting_money": {
-    "contributions_received": 138300.0,
-    "total_contributions": 138300.0,
+    "contributions_received": 173682.0,
+    "total_contributions": 173682.0,
     "total_expenditures": 85348.15,
     "total_loans_received": -2400.0,
     "total_supporting_independent": 47085.67,
@@ -106,7 +106,7 @@
       }
     ]
   },
-  "total_contributions": 138300.0,
+  "total_contributions": 173682.0,
   "total_expenditures": 85348.15,
   "total_loans_received": -2400.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/francis-hummel.json b/build/_data/candidates/oakland/2018-11-06/francis-hummel.json
index 3b49889..65e3cb1 100644
--- a/build/_data/candidates/oakland/2018-11-06/francis-hummel.json
+++ b/build/_data/candidates/oakland/2018-11-06/francis-hummel.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1408016,
   "supporting_money": {
-    "contributions_received": 11355.0,
-    "total_contributions": 11355.0,
+    "contributions_received": 14928.6,
+    "total_contributions": 14928.6,
     "total_expenditures": 17064.88,
     "total_loans_received": 1500.0,
     "total_supporting_independent": 0.0,
@@ -53,7 +53,7 @@
 
     ]
   },
-  "total_contributions": 11355.0,
+  "total_contributions": 14928.6,
   "total_expenditures": 17064.88,
   "total_loans_received": 1500.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/gary-yee.json b/build/_data/candidates/oakland/2018-11-06/gary-yee.json
index e3f57f5..0c35995 100644
--- a/build/_data/candidates/oakland/2018-11-06/gary-yee.json
+++ b/build/_data/candidates/oakland/2018-11-06/gary-yee.json
@@ -18,8 +18,8 @@
   "is_winner": true,
   "filer_id": 1409088,
   "supporting_money": {
-    "contributions_received": 15550.0,
-    "total_contributions": 15550.0,
+    "contributions_received": 37333.0,
+    "total_contributions": 37333.0,
     "total_expenditures": 6045.73,
     "total_loans_received": 0.0,
     "total_supporting_independent": 149368.03,
@@ -62,7 +62,7 @@
 
     ]
   },
-  "total_contributions": 15550.0,
+  "total_contributions": 37333.0,
   "total_expenditures": 6045.73,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/joseph-simmons.json b/build/_data/candidates/oakland/2018-11-06/joseph-simmons.json
index bad5c2f..6cccf64 100644
--- a/build/_data/candidates/oakland/2018-11-06/joseph-simmons.json
+++ b/build/_data/candidates/oakland/2018-11-06/joseph-simmons.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1406398,
   "supporting_money": {
-    "contributions_received": 55041.65,
-    "total_contributions": 55041.65,
+    "contributions_received": 59141.65,
+    "total_contributions": 59141.65,
     "total_expenditures": 36781.17,
     "total_loans_received": 36600.0,
     "total_supporting_independent": 0.0,
@@ -61,7 +61,7 @@
 
     ]
   },
-  "total_contributions": 55041.65,
+  "total_contributions": 59141.65,
   "total_expenditures": 36781.17,
   "total_loans_received": 36600.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/joseph-tanios.json b/build/_data/candidates/oakland/2018-11-06/joseph-tanios.json
index 895aac2..916ba7e 100644
--- a/build/_data/candidates/oakland/2018-11-06/joseph-tanios.json
+++ b/build/_data/candidates/oakland/2018-11-06/joseph-tanios.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1406153,
   "supporting_money": {
-    "contributions_received": 33170.0,
-    "total_contributions": 33170.0,
+    "contributions_received": 24920.0,
+    "total_contributions": 24920.0,
     "total_expenditures": 17962.02,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -60,7 +60,7 @@
 
     ]
   },
-  "total_contributions": 33170.0,
+  "total_contributions": 24920.0,
   "total_expenditures": 17962.02,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/libby-schaaf.json b/build/_data/candidates/oakland/2018-11-06/libby-schaaf.json
index 75694da..d8549cb 100644
--- a/build/_data/candidates/oakland/2018-11-06/libby-schaaf.json
+++ b/build/_data/candidates/oakland/2018-11-06/libby-schaaf.json
@@ -18,8 +18,8 @@
   "is_winner": true,
   "filer_id": 1395968,
   "supporting_money": {
-    "contributions_received": 490418.16,
-    "total_contributions": 490418.16,
+    "contributions_received": 501645.16,
+    "total_contributions": 501645.16,
     "total_expenditures": 383253.7,
     "total_loans_received": 0.0,
     "total_supporting_independent": 7672.0,
@@ -76,7 +76,7 @@
 
     ]
   },
-  "total_contributions": 490418.16,
+  "total_contributions": 501645.16,
   "total_expenditures": 383253.7,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/loren-taylor.json b/build/_data/candidates/oakland/2018-11-06/loren-taylor.json
index 1b227c9..10c0bea 100644
--- a/build/_data/candidates/oakland/2018-11-06/loren-taylor.json
+++ b/build/_data/candidates/oakland/2018-11-06/loren-taylor.json
@@ -18,8 +18,8 @@
   "is_winner": true,
   "filer_id": 1401499,
   "supporting_money": {
-    "contributions_received": 141041.26,
-    "total_contributions": 141041.26,
+    "contributions_received": 152465.26,
+    "total_contributions": 152465.26,
     "total_expenditures": 95964.07,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -66,7 +66,7 @@
 
     ]
   },
-  "total_contributions": 141041.26,
+  "total_contributions": 152465.26,
   "total_expenditures": 95964.07,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/marchon-tatmon.json b/build/_data/candidates/oakland/2018-11-06/marchon-tatmon.json
index 77ef65f..e500252 100644
--- a/build/_data/candidates/oakland/2018-11-06/marchon-tatmon.json
+++ b/build/_data/candidates/oakland/2018-11-06/marchon-tatmon.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1403436,
   "supporting_money": {
-    "contributions_received": 22359.8,
-    "total_contributions": 22359.8,
+    "contributions_received": 20836.8,
+    "total_contributions": 20836.8,
     "total_expenditures": 23169.2,
     "total_loans_received": 7165.0,
     "total_supporting_independent": 0.0,
@@ -52,7 +52,7 @@
 
     ]
   },
-  "total_contributions": 22359.8,
+  "total_contributions": 20836.8,
   "total_expenditures": 23169.2,
   "total_loans_received": 7165.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/maria-marlo-rodriguez.json b/build/_data/candidates/oakland/2018-11-06/maria-marlo-rodriguez.json
index ecf9d9c..54bc099 100644
--- a/build/_data/candidates/oakland/2018-11-06/maria-marlo-rodriguez.json
+++ b/build/_data/candidates/oakland/2018-11-06/maria-marlo-rodriguez.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1404416,
   "supporting_money": {
-    "contributions_received": 24534.0,
-    "total_contributions": 24534.0,
+    "contributions_received": 25483.0,
+    "total_contributions": 25483.0,
     "total_expenditures": 20151.71,
     "total_loans_received": 15080.0,
     "total_supporting_independent": 0.0,
@@ -57,7 +57,7 @@
 
     ]
   },
-  "total_contributions": 24534.0,
+  "total_contributions": 25483.0,
   "total_expenditures": 20151.71,
   "total_loans_received": 15080.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/mya-whitaker.json b/build/_data/candidates/oakland/2018-11-06/mya-whitaker.json
index bec9b9c..087af94 100644
--- a/build/_data/candidates/oakland/2018-11-06/mya-whitaker.json
+++ b/build/_data/candidates/oakland/2018-11-06/mya-whitaker.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1405266,
   "supporting_money": {
-    "contributions_received": 15691.0,
-    "total_contributions": 15691.0,
+    "contributions_received": 28752.0,
+    "total_contributions": 28752.0,
     "total_expenditures": 10023.37,
     "total_loans_received": 0.0,
     "total_supporting_independent": 435.08,
@@ -65,7 +65,7 @@
 
     ]
   },
-  "total_contributions": 15691.0,
+  "total_contributions": 28752.0,
   "total_expenditures": 10023.37,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/nayeli-maxson.json b/build/_data/candidates/oakland/2018-11-06/nayeli-maxson.json
index 75482c1..780a829 100644
--- a/build/_data/candidates/oakland/2018-11-06/nayeli-maxson.json
+++ b/build/_data/candidates/oakland/2018-11-06/nayeli-maxson.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1405187,
   "supporting_money": {
-    "contributions_received": 51259.29,
-    "total_contributions": 51259.29,
+    "contributions_received": 58293.92,
+    "total_contributions": 58293.92,
     "total_expenditures": null,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -68,7 +68,7 @@
 
     ]
   },
-  "total_contributions": 51259.29,
+  "total_contributions": 58293.92,
   "total_expenditures": null,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/nikki-fortunato-bas.json b/build/_data/candidates/oakland/2018-11-06/nikki-fortunato-bas.json
index bef9ccf..d9e3b34 100644
--- a/build/_data/candidates/oakland/2018-11-06/nikki-fortunato-bas.json
+++ b/build/_data/candidates/oakland/2018-11-06/nikki-fortunato-bas.json
@@ -18,8 +18,8 @@
   "is_winner": true,
   "filer_id": 1400325,
   "supporting_money": {
-    "contributions_received": 112436.87,
-    "total_contributions": 112436.87,
+    "contributions_received": 133394.87,
+    "total_contributions": 133394.87,
     "total_expenditures": 103078.95,
     "total_loans_received": 0.0,
     "total_supporting_independent": 113018.0,
@@ -71,7 +71,7 @@
 
     ]
   },
-  "total_contributions": 112436.87,
+  "total_contributions": 133394.87,
   "total_expenditures": 103078.95,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/pamela-harris.json b/build/_data/candidates/oakland/2018-11-06/pamela-harris.json
index 87ad353..804cd56 100644
--- a/build/_data/candidates/oakland/2018-11-06/pamela-harris.json
+++ b/build/_data/candidates/oakland/2018-11-06/pamela-harris.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1405422,
   "supporting_money": {
-    "contributions_received": 53974.0,
-    "total_contributions": 53974.0,
+    "contributions_received": 71451.0,
+    "total_contributions": 71451.0,
     "total_expenditures": 64036.33,
     "total_loans_received": 0.0,
     "total_supporting_independent": 435.08,
@@ -72,7 +72,7 @@
 
     ]
   },
-  "total_contributions": 53974.0,
+  "total_contributions": 71451.0,
   "total_expenditures": 64036.33,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/pamela-price.json b/build/_data/candidates/oakland/2018-11-06/pamela-price.json
index 70c7406..a366a4f 100644
--- a/build/_data/candidates/oakland/2018-11-06/pamela-price.json
+++ b/build/_data/candidates/oakland/2018-11-06/pamela-price.json
@@ -18,8 +18,8 @@
   "is_winner": false,
   "filer_id": 1407729,
   "supporting_money": {
-    "contributions_received": 75801.0,
-    "total_contributions": 75801.0,
+    "contributions_received": 40978.0,
+    "total_contributions": 40978.0,
     "total_expenditures": 62979.55,
     "total_loans_received": 34500.0,
     "total_supporting_independent": 0.0,
@@ -62,7 +62,7 @@
 
     ]
   },
-  "total_contributions": 75801.0,
+  "total_contributions": 40978.0,
   "total_expenditures": 62979.55,
   "total_loans_received": 34500.0
 }
diff --git a/build/_data/candidates/oakland/2018-11-06/sheng-thao.json b/build/_data/candidates/oakland/2018-11-06/sheng-thao.json
index a408e62..4896141 100644
--- a/build/_data/candidates/oakland/2018-11-06/sheng-thao.json
+++ b/build/_data/candidates/oakland/2018-11-06/sheng-thao.json
@@ -18,8 +18,8 @@
   "is_winner": true,
   "filer_id": 1405456,
   "supporting_money": {
-    "contributions_received": 70973.0,
-    "total_contributions": 70973.0,
+    "contributions_received": 100087.95,
+    "total_contributions": 100087.95,
     "total_expenditures": 56121.68,
     "total_loans_received": 800.0,
     "total_supporting_independent": 115667.16,
@@ -92,7 +92,7 @@
 
     ]
   },
-  "total_contributions": 70973.0,
+  "total_contributions": 100087.95,
   "total_expenditures": 56121.68,
   "total_loans_received": 800.0
 }
diff --git a/build/_data/candidates/oakland/2020-11-03/esmeralda-cortez-rosales.json b/build/_data/candidates/oakland/2020-11-03/esmeralda-cortez-rosales.json
index 72f50c6..eafc0d6 100644
--- a/build/_data/candidates/oakland/2020-11-03/esmeralda-cortez-rosales.json
+++ b/build/_data/candidates/oakland/2020-11-03/esmeralda-cortez-rosales.json
@@ -18,8 +18,8 @@
   "is_winner": null,
   "filer_id": 1421466,
   "supporting_money": {
-    "contributions_received": 5270.4,
-    "total_contributions": 5270.4,
+    "contributions_received": 5190.7,
+    "total_contributions": 5190.7,
     "total_expenditures": 1163.72,
     "total_loans_received": 0.0,
     "total_supporting_independent": 0.0,
@@ -50,7 +50,7 @@
 
     ]
   },
-  "total_contributions": 5270.4,
+  "total_contributions": 5190.7,
   "total_expenditures": 1163.72,
   "total_loans_received": 0.0
 }
diff --git a/build/_data/totals.json b/build/_data/totals.json
index 0fec9a7..2cd3967 100644
--- a/build/_data/totals.json
+++ b/build/_data/totals.json
@@ -120,7 +120,7 @@
         "title": "City Council District 7",
         "type": "office",
         "slug": "city-council-district-7",
-        "amount": 71770.86
+        "amount": 71691.16
       },
       {
         "title": "City Council At-Large",
diff --git a/build/_office_elections/oakland/2016-11-08/city-council-at-large.md b/build/_office_elections/oakland/2016-11-08/city-council-at-large.md
index 22dcd93..f987549 100644
--- a/build/_office_elections/oakland/2016-11-08/city-council-at-large.md
+++ b/build/_office_elections/oakland/2016-11-08/city-council-at-large.md
@@ -2,8 +2,8 @@
 election: _elections/oakland/2016-11-08.md
 candidates:
 - peggy-moore
-- bruce-quan
 - rebecca-kaplan
+- bruce-quan
 - francis-matt-hummel
 - nancy-sidebotham
 title: City Council At-Large
diff --git a/build/_office_elections/oakland/2018-11-06/city-council-district-2.md b/build/_office_elections/oakland/2018-11-06/city-council-district-2.md
index 7acec3c..d53ad32 100644
--- a/build/_office_elections/oakland/2018-11-06/city-council-district-2.md
+++ b/build/_office_elections/oakland/2018-11-06/city-council-district-2.md
@@ -1,8 +1,8 @@
 ---
 election: _elections/oakland/2018-11-06.md
 candidates:
-- nikki-fortunato-bas
 - abel-guillen
+- nikki-fortunato-bas
 - donte-kenzie-smith
 title: City Council District 2
 label: City Council
diff --git a/build/_office_elections/oakland/2018-11-06/city-council-district-4.md b/build/_office_elections/oakland/2018-11-06/city-council-district-4.md
index e13de1e..ca8e7d9 100644
--- a/build/_office_elections/oakland/2018-11-06/city-council-district-4.md
+++ b/build/_office_elections/oakland/2018-11-06/city-council-district-4.md
@@ -1,10 +1,10 @@
 ---
 election: _elections/oakland/2018-11-06.md
 candidates:
-- charlie-michelson
 - sheng-thao
-- joseph-simmons
+- charlie-michelson
 - pamela-harris
+- joseph-simmons
 - nayeli-maxson
 - joseph-tanios
 - francis-hummel
diff --git a/build/_office_elections/oakland/2018-11-06/city-council-district-6.md b/build/_office_elections/oakland/2018-11-06/city-council-district-6.md
index 98a23ed..56885a5 100644
--- a/build/_office_elections/oakland/2018-11-06/city-council-district-6.md
+++ b/build/_office_elections/oakland/2018-11-06/city-council-district-6.md
@@ -1,11 +1,11 @@
 ---
 election: _elections/oakland/2018-11-06.md
 candidates:
-- loren-taylor
 - desley-brooks
+- loren-taylor
 - natasha-middleton
-- maria-marlo-rodriguez
 - mya-whitaker
+- maria-marlo-rodriguez
 title: City Council District 6
 label: City Council
 ---

mikeubell
mikeubell approved these changes Apr 8, 2020
View reviewed changes
calculators/total_contributions_calculator.rb
AND ("Start_Date" IS NULL OR "Rpt_Date" >= "Start_Date")
AND ("End_Date" IS NULL OR "Rpt_Date" <= "End_Date")
AND ("Start_Date" IS NULL OR "From_Date" >= "Start_Date")
AND ("End_Date" IS NULL OR "Thru_Date" <= "End_Date")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is just a bug fix. While it should not happen, it seems like there could be a problem where the reporting period spans the Start or End date. This would imply that the date recorded as the start/end of the campaign was not accurate, I think. I recall these dates are set fairly arbitrarily.

calculators/total_contributions_calculator.rb
)
SELECT "Summary"."Filer_ID", "Summary"."Thru_Date", "Amount_A" as "Starting_Balance"
FROM "Summary"
INNER JOIN first_filing_after_start_dates
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love the use of two different syntax forms for inner join ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikeubell mikeubell mikeubell approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tdooner @mikeubell