Merge pull request #128 from AppliedIS/sprint3-fixes

Linter rule fixes.
ais-open · Nov 10, 2016 · e311a2b · e311a2b
2 parents 72f1727 + ec17dac
commit e311a2b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/DOL.WHD.Section14c.Web/.eslintignore b/DOL.WHD.Section14c.Web/.eslintignore
@@ -1,2 +1 @@
-# ignore validationService
-src/modules/services/validationService.js
+
diff --git a/DOL.WHD.Section14c.Web/.eslintrc.js b/DOL.WHD.Section14c.Web/.eslintrc.js
@@ -49,7 +49,7 @@ module.exports = {
         //Best Practices
         "accessor-pairs": 2,
         "block-scoped-var": 0,
-        "complexity": [2, 12],
+        "complexity": [2, 6],
         "consistent-return": 0,
         "curly": 0,
         "default-case": 0,

diff --git a/...tion14c.Web/src/modules/components/userRegistrationForm/userRegistrationFormController.js b/...tion14c.Web/src/modules/components/userRegistrationForm/userRegistrationFormController.js
@@ -78,12 +78,14 @@ module.exports = function(ngModule) {
                 vm.emailVerificationError = true;
                 console.log(error.statusText + (error.data && error.data.error ? ': ' + error.data.error + ' - ' + error.data.error_description : ''));
             });
-        }     
+        }
 
         $scope.onSubmitClick = function() {
             vm.resetErrors();
             vm.registerdEmail = ''
             vm.submittingForm = true;
+
+            /* eslint-disable complexity */
             apiService.userRegister($scope.formVals.ein, $scope.formVals.email, $scope.formVals.pass, $scope.formVals.confirmPass, $scope.regResponse, vm.emailVerificationUrl).then(function (result) {
                 $scope.resetRegCaptcha();
                 vm.registerdEmail = $scope.formVals.email
@@ -106,14 +108,15 @@ module.exports = function(ngModule) {
                 } else {
                     vm.generalRegistrationError = true;
                 }
-                
+
                 console.log(error.statusText + (error.data && error.data.error ? ': ' + error.data.error + ' - ' + error.data.error_description : ''));
                 $scope.resetRegCaptcha();
                 vm.submittingForm = false;
                 $location.path("/");
             });
+            /* eslint-enable complexity */
         }
-        
+
         $scope.regResponse = null;
         $scope.regWidgetId = null;
         $scope.model = {

diff --git a/DOL.WHD.Section14c.Web/src/modules/services/validationService.js b/DOL.WHD.Section14c.Web/src/modules/services/validationService.js
@@ -108,6 +108,7 @@ module.exports = function(ngModule) {
             }
         }
 
+        /* eslint-disable complexity */
         this.checkRequiredNumber = function(propPath, msg, min, max) {
             let val = this.checkRequiredValue(propPath);
             if (isNumber(val)) {
@@ -126,6 +127,7 @@ module.exports = function(ngModule) {
             this.setValidationError(propPath, msg ? msg : "Please enter a valid numerical value");
             return undefined;
         }
+        /* eslint-enable complexity */
 
         this.checkRequiredMultipleChoice = function(propPath, msg) {
             return this.checkRequiredValue(propPath, msg ? msg : "Please select a value");
@@ -185,6 +187,7 @@ module.exports = function(ngModule) {
 
 
         // methods for validating each section (primarily used internally)
+
         this.validateAssurances = function() {
             section = "__assurances";
 
@@ -194,6 +197,7 @@ module.exports = function(ngModule) {
             this.checkRequiredDateComponent("signature.date", "Please enter today's date");
         }
 
+        /* eslint-disable complexity */
         this.validateAppInfo = function() {
             section = "__appinfo";
 
@@ -467,6 +471,8 @@ module.exports = function(ngModule) {
             section = undefined;
         }
 
+        /* eslint-enable complexity */
+
         this.validateWIOA = function() {
             section = "__wioa";