{"sha":"39d48307d1e7dd7c6d78ddde941f4642fec25e9d","node_id":"MDY6Q29tbWl0MTc2NDUwOTc6MzlkNDgzMDdkMWU3ZGQ3YzZkNzhkZGRlOTQxZjQ2NDJmZWMyNWU5ZA==","commit":{"author":{"name":"palewire","email":"ben.welsh@gmail.com","date":"2014-09-01T21:19:53Z"},"committer":{"name":"palewire","email":"ben.welsh@gmail.com","date":"2014-09-01T21:19:53Z"},"message":"No more willy nilly contribs abbreviations. All long hand all the time. Fixes #63.","tree":{"sha":"6510f0c836b1a754860389bc4a86508163291e52","url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/git/trees/6510f0c836b1a754860389bc4a86508163291e52"},"url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/git/commits/39d48307d1e7dd7c6d78ddde941f4642fec25e9d","comment_count":0,"verification":{"verified":false,"reason":"unsigned","signature":null,"payload":null}},"url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/commits/39d48307d1e7dd7c6d78ddde941f4642fec25e9d","html_url":"https://github.com/palewire/django-calaccess-campaign-browser/commit/39d48307d1e7dd7c6d78ddde941f4642fec25e9d","comments_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/commits/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/comments","author":{"login":"palewire","id":9993,"node_id":"MDQ6VXNlcjk5OTM=","avatar_url":"https://avatars.githubusercontent.com/u/9993?v=4","gravatar_id":"","url":"https://api.github.com/users/palewire","html_url":"https://github.com/palewire","followers_url":"https://api.github.com/users/palewire/followers","following_url":"https://api.github.com/users/palewire/following{/other_user}","gists_url":"https://api.github.com/users/palewire/gists{/gist_id}","starred_url":"https://api.github.com/users/palewire/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/palewire/subscriptions","organizations_url":"https://api.github.com/users/palewire/orgs","repos_url":"https://api.github.com/users/palewire/repos","events_url":"https://api.github.com/users/palewire/events{/privacy}","received_events_url":"https://api.github.com/users/palewire/received_events","type":"User","site_admin":false},"committer":{"login":"palewire","id":9993,"node_id":"MDQ6VXNlcjk5OTM=","avatar_url":"https://avatars.githubusercontent.com/u/9993?v=4","gravatar_id":"","url":"https://api.github.com/users/palewire","html_url":"https://github.com/palewire","followers_url":"https://api.github.com/users/palewire/followers","following_url":"https://api.github.com/users/palewire/following{/other_user}","gists_url":"https://api.github.com/users/palewire/gists{/gist_id}","starred_url":"https://api.github.com/users/palewire/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/palewire/subscriptions","organizations_url":"https://api.github.com/users/palewire/orgs","repos_url":"https://api.github.com/users/palewire/repos","events_url":"https://api.github.com/users/palewire/events{/privacy}","received_events_url":"https://api.github.com/users/palewire/received_events","type":"User","site_admin":false},"parents":[{"sha":"ec058e95efb3796ff6a235749a9bd6dfb012a096","url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/commits/ec058e95efb3796ff6a235749a9bd6dfb012a096","html_url":"https://github.com/palewire/django-calaccess-campaign-browser/commit/ec058e95efb3796ff6a235749a9bd6dfb012a096"}],"stats":{"total":192,"additions":99,"deletions":93},"files":[{"sha":"30af18cdce2fba0a0dd5586e3baf4d36ec1ab66e","filename":"calaccess_campaign_browser/admin.py","status":"modified","additions":1,"deletions":1,"changes":2,"blob_url":"https://github.com/palewire/django-calaccess-campaign-browser/blob/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fadmin.py","raw_url":"https://github.com/palewire/django-calaccess-campaign-browser/raw/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fadmin.py","contents_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/contents/calaccess_campaign_browser%2Fadmin.py?ref=39d48307d1e7dd7c6d78ddde941f4642fec25e9d","patch":"@@ -123,7 +123,7 @@ class SummaryAdmin(BaseAdmin):\n \"committee\",\n \"filing\",\n \"form_type\",\n- \"total_contribs\",\n+ \"total_contributions\",\n \"total_expenditures\",\n \"dupe\"\n )"},{"sha":"f1ca66e507e05e3cabf9a9d3782fbfd87a9f0ed9","filename":"calaccess_campaign_browser/management/commands/buildcalaccesscampaignbrowser.py","status":"modified","additions":2,"deletions":2,"changes":4,"blob_url":"https://github.com/palewire/django-calaccess-campaign-browser/blob/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Fbuildcalaccesscampaignbrowser.py","raw_url":"https://github.com/palewire/django-calaccess-campaign-browser/raw/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Fbuildcalaccesscampaignbrowser.py","contents_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/contents/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Fbuildcalaccesscampaignbrowser.py?ref=39d48307d1e7dd7c6d78ddde941f4642fec25e9d","patch":"@@ -9,5 +9,5 @@ def handle(self, *args, **options):\n call_command(\"loadcalaccesscampaignfilers\")\n call_command(\"loadcalaccesscampaignfilings\")\n call_command(\"loadcalaccesscampaignsummaries\")\n- call_command(\"loadcalaccesscampaigncontribs\")\n- call_command(\"loadcalaccesscampaignexpends\")\n+ call_command(\"loadcalaccesscampaigncontributions\")\n+ call_command(\"loadcalaccesscampaignexpenditures\")"},{"sha":"202ad0dce5b2b08404422b14d0909c56dfba3789","filename":"calaccess_campaign_browser/management/commands/exportcalaccesscampaignfinance.py","status":"modified","additions":5,"deletions":5,"changes":10,"blob_url":"https://github.com/palewire/django-calaccess-campaign-browser/blob/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Fexportcalaccesscampaignfinance.py","raw_url":"https://github.com/palewire/django-calaccess-campaign-browser/raw/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Fexportcalaccesscampaignfinance.py","contents_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/contents/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Fexportcalaccesscampaignfinance.py?ref=39d48307d1e7dd7c6d78ddde941f4642fec25e9d","patch":"@@ -202,14 +202,14 @@ def summary(self):\n ('form_type', 'form_type'),\n ('id', 'id'),\n ('itemized_expenditures', 'itemized_expenditures'),\n- ('itemized_monetary_contribs', 'itemized_monetary_contribs'),\n- ('non_monetary_contribs', 'non_monetary_contribs'),\n+ ('itemized_monetary_contributions', 'itemized_monetary_contributions'),\n+ ('non_monetary_contributions', 'non_monetary_contributions'),\n ('outstanding_debts', 'outstanding_debts'),\n- ('total_contribs', 'total_contribs'),\n+ ('total_contributions', 'total_contributions'),\n ('total_expenditures', 'total_expenditures'),\n- ('total_monetary_contribs', 'total_monetary_contribs'),\n+ ('total_monetary_contributions', 'total_monetary_contributions'),\n ('unitemized_expenditures', 'unitemized_expenditures'),\n- ('unitemized_monetary_contribs', 'unitemized_monetary_contribs'),\n+ ('unitemized_monetary_contributions', 'unitemized_monetary_contributions'),\n ])\n csv_writer = csvkit.unicsv.UnicodeCSVDictWriter(\n outfile, fieldnames=header_translation.keys(), delimiter='|')"},{"sha":"c2941c133be6520550bc0affe6163c18b479e50f","filename":"calaccess_campaign_browser/management/commands/loadcalaccesscampaigncontributions.py","status":"renamed","additions":0,"deletions":0,"changes":0,"blob_url":"https://github.com/palewire/django-calaccess-campaign-browser/blob/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaigncontributions.py","raw_url":"https://github.com/palewire/django-calaccess-campaign-browser/raw/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaigncontributions.py","contents_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/contents/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaigncontributions.py?ref=39d48307d1e7dd7c6d78ddde941f4642fec25e9d","previous_filename":"calaccess_campaign_browser/management/commands/loadcalaccesscampaigncontribs.py"},{"sha":"4efda9eace4cf8428c3c4e199ae5754bcb3cd857","filename":"calaccess_campaign_browser/management/commands/loadcalaccesscampaignexpenditures.py","status":"renamed","additions":0,"deletions":0,"changes":0,"blob_url":"https://github.com/palewire/django-calaccess-campaign-browser/blob/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaignexpenditures.py","raw_url":"https://github.com/palewire/django-calaccess-campaign-browser/raw/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaignexpenditures.py","contents_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/contents/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaignexpenditures.py?ref=39d48307d1e7dd7c6d78ddde941f4642fec25e9d","previous_filename":"calaccess_campaign_browser/management/commands/loadcalaccesscampaignexpends.py"},{"sha":"8f5b834150f6d4a8fb41eaf4b30b1fb930c6f9ef","filename":"calaccess_campaign_browser/management/commands/loadcalaccesscampaignsummaries.py","status":"modified","additions":56,"deletions":50,"changes":106,"blob_url":"https://github.com/palewire/django-calaccess-campaign-browser/blob/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaignsummaries.py","raw_url":"https://github.com/palewire/django-calaccess-campaign-browser/raw/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaignsummaries.py","contents_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/contents/calaccess_campaign_browser%2Fmanagement%2Fcommands%2Floadcalaccesscampaignsummaries.py?ref=39d48307d1e7dd7c6d78ddde941f4642fec25e9d","patch":"@@ -22,11 +22,11 @@ def load_form_F460(self):\n cycle_id,\n form_type,\n dupe,\n- itemized_monetary_contribs,\n- unitemized_monetary_contribs,\n- total_monetary_contribs,\n- non_monetary_contribs,\n- total_contribs,\n+ itemized_monetary_contributions,\n+ unitemized_monetary_contributions,\n+ total_monetary_contributions,\n+ non_monetary_contributions,\n+ total_contributions,\n itemized_expenditures,\n unitemized_expenditures,\n total_expenditures,\n@@ -40,22 +40,25 @@ def load_form_F460(self):\n f.form_id as form_type,\n f.dupe,\n COALESCE(\n- itemized_monetary_contribs.amount_a,\n+ itemized_monetary_contributions.amount_a,\n 0.00\n- ) as itemized_monetary_contribs,\n+ ) as itemized_monetary_contributions,\n COALESCE(\n- unitemized_monetary_contribs.amount_a,\n+ unitemized_monetary_contributions.amount_a,\n 0.00\n- ) as unitemized_monetary_contribs,\n+ ) as unitemized_monetary_contributions,\n COALESCE(\n- total_monetary_contribs.amount_a,\n+ total_monetary_contributions.amount_a,\n 0.00\n- ) as total_monetary_contribs,\n+ ) as total_monetary_contributions,\n COALESCE(\n- non_monetary_contribs.amount_a,\n+ non_monetary_contributions.amount_a,\n 0.00\n- ) as non_monetary_contribs,\n- COALESCE(total_contribs.amount_a, 0.00) as total_contribs,\n+ ) as non_monetary_contributions,\n+ COALESCE(\n+ total_contributions.amount_a,\n+ 0.00\n+ ) as total_contributions,\n COALESCE(\n itemized_expenditures.amount_a,\n 0.00\n@@ -88,45 +91,45 @@ def load_form_F460(self):\n FROM SMRY_CD\n WHERE form_type = 'A'\n AND line_item = '1'\n- ) as itemized_monetary_contribs\n- ON f.filing_id_raw = itemized_monetary_contribs.filing_id\n- AND f.amend_id = itemized_monetary_contribs.amend_id\n+ ) as itemized_monetary_contributions\n+ ON f.filing_id_raw = itemized_monetary_contributions.filing_id\n+ AND f.amend_id = itemized_monetary_contributions.amend_id\n \n LEFT OUTER JOIN (\n SELECT filing_id, amend_id, amount_a\n FROM SMRY_CD\n WHERE form_type = 'A'\n AND line_item = '2'\n- ) as unitemized_monetary_contribs\n- ON f.filing_id_raw = unitemized_monetary_contribs.filing_id\n- AND f.amend_id = unitemized_monetary_contribs.amend_id\n+ ) as unitemized_monetary_contributions\n+ ON f.filing_id_raw = unitemized_monetary_contributions.filing_id\n+ AND f.amend_id = unitemized_monetary_contributions.amend_id\n \n LEFT OUTER JOIN (\n SELECT filing_id, amend_id, amount_a\n FROM SMRY_CD\n WHERE form_type = 'A'\n AND line_item = '3'\n- ) as total_monetary_contribs\n- ON f.filing_id_raw = total_monetary_contribs.filing_id\n- AND f.amend_id = total_monetary_contribs.amend_id\n+ ) as total_monetary_contributions\n+ ON f.filing_id_raw = total_monetary_contributions.filing_id\n+ AND f.amend_id = total_monetary_contributions.amend_id\n \n LEFT OUTER JOIN (\n SELECT filing_id, amend_id, amount_a\n FROM SMRY_CD\n WHERE form_type = 'F460'\n AND line_item = '4'\n- ) as non_monetary_contribs\n- ON f.filing_id_raw = non_monetary_contribs.filing_id\n- AND f.amend_id = non_monetary_contribs.amend_id\n+ ) as non_monetary_contributions\n+ ON f.filing_id_raw = non_monetary_contributions.filing_id\n+ AND f.amend_id = non_monetary_contributions.amend_id\n \n LEFT OUTER JOIN (\n SELECT filing_id, amend_id, amount_a\n FROM SMRY_CD\n WHERE form_type = 'F460'\n AND line_item = '5'\n- ) as total_contribs\n- ON f.filing_id_raw = total_contribs.filing_id\n- AND f.amend_id = total_contribs.amend_id\n+ ) as total_contributions\n+ ON f.filing_id_raw = total_contributions.filing_id\n+ AND f.amend_id = total_contributions.amend_id\n \n LEFT OUTER JOIN (\n SELECT filing_id, amend_id, amount_a\n@@ -185,11 +188,11 @@ def load_form_F450(self):\n cycle_id,\n form_type,\n dupe,\n- itemized_monetary_contribs,\n- unitemized_monetary_contribs,\n- total_monetary_contribs,\n- non_monetary_contribs,\n- total_contribs,\n+ itemized_monetary_contributions,\n+ unitemized_monetary_contributions,\n+ total_monetary_contributions,\n+ non_monetary_contributions,\n+ total_contributions,\n itemized_expenditures,\n unitemized_expenditures,\n total_expenditures,\n@@ -202,17 +205,20 @@ def load_form_F450(self):\n f.cycle_id,\n f.form_id as form_type,\n f.dupe,\n- null as itemized_monetary_contribs,\n- null as unitemized_monetary_contribs,\n+ null as itemized_monetary_contributions,\n+ null as unitemized_monetary_contributions,\n+ COALESCE(\n+ total_monetary_contributions.amount_a,\n+ 0.00\n+ ) as total_monetary_contributions,\n COALESCE(\n- total_monetary_contribs.amount_a,\n+ non_monetary_contributions.amount_a,\n 0.00\n- ) as total_monetary_contribs,\n+ ) as non_monetary_contributions,\n COALESCE(\n- non_monetary_contribs.amount_a,\n+ total_contributions.amount_a,\n 0.00\n- ) as non_monetary_contribs,\n- COALESCE(total_contribs.amount_a, 0.00) as total_contribs,\n+ ) as total_contributions,\n COALESCE(\n itemized_expenditures.amount_a,\n 0.00\n@@ -242,27 +248,27 @@ def load_form_F450(self):\n FROM SMRY_CD\n WHERE form_type = 'F450'\n AND line_item = '7'\n- ) as total_monetary_contribs\n- ON f.filing_id_raw = total_monetary_contribs.filing_id\n- AND f.amend_id = total_monetary_contribs.amend_id\n+ ) as total_monetary_contributions\n+ ON f.filing_id_raw = total_monetary_contributions.filing_id\n+ AND f.amend_id = total_monetary_contributions.amend_id\n \n LEFT OUTER JOIN (\n SELECT filing_id, amend_id, amount_a\n FROM SMRY_CD\n WHERE form_type = 'F450'\n AND line_item = '8'\n- ) as non_monetary_contribs\n- ON f.filing_id_raw = non_monetary_contribs.filing_id\n- AND f.amend_id = non_monetary_contribs.amend_id\n+ ) as non_monetary_contributions\n+ ON f.filing_id_raw = non_monetary_contributions.filing_id\n+ AND f.amend_id = non_monetary_contributions.amend_id\n \n LEFT OUTER JOIN (\n SELECT filing_id, amend_id, amount_a\n FROM SMRY_CD\n WHERE form_type = 'F450'\n AND line_item = '10'\n- ) as total_contribs\n- ON f.filing_id_raw = total_contribs.filing_id\n- AND f.amend_id = total_contribs.amend_id\n+ ) as total_contributions\n+ ON f.filing_id_raw = total_contributions.filing_id\n+ AND f.amend_id = total_contributions.amend_id\n \n LEFT OUTER JOIN (\n SELECT filing_id, amend_id, amount_a"},{"sha":"177bcbc66aca94569f7e83da4f19d4f9b21a9274","filename":"calaccess_campaign_browser/models.py","status":"modified","additions":10,"deletions":10,"changes":20,"blob_url":"https://github.com/palewire/django-calaccess-campaign-browser/blob/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmodels.py","raw_url":"https://github.com/palewire/django-calaccess-campaign-browser/raw/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Fmodels.py","contents_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/contents/calaccess_campaign_browser%2Fmodels.py?ref=39d48307d1e7dd7c6d78ddde941f4642fec25e9d","patch":"@@ -70,7 +70,7 @@ def slug(self):\n def total_contributions(self):\n qs = Filing.objects.filter(committee__filer=self)\n total = Summary.objects.filter(filing__in=qs).aggregate(\n- tot=Sum('total_contribs'))['tot']\n+ tot=Sum('total_contributions'))['tot']\n return total\n \n \n@@ -117,7 +117,7 @@ def short_name(self, character_limit=75):\n def total_contributions(self):\n qs = Filing.objects.filter(committee=self)\n total = Summary.objects.filter(filing__in=qs).aggregate(\n- tot=Sum('total_contribs'))['tot']\n+ tot=Sum('total_contributions'))['tot']\n return total\n \n @property\n@@ -215,7 +215,7 @@ class Summary(models.Model):\n db_index=True,\n )\n dupe = models.BooleanField(default=False, db_index=True)\n- itemized_monetary_contribs = models.DecimalField(\n+ itemized_monetary_contributions = models.DecimalField(\n max_digits=16,\n decimal_places=2,\n null=True,\n@@ -233,19 +233,19 @@ class Summary(models.Model):\n null=True,\n default=None,\n )\n- total_monetary_contribs = models.DecimalField(\n+ total_monetary_contributions = models.DecimalField(\n max_digits=16,\n decimal_places=2,\n null=True,\n default=None,\n )\n- unitemized_monetary_contribs = models.DecimalField(\n+ unitemized_monetary_contributions = models.DecimalField(\n max_digits=16,\n decimal_places=2,\n null=True,\n default=None,\n )\n- non_monetary_contribs = models.DecimalField(\n+ non_monetary_contributions = models.DecimalField(\n max_digits=16,\n decimal_places=2,\n null=True,\n@@ -257,7 +257,7 @@ class Summary(models.Model):\n null=True,\n default=None,\n )\n- total_contribs = models.DecimalField(\n+ total_contributions = models.DecimalField(\n max_digits=16,\n decimal_places=2,\n null=True,\n@@ -476,9 +476,9 @@ class Stats(models.Model):\n ('pac', 'Political Action Committee'),\n )\n STAT_TYPE_CHOICES = (\n- ('itemized_monetary_contribs', 'Itemized Monetary Contributions'),\n- ('unitemized_monetary_contribs', 'Unitemized Monetary Contributions'),\n- ('total_contribs', 'Total Contributions'),\n+ ('itemized_monetary_contributions', 'Itemized Monetary Contributions'),\n+ ('unitemized_monetary_contributions', 'Unitemized Monetary Contributions'),\n+ ('total_contributions', 'Total Contributions'),\n ('total_expenditures', 'Total Expenditures'),\n ('outstanding_debts', 'Outstanding Debt'),\n "},{"sha":"5f27cc37222a668b4ce825bdd872700f94c2934f","filename":"calaccess_campaign_browser/templates/calaccess_campaign_browser/committee_detail.html","status":"modified","additions":5,"deletions":5,"changes":10,"blob_url":"https://github.com/palewire/django-calaccess-campaign-browser/blob/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Ftemplates%2Fcalaccess_campaign_browser%2Fcommittee_detail.html","raw_url":"https://github.com/palewire/django-calaccess-campaign-browser/raw/39d48307d1e7dd7c6d78ddde941f4642fec25e9d/calaccess_campaign_browser%2Ftemplates%2Fcalaccess_campaign_browser%2Fcommittee_detail.html","contents_url":"https://api.github.com/repos/palewire/django-calaccess-campaign-browser/contents/calaccess_campaign_browser%2Ftemplates%2Fcalaccess_campaign_browser%2Fcommittee_detail.html?ref=39d48307d1e7dd7c6d78ddde941f4642fec25e9d","patch":"@@ -70,11 +70,11 @@