Merge branch 'develop'

forecast-admin/forecast/forecast/settings.py

@@ -46,6 +46,7 @@
     'django.contrib.humanize',
 
     'localflavor',
+    'django_countries',
     'rest_framework',
     'rest_framework_swagger',
 
@@ -140,7 +141,9 @@
         'rest_framework.renderers.BrowsableAPIRenderer',
         'rest_framework_csv.renderers.CSVRenderer',
     ),
-    'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',)
+    'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',),
+    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
+    'PAGE_SIZE': 100
 }
 
 # Static files (CSS, JavaScript, Images)

forecast-admin/forecast/opportunities/admin.py

@@ -10,6 +10,8 @@ class OpportunityAdmin(admin.ModelAdmin):
     # TODO: when customizing admin page, add help text to search box
     search_fields = ['id']
 
+    save_as = True
+
     def make_published(self, request, queryset):
         for obj in queryset:
             obj.published = True

forecast-admin/forecast/opportunities/migrations/0022_auto_20160406_1939.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('opportunities', '0021_auto_20160302_2127'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='opportunity',
+            name='socioeconomic',
+            field=models.CharField(default='To Be Determined', verbose_name='Socioeconomic Category', choices=[('Small Business', 'Small Business'), ('Small Disadvantaged Business (includes Section 8a)', 'Small Disadvantaged Business (includes Section 8a)'), ('Woman-Owned Small Business', 'Woman-Owned Small Business'), ('HUBZone Small Business', 'HUBZone Small Business'), ('Service Disabled Veteran-owned Small Business', 'Service Disabled Veteran-owned Small Business'), ('Veteran-owned Small Business,', 'Veteran-owned Small Business'), ('Multiple Small Business Categories', 'Multiple Small Business Categories'), ('Other Than Small', 'Other Than Small'), ('AbilityOne', 'AbilityOne'), ('To Be Determined', 'To Be Determined'), ('To Be Determined-BPA', 'To Be Determined-BPA'), ('To Be Determined-IDIQ', 'To Be Determined-IDIQ')], max_length=100),
+        ),
+    ]

