-
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.js b/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.js
index d31fd49..cad3873 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.js
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.js
@@ -54,7 +54,8 @@ var SetupTestAccountComponent = (function () {
'minLength': 'Password must be 8 characters long.'
},
'emailId': {
- 'required': 'EmailId is required.'
+ 'required': 'EmailId is required.',
+ 'pattern': 'Email pattern is not valid.'
},
'accountType': {
'required': 'AccountType is required.'
@@ -75,7 +76,8 @@ var SetupTestAccountComponent = (function () {
'required': 'City is required.'
},
'zip': {
- 'required': 'Zip code is required.'
+ 'required': 'Zip code is required.',
+ 'pattern': 'Only 5 digited numbers (US zip) are allowed.'
},
'state': {
'required': 'State is required.'
@@ -84,7 +86,8 @@ var SetupTestAccountComponent = (function () {
'required': 'Country is required.'
},
'phone': {
- 'required': 'Phone is required.'
+ 'required': 'Phone is required.',
+ 'pattern': 'Not a valid US pattern.'
}
};
}
@@ -142,17 +145,17 @@ var SetupTestAccountComponent = (function () {
'licenseeLastName': ['', [forms_1.Validators.required]],
'username': ['', [forms_1.Validators.required, forms_1.Validators.minLength(8)]],
'password': ['', [forms_1.Validators.required, forms_1.Validators.minLength(8)]],
- 'emailId': ['', [forms_1.Validators.required, forms_1.Validators.pattern(/^[a-z0-9!#$%&' * +\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i)]],
+ 'emailId': ['', forms_1.Validators.compose([forms_1.Validators.required, forms_1.Validators.pattern(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/)])],
'accountType': ['', [forms_1.Validators.required]],
'edition': ['', [forms_1.Validators.required]],
'subscriptionStartDate': ['', [forms_1.Validators.required]],
'subscriptionEndDate': ['', [forms_1.Validators.required]],
'address': ['', [forms_1.Validators.required]],
'city': ['', [forms_1.Validators.required]],
- 'zip': ['', [forms_1.Validators.required]],
+ 'zip': ['', forms_1.Validators.compose([(forms_1.Validators.required, forms_1.Validators.pattern(/^\d{5}$/))])],
'state': ['', [forms_1.Validators.required]],
'country': ['', [forms_1.Validators.required]],
- 'phone': ['', [forms_1.Validators.required]]
+ 'phone': ['', forms_1.Validators.compose([(forms_1.Validators.required, forms_1.Validators.pattern(/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/))])]
});
this.testAccountForm.valueChanges
.subscribe(function (data) { return _this.onValueChanged(data); });
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.js.map b/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.js.map
index c2205be..c313542 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.js.map
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"setup-test-account.component.js","sourceRoot":"","sources":["setup-test-account.component.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"setup-test-account.component.js","sourceRoot":"","sources":["setup-test-account.component.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.ts b/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.ts
index 404e993..064e6ce 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.ts
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/setup-test-account.component.ts
@@ -19,40 +19,40 @@ export class SetupTestAccountComponent implements AfterViewInit, OnInit {
ngAfterViewInit(): void {
this.initializeUIElements();
- jQuery(function () {
- jQuery('#datetimepicker1, #datetimepicker2').datetimepicker({
- //language: 'pt-BR'
- });
+ jQuery(function () {
+ jQuery('#datetimepicker1, #datetimepicker2').datetimepicker({
+ //language: 'pt-BR'
+ });
});
- jQuery(function () {
- jQuery('#fixed_hdr2').fxdHdrCol({
- fixedCols: 0,
- width: "100%",
- height: 200,
- colModal: [
- { width: 180, align: 'center' },
- { width: 230, align: 'center' },
- { width: 150, align: 'Center' },
- { width: 150, align: 'Center' },
- { width: 350, align: 'Center' },
- { width: 500, align: 'Center' },
- { width: 130, align: 'Center' },
- { width: 120, align: 'center' },
- { width: 280, align: 'Center' },
- { width: 180, align: 'center' },
- { width: 200, align: 'center' },
- { width: 170, align: 'center' },
- { width: 80, align: 'center' },
- { width: 150, align: 'center' },
- { width: 150, align: 'center' },
- { width: 180, align: 'Center' },
- { width: 400, align: 'Center' },
- { width: 150, align: 'center' },
- { width: 110, align: 'center' },
- ],
- sort: true
- });
+ jQuery(function () {
+ jQuery('#fixed_hdr2').fxdHdrCol({
+ fixedCols: 0,
+ width: "100%",
+ height: 200,
+ colModal: [
+ { width: 180, align: 'center' },
+ { width: 230, align: 'center' },
+ { width: 150, align: 'Center' },
+ { width: 150, align: 'Center' },
+ { width: 350, align: 'Center' },
+ { width: 500, align: 'Center' },
+ { width: 130, align: 'Center' },
+ { width: 120, align: 'center' },
+ { width: 280, align: 'Center' },
+ { width: 180, align: 'center' },
+ { width: 200, align: 'center' },
+ { width: 170, align: 'center' },
+ { width: 80, align: 'center' },
+ { width: 150, align: 'center' },
+ { width: 150, align: 'center' },
+ { width: 180, align: 'Center' },
+ { width: 400, align: 'Center' },
+ { width: 150, align: 'center' },
+ { width: 110, align: 'center' },
+ ],
+ sort: true
+ });
});
}
@@ -80,17 +80,17 @@ export class SetupTestAccountComponent implements AfterViewInit, OnInit {
'licenseeLastName': ['', [Validators.required]],
'username': ['', [Validators.required, Validators.minLength(8)]],
'password': ['', [Validators.required, Validators.minLength(8)]],
- 'emailId': ['', [Validators.required, Validators.pattern(/^[a-z0-9!#$%&' * +\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i)]],
+ 'emailId': ['', Validators.compose([Validators.required, Validators.pattern(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/)])],
'accountType': ['', [Validators.required]],
'edition': ['', [Validators.required]],
'subscriptionStartDate': ['', [Validators.required]],
'subscriptionEndDate': ['', [Validators.required]],
'address': ['', [Validators.required]],
'city': ['', [Validators.required]],
- 'zip': ['', [Validators.required]],
+ 'zip': ['', Validators.compose([(Validators.required, Validators.pattern(/^\d{5}$/))])],
'state': ['', [Validators.required]],
'country': ['', [Validators.required]],
- 'phone': ['', [Validators.required]]
+ 'phone': ['', Validators.compose([(Validators.required, Validators.pattern(/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/))])]
});
this.testAccountForm.valueChanges
@@ -155,7 +155,8 @@ export class SetupTestAccountComponent implements AfterViewInit, OnInit {
'minLength': 'Password must be 8 characters long.'
},
'emailId': {
- 'required': 'EmailId is required.'
+ 'required': 'EmailId is required.',
+ 'pattern': 'Email pattern is not valid.'
},
'accountType': {
'required': 'AccountType is required.'
@@ -176,7 +177,8 @@ export class SetupTestAccountComponent implements AfterViewInit, OnInit {
'required': 'City is required.'
},
'zip': {
- 'required': 'Zip code is required.'
+ 'required': 'Zip code is required.',
+ 'pattern': 'Only 5 digited numbers (US zip) are allowed.'
},
'state': {
'required': 'State is required.'
@@ -185,7 +187,8 @@ export class SetupTestAccountComponent implements AfterViewInit, OnInit {
'required': 'Country is required.'
},
'phone': {
- 'required': 'Phone is required.'
+ 'required': 'Phone is required.',
+ 'pattern': 'Not a valid US pattern.'
}
- }
+ };
}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.js b/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.js
index 4709c2a..6efcbee 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.js
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.js
@@ -35,7 +35,8 @@ var UpdateProfileComponent = (function () {
'required': 'Last name is required.'
},
'email': {
- 'required': 'Email is required.'
+ 'required': 'Email is required.',
+ 'pattern': 'Email pattern is not valid.'
}
};
}
@@ -73,7 +74,7 @@ var UpdateProfileComponent = (function () {
this.updateProfileForm = this.fb.group({
'firstName': ['', [forms_1.Validators.required]],
'lastName': ['', [forms_1.Validators.required]],
- 'email': ['', [forms_1.Validators.required, forms_1.Validators.pattern(/^[a-z0-9!#$%&' * +\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i)]]
+ 'email': ['', forms_1.Validators.compose([forms_1.Validators.required, forms_1.Validators.pattern(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/)])],
});
this.updateProfileForm.valueChanges
.subscribe(function (data) { return _this.onValueChanged(data); });
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.js.map b/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.js.map
index e302d86..07ac6e5 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.js.map
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"update-profile.component.js","sourceRoot":"","sources":["update-profile.component.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,qBAAiD,eAAe,CAAC,CAAA;AACjE,uBAAuB,iBAAiB,CAAC,CAAA;AACzC,oCAAmC,iCAAiC,CAAC,CAAA;AACrE,sBAAmD,gBAAgB,CAAC,CAAA;AAOpE;IAII,gCAAgC;IAChC,mCAAmC;IACnC,kCAAkC;IAClC,8BAA8B;IAC9B,KAAK;IAEL,gCAAoB,WAA+B,EAAU,MAAc,EAAU,EAAe;QAAhF,gBAAW,GAAX,WAAW,CAAoB;QAAU,WAAM,GAAN,MAAM,CAAQ;QAAU,OAAE,GAAF,EAAE,CAAa;QA0EpG,eAAU,GAAG;YACT,WAAW,EAAE,EAAE;YACf,UAAU,EAAE,EAAE;YACd,OAAO,EAAE,EAAE;SACd,CAAC;QAEF,uBAAkB,GAAG;YACjB,WAAW,EAAE;gBACT,UAAU,EAAE,yBAAyB;aACxC;YACD,UAAU,EAAE;gBACR,UAAU,EAAE,wBAAwB;aACvC;YACD,OAAO,EAAE;gBACL,UAAU,EAAE,oBAAoB;aACnC;SACJ,CAAA;IAxFD,CAAC;IAED,gDAAe,GAAf;QACI,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAE5B,sBAAsB;QACtB,4CAA4C;QAC5C,uBAAuB;QACvB,iBAAiB;QACjB,kBAAkB;QAClB,oBAAoB;QACpB,uCAAuC;QACvC,gDAAgD;QAChD,WAAW;QACX,SAAS;QACT,4EAA4E;QAE5E,KAAK;QAEL,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC;YACvB,MAAM,EAAE,eAAe;SAC1B,CAAC,CAAC;IACP,CAAC;IAED,qDAAoB,GAApB;IAIA,CAAC;IAED,yCAAQ,GAAR;QACI;;WAEG;QACH,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACnC,CAAC;IAED,0CAAS,GAAT,UAAU,EAAU;QAChB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,wDAAuB,GAAvB;QAAA,iBAWC;QAVG,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;YACnC,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAU,CAAC,QAAQ,CAAC,CAAC;YACxC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAU,CAAC,QAAQ,CAAC,CAAC;YACvC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAU,CAAC,QAAQ,EAAE,kBAAU,CAAC,OAAO,CAAC,qGAAqG,CAAC,CAAC,CAAC;SAClK,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,CAAC,YAAY;aAC9B,SAAS,CAAC,UAAA,IAAI,IAAI,OAAA,KAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAzB,CAAyB,CAAC,CAAC;QAElD,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,kCAAkC;IAC7D,CAAC;IAED,+CAAc,GAAd,UAAe,IAAU;QACrB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;YAAC,MAAM,CAAC;QAAC,CAAC;QACxC,IAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAEpC,GAAG,CAAC,CAAC,IAAM,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAClC,wCAAwC;YACxC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YAC5B,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEhC,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC7C,IAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAChD,GAAG,CAAC,CAAC,IAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;oBAC/B,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;gBAClD,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IArFL;QAAC,gBAAS,CAAC;YACP,WAAW,EAAE,gDAAgD;SAChE,CAAC;;8BAAA;IAsGF,6BAAC;AAAD,CAAC,AArGD,IAqGC;AArGY,8BAAsB,yBAqGlC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"update-profile.component.js","sourceRoot":"","sources":["update-profile.component.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.ts b/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.ts
index 874e4f7..1c0643d 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.ts
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/update-profile.component.ts
@@ -65,7 +65,7 @@ export class UpdateProfileComponent implements AfterViewInit, OnInit {
this.updateProfileForm = this.fb.group({
'firstName': ['', [Validators.required]],
'lastName': ['', [Validators.required]],
- 'email': ['', [Validators.required, Validators.pattern(/^[a-z0-9!#$%&' * +\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i)]]
+ 'email': ['', Validators.compose([Validators.required, Validators.pattern(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/)])],
});
this.updateProfileForm.valueChanges
@@ -106,7 +106,8 @@ export class UpdateProfileComponent implements AfterViewInit, OnInit {
'required': 'Last name is required.'
},
'email': {
- 'required': 'Email is required.'
+ 'required': 'Email is required.',
+ 'pattern': 'Email pattern is not valid.'
}
}
}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.js b/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.js
index 00c4e71..dd8f066 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.js
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.js
@@ -13,31 +13,30 @@ var router_1 = require('@angular/router');
var application_service_1 = require('../services/application.service');
var forms_1 = require('@angular/forms');
var ViewUpdateProfileComponent = (function () {
+ //viewUpdateProfileForm = new FormGroup({
+ // licenseeFirstName: new FormControl(),
+ // licenseeLastName: new FormControl(),
+ // institutionName: new FormControl(),
+ // address: new FormControl(),
+ // city: new FormControl(),
+ // state: new FormControl(),
+ // country: new FormControl(),
+ // zip: new FormControl(),
+ // phone: new FormControl(),
+ // email: new FormControl(),
+ // subscriptionStartDate: new FormControl(),
+ // subscriptionEndDate: new FormControl(),
+ // subscriptionPrice: new FormControl(),
+ // exportImages: new FormControl(),
+ // userName1: new FormControl(),
+ // password: new FormControl(),
+ // securityQuestion: new FormControl(),
+ // answer: new FormControl()
+ //});
function ViewUpdateProfileComponent(application, router, fb) {
this.application = application;
this.router = router;
this.fb = fb;
- //viewUpdateProfileForm: FormGroup;
- this.viewUpdateProfileForm = new forms_1.FormGroup({
- licenseeFirstName: new forms_1.FormControl(),
- licenseeLastName: new forms_1.FormControl(),
- institutionName: new forms_1.FormControl(),
- address: new forms_1.FormControl(),
- city: new forms_1.FormControl(),
- state: new forms_1.FormControl(),
- country: new forms_1.FormControl(),
- zip: new forms_1.FormControl(),
- phone: new forms_1.FormControl(),
- email: new forms_1.FormControl(),
- subscriptionStartDate: new forms_1.FormControl(),
- subscriptionEndDate: new forms_1.FormControl(),
- subscriptionPrice: new forms_1.FormControl(),
- exportImages: new forms_1.FormControl(),
- userName1: new forms_1.FormControl(),
- password: new forms_1.FormControl(),
- securityQuestion: new forms_1.FormControl(),
- answer: new forms_1.FormControl()
- });
this.formErrors = {
'licenseeFirstName': '',
'licenseeLastName': '',
@@ -62,7 +61,8 @@ var ViewUpdateProfileComponent = (function () {
'required': 'InstitutionName is required.'
},
'emailId': {
- 'required': 'EmailId is required.'
+ 'required': 'EmailId is required.',
+ 'pattern': 'Email pattern is not valid.'
},
'address1': {
'required': 'Address1 is required.'
@@ -74,7 +74,8 @@ var ViewUpdateProfileComponent = (function () {
'required': 'City is required.'
},
'zip': {
- 'required': 'Zip code is required.'
+ 'required': 'Zip code is required.',
+ 'pattern': 'Only 5 digited numbers (US zip) are allowed.'
},
'state': {
'required': 'State is required.'
@@ -83,7 +84,8 @@ var ViewUpdateProfileComponent = (function () {
'required': 'Country name is required.'
},
'phone': {
- 'required': 'Phone number is required.'
+ 'required': 'Phone number is required.',
+ 'pattern': 'Not a valid US pattern.'
}
};
}
@@ -143,10 +145,10 @@ var ViewUpdateProfileComponent = (function () {
'address1': ['', [forms_1.Validators.required]],
'address2': ['', [forms_1.Validators.required]],
'city': ['', [forms_1.Validators.required]],
- 'zip': ['', [forms_1.Validators.required]],
+ 'zip': ['', forms_1.Validators.compose([(forms_1.Validators.required, forms_1.Validators.pattern(/^\d{5}$/))])],
'state': ['', [forms_1.Validators.required]],
'country': ['', [forms_1.Validators.required]],
- 'phone': ['', [forms_1.Validators.required]] //, Validators.pattern()
+ 'phone': ['', forms_1.Validators.compose([(forms_1.Validators.required, forms_1.Validators.pattern(/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/))])]
});
this.viewUpdateProfileForm.valueChanges
.subscribe(function (data) { return _this.onValueChanged(data); });
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.js.map b/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.js.map
index 0e17ecf..f7c8ee7 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.js.map
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"view-update-profile.component.js","sourceRoot":"","sources":["view-update-profile.component.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"view-update-profile.component.js","sourceRoot":"","sources":["view-update-profile.component.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.ts b/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.ts
index ae76407..861a225 100644
--- a/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.ts
+++ b/400-SOURCECODE/AIAHTML5.Admin/app/components/view-update-profile.component.ts
@@ -9,28 +9,28 @@ declare var jQuery: any;
templateUrl: './app/components/view-update-profile.component.html'
})
export class ViewUpdateProfileComponent implements AfterViewInit, OnInit {
- //viewUpdateProfileForm: FormGroup;
-
- viewUpdateProfileForm = new FormGroup({
- licenseeFirstName: new FormControl(),
- licenseeLastName: new FormControl(),
- institutionName: new FormControl(),
- address: new FormControl(),
- city: new FormControl(),
- state: new FormControl(),
- country: new FormControl(),
- zip: new FormControl(),
- phone: new FormControl(),
- email: new FormControl(),
- subscriptionStartDate: new FormControl(),
- subscriptionEndDate: new FormControl(),
- subscriptionPrice: new FormControl(),
- exportImages: new FormControl(),
- userName1: new FormControl(),
- password: new FormControl(),
- securityQuestion: new FormControl(),
- answer: new FormControl()
- });
+ viewUpdateProfileForm: FormGroup;
+
+ //viewUpdateProfileForm = new FormGroup({
+ // licenseeFirstName: new FormControl(),
+ // licenseeLastName: new FormControl(),
+ // institutionName: new FormControl(),
+ // address: new FormControl(),
+ // city: new FormControl(),
+ // state: new FormControl(),
+ // country: new FormControl(),
+ // zip: new FormControl(),
+ // phone: new FormControl(),
+ // email: new FormControl(),
+ // subscriptionStartDate: new FormControl(),
+ // subscriptionEndDate: new FormControl(),
+ // subscriptionPrice: new FormControl(),
+ // exportImages: new FormControl(),
+ // userName1: new FormControl(),
+ // password: new FormControl(),
+ // securityQuestion: new FormControl(),
+ // answer: new FormControl()
+ //});
constructor(private application: ApplicationService, private router: Router, private fb: FormBuilder) {
@@ -102,10 +102,10 @@ export class ViewUpdateProfileComponent implements AfterViewInit, OnInit {
'address1': ['', [Validators.required]],
'address2': ['', [Validators.required]],
'city': ['', [Validators.required]],
- 'zip': ['', [Validators.required]],//, Validators.pattern(), Validators.pattern()
+ 'zip': ['', Validators.compose([(Validators.required, Validators.pattern(/^\d{5}$/))])],
'state': ['', [Validators.required]],
'country': ['', [Validators.required]],
- 'phone': ['', [Validators.required]] //, Validators.pattern()
+ 'phone': ['', Validators.compose([(Validators.required, Validators.pattern(/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/))])]
});
this.viewUpdateProfileForm.valueChanges
@@ -157,7 +157,8 @@ export class ViewUpdateProfileComponent implements AfterViewInit, OnInit {
'required': 'InstitutionName is required.'
},
'emailId': {
- 'required': 'EmailId is required.'
+ 'required': 'EmailId is required.',
+ 'pattern': 'Email pattern is not valid.'
},
'address1': {
'required': 'Address1 is required.'
@@ -169,7 +170,8 @@ export class ViewUpdateProfileComponent implements AfterViewInit, OnInit {
'required': 'City is required.'
},
'zip': {
- 'required': 'Zip code is required.'
+ 'required': 'Zip code is required.',
+ 'pattern': 'Only 5 digited numbers (US zip) are allowed.'
},
'state': {
'required': 'State is required.'
@@ -178,7 +180,8 @@ export class ViewUpdateProfileComponent implements AfterViewInit, OnInit {
'required': 'Country name is required.'
},
'phone': {
- 'required': 'Phone number is required.'
+ 'required': 'Phone number is required.',
+ 'pattern': 'Not a valid US pattern.'
}
- }
+ };
}
\ No newline at end of file