Merge pull request #257 from cfpb/no-program

Form-level error for bad Program ID
cfpb · Aug 5, 2016 · 371bcd0 · 371bcd0
2 parents 5a96c45 + ee3b1bd
commit 371bcd0
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ 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
+- Add form-level error for bad program ID
 - Update national stats to deliver generic stats at /api/national-stats/
 - simplify warnings for ID problems
 

diff --git a/paying_for_college/templates/worksheet.html b/paying_for_college/templates/worksheet.html
@@ -45,14 +45,32 @@ <h1 class="hero_heading">
         <section class="verify step content_wrapper">
             <div class="content_main">
                 <div class="cf-notification cf-notification__error verify_content" 
-                data-error-block="badSchoolData">
+                data-missing-data-error="noSchool">
                   <span class="cf-notification_icon cf-notification_icon__error cf-icon cf-icon-delete-round" role="alert"></span>
                   <div class="cf-notification_text">
                     <p>The information your school provided is missing the school ID, which is vital information for this tool to work. Please contact your school and ask them to ensure they are sending us the right school ID and it's in the correct format.</p>
 
                     <p>Once your school provides you with an updated URL link, you will be able to return here so you can continue reviewing the information in the tool.</p>
                   </div>
                 </div>
+                <div class="cf-notification cf-notification__error verify_content" 
+                data-missing-data-error="noProgram">
+                  <span class="cf-notification_icon cf-notification_icon__error cf-icon cf-icon-delete-round" role="alert"></span>
+                  <div class="cf-notification_text">
+                    <p>The information your school provided is missing the program ID, which is vital information for this tool to work. Please contact your school and ask them to ensure they are sending us the right program ID and it's in the correct format.</p>
+
+                    <p>Once your school provides you with an updated URL link, you will be able to return here so you can continue reviewing the information in the tool.</p>
+                  </div>
+                </div>
+                <div class="cf-notification cf-notification__error verify_content" 
+                data-missing-data-error="noOffer">
+                  <span class="cf-notification_icon cf-notification_icon__error cf-icon cf-icon-delete-round" role="alert"></span>
+                  <div class="cf-notification_text">
+                    <p>The information your school provided is missing the offer ID, which is vital information for this tool to work. Please contact your school and ask them to ensure they are sending us the right offer ID and it's in the correct format.</p>
+
+                    <p>Once your school provides you with an updated URL link, you will be able to return here so you can continue reviewing the information in the tool.</p>
+                  </div>
+                </div>
                 <div class="verify_wrapper">
                     <div class="verify_content" data-warning="{{warning}}">
                         <h2 class="verify_prompt">

diff --git a/src/disclosures/css/disclosures.less b/src/disclosures/css/disclosures.less
@@ -205,7 +205,7 @@
     font-size: 1em;
   }
 
-  [data-error-block] {
+  [data-missing-data-error] {
     display: none;
   }
 }

diff --git a/src/disclosures/js/dispatchers/get-api-values.js b/src/disclosures/js/dispatchers/get-api-values.js
@@ -52,10 +52,8 @@ var getApiValues = {
       success: function( resp ) {
         return resp;
       },
-      // TODO: the user should be notified of errors
       error: function( req, status, err ) {
-        // console.log( 'API: fetchSchoolData', status, err );
-        financialView.badSchoolData();
+        financialView.missingData( 'school' );
       }
     } );
 
@@ -80,9 +78,8 @@ var getApiValues = {
       success: function( resp ) {
         return resp;
       },
-      // TODO: the user should be notified of errors
       error: function( req, status, err ) {
-        console.log( 'API: fetchProgramData', status, err );
+        financialView.missingData( 'program' );
       }
     } );
 
@@ -125,6 +122,12 @@ var getApiValues = {
   },
 
   initialData: function() {
+    // If there's a [data-warning], display error
+    var warning = $( '[data-warning]' ).attr( 'data-warning' );
+    if ( warning !== '' ) {
+      financialView.missingData( warning );
+      return $.Deferred;
+    }
     return $.when( this.constants(), this.expenses() );
   }
 

diff --git a/src/disclosures/js/views/financial-view.js b/src/disclosures/js/views/financial-view.js
@@ -790,10 +790,13 @@ var financialView = {
 
   /**
    * Update view for bad school requests
+   * @param {string} dataType - type of missing data, 'school' or 'program'
    */
-  badSchoolData: function() {
+  missingData: function( dataType ) {
     $( '.verify_wrapper' ).hide();
-    $( '[data-error-block="badSchoolData"]').show();
+    if ( $( '[data-missing-data-error]:visible' ).length === 0 ) {
+      $( '[data-missing-data-error="' + dataType + '"]').show();
+    }
   }
 };
 

diff --git a/src/disclosures/js/views/metric-view.js b/src/disclosures/js/views/metric-view.js
@@ -35,8 +35,6 @@ var metricView = {
   },
 
   settlementStatus: false,
-  $gradGraphContent: $( '.content-grad-program' ),
-  $defaultGraphContent: $( '.content-default-program' ),
 
   /**
    * Initiates the object
@@ -399,10 +397,10 @@ var metricView = {
 
     $ele.text( text );
     if ( metricKey === 'gradRate' && source === 'school' ) {
-      this.$gradGraphContent.hide();
+      $( '.content-grad-program' ).hide();
     }
     if ( metricKey === 'defaultRate' && source === 'school' ) {
-      this.$defaultGraphContent.text( source );
+      $( '.content-default-program' ).text( source );
     }
   },