Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/cfpb/college-costs into l…
Browse files Browse the repository at this point in the history
…oad-test
  • Loading branch information
amymok committed Jun 24, 2016
2 parents f6c17b8 + f2dc36c commit 72d0fea
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ We follow the [Semantic Versioning 2.0.0](http://semver.org/) format.

## Unreleased
- Added load tests
- removed 6 unneeded fields from school json payload

## 2.1.2
- Parent PLUS loans separated from other family contributions
Expand Down
6 changes: 0 additions & 6 deletions paying_for_college/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,22 +238,16 @@ def as_json(self):
ordered_out = OrderedDict()
jdata = json.loads(self.data_json)
dict_out = {
'avg_net_price': self.avg_net_price,
'books': jdata['BOOKS'],
'city': self.city,
'control': self.control,
'defaultRate': "{0}".format(self.default_rate),
'gradRate': "{0}".format(self.grad_rate),
'highestDegree': self.get_highest_degree(),
'indicatorGroup': jdata['INDICATORGROUP'],
'KBYOSS': self.KBYOSS,
'medianAnnualPay': self.median_annual_pay,
'medianMonthlyDebt': "{0}".format(self.median_monthly_debt),
'medianTotalDebt': "{0}".format(self.median_total_debt),
'nicknames': ", ".join([nick.nickname for nick in self.nickname_set.all()]),
'offerAA': jdata['OFFERAA'],
'offerBA': jdata['OFFERBA'],
'offerGrad': jdata['OFFERGRAD'],
'offersPerkins': self.offers_perkins,
'onCampusAvail': jdata['ONCAMPUSAVAIL'],
'online': self.online_only,
Expand Down

0 comments on commit 72d0fea

Please sign in to comment.