Skip to content

adds international masking / validation to old forms #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

adds international masking / validation to old forms #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions projects/em2m/surveyor/src/lib/ui/form/plugins/form-services/masks/surveyor-masks.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export class SurveyorMasks {
newModelVal = newModelVal.substring(0, newModelVal.length - 1);
}

if (newModelVal.length > 10) {
newModelVal = newModelVal.substring(0, 10);
if (newModelVal.length > 15) {
newModelVal = newModelVal.substring(0, 15);
}

return newModelVal;
Expand All @@ -36,8 +36,13 @@ export class SurveyorMasks {
newVal = value.replace(/^(\d{0,3})/, '($1)');
} else if (value.length <= 6) {
newVal = value.replace(/^(\d{0,3})(\d{0,3})/, '($1) $2');
} else {
} else if (value.length <= 10) {
newVal = value.replace(/^(\d{0,3})(\d{0,3})(.*)/, '($1) $2-$3');
} else {
const countryCodeLength = value.length - 10;
const countryCode = value.substring(0, countryCodeLength);
const remaining = value.substring(countryCodeLength);
newVal = '+' + countryCode + ' ' + remaining.replace(/^(\d{0,3})(\d{0,3})(.*)/, '($1) $2-$3');
}
return newVal;
}
Expand Down
2 changes: 1 addition & 1 deletion .../surveyor/src/lib/ui/form/plugins/form-services/validators/surveyor-validators.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class SurveyorValidators {

static isValidPhoneFormat(c: AbstractControl) {
const temp = (c.value || '').replace(/\D/g, '');
if (temp.length === 10 || temp.length === 0) {
if (temp.length === 0 || (temp.length >= 10 && temp.length <= 15)) {
return null;
} else {
return { invalidPhoneNumber: true };
Expand Down