forecast-admin/forecast/opportunities/migrations/0023_opportunity_place_of_performance_country.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('opportunities', '0022_auto_20160406_1939'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='opportunity',
+            name='place_of_performance_country',
+            field=models.CharField(choices=[('AF', 'Afghanistan'), ('AX', 'Åland Islands'), ('AL', 'Albania'), ('DZ', 'Algeria'), ('AS', 'American Samoa'), ('AD', 'Andorra'), ('AO', 'Angola'), ('AI', 'Anguilla'), ('AQ', 'Antarctica'), ('AG', 'Antigua and Barbuda'), ('AR', 'Argentina'), ('AM', 'Armenia'), ('AW', 'Aruba'), ('AU', 'Australia'), ('AT', 'Austria'), ('AZ', 'Azerbaijan'), ('BS', 'Bahamas'), ('BH', 'Bahrain'), ('BD', 'Bangladesh'), ('BB', 'Barbados'), ('BY', 'Belarus'), ('BE', 'Belgium'), ('BZ', 'Belize'), ('BJ', 'Benin'), ('BM', 'Bermuda'), ('BT', 'Bhutan'), ('BO', 'Bolivia'), ('BQ', 'Bonaire, Sint Eustatius and Saba'), ('BA', 'Bosnia and Herzegovina'), ('BW', 'Botswana'), ('BV', 'Bouvet Island'), ('BR', 'Brazil'), ('IO', 'British Indian Ocean Territory'), ('BN', 'Brunei'), ('BG', 'Bulgaria'), ('BF', 'Burkina Faso'), ('BI', 'Burundi'), ('CV', 'Cabo Verde'), ('KH', 'Cambodia'), ('CM', 'Cameroon'), ('CA', 'Canada'), ('KY', 'Cayman Islands'), ('CF', 'Central African Republic'), ('TD', 'Chad'), ('CL', 'Chile'), ('CN', 'China'), ('CX', 'Christmas Island'), ('CC', 'Cocos (Keeling) Islands'), ('CO', 'Colombia'), ('KM', 'Comoros'), ('CG', 'Congo'), ('CD', 'Congo (the Democratic Republic of the)'), ('CK', 'Cook Islands'), ('CR', 'Costa Rica'), ('CI', "Côte d'Ivoire"), ('HR', 'Croatia'), ('CU', 'Cuba'), ('CW', 'Curaçao'), ('CY', 'Cyprus'), ('CZ', 'Czech Republic'), ('DK', 'Denmark'), ('DJ', 'Djibouti'), ('DM', 'Dominica'), ('DO', 'Dominican Republic'), ('EC', 'Ecuador'), ('EG', 'Egypt'), ('SV', 'El Salvador'), ('GQ', 'Equatorial Guinea'), ('ER', 'Eritrea'), ('EE', 'Estonia'), ('ET', 'Ethiopia'), ('FK', 'Falkland Islands  [Malvinas]'), ('FO', 'Faroe Islands'), ('FJ', 'Fiji'), ('FI', 'Finland'), ('FR', 'France'), ('GF', 'French Guiana'), ('PF', 'French Polynesia'), ('TF', 'French Southern Territories'), ('GA', 'Gabon'), ('GM', 'Gambia'), ('GE', 'Georgia'), ('DE', 'Germany'), ('GH', 'Ghana'), ('GI', 'Gibraltar'), ('GR', 'Greece'), ('GL', 'Greenland'), ('GD', 'Grenada'), ('GP', 'Guadeloupe'), ('GU', 'Guam'), ('GT', 'Guatemala'), ('GG', 'Guernsey'), ('GN', 'Guinea'), ('GW', 'Guinea-Bissau'), ('GY', 'Guyana'), ('HT', 'Haiti'), ('HM', 'Heard Island and McDonald Islands'), ('VA', 'Holy See'), ('HN', 'Honduras'), ('HK', 'Hong Kong'), ('HU', 'Hungary'), ('IS', 'Iceland'), ('IN', 'India'), ('ID', 'Indonesia'), ('IR', 'Iran'), ('IQ', 'Iraq'), ('IE', 'Ireland'), ('IM', 'Isle of Man'), ('IL', 'Israel'), ('IT', 'Italy'), ('JM', 'Jamaica'), ('JP', 'Japan'), ('JE', 'Jersey'), ('JO', 'Jordan'), ('KZ', 'Kazakhstan'), ('KE', 'Kenya'), ('KI', 'Kiribati'), ('KW', 'Kuwait'), ('KG', 'Kyrgyzstan'), ('LA', 'Laos'), ('LV', 'Latvia'), ('LB', 'Lebanon'), ('LS', 'Lesotho'), ('LR', 'Liberia'), ('LY', 'Libya'), ('LI', 'Liechtenstein'), ('LT', 'Lithuania'), ('LU', 'Luxembourg'), ('MO', 'Macao'), ('MK', 'Macedonia'), ('MG', 'Madagascar'), ('MW', 'Malawi'), ('MY', 'Malaysia'), ('MV', 'Maldives'), ('ML', 'Mali'), ('MT', 'Malta'), ('MH', 'Marshall Islands'), ('MQ', 'Martinique'), ('MR', 'Mauritania'), ('MU', 'Mauritius'), ('YT', 'Mayotte'), ('MX', 'Mexico'), ('FM', 'Micronesia (Federated States of)'), ('MD', 'Moldova'), ('MC', 'Monaco'), ('MN', 'Mongolia'), ('ME', 'Montenegro'), ('MS', 'Montserrat'), ('MA', 'Morocco'), ('MZ', 'Mozambique'), ('MM', 'Myanmar'), ('NA', 'Namibia'), ('NR', 'Nauru'), ('NP', 'Nepal'), ('NL', 'Netherlands'), ('NC', 'New Caledonia'), ('NZ', 'New Zealand'), ('NI', 'Nicaragua'), ('NE', 'Niger'), ('NG', 'Nigeria'), ('NU', 'Niue'), ('NF', 'Norfolk Island'), ('KP', 'North Korea'), ('MP', 'Northern Mariana Islands'), ('NO', 'Norway'), ('OM', 'Oman'), ('PK', 'Pakistan'), ('PW', 'Palau'), ('PS', 'Palestine, State of'), ('PA', 'Panama'), ('PG', 'Papua New Guinea'), ('PY', 'Paraguay'), ('PE', 'Peru'), ('PH', 'Philippines'), ('PN', 'Pitcairn'), ('PL', 'Poland'), ('PT', 'Portugal'), ('PR', 'Puerto Rico'), ('QA', 'Qatar'), ('RE', 'Réunion'), ('RO', 'Romania'), ('RU', 'Russia'), ('RW', 'Rwanda'), ('BL', 'Saint Barthélemy'), ('SH', 'Saint Helena, Ascension and Tristan da Cunha'), ('KN', 'Saint Kitts and Nevis'), ('LC', 'Saint Lucia'), ('MF', 'Saint Martin (French part)'), ('PM', 'Saint Pierre and Miquelon'), ('VC', 'Saint Vincent and the Grenadines'), ('WS', 'Samoa'), ('SM', 'San Marino'), ('ST', 'Sao Tome and Principe'), ('SA', 'Saudi Arabia'), ('SN', 'Senegal'), ('RS', 'Serbia'), ('SC', 'Seychelles'), ('SL', 'Sierra Leone'), ('SG', 'Singapore'), ('SX', 'Sint Maarten (Dutch part)'), ('SK', 'Slovakia'), ('SI', 'Slovenia'), ('SB', 'Solomon Islands'), ('SO', 'Somalia'), ('ZA', 'South Africa'), ('GS', 'South Georgia and the South Sandwich Islands'), ('KR', 'South Korea'), ('SS', 'South Sudan'), ('ES', 'Spain'), ('LK', 'Sri Lanka'), ('SD', 'Sudan'), ('SR', 'Suriname'), ('SJ', 'Svalbard and Jan Mayen'), ('SZ', 'Swaziland'), ('SE', 'Sweden'), ('CH', 'Switzerland'), ('SY', 'Syria'), ('TW', 'Taiwan'), ('TJ', 'Tajikistan'), ('TZ', 'Tanzania'), ('TH', 'Thailand'), ('TL', 'Timor-Leste'), ('TG', 'Togo'), ('TK', 'Tokelau'), ('TO', 'Tonga'), ('TT', 'Trinidad and Tobago'), ('TN', 'Tunisia'), ('TR', 'Turkey'), ('TM', 'Turkmenistan'), ('TC', 'Turks and Caicos Islands'), ('TV', 'Tuvalu'), ('UG', 'Uganda'), ('UA', 'Ukraine'), ('AE', 'United Arab Emirates'), ('GB', 'United Kingdom'), ('UM', 'United States Minor Outlying Islands'), ('US', 'United States of America'), ('UY', 'Uruguay'), ('UZ', 'Uzbekistan'), ('VU', 'Vanuatu'), ('VE', 'Venezuela'), ('VN', 'Vietnam'), ('VG', 'Virgin Islands (British)'), ('VI', 'Virgin Islands (U.S.)'), ('WF', 'Wallis and Futuna'), ('EH', 'Western Sahara'), ('YE', 'Yemen'), ('ZM', 'Zambia'), ('ZW', 'Zimbabwe')], max_length=100, default='US'),
+        ),
+    ]

