Skip to content
This repository has been archived by the owner on Dec 8, 2017. It is now read-only.

Commit

Permalink
final bit of data cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
stvnrlly committed Apr 25, 2016
1 parent ed07137 commit 0934404
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 27 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('opportunities', '0026_auto_20160411_1821'),
]

operations = [
migrations.AlterField(
model_name='opportunity',
name='award_status',
field=models.CharField(default='Planning', max_length=50, choices=[('Award Pending', 'Award Pending'), ('Awarded', 'Awarded'), ('Cancelled', 'Cancelled'), ('Drafting Solicitation', 'Drafting Solicitation'), ('Evaluation Stage', 'Evaluation Stage'), ('Option Exercise Pending', 'Option Exercise Pending'), ('Option Exercised', 'Option Exercised'), ('Planning', 'Planning'), ('Solicitation Closed', 'Solicitation Closed'), ('Solicitation Issued', 'Solicitation Issued')]),
),
migrations.AlterField(
model_name='opportunity',
name='competition_strategy',
field=models.CharField(default='To Be Determined', max_length=200, choices=[('Sole Source', 'Sole Source'), ('Full and Open', 'Full and Open'), ('Set-Aside', 'Set-Aside'), ('Partial Small Business Set-Aside', 'Partial Small Business Set-Aside'), ('A/E Procedures', 'A/E Procedures'), ('Full and Open Competition', 'Full and Open Competition'), ('Not Available for Competition (e.g., 8a sole source, HUBZone & SDVOSB sole source, Ability One, all > SAT)', 'Not Available for Competition (e.g., 8a sole source, HUBZone & SDVOSB sole source, Ability One, all > SAT)'), ('Not Competed (e.g., sole source, urgency, etc., all > SAT)', 'Not Competed (e.g., sole source, urgency, etc., all > SAT)'), ('Full and Open after exclusion of sources (competitive small business set-asides, competitive 8a)', 'Full and Open after exclusion of sources (competitive small business set-asides, competitive 8a)'), ('Follow On to Competed Action', 'Follow On to Competed Action'), ('Competed under SAP', 'Competed under SAP'), ('Not Competed under SAP (e.g., Urgent, Sole source, Logical Follow-On, 8a, HUBZone & SDVOSB sole source, all < SAT)', 'Not Competed under SAP (e.g., Urgent, Sole source, Logical Follow-On, 8a, HUBZone & SDVOSB sole source, all < SAT)'), ('Competitive Delivery Order Fair Opportunity Provided', 'Competitive Delivery Order Fair Opportunity Provided'), ('Non-Competitive Delivery Order', 'Non-Competitive Delivery Order'), ('Fair Opportunity', 'Fair Opportunity'), ('Sole-Source', 'Sole-Source'), ('Limited Sources', 'Limited Sources'), ('To Be Determined', 'To Be Determined'), ('Competitive Schedule Buy', 'Competitive Schedule Buy'), ('Full and Open after exclusion of sources (competitive small business set-asides, competitive 8a)', 'Full and Open after exclusion of sources (competitive small business set-asides, competitive 8a)'), ('Full and Open Competition Unrestricted', 'Full and Open Competition Unrestricted'), ('Not Available for Competition (e.g., 8a sole source, HUBZone & SDVOSB sole source, Ability One, all > SAT)', 'Not Available for Competition (e.g., 8a sole source, HUBZone & SDVOSB sole source, Ability One, all > SAT)'), ('Not Competed (e.g., sole source, urgency, etc., all > SAT)', 'Not Competed (e.g., sole source, urgency, etc., all > SAT)'), ('Not Competed under SAP (e.g., Urgent, Sole source, Logical Follow-On, 8a, HUBZone & SDVOSB sole source, all < SAT)', 'Not Competed under SAP (e.g., Urgent, Sole source, Logical Follow-On, 8a, HUBZone & SDVOSB sole source, all < SAT)'), ('A/E Procedures', 'A/E Procedures'), ('Competed under SAP', 'Competed under SAP'), ('Follow On to Competed Action (FAR 6.302-1)', 'Follow On to Competed Action (FAR 6.302-1)'), ('To Be Determined', 'To Be Determined'), ('Limited Sources FSS Order', 'Limited Sources FSS Order'), ('Competitive Schedule Buy', 'Competitive Schedule Buy'), ('Partial Small Business Set-Aside', 'Partial Small Business Set-Aside')]),
),
migrations.AlterField(
model_name='opportunity',
name='contract_type',
field=models.CharField(default='To Be Determined', max_length=200, verbose_name='Contract Type', choices=[('Cost No Fee', 'Cost No Fee'), ('Cost Plus Award Fee', 'Cost Plus Award Fee'), ('Cost Plus Fixed Fee', 'Cost Plus Fixed Fee'), ('Cost Plus Incentive Fee', 'Cost Plus Incentive Fee'), ('Cost Sharing', 'Cost Sharing'), ('Fixed Price', 'Fixed Price'), ('Fixed Price Award Fee', 'Fixed Price Award Fee'), ('Fixed Price Incentive', 'Fixed Price Incentive'), ('Fixed Price Labor Hours', 'Fixed Price Labor Hours'), ('Fixed Price Level of Effort', 'Fixed Price Level of Effort'), ('Fixed Price Time and Materials', 'Fixed Price Time and Materials'), ('Fixed Price with Economic Price Adjustment', 'Fixed Price with Economic Price Adjustment'), ('Interagency Agreement', 'Interagency Agreement'), ('Labor Hours', 'Labor Hours'), ('Labor Hours and Time and Materials', 'Labor Hours and Time and Materials'), ('Order Dependent', 'Order Dependent'), ('Time and Materials', 'Time and Materials'), ('To Be Determined', 'To Be Determined')]),
),
migrations.AlterField(
model_name='opportunity',
name='procurement_method',
field=models.CharField(default='To Be Determined', max_length=200, verbose_name='Procurement Method', choices=[('GSA Schedule', 'GSA Schedule'), ('Government-wide Agency Contract-GWAC', 'Government-wide Agency Contract-GWAC'), ('Basic Ordering Agreement', 'Basic Ordering Agreement'), ('Blanket Purchase Agreement-BPA', 'Blanket Purchase Agreement-BPA'), ('Multi-Agency Contract', 'Multi-Agency Contract'), ('BPA Call', 'BPA Call'), ('Purchase Order', 'Purchase Order'), ('Definitive Contract', 'Definitive Contract'), ('Ability One', 'Ability One'), ('Indefinite Delivery Indefinite Quantity-IDIQ', 'Indefinite Delivery Indefinite Quantity-IDIQ'), ('Negotiated', 'Negotiated'), ('Sealed Bid', 'Sealed Bid'), ('Contract', 'Contract'), ('Commercial Item Contract', 'Commercial Item Contract'), ('GSA Schedules Program BPA', 'GSA Schedules Program BPA'), ('Indefinite Delivery Vehicle (IDV)', 'Indefinite Delivery Vehicle (IDV)'), ('Purchase Order', 'Purchase Order'), ('Order under IDV', 'Order under IDV'), ('Order under GSA Schedules Program', 'Order under GSA Schedules Program'), ('Order under GSA Schedules Program BPA', 'Order under GSA Schedules Program BPA'), ('To Be Determined', 'To Be Determined'), ('Definitive Contract other than IDV', 'Definitive Contract other than IDV'), ('Indefinite Delivery Vehicle Base Contract', 'Indefinite Delivery Vehicle Base Contract'), ('Order under GSA Federal Supply Schedules Program', 'Order under GSA Federal Supply Schedules Program'), ('Order under IDV', 'Order under IDV'), ('Purchase Order', 'Purchase Order'), ('Contract modification', 'Contract modification'), ('Ability One', 'Ability One'), ('Call Order under GSA Schedules BPA', 'Call Order under GSA Schedules BPA'), ('To Be Determined', 'To Be Determined'), ('GSA Schedule Contract', 'GSA Schedule Contract'), ('Negotiated', 'Negotiated'), ('Sealed Bid', 'Sealed Bid'), ('Government-wide Agency Contract-GWAC', 'Government-wide Agency Contract-GWAC'), ('Commercial Item Contract', 'Commercial Item Contract'), ('GSA Schedules Program BPA', 'GSA Schedules Program BPA'), ('Basic Ordering Agreement', 'Basic Ordering Agreement'), ('Blanket Purchase Agreement-BPA', 'Blanket Purchase Agreement-BPA'), ('Multi-Agency Contract', 'Multi-Agency Contract')]),
),
migrations.AlterField(
model_name='opportunity',
name='socioeconomic',
field=models.CharField(default='To Be Determined', max_length=100, verbose_name='Socioeconomic Category', choices=[('AbilityOne', 'AbilityOne'), ('HUBZone Small Business', 'HUBZone Small Business'), ('Multiple Small Business Categories', 'Multiple Small Business Categories'), ('Other Than Small', 'Other Than Small'), ('Service Disabled Veteran-owned Small Business', 'Service Disabled Veteran-owned Small Business'), ('Small Business', 'Small Business'), ('Small Disadvantaged Business (includes Section 8a)', 'Small Disadvantaged Business (includes Section 8a)'), ('To Be Determined-BPA', 'To Be Determined-BPA'), ('To Be Determined-IDIQ', 'To Be Determined-IDIQ'), ('To Be Determined', 'To Be Determined'), ('Veteran-owned Small Business', 'Veteran-owned Small Business'), ('Woman-Owned Small Business', 'Woman-Owned Small Business')]),
),
]
55 changes: 29 additions & 26 deletions forecast-admin/forecast/opportunities/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,49 +72,56 @@ class Meta:

