From: Mark Date: Wed, 18 Jan 2017 12:36:22 +0000 (+0200) Subject: latest updates requested X-Git-Url: https://xp-dev.com/git/namibia/commitdiff_plain/6abb4229a12dfab10e8a3fcb64d3f905585bf972 latest updates requested --- diff --git a/module/User/src/User/DataBin/Profile.php b/module/User/src/User/DataBin/Profile.php index b4b7432..dc0039a 100644 --- a/module/User/src/User/DataBin/Profile.php +++ b/module/User/src/User/DataBin/Profile.php @@ -337,8 +337,8 @@ class Profile extends \Workspace\Service\DataBin 'email' => 'Email', 'firstName' => 'String100', 'familyName' => 'String100', - 'idNumber' => 'IdNumber', - 'dateOfBirth' => 'Date', +// 'idNumber' => 'IdNumber', +// 'dateOfBirth' => 'Date', 'mobile' => 'String20', 'permissions' => 'Id' ) diff --git a/public/js/app/admin-workspace/systemuserview.js b/public/js/app/admin-workspace/systemuserview.js index b167914..3db1f25 100644 --- a/public/js/app/admin-workspace/systemuserview.js +++ b/public/js/app/admin-workspace/systemuserview.js @@ -154,28 +154,28 @@ value : data.familyName ? data.familyName : '', maxlength : 100 }, - 'idNumber' : { - type : 'input', - id : 'idNumber', - title : 'ID Number', - value : data.idNumber ? data.idNumber : '', - maxlength : 13, - onChange : function() { - var dig = $(this).val().substring(0, 6); - $('#dateOfBirth').val( - '19' + dig.substring(0, 2) + - '-' + dig.substring(2, 4) + - '-' + dig.substring(4, 6) - ); - } - }, - 'dateOfBirth' : { - type : 'input', - id : 'dateOfBirth', - title : 'Date of birth', - style : 'datepicker', - value : data.dateOfBirth ? data.dateOfBirth : '' - }, + //'idNumber' : { + // type : 'input', + // id : 'idNumber', + // title : 'ID Number', + // value : data.idNumber ? data.idNumber : '', + // maxlength : 13, + // onChange : function() { + // var dig = $(this).val().substring(0, 6); + // $('#dateOfBirth').val( + // '19' + dig.substring(0, 2) + + // '-' + dig.substring(2, 4) + + // '-' + dig.substring(4, 6) + // ); + // } + //}, + //'dateOfBirth' : { + // type : 'input', + // id : 'dateOfBirth', + // title : 'Date of birth', + // style : 'datepicker', + // value : data.dateOfBirth ? data.dateOfBirth : '' + //}, 'mobile' : { type : 'mobile', id : 'mobile', @@ -265,8 +265,8 @@ "rules": { firstName: "required", familyName: "required", - idNumber: {required: true, minlength: 13, maxlength: 13, digits: true}, - dateOfBirth: {required: true, dateISO: true}, + //idNumber: {required: true, minlength: 13, maxlength: 13, digits: true}, + //dateOfBirth: {required: true, dateISO: true}, mobile: {required: true, mobile: true}, email: { required: true, @@ -296,13 +296,13 @@ email: { email: "Must be a valid email address." }, - idNumber: { - minlength: "Must be 13 digits.", - maxlength: "Must be 13 digits." - }, - dateOfBirth: { - dateISO: "Must be a valid date." - }, + //idNumber: { + // minlength: "Must be 13 digits.", + // maxlength: "Must be 13 digits." + //}, + //dateOfBirth: { + // dateISO: "Must be a valid date." + //}, permissions : "This field is required." }, submitHandler: function( form ) { diff --git a/public/js/app/portal-workspace/userview.js b/public/js/app/portal-workspace/userview.js index 0dd44e2..5836588 100644 --- a/public/js/app/portal-workspace/userview.js +++ b/public/js/app/portal-workspace/userview.js @@ -257,8 +257,8 @@ "rules": { firstName: "required", familyName: "required", - idNumber: {required: true, minlength: 13, maxlength: 13, digits: true}, - dateOfBirth: {required: true, dateISO: true}, + //idNumber: {required: true, minlength: 13, maxlength: 13, digits: true}, + //dateOfBirth: {required: true, dateISO: true}, mobile: {required: true, mobile: true}, email: { required: true, diff --git a/public/templates/page/registered.html b/public/templates/page/registered.html index dedafb6..181fa19 100644 --- a/public/templates/page/registered.html +++ b/public/templates/page/registered.html @@ -6,8 +6,7 @@ Thank you for registering. Your registration was submitted for approval and you will receive email confirmation once your account has been verified.Please note that if any documents were not uploaded - they need to be emailed (info@bid4cars.com.na) or faxed (086 618 5584) - before we can approve your account. + they need to be emailed (info@bid4cars.com.na) before we can approve your account.

diff --git a/public/templates/page/systemuserview.js b/public/templates/page/systemuserview.js index 2ff160a..d196e5f 100644 --- a/public/templates/page/systemuserview.js +++ b/public/templates/page/systemuserview.js @@ -5,8 +5,8 @@ var template_systemuserview = function( static ) company : new App.TemplateElement.FieldComponent('company'), firstName : new App.TemplateElement.FieldComponent('firstName'), familyName : new App.TemplateElement.FieldComponent('familyName'), - idNumber : new App.TemplateElement.FieldComponent('idNumber'), - dateOfBirth : new App.TemplateElement.FieldComponent('dateOfBirth'), + //idNumber : new App.TemplateElement.FieldComponent('idNumber'), + //dateOfBirth : new App.TemplateElement.FieldComponent('dateOfBirth'), mobile : new App.TemplateElement.FieldComponent('mobile'), email : new App.TemplateElement.FieldComponent('email'), manager : new App.TemplateElement.FieldComponent('manager'),