forecast-admin/forecast/opportunities/migrations/0024_auto_20160406_2115.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('opportunities', '0023_opportunity_place_of_performance_country'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='opportunity',
+            name='place_of_performance_state',
+            field=models.CharField(choices=[('None', 'None'), ('International', 'International'), ('Nationwide', 'Nationwide'), ('Region 1', 'Region 1'), ('Region 2', 'Region 2'), ('Region 3', 'Region 3'), ('Region 4', 'Region 4'), ('Region 5', 'Region 5'), ('Region 6', 'Region 6'), ('Region 7', 'Region 7'), ('Region 8', 'Region 8'), ('Region 9', 'Region 9'), ('Region 10', 'Region 10'), ('National Capital Region', 'National Capital Region'), ('Central Office', 'Central Office'), ('AL', 'Alabama'), ('AK', 'Alaska'), ('AZ', 'Arizona'), ('AR', 'Arkansas'), ('CA', 'California'), ('CO', 'Colorado'), ('CT', 'Connecticut'), ('DE', 'Delaware'), ('DC', 'District of Columbia'), ('FL', 'Florida'), ('GA', 'Georgia'), ('HI', 'Hawaii'), ('ID', 'Idaho'), ('IL', 'Illinois'), ('IN', 'Indiana'), ('IA', 'Iowa'), ('KS', 'Kansas'), ('KY', 'Kentucky'), ('LA', 'Louisiana'), ('ME', 'Maine'), ('MD', 'Maryland'), ('MA', 'Massachusetts'), ('MI', 'Michigan'), ('MN', 'Minnesota'), ('MS', 'Mississippi'), ('MO', 'Missouri'), ('MT', 'Montana'), ('NE', 'Nebraska'), ('NV', 'Nevada'), ('NH', 'New Hampshire'), ('NJ', 'New Jersey'), ('NM', 'New Mexico'), ('NY', 'New York'), ('NC', 'North Carolina'), ('ND', 'North Dakota'), ('OH', 'Ohio'), ('OK', 'Oklahoma'), ('OR', 'Oregon'), ('PA', 'Pennsylvania'), ('RI', 'Rhode Island'), ('SC', 'South Carolina'), ('SD', 'South Dakota'), ('TN', 'Tennessee'), ('TX', 'Texas'), ('UT', 'Utah'), ('VT', 'Vermont'), ('VA', 'Virginia'), ('WA', 'Washington'), ('WV', 'West Virginia'), ('WI', 'Wisconsin'), ('WY', 'Wyoming')], max_length=100, default='DC'),
+        ),
+    ]