class Opportunity(models.Model):
AWARD_STATUS_CHOICES = (
("Awarded", "Awarded"),
("Award Pending", "Award Pending"),
("Solicitation Issued", "Solicitation Issued"),
("Awarded", "Awarded"),
("Cancelled", "Cancelled"),
("Drafting Solicitation", "Drafting Solicitation"),
("Solicitation Closed", "Solicitation Closed"),
("Planning", "Planning"), ("Cancelled", "Cancelled"),
("Evaluation Stage", "Evaluation Stage"),
("Option Exercise Pending", "Option Exercise Pending"),
("Option Exercised", "Option Exercised"),
("Planning", "Planning"),
("Solicitation Closed", "Solicitation Closed"),
("Solicitation Issued", "Solicitation Issued"),
)

SOCIOECONOMIC_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"),
("AbilityOne", "AbilityOne"),
("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"),
("Other Than Small", "Other Than Small"),
("Service Disabled Veteran-owned Small Business",
"Service Disabled Veteran-owned Small Business"),
("Small Business", "Small Business"),
("Small Disadvantaged Business (includes Section 8a)",
"Small Disadvantaged Business (includes Section 8a)"),
("To Be Determined-BPA", "To Be Determined-BPA"),
("To Be Determined-IDIQ", "To Be Determined-IDIQ")
("To Be Determined-IDIQ", "To Be Determined-IDIQ"),
("To Be Determined", "To Be Determined"),
("Veteran-owned Small Business", "Veteran-owned Small Business"),
("Woman-Owned Small Business", "Woman-Owned Small Business"),
)

