Conflicts resolved

CHANGELOG.md

@@ -1,7 +1,7 @@
 All notable changes to this project will be documented in this file.
 We follow the [Semantic Versioning 2.0.0](http://semver.org/) format.
 
-## Unreleased
+## 2.1.6
 - Add technical notes on the About This Tool page
 - Make loan origination fees dynamic from the API
 - Changed display of graph notifications for settlement school status
@@ -15,9 +15,12 @@ We follow the [Semantic Versioning 2.0.0](http://semver.org/) format.
 - Updates loan origination fee displays to work with corrected constants
 - Fix alignment issues in debt summary
 - Update our national statistics from scorecard project
+- Consolidate how input elements are updated
+- Fix input errors if attempting to borrow more than total cost of attendance
 - Add form-level error for bad program ID
 - Update national stats to deliver generic stats at /api/national-stats/
 - simplify warnings for ID problems
+- make bare /offer/ URL return blank disclosure
 - Updated the budget section to better message lack of salary data
 - don't treat PID as numeric in js -- characters are allowed
 - Changed `/national-stats/` API to deliver a `nationalSalary` value of $34,300 regardless of program length

package.json

@@ -1,6 +1,6 @@
 {
   "name": "college-costs",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Tools to help students make informed financial decisions about college.",
   "homepage": "http://www.github.com/cfpb/college-costs/",
   "author": {
@@ -22,30 +22,30 @@
     "prepublish": "npm run snyk-protect"
   },
   "devDependencies": {
-    "browser-sync": "2.13.0",
-    "browserify": "13.0.1",
+    "browser-sync": "2.14.0",
+    "browserify": "13.1.0",
     "chai": "3.5.0",
-    "glob-all": "3.0.3",
+    "glob-all": "3.1.0",
     "gulp": "3.9.1",
     "gulp-autoprefixer": "3.1.0",
-    "gulp-changed": "1.3.0",
+    "gulp-changed": "1.3.1",
     "gulp-concat": "2.6.0",
     "gulp-cssmin": "0.1.7",
     "gulp-eslint": "3.0.1",
     "gulp-header": "1.8.7",
-    "gulp-imagemin": "3.0.1",
+    "gulp-imagemin": "3.0.2",
     "gulp-less": "3.1.0",
     "gulp-load-plugins": "1.2.4",
     "gulp-mq-remove": "0.0.2",
     "gulp-notify": "2.2.0",
     "gulp-rename": "1.2.2",
     "gulp-replace": "0.5.4",
     "gulp-sourcemaps": "1.6.0",
-    "gulp-uglify": "1.5.4",
+    "gulp-uglify": "2.0.0",
     "gulp-util": "3.0.7",
     "mocha": "2.5.3",
     "pretty-hrtime": "1.0.2",
-    "protractor": "4.0.0",
+    "protractor": "4.0.2",
     "vinyl-buffer": "1.0.0",
     "vinyl-source-stream": "1.1.0"
   },
@@ -62,7 +62,7 @@
     "normalize-legacy-addon": "0.1.0",
     "number-to-words": "1.2.3",
     "require-dir": "0.3.0",
-    "snyk": "1.17.1",
+    "snyk": "1.18.0",
     "sticky-kit": "1.1.3",
     "student-debt-calc": "2.5.11"
   },

paying_for_college/fixtures/collegedata.json

@@ -325133,7 +325133,7 @@
         "private_debt": null,
         "total_cost": 44700,
         "housing": null,
-        "program_code": "a832",
+        "program_code": "1832",
         "campus": "Tampa",
         "median_student_loan_completers": 27792,
         "job_note": "",

paying_for_college/tests/test_views.py

@@ -278,6 +278,9 @@ def test_offer(self):
         resp9 = client.get(url+no_program)
         self.assertTrue("noProgram" in resp9.context['warning'])
         self.assertTrue(resp9.status_code == 200)
+        resp10 = client.get(url)
+        self.assertTrue(resp10.context['warning'] == '')
+        self.assertTrue(resp10.status_code == 200)
 
 
 class APITests(django.test.TestCase):

paying_for_college/views.py

@@ -145,6 +145,18 @@ def get(self, request):
         school_data = 'null'
         warning = ''
         OID = ''
+        if not request.GET:
+            return render_to_response('worksheet.html',
+                                      {'data_js': "0",
+                                       'school': school,
+                                       'schoolData': school_data,
+                                       'program': program,
+                                       'programData': program_data,
+                                       'oid': OID,
+                                       'base_template': BASE_TEMPLATE,
+                                       'warning': warning,
+                                       'url_root': URL_ROOT},
+                                      context_instance=RequestContext(request))
         if 'oid' in request.GET and request.GET['oid']:
             OID = request.GET['oid']
         else:

setup.py

@@ -56,7 +56,7 @@ def run(self):
 
 setup(
     name='college-costs',
-    version='2.1.5',
+    version='2.1.6',
     author='CFPB',
     author_email='tech@cfpb.gov',
     maintainer='cfpb',