forecast-admin/forecast/opportunities/migrations/0025_auto_20160407_1424.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('opportunities', '0024_auto_20160406_2115'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='opportunity',
+            name='socioeconomic',
+            field=models.CharField(max_length=100, verbose_name='Socioeconomic Category', choices=[('Small Business', 'Small Business'), ('Small Disadvantaged Business (includes Section 8a)', 'Small Disadvantaged Business (includes Section 8a)'), ('Woman-Owned Small Business', 'Woman-Owned Small Business'), ('HUBZone Small Business', 'HUBZone Small Business'), ('Service Disabled Veteran-owned Small Business', 'Service Disabled Veteran-owned Small Business'), ('Veteran-owned Small Business', 'Veteran-owned Small Business'), ('Multiple Small Business Categories', 'Multiple Small Business Categories'), ('Other Than Small', 'Other Than Small'), ('AbilityOne', 'AbilityOne'), ('To Be Determined', 'To Be Determined'), ('To Be Determined-BPA', 'To Be Determined-BPA'), ('To Be Determined-IDIQ', 'To Be Determined-IDIQ')], default='To Be Determined'),
+        ),
+    ]

forecast-admin/forecast/opportunities/migrations/0026_auto_20160411_1821.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('opportunities', '0025_auto_20160407_1424'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='opportunity',
+            name='place_of_performance_state',
+            field=models.CharField(default='DC', max_length=100, choices=[('TBD', 'TBD'), ('Regionwide', 'Regionwide'), ('Various', 'Various'), ('International', 'International'), ('AL', 'Alabama'), ('AK', 'Alaska'), ('AZ', 'Arizona'), ('AR', 'Arkansas'), ('CA', 'California'), ('CO', 'Colorado'), ('CT', 'Connecticut'), ('DE', 'Delaware'), ('DC', 'District of Columbia'), ('FL', 'Florida'), ('GA', 'Georgia'), ('HI', 'Hawaii'), ('ID', 'Idaho'), ('IL', 'Illinois'), ('IN', 'Indiana'), ('IA', 'Iowa'), ('KS', 'Kansas'), ('KY', 'Kentucky'), ('LA', 'Louisiana'), ('ME', 'Maine'), ('MD', 'Maryland'), ('MA', 'Massachusetts'), ('MI', 'Michigan'), ('MN', 'Minnesota'), ('MS', 'Mississippi'), ('MO', 'Missouri'), ('MT', 'Montana'), ('NE', 'Nebraska'), ('NV', 'Nevada'), ('NH', 'New Hampshire'), ('NJ', 'New Jersey'), ('NM', 'New Mexico'), ('NY', 'New York'), ('NC', 'North Carolina'), ('ND', 'North Dakota'), ('OH', 'Ohio'), ('OK', 'Oklahoma'), ('OR', 'Oregon'), ('PA', 'Pennsylvania'), ('RI', 'Rhode Island'), ('SC', 'South Carolina'), ('SD', 'South Dakota'), ('TN', 'Tennessee'), ('TX', 'Texas'), ('UT', 'Utah'), ('VT', 'Vermont'), ('VA', 'Virginia'), ('WA', 'Washington'), ('WV', 'West Virginia'), ('WI', 'Wisconsin'), ('WY', 'Wyoming'), ('AS', 'American Samoa'), ('GU', 'Guam'), ('MP', 'Northern Mariana Islands'), ('PR', 'Puerto Rico'), ('VI', 'Virgin Islands')]),
+        ),
+    ]