CONTRACT_TYPE_CHOICES = (
("Fixed Price with Economic Price Adjustment",
"Fixed Price with Economic Price Adjustment"),
("Fixed Price Incentive", "Fixed Price Incentive"),
("Fixed Price Award Fee", "Fixed Price Award Fee"),
("Cost Plus Award Fee", "Cost Plus Award Fee"),
("Cost No Fee", "Cost No Fee"),
("Cost Sharing", "Cost Sharing"),
("Cost Plus Award Fee", "Cost Plus Award Fee"),
("Cost Plus Fixed Fee", "Cost Plus Fixed Fee"),
("Cost Plus Incentive Fee", "Cost Plus Incentive Fee"),
("Time and Materials", "Time and Materials"),
("Cost Sharing", "Cost Sharing"),
("Fixed Price","Fixed Price"),
("Fixed Price Award Fee", "Fixed Price Award Fee"),
("Fixed Price Incentive", "Fixed Price Incentive"),
("Fixed Price Labor Hours","Fixed Price Labor Hours"),
("Fixed Price Level of Effort","Fixed Price Level of Effort"),
("Fixed Price Time and Materials","Fixed Price Time and Materials"),
("Fixed Price with Economic Price Adjustment",
"Fixed Price with Economic Price Adjustment"),
("Interagency Agreement", "Interagency Agreement"),
("Labor Hours", "Labor Hours"),
("Labor Hours and Time and Materials","Labor Hours and Time and Materials"),
("Order Dependent", "Order Dependent"),
("Time and Materials", "Time and Materials"),
("To Be Determined", "To Be Determined"),
("Interagency Agreement", "Interagency Agreement")
)

PROCUREMENT_METHOD_CHOICES = (
Expand Down Expand Up @@ -164,7 +171,6 @@ class Opportunity(models.Model):
"Government-wide Agency Contract-GWAC"),
("Commercial Item Contract", "Commercial Item Contract"),
("GSA Schedules Program BPA", "GSA Schedules Program BPA"),
("BPA Call", "BPA Call"),
("Basic Ordering Agreement", "Basic Ordering Agreement"),
("Blanket Purchase Agreement-BPA", "Blanket Purchase Agreement-BPA"),
("Multi-Agency Contract", "Multi-Agency Contract")
Expand Down Expand Up @@ -222,9 +228,6 @@ class Opportunity(models.Model):
("Competed under SAP", "Competed under SAP"),
("Follow On to Competed Action (FAR 6.302-1)",
"Follow On to Competed Action (FAR 6.302-1)"),
("Competitive Delivery Order - Fair Opportunity Provided",
"Competitive Delivery Order - Fair Opportunity Provided"),
("Non-Competitive Delivery Order", "Non-Competitive Delivery Order"),
("To Be Determined", "To Be Determined"),
("Limited Sources FSS Order", "Limited Sources FSS Order"),
("Competitive Schedule Buy", "Competitive Schedule Buy"),
Expand Down

0 comments on commit 0934404

Please sign in to comment.