Skip to content

Commit

Permalink
Ironed out some wrinkles in how we are formatting the section names
Browse files Browse the repository at this point in the history
  • Loading branch information
@palewire
palewire committed Sep 12, 2016
1 parent 5afd3e9 commit 38f347b
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 43 deletions.
2 changes: 0 additions & 2 deletions calaccess_raw/annotations/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,7 @@ def __init__(self, id, title, **kwargs):
self.group = kwargs.get('group')
self.documentcloud_id = kwargs.get('documentcloud_id')
self.db_value = kwargs.get('db_value', self.id)

self.sections = []

if self.documentcloud_id:
self.documentcloud = DocumentCloud(self.documentcloud_id)
else:
Expand Down
82 changes: 41 additions & 41 deletions calaccess_raw/annotations/filing_forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ def get_filing_form(id):
form = get_filing_form('F450')
form.add_section(
id='CVR',
title='Type of Recipient Committee',
title='Cover Page, Type of Recipient Committee',
start_page=3
)
form.add_section(
Expand Down Expand Up @@ -591,14 +591,14 @@ def get_filing_form(id):
form = get_filing_form('F460')
form.add_section(
id='CVR',
title='Cover Page',
title='Cover Page, Part 1',
start_page=3,
end_page=4,
db_value='CVR',
)
form.add_section(
id='CVR2',
title='Cover Page - Part 2',
title='Cover Page, Part 2',
start_page=2,
db_value='CVR2',
)
Expand All @@ -625,22 +625,22 @@ def get_filing_form(id):
)
form.add_section(
id='B1',
title='Schedule B - Part 1, Loans Received',
title='Schedule B, Part 1, Loans Received',
start_page=12,
end_page=13,
db_value='B1',
)
form.add_section(
id='B2',
title='Schedule B - Part 2, Loan Guarantors',
title='Schedule B, Part 2, Loan Guarantors',
start_page=14,
end_page=15,
db_value='B2',
)
# this section appears in older versions of Form 460, but not in the current one
form.add_section(
id='B3',
title='Schedule B - Part 3, Outstanding Bal',
title='Schedule B, Part 3, Outstanding Balance',
db_value='B3',
)
form.add_section(
Expand Down Expand Up @@ -691,26 +691,26 @@ def get_filing_form(id):
# but does appear in the filings
form.add_section(
id='H1',
title='Schedule H - Part 1, Loans Made',
title='Schedule H, Part 1, Loans Made',
db_value='H1',
)
# this section is not in the sample form downloaded from the FPPC site
# but does appear in the filings
form.add_section(
id='H2',
title='Schedule H- Part 2, Repayments Rcvd',
title='Schedule H, Part 2, Repayments Rcvd',
db_value='H2',
)
# this section is not in the sample form downloaded from the FPPC site
# but does appear in the filings
form.add_section(
id='H3',
title='Schedule H - Part 3, Outstanding Loans',
title='Schedule H, Part 3, Outstanding Loans',
db_value='H3',
)
form.add_section(
id='I',
title='Schedule I, miscellanous increases to cash',
title='Schedule I, Miscellanous increases to cash',
start_page=31,
end_page=32,
db_value='I',
Expand Down Expand Up @@ -811,13 +811,13 @@ def get_filing_form(id):
form = get_filing_form('F497')
form.add_section(
id='P1',
title='Part 1, Contribution(s) Received',
title='Part 1, Contributions Received',
start_page=2,
db_value='F497P1',
)
form.add_section(
id='P2',
title='Part 2, Contribution(s) Made',
title='Part 2, Contributions Made',
start_page=4,
db_value='F497P2',
)
Expand All @@ -839,20 +839,20 @@ def get_filing_form(id):
form.add_section(
id='P1',
db_value='F601P1',
title='Individual Lobbyists',
title='Part 1, Individual Lobbyists',
start_page=2,
)
form.add_section(
id='P2A',
db_value='F601P2A',
title='Part 2: Section A, Lobbyist Employers',
title='Part 2, Section A, Lobbyist Employers',
start_page=2,
end_page=4,
)
form.add_section(
id='P2B',
db_value='F601P2B',
title='Part 2: Section B: Subcontracted Clients',
title='Part 2, Section B, Subcontracted Clients',
start_page=4,
)

Expand Down Expand Up @@ -887,121 +887,121 @@ def get_filing_form(id):
form.add_section(
id='P3A',
db_value='F625P3A',
title='Part 3 (Payments Made In Connection With Lobbying Activities), \
Section A: Activity Expenses',
title='Part 3, Payments Made In Connection With Lobbying Activities, \
Section A, Activity Expenses',
start_page=4,
)
form.add_section(
id='P3B',
db_value='F625P3B',
title='Part 3 (Payments Made In Connection With Lobbying Activities), \
Section B: Payments Made',
title='Part 3, Payments Made In Connection With Lobbying Activities, \
Section B, Payments Made',
start_page=8,
)
form.add_section(
id='P3C',
db_value='F625P3C',
title='Part 3 (Payments Made In Connection With Lobbying Activities), \
Section C: Summary of Payments',
title='Part 3, Payments Made In Connection With Lobbying Activities, \
Section C, Summary of Payments',
start_page=2,
)
form.add_section(
id='P4B',
db_value='F625P4B',
title='Part 4: Campaign Contributions Made',
title='Part 4, Campaign Contributions Made',
start_page=2,
)

form = get_filing_form('F635')
form.add_section(
id='P1',
db_value='F635P1',
title='Part 1: Legislative or State Agency Administrative Actions Actively \
title='Part 1, Legislative or State Agency Administrative Actions Actively \
Lobbied During the Period',
start_page=2,
)
form.add_section(
id='P2',
db_value='F635P2',
title='Part 2: Partners, Owners, and Employees whose "Lobbyist Reports" \
(Form 615) are Atttached to this Report',
title='Part 2, Partners, Owners, and Employees whose "Lobbyist Reports" \
(Form 615) are Attached to this Report',
start_page=4,
)
form.add_section(
id='P3A',
db_value='F635P3A',
title='Part 3 (Payments Made in Connection with Lobbying Activities), \
Section A: Payments To In-house Employee Lobbyists',
title='Part 3, Payments Made in Connection with Lobbying Activities, \
Section A, Payments To In-house Employee Lobbyists',
start_page=4,
)
form.add_section(
id='P3B',
db_value='F635P3B',
title='Part 3 (Payments Made in Connection with Lobbying Activities), \
Section B: Payments To Lobbying Firms',
title='Part 3, Payments Made in Connection with Lobbying Activities, \
Section B, Payments To Lobbying Firms',
start_page=4,
)
form.add_section(
id='P3C',
db_value='F635P3C',
title='Part 3 (Payments Made in Connection with Lobbying Activities), \
Section C: Activity Expenses',
title='Part 3, Payments Made in Connection with Lobbying Activities, \
Section C, Activity Expenses',
start_page=6,
)
form.add_section(
id='P3D',
db_value='F635P3D',
title='Part 3 (Payments Made in Connection with Lobbying Activities), \
Section D: Other Payments to Influence Legislative or Administrative Action',
title='Part 3, Payments Made in Connection with Lobbying Activities, \
Section D, Other Payments to Influence Legislative or Administrative Action',
start_page=6,
)
form.add_section(
id='P3E',
db_value='F635P3E',
title='Part 3 (Payments Made in Connection with Lobbying Activities), \
Section E: Payments in Connection with Administrative Testimony in Ratemaking \
title='Part 3, Payments Made in Connection with Lobbying Activities, \
Section E, Payments in Connection with Administrative Testimony in Ratemaking \
Proceedings Before The California Public Utilities Commission',
start_page=6,
)
form.add_section(
id='P4B',
db_value='F635P4B',
title='Part 4: Campaign Contributions Made',
title='Part 4, Campaign Contributions Made',
start_page=8,
)

form = get_filing_form('F645')
form.add_section(
id='P1',
db_value='F645P1',
title='Part 1: Legislative or State Agency Administrative Actions Actively \
title='Part 1, Legislative or State Agency Administrative Actions Actively \
Lobbied during the Period',
start_page=2,
)
form.add_section(
id='P2A',
db_value='F645P2A',
title='Part 2 (Payments Made this Period), Section A: Activity Expenses',
title='Part 2, Payments Made this Period, Section A, Activity Expenses',
start_page=4,
)
form.add_section(
id='P2B',
db_value='F645P2B',
title='Part 2 (Payments Made this Period), Section B: Other Payments to \
title='Part 2, Payments Made this Period, Section B, Other Payments to \
Influence Legislative or Administrative Action',
start_page=4,
)
form.add_section(
id='P2C',
db_value='F645P2C',
title='Part 2 (Payments Made this Period), Section C: Payments in Connection \
title='Part 2, Payments Made this Period, Section C, Payments in Connection \
with Administrative Testimony in Ratemaking Proceedings Before the California \
Public Utilities Commission',
start_page=4,
)
form.add_section(
id='P3B',
db_value='F645P3B',
title='Part 3: Campaign Contributions Made',
title='Part 3, Campaign Contributions Made',
start_page=4,
)

0 comments on commit 38f347b

Please sign in to comment.