forecast-admin/forecast/opportunities/models.py

@@ -3,7 +3,9 @@
 from django.core.validators import MaxValueValidator, RegexValidator
 
 from localflavor.us.models import USStateField, PhoneNumberField
-from localflavor.us.us_states import US_STATES
+from localflavor.us.us_states import US_STATES, US_TERRITORIES
+from django_countries.fields import CountryField
+from django_countries import countries
 from opportunities.validators import validate_NAICS
 
 from datetime import date
@@ -89,6 +91,7 @@ class Opportunity(models.Model):
         ("HUBZone Small Business", "HUBZone Small Business"),
         ("Service Disabled Veteran-owned Small Business",
             "Service Disabled Veteran-owned Small Business"),
+        ("Veteran-owned Small Business", "Veteran-owned Small Business"),
         ("Multiple Small Business Categories",
             "Multiple Small Business Categories"),
         ("Other Than Small", "Other Than Small"), ("AbilityOne", "AbilityOne"),
@@ -265,22 +268,13 @@ class Opportunity(models.Model):
     )
 
     NON_STATE_OPTIONS = (
-        ("International", "International"),
-        ("Nationwide", "Nationwide"),
-        ("Region 1", "Region 1"),
-        ("Region 2", "Region 2"),
-        ("Region 3", "Region 3"),
-        ("Region 4", "Region 4"),
-        ("Region 5", "Region 5"),
-        ("Region 6", "Region 6"),
-        ("Region 7", "Region 7"),
-        ("Region 8", "Region 8"),
-        ("Region 9", "Region 9"),
-        ("Region 10", "Region 10"),
-        ("National Capital Region", "National Capital Region"),
-        ("Central Office", "Central Office")
+        ("TBD", "TBD"),
+        ("Regionwide", "Regionwide"),
+        ("Various", "Various"),
+        ("International", "International")
     )
-    STATES = US_STATES+NON_STATE_OPTIONS
+    STATES = NON_STATE_OPTIONS+US_STATES+US_TERRITORIES
+    COUNTRIES = countries
 
     office = models.ForeignKey(Office, blank=True, null=True)
     agency = models.CharField(max_length=100, default="GSA", editable=False)
@@ -291,8 +285,11 @@ class Opportunity(models.Model):
     place_of_performance_city = models.CharField(max_length=100,
                                                  default="Washington", blank=False)
     place_of_performance_state = models.CharField(max_length=100,
-                                                  choices=STATES, default="DC",
-                                                  blank=False)
+                                                  choices=STATES, default="DC")
+    place_of_performance_country = models.CharField(max_length=100,
+                                                    choices=COUNTRIES,
+                                                    default="US",
+                                                    blank=False)
     naics = models.CharField("Primary NAICS Code",
                              max_length=6, blank=False, null=True,
                              validators=[validate_NAICS])
@@ -346,6 +343,12 @@ class Opportunity(models.Model):
     def __str__(self):
         return "%s (%s)" % (self.description, self.estimated_fiscal_year)
 
+    def clean(self):
+        super(Opportunity, self).clean()
+
+        if self.place_of_performance_country == 'US' and not self.place_of_performance_state:
+            raise ValidationError('A state is required for opportunities in the US')
+
     class Meta:
         verbose_name = "Procurement"
         verbose_name_plural = "Procurements"

forecast-admin/forecast/opportunities/templates/includes/disclaimer.html

