Account Number
@@ -652,24 +665,24 @@ function onlyAlphabets(evt) {
Bank Branch Name
-
-
-
+
+
-
+
@@ -748,163 +761,167 @@ function onlyAlphabets(evt) {
function Validate()
{
if($("#FirstName").val().length < 1)
- {
- alert('Please Enter FirstName');
+ {
+ alert('Please Enter FirstName');
$("#FirstName").focus();
- return false;
- }
- if($("#LastName").val().length < 1)
- {
- alert('Please Enter LastName');
- return false;
- }
- if($("#FatherName").val().length < 1)
- {
- alert('Please Enter FatherName');
- return false;
- }
- if($("#DateofBirth").val().length < 1)
- {
- alert('Please Enter Date of Birth');
- return false;
- }
- if ( $('#ContactNumber').val().length < 1 )
- {
- alert('Please Enter Contact Number');
- return false;
- }
- else if(!getMobileValidation())
- { return false; }
-
-
-
-
- if($("#emailid").val().length < 1)
- {
- alert('Please Enter Personal Email ID');
- return false;
- }
- else if(!validateEmail())
- {
- return;
- }
-
- if($("#mail").val().length < 1)
- {
- alert('Please Enter Company Email ID');
- return false;
- }
- else if(!validatecomEmail())
- {
- return;
- }
-
- if($("option:selected", $("#gender")).val() == '-1')
- {
- alert('Please Select Gender');
+ return false;
+ }
+ if($("#LastName").val().length < 1)
+ {
+ alert('Please Enter LastName');
+ return false;
+ }
+ if($("#FatherName").val().length < 1)
+ {
+ alert('Please Enter FatherName');
+ return false;
+ }
+ if($("#DateofBirth").val().length < 1)
+ {
+ alert('Please Enter Date of Birth');
+ return false;
+ }
+ if ( $('#ContactNumber').val().length < 1 )
+ {
+ alert('Please Enter Contact Number');
+ return false;
+ }
+ else if(!getMobileValidation())
+ { return false; }
+
+
+
+
+ if($("#emailid").val().length < 1)
+ {
+ alert('Please Enter Personal Email ID');
+ return false;
+ }
+ else if(!validateEmail())
+ {
+ return;
+ }
+
+ if($("#mail").val().length < 1)
+ {
+ alert('Please Enter Company Email ID');
+ return false;
+ }
+ else if(!validatecomEmail())
+ {
+ return;
+ }
+
+ if($("option:selected", $("#gender")).val() == '-1')
+ {
+ alert('Please Select Gender');
$('#gender').focus();
- return false;
- }
-
- if($("option:selected", $("#MartialStatus")).val() == "-1")
- {
- alert('Please Select Martial Status');
+ return false;
+ }
+
+ if($("option:selected", $("#MartialStatus")).val() == "-1")
+ {
+ alert('Please Select Martial Status');
$('#MartialStatus').focus();
- return false;
- }
-
- if($("option:selected", $("#bloodgroup")).val() == "-1")
- {
- alert('Please Select Blood group ');
+ return false;
+ }
+
+ if($("option:selected", $("#bloodgroup")).val() == "-1")
+ {
+ alert('Please Select Blood group ');
$("#bloodgroup").focus();
- return false;
- }
- if($("#currentaddress").val().length < 1)
- {
- alert('Please Enter Current Address');
- return false;
- }
- if($("#permanentaddress").val().length < 1)
- {
- alert('Please Enter Permanent Address');
- return false;
- }
- if($("#emergencycontactname").val().length < 1)
- {
- alert('Please Enter Emergency Contact Name');
- return false;
- }
- if($("#emergencycontactnumber").val().length < 1)
- {
- alert('Please Enter Emergency Contact Number');
- return false;
- }
- else if(!getValidEmergencyNumber())
- { return false;}
-
-
- if($("option:selected", $("#desigination")).val() == "-1")
- {
- alert('Please Select Desigination ');
+ return false;
+ }
+ if($("#currentaddress").val().length < 1)
+ {
+ alert('Please Enter Current Address');
+ return false;
+ }
+ if($("#permanentaddress").val().length < 1)
+ {
+ alert('Please Enter Permanent Address');
+ return false;
+ }
+ if($("#emergencycontactname").val().length < 1)
+ {
+ alert('Please Enter Emergency Contact Name');
+ return false;
+ }
+ if($("#emergencycontactnumber").val().length < 1)
+ {
+ alert('Please Enter Emergency Contact Number');
+ return false;
+ }
+ else if(!getValidEmergencyNumber())
+ { return false;}
+
+
+ if($("option:selected", $("#desigination")).val() == "-1")
+ {
+ alert('Please Select Desigination ');
$("#desigination").focus();
- return false;
- }
- if($("option:selected", $("#departmentname")).val() == "-1")
- {
- alert('Please Select Department name');
+ return false;
+ }
+ if($("option:selected", $("#departmentname")).val() == "-1")
+ {
+ alert('Please Select Department name');
$("#departmentname").focus();
- return false;
- }
- if($("option:selected", $("#eduqualifaction")).val() == "-1")
- {
- alert('Please Select Qualification');
+ return false;
+ }
+ if($("option:selected", $("#eduqualifaction")).val() == "-1")
+ {
+ alert('Please Select Qualification');
$("#eduqualifaction").focus();
- return false;
- }
-
- if($("#referrercontno").val().length > 0)
- {
- getValidReferNumber();
- }
-
- if($("#passportno").val().length > 1)
- {
- ValidatePassport();
-
- }
-
-
+ return false;
+ }
+
+ if($("#referrercontno").val().length > 0)
+ {
+ getValidReferNumber();
+ }
+
+ if($("#passportno").val().length > 1)
+ {
+ ValidatePassport();
+
+ }
+
+
}
$("#emailid").change(function () {
var id = $('#emailid').val();
- if(validateEmail())
- {
- $.ajax({
- data:{id:id},
-
- type:"POST",
- url:"employeedetails/CheckEmail",
- success:function(data) {
- if(data)
- {
-
- var answer = confirm(data+""+" Employee already exists in the database.Do you want to change the Email id ?")
- if (answer) {
- $('#emailid').val('');
- $('#emailid').focus();
- }
- else
- {
- window.location = 'employeedetails/employeeListing';
- }
-
- }
-
- }
-
- });
- }
+ if(validateEmail())
+ {
+ $.ajax({
+ data:{id:id},
+
+ type:"POST",
+ url:"employeedetails/CheckEmail",
+ success:function(data) {
+ if(data)
+ {
+ // alert(data+""+" Employee already exists in the database.Please Change the Email id")
+ // $('#emailid').val('');
+ // $('#emailid').focus();
+
+ var answer = confirm(data+""+" Employee already exists in the database.Do you want to change the Email id ?")
+ if (answer) {
+ $('#emailid').val('');
+ $('#emailid').focus();
+ }
+ else
+ {
+ alert('please edit the emailid in the edit employee screen');
+ window.location = 'employeedetails/employeeListing';
+ }
+
+ }
+
+ }
+
+ });
+ }
});
@@ -921,6 +938,9 @@ function Validate()
success:function(data) {
if(data)
{
+ // alert( data+""+" Employee already exists in the database.Please Change the Pan Card Number");
+ // $('#panno').val('');
+ // $('#panno').focus();
var answer = confirm(data + " " +" Employee details is already exists in the database.Do you want to change the Employee details?")
if (answer)
@@ -931,7 +951,8 @@ function Validate()
}
else
{
- window.location = 'employeedetails/employeeListing';
+ alert('please edit the PAN number in the Edit employee screen');
+ window.location = 'employeedetails/employeeListing';
}
}
@@ -941,13 +962,14 @@ function Validate()
}
else
{
+ //alert();
alert('Please enter the PAN Number');
$('#panno').focus();
return false;
}
});
-
+ //
$('#aadharno').change(function() {
var id = $('#aadharno').val();
@@ -955,35 +977,42 @@ function Validate()
{
$.ajax({
data:{id:id},
+
type:"POST",
url:"employeedetails/checkAadharNo",
success:function(data) {
- if(data)
+ if(data)
{
+ // alert( data+""+" Employee already exists in the database.Please Change the Aadhar card Number");
+ // $('#aadharno').val('');
+ // $('#aadharno').focus();
- var answer = confirm(data + " " +" employee details is already exists in the database.Do you want to change the Employee details?")
+ var answer = confirm(data + " " +" employee details is already exists in the database.Do you want to change the Employee details?")
if (answer)
{
$('#aadharno').val('');
$('#aadharno').focus();
return false;
- }
- else
+ }
+ else
{
+ alert('please edit the aadhar number in the edit employee screen');
window.location = 'employeedetails/employeeListing';
}
- }
+ }
}
});
}
else
{
+ //alert();
alert('Please enter the Aadhar Number');
- $('#aadharno').focus();
+ $('#aadharno').focus();
return false;
}
});
+
\ No newline at end of file
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index 78053a20..291ee57a 100755
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -40,11 +40,11 @@ function alpha(e) {
return false;
}
}
-
+//charCode <= 31 && charCode != 32 && charCode => 33
function isNumberKey(evt)
{
var charCode = (evt.which) ? evt.which : evt.keyCode;
- if (charCode != 46 && charCode > 31
+ if (charCode != 46 && charCode != 32 && charCode >= 33
&& (charCode < 48 || charCode > 57))
return false;
@@ -340,11 +340,11 @@ $(function() {
Contact Number*
-
+
Alternate Contact Number
-
+
@@ -380,7 +380,7 @@ $(function() {
PAN
-
+
TIN*
@@ -388,7 +388,7 @@ $(function() {
UA Number
-
+
@@ -398,15 +398,15 @@ $(function() {
- CST Number
-
+ CST Number
+
CST Registration Date
GST Number*
-
+
GST Range
@@ -453,7 +453,7 @@ $(function() {
IFSC Code
-
+
Bank Branch Name
@@ -662,7 +662,7 @@ if(!validateEmail())
}
else
{
- alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
+ alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
window.location = 'supplier/supplierListing';
}
diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php
index 62401845..670b5026 100755
--- a/application/views/editEmployee.php
+++ b/application/views/editEmployee.php
@@ -164,7 +164,7 @@ $(function(){
function isNumberKey(evt)
{
var charCode = (evt.which) ? evt.which : evt.keyCode;
- if (charCode != 46 && charCode > 31
+ if (charCode != 46 && charCode != 32 && charCode >= 33
&& (charCode < 48 || charCode > 57))
return false;
@@ -205,24 +205,27 @@ function validatePAN() {
}
+
function ValidateAadhar(){
//alert('validation entered');
- var reg = /^\d{12}$/
+ var reg = /^\d{4}\s\d{4}\s\d{4}$/
var aadhar = $('#aadharno').val();
var aadhar_count = $('#aadharno').val().length;
- if(aadhar != '' && aadhar_count != '')
+ if(aadhar != '' )// && aadhar_count != '')
{
//alert('this is aadhar :'+aadhar);
- if(aadhar_count < 12)
- {
- //alert(aadhar1);
- alert('Aadhar card should be in 12 digits');
- }
- else if(reg.test(aadhar)== false)
+ // if(aadhar_count < 14)
+ // {
+ // //alert(aadhar1);
+ // alert('Aadhar card should be in 12 digits');
+ // }
+ // else
+ if(reg.test(aadhar)== false)
{
//alert('alskdjsakjf');
alert('Please Enter Valid Aadhar Number');
+ return (false);
}
else
{
@@ -230,12 +233,12 @@ function ValidateAadhar(){
return true;
}
}
- else
- {
+ //else
+ //{
//alert('aadhar is blank');
- alert('please Enter Aadhar number');
+ //alert('please Enter Aadhar number');
- }
+ //}
}
@@ -530,6 +533,9 @@ $(document).ready(function(){
// $("#desigination").select2();
// $("#departmentname").select2();
// $("#eduqualifaction").select2();
+ document.getElementById('aadharno').addEventListener('input', function (e) {
+ e.target.value = e.target.value.replace(/[^\d]/g, '').replace(/(.{4})/g, '$1 ').trim();
+ });
});
function onlyAlphabets(evt) {
@@ -609,7 +615,7 @@ function onlyAlphabets(evt) {
-
+
name="isactive" value="1"> IS ACTIVE
@@ -641,7 +647,7 @@ function onlyAlphabets(evt) {
Contact Number*
-
+
@@ -755,7 +761,7 @@ function onlyAlphabets(evt) {
Emergency Contact Number*
-
+
@@ -863,20 +869,20 @@ function onlyAlphabets(evt) {