pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #381 from dod-ccpo/edit-pe-number-#160627814

Browse Source 
Edit pe number #160627814
This commit is contained in:
leigh-mil 2018-10-12 11:43:25 -04:00 committed by GitHub
commit 029941e9c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/lib/input_validations.js
View File

@ -54,12 +54,8 @@ export default {
validationError: 'Please enter a 10-digit DoD ID number' validationError: 'Please enter a 10-digit DoD ID number'
}, },
peNumber: { peNumber: {
mask: val => { mask: false,
if (val.length <= 7) return [/\d/,/\d/,/\d/,/\d/,/\d/,/\d/,/\d/,/[a-z,A-Z]/] match: /(0\d)(0\d)(\d{3})([a-z,A-Z]{1,3})/,
if (val.length === 8) return [/\d/,/\d/,/\d/,/\d/,/\d/,/\d/,/\d/,/[a-z,A-Z]/,/[a-z,A-Z]/]
return [/\d/,/\d/,/\d/,/\d/,/\d/,/\d/,/\d/,/[a-z,A-Z]/,/[a-z,A-Z]/,/[a-z,A-Z]/]
},
match: /(0\d)(0\d)(\d)(\d{2})([a-z,A-Z]{1,3})/,
unmask: ['_'], unmask: ['_'],
validationError: 'Please enter a valid PE number. Note that it should be 7 digits followed by 1-3 letters, and should have a zero as the first and third digits.' validationError: 'Please enter a valid PE number. Note that it should be 7 digits followed by 1-3 letters, and should have a zero as the first and third digits.'
}, },
@ -70,11 +66,7 @@ export default {
validationError: 'Please enter a valid Program Treasury Code. Note that it should be a four digit or six digit number, optionally prefixed by one or more zeros.' validationError: 'Please enter a valid Program Treasury Code. Note that it should be a four digit or six digit number, optionally prefixed by one or more zeros.'
}, },
baCode: { baCode: {
mask: val => { mask: false,
if (val.length === 1) return [/\d/]
if (val.length === 2) return [/\d/, /\d/]
return [/\d/,/\d/,/[a-z,A-Z]/]
},
match: /[0-9]{2}\w?$/, match: /[0-9]{2}\w?$/,
unmask: [], unmask: [],
validationError: 'Please enter a valid BA Code. Note that it should be two digits, followed by an optional letter.' validationError: 'Please enter a valid BA Code. Note that it should be two digits, followed by an optional letter.'