@@ -0,0 +1,23 @@
+{% load static from staticfiles %}
+
+<header class="usa-site-header disclaimer" role="banner">
+
+  <div class="usa-disclaimer">
+    <div class="usa-grid-no-padding">
+      <div class="usa-width-one-whole">
+      	<div class="disclaimer-left">
+	        <span class="usa-disclaimer-official">
+	          An official website of the United States Government
+	          <img class="usa-flag_icon" alt="US flag signifying that this is a United States Federal Government website" src="{% static 'assets/img/us_flag_small.png' %}">
+	        </span>
+	      </div>
+	      <div class="disclaimer-right">
+	        <span>
+	          This site is in <a href="https://18f.gsa.gov/dashboard/stages/#beta">beta</a>.
+	        </span>
+	      </div>
+      </div>
+    </div>
+  </div>
+
+</header>

forecast-admin/forecast/opportunities/templates/includes/filters.html

@@ -6,6 +6,9 @@ <h2 class="h3 filter-header">Filter by:</h2>
   <label for="agency-dropdown">Agency</label>
   <select name="agency-dropdown" id="agency-dropdown" >
     <option default value="all">All</option>
+    {% for a in agency %}
+    <option value="{{ a.agency }}">{{ a.agency }}</option>
+    {% endfor %}
   </select>
   </div>
 
@@ -14,6 +17,9 @@ <h2 class="h3 filter-header">Filter by:</h2>
   <label for="place_of_performance_state-dropdown">Place of Performance</label>
   <select name="place_of_performance_state-dropdown" id="place_of_performance_state-dropdown" >
     <option default value="all">All</option>
+    {% for p in place_of_performance_state %}
+    <option value="{{ p.place_of_performance_state }}">{{ p.place_of_performance_state }}</option>
+    {% endfor %}
   </select>
   </div>
 
@@ -22,6 +28,9 @@ <h2 class="h3 filter-header">Filter by:</h2>
   <label for="socioeconomic-dropdown">Socioeconomic Category</label>
   <select name="socioeconomic-dropdown" id="socioeconomic-dropdown" >
     <option default value="all">All</option>
+    {% for s in socioeconomic %}
+    <option value="{{ s.socioeconomic }}">{{ s.socioeconomic }}</option>
+    {% endfor %}
   </select>
   </div>
 
@@ -30,6 +39,9 @@ <h2 class="h3 filter-header">Filter by:</h2>
   <label for="naics-dropdown">NAICS Code</label>
   <select name="naics-dropdown" id="naics-dropdown" >
     <option default value="all">All</option>
+    {% for n in naics %}
+    <option value="{{ n.naics }}">{{ n.naics }}</option>
+    {% endfor %}
   </select>
   </div>
 
@@ -53,6 +65,9 @@ <h2 class="h3 filter-header">Filter by:</h2>
     <label for="estimated_fiscal_year_quarter-dropdown">Projected Solicitation Quarter</label>
     <select name="estimated_fiscal_year_quarter-dropdown" id="estimated_fiscal_year_quarter-dropdown" >
       <option default value="all">All</option>
+      {% for e in estimated_fiscal_year_quarter %}
+      <option value="{{ e.estimated_fiscal_year_quarter }}">{{ e.estimated_fiscal_year_quarter }}</option>
+      {% endfor %}
     </select>
     </div>
 
@@ -61,6 +76,9 @@ <h2 class="h3 filter-header">Filter by:</h2>
     <label for="contract_type-dropdown">Contract Type</label>
     <select name="contract_type-dropdown" id="contract_type-dropdown" >
       <option default value="all">All</option>
+      {% for c in contract_type %}
+      <option value="{{ c.contract_type }}">{{ c.contract_type }}</option>
+      {% endfor %}
     </select>
     </div>
 
@@ -69,6 +87,9 @@ <h2 class="h3 filter-header">Filter by:</h2>
     <label for="award_status-dropdown">Award Status</label>
     <select name="award_status-dropdown" id="award_status-dropdown" >
       <option default value="all">All</option>
+      {% for a in award_status %}
+      <option value="{{ a.award_status }}">{{ a.award_status }}</option>
+      {% endfor %}
     </select>
     </div>
   </div>