employee,asset and supplier validation and user screen and material master and report_cost center

This commit is contained in:
venbatechnologies@gmail.com 2017-09-01 18:32:26 +05:30
parent 8df7a5f7ea
commit e750712678
13 changed files with 898 additions and 827 deletions

View File

@ -467,8 +467,8 @@ class CostCenter extends BaseController
$this->excel->getActiveSheet()->setCellValue('H5', 'SERVICE'); $this->excel->getActiveSheet()->setCellValue('H5', 'SERVICE');
$this->excel->getActiveSheet()->setCellValue('I5', 'BudgetYear'); $this->excel->getActiveSheet()->setCellValue('I5', 'BudgetYear');
$this->excel->getActiveSheet()->setCellValue('J5', 'DepartmentName'); $this->excel->getActiveSheet()->setCellValue('J5', 'DepartmentName');
//$this->excel->getActiveSheet()->setCellValue('K5', 'IsActive'); $this->excel->getActiveSheet()->setCellValue('K5', 'IsActive');
$this->excel->getActiveSheet()->setCellValue('K5', 'Remarks'); //$this->excel->getActiveSheet()->setCellValue('K5', 'Remarks');
$this->excel->getActiveSheet()->setCellValue('L5', 'CreatedBy'); $this->excel->getActiveSheet()->setCellValue('L5', 'CreatedBy');
$this->excel->getActiveSheet()->setCellValue('M5', 'UpdatedBy'); $this->excel->getActiveSheet()->setCellValue('M5', 'UpdatedBy');
$this->excel->getActiveSheet()->setCellValue('N5', 'IsApproved'); $this->excel->getActiveSheet()->setCellValue('N5', 'IsApproved');
@ -532,8 +532,8 @@ class CostCenter extends BaseController
$this->excel->getActiveSheet()->setCellValue('H'. $i,$data['service']); $this->excel->getActiveSheet()->setCellValue('H'. $i,$data['service']);
$this->excel->getActiveSheet()->setCellValue('I'. $i,$data['BudgetYear']); $this->excel->getActiveSheet()->setCellValue('I'. $i,$data['BudgetYear']);
$this->excel->getActiveSheet()->setCellValue('J'. $i,$data['DepartmentName']); $this->excel->getActiveSheet()->setCellValue('J'. $i,$data['DepartmentName']);
//$this->excel->getActiveSheet()->setCellValue('K'. $i,$data['IsActive']); $this->excel->getActiveSheet()->setCellValue('K'. $i,$data['IsActive']);
$this->excel->getActiveSheet()->setCellValue('K'. $i,$data['Remarks']); //$this->excel->getActiveSheet()->setCellValue('K'. $i,$data['Remarks']);
$this->excel->getActiveSheet()->setCellValue('L'. $i,$data['firstname']); $this->excel->getActiveSheet()->setCellValue('L'. $i,$data['firstname']);
$this->excel->getActiveSheet()->setCellValue('M'. $i,$data['Updated_By']); $this->excel->getActiveSheet()->setCellValue('M'. $i,$data['Updated_By']);
$this->excel->getActiveSheet()->setCellValue('N'. $i,$data['IsApproved']); $this->excel->getActiveSheet()->setCellValue('N'. $i,$data['IsApproved']);

View File

@ -274,13 +274,13 @@ class employeedetails extends BaseController
$bankaddress = $this->input->post('bankaddress'); $bankaddress = $this->input->post('bankaddress');
$aadharno = $this->input->post('aadharno'); $aadharno = $this->input->post('aadharno');
$panno = strtoupper($this->input->post('panno')); $panno = strtoupper($this->input->post('panno'));
$passportno = $this->input->post('passportno'); $passportno = strtoupper($this->input->post('passportno'));
$ValidTill = $this->input->post('ValidTill'); $ValidTill = $this->input->post('ValidTill');
$addinfo = $this->input->post('addinfo'); $addinfo = $this->input->post('addinfo');
$IsActive = '1'; $IsActive = '1';
$driverlicense = $this->input->post ( 'driverlicense' ); $driverlicense = strtoupper($this->input->post ( 'driverlicense' ));
$licenseExpiryDate = $this->input->post ( 'licenseExpiryDate' ); $licenseExpiryDate = $this->input->post ( 'licenseExpiryDate' );
$VoterID = $this->input->post ( 'voterID' ); $VoterID = strtoupper($this->input->post ( 'voterID' ));
$createdby = $this->session->userdata ( 'userId' ); $createdby = $this->session->userdata ( 'userId' );
if($licenseExpiryDate != '') if($licenseExpiryDate != '')
@ -604,7 +604,7 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
$this->load->model('employeedetails_model'); $this->load->model('employeedetails_model');
$EmpId = $this->input->post('employeeid'); $EmpId = $this->input->post('employeeid');
$PictureName = $this->input->post('photo'); $PictureName = $this->input->post('Image');
if ($PictureName != '') if ($PictureName != '')
{ {
@ -656,12 +656,12 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
$bankaddress = $this->input->post('bankaddress'); $bankaddress = $this->input->post('bankaddress');
$aadharno = $this->input->post('aadharno'); $aadharno = $this->input->post('aadharno');
$panno = strtoupper($this->input->post('panno')); $panno = strtoupper($this->input->post('panno'));
$passportno = $this->input->post('passportno'); $passportno = strtoupper($this->input->post('passportno'));
$ValidTill = $this->input->post('ValidTill'); $ValidTill = $this->input->post('ValidTill');
$addinfo = $this->input->post('addinfo'); $addinfo = $this->input->post('addinfo');
$driverlicense = $this->input->post ( 'Driverlicense' ); $driverlicense = strtoupper($this->input->post ( 'Driverlicense' ));
$licenseExpiryDate = $this->input->post ( 'LicenseExpiryDate' ); $licenseExpiryDate = $this->input->post ( 'LicenseExpiryDate' );
$VoterID = $this->input->post ( 'VoterID' ); $VoterID = strtoupper($this->input->post ( 'VoterID' ));
$chked = $this->input->post('isactive'); $chked = $this->input->post('isactive');
// echo 'chkvalue'. $chked ; // echo 'chkvalue'. $chked ;
if( $chked != '') if( $chked != '')

View File

@ -343,11 +343,13 @@ class rawmaterialdetails extends BaseController
$this->load->library('excel'); $this->load->library('excel');
$this->excel->setActiveSheetIndex(0)->mergeCells('D3:J3'); //$this->excel->setActiveSheetIndex(0)->mergeCells('D3:J3');
$this->excel->setActiveSheetIndex(0)->mergeCells('F3:M3');
$this->excel->setActiveSheetIndex(0)->getStyle('F3')->getAlignment()->applyFromArray(array('horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER,));
$this->excel->getActiveSheet()->setTitle('Material Master'); $this->excel->getActiveSheet()->setTitle('Material Master');
$this->excel->getActiveSheet()->setCellValue('D3', 'SIDDHARTH INDUSTRIES Material Master'); $this->excel->getActiveSheet()->setCellValue('F3', 'SIDDHARTH INDUSTRIES Material Master');
$this->excel->getActiveSheet()->setCellValue('C5', 'MaterialCode'); $this->excel->getActiveSheet()->setCellValue('C5', 'MaterialCode');
$this->excel->getActiveSheet()->setCellValue('D5', 'MaterialName'); $this->excel->getActiveSheet()->setCellValue('D5', 'MaterialName');
$this->excel->getActiveSheet()->setCellValue('E5', 'MaterialType'); $this->excel->getActiveSheet()->setCellValue('E5', 'MaterialType');
@ -366,8 +368,8 @@ class rawmaterialdetails extends BaseController
$this->excel->getActiveSheet()->getStyle('D3')->getFont()->setSize(14); $this->excel->getActiveSheet()->getStyle('F3')->getFont()->setSize(14);
$this->excel->getActiveSheet()->getStyle('D3')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('F3')->getFont()->setBold(true);
$this->excel->getActiveSheet()->getStyle('C5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('C5')->getFont()->setSize(12);
$this->excel->getActiveSheet()->getStyle('C5')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('C5')->getFont()->setBold(true);
$this->excel->getActiveSheet()->getStyle('D5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('D5')->getFont()->setSize(12);

View File

@ -464,7 +464,8 @@ class supplier extends BaseController
$this->excel->getActiveSheet()->getStyle('J3')->getFont()->setSize(12);
$this->excel->getActiveSheet()->getStyle('J3')->getFont()->setBold(true);
$this->excel->getActiveSheet()->getStyle('A5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('A5')->getFont()->setSize(12);
$this->excel->getActiveSheet()->getStyle('A5')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('A5')->getFont()->setBold(true);
$this->excel->getActiveSheet()->getStyle('B5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('B5')->getFont()->setSize(12);

View File

@ -197,7 +197,8 @@ function addNewasset($asset)
$this->db->trans_start(); $this->db->trans_start();
$this->db->insert('T_Asset_Details', $asset); $this->db->insert('T_Asset_Details', $asset);
$Asset_Code = $this->db->insert_id(); //$Asset_Code = $this->db->insert_id();
$Asset_Code = $this->db->affected_rows();
$this->db->trans_complete(); $this->db->trans_complete();

View File

@ -339,12 +339,11 @@ function addNewcost($Cost)
$where = null; $where = null;
$this->db->select('Mas.*,bud.*,emp.firstname,emp1.firstname as Updated_By');//count(dep.DEPCode) AS ctvalue'); $this->db->select('Mas.*,bud.*,emp.firstname,emp1.firstname as Updated_By');//count(dep.DEPCode) AS ctvalue');
$this->db->select('sum(if(budgettype="CAPITAL",budgetamount,0)) as capital',FALSE); $this->db->select('sum(distinct case when Mas.budgettype="CAPITAL" then budgetamount else 0 end) as capital',FALSE);
$this->db->select('sum(if(budgettype="REVENUE",budgetamount,0)) as revenue',FALSE); $this->db->select('sum(distinct case when Mas.budgettype="REVENUE" then budgetamount else 0 end) as revenue',FALSE);
$this->db->select('sum(if(budgettype="SERVICE",budgetamount,0)) as service',FALSE); $this->db->select('sum(distinct case when Mas.budgettype="SERVICE" then budgetamount else 0 end) as service',FALSE);
$this->db->select('sum(if(budgettype="IMPORT",budgetamount,0)) as import',FALSE); $this->db->select('sum(distinct case when Mas.budgettype="IMPORT" then budgetamount else 0 end) as import',FALSE);
$this->db->select('GROUP_CONCAT(distinct part.DepartmentName) as DepartmentName'); $this->db->select('GROUP_CONCAT(distinct part.DepartmentName) as DepartmentName');
//$this->db->select('GROUP_CONCAT(DISTINCT part.DepartmentName SEPARATOR "/" ');
$this->db->join('T_CostCenter_Budget as Mas','Mas.CostCenterCode=bud.CostCenterCode','left'); $this->db->join('T_CostCenter_Budget as Mas','Mas.CostCenterCode=bud.CostCenterCode','left');
$this->db->join('T_CostCenter_Departments as dep',' dep.CostCenterCode=Mas.CostCenterCode','left'); $this->db->join('T_CostCenter_Departments as dep',' dep.CostCenterCode=Mas.CostCenterCode','left');
$this->db->join('T_DepartmentDetails as part','part.DEPCode=dep.DEPCode','left'); $this->db->join('T_DepartmentDetails as part','part.DEPCode=dep.DEPCode','left');

View File

@ -352,23 +352,23 @@ end
as Util_Amount, as Util_Amount,
case Cost_Center_Budget.BudgetType case Cost_Center_Budget.BudgetType
when 'IMPORT' when 'IMPORT'
then ifnull((Cost_Center_Budget.BudgetAmount - (sum((PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate))),0) then (Cost_Center_Budget.BudgetAmount - ifnull((sum((PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0))
when 'CAPITAL' when 'CAPITAL'
then then
case po.CapitalRange case po.CapitalRange
when '0' when '0'
then ifnull((Cost_Center_Budget.BudgetAmount - (sum((PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate))),0) then (Cost_Center_Budget.BudgetAmount - ifnull((sum((PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0))
else ifnull((Cost_Center_Budget.BudgetAmount - (sum(PO_Line_Item.Quantity * PO_Line_Item.Rate))),0) else (Cost_Center_Budget.BudgetAmount - ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate)),0))
end end
when 'SERVICE' when 'SERVICE'
then ifnull((Cost_Center_Budget.BudgetAmount - (sum(PO_Line_Item.Quantity * PO_Line_Item.Rate))),0) then (Cost_Center_Budget.BudgetAmount - ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate)),0))
when 'REVENUE' when 'REVENUE'
then ifnull((Cost_Center_Budget.BudgetAmount - (sum(PO_Line_Item.Quantity * PO_Line_Item.Rate) - sum(T_Rev_Tax.AfterDiscount))),0) then (Cost_Center_Budget.BudgetAmount - ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate) - sum(T_Rev_Tax.AfterDiscount)),0))
end end
as Avlbl_Amt as Avlbl_Amt
from T_CostCenter_Budget Cost_Center_Budget from T_CostCenter_Budget Cost_Center_Budget
left join T_PurchaseOrder_LineItem PO_Line_Item on Cost_Center_Budget.CostCenterCode=PO_Line_Item.CostCenterCode left join T_PurchaseOrder_LineItem PO_Line_Item on Cost_Center_Budget.CostCenterCode=PO_Line_Item.CostCenterCode
left JOIN T_PurchaseOrder_Master po on po.PONO=PO_Line_Item.PONO and po.Status !='ST030' left JOIN T_PurchaseOrder_Master po on po.PONO=PO_Line_Item.PONO
left JOIN T_Revenue_Tax T_Rev_Tax on PO_Line_Item.LineItemNo=T_Rev_Tax.LineItemNo left JOIN T_Revenue_Tax T_Rev_Tax on PO_Line_Item.LineItemNo=T_Rev_Tax.LineItemNo
JOIN T_CostCenter_Master Cost_Mast on Cost_Center_Budget.CostCenterCode=Cost_Mast.CostCenterCode JOIN T_CostCenter_Master Cost_Mast on Cost_Center_Budget.CostCenterCode=Cost_Mast.CostCenterCode
JOIN T_CostCenter_Departments CostCentDept on CostCentDept.CostCenterCode=Cost_Mast.CostCenterCode JOIN T_CostCenter_Departments CostCentDept on CostCentDept.CostCenterCode=Cost_Mast.CostCenterCode

View File

@ -84,8 +84,26 @@ if(!empty($ccrpt))
<td><span><?php echo $rel->Dept_Name?></span></td> <td><span><?php echo $rel->Dept_Name?></span></td>
<td><span><?php echo $rel->BudgetType?></span></td> <td><span><?php echo $rel->BudgetType?></span></td>
<td><span><?php echo $rel->BudgetYear?></span></td> <td><span><?php echo $rel->BudgetYear?></span></td>
<td align="right"><span><?php echo $rel->Util_Amount?></span></td> <td align="right"><span><?php
<td align="right"><span><?php echo $rel->Avlbl_Amt?></span></td> setlocale(LC_MONETARY, 'en_IN.UTF-8');
echo money_format('%n', $rel->Util_Amount);
//echo number_format($rel->Util_Amount, 2)
?></span></td>
<td align="right"><span><?php
$avlamount = 0;
if($rel->Avlbl_Amt < 0 ){
setlocale(LC_MONETARY, 'en_IN.UTF-8');
echo money_format('%n', $avlamount);
//echo number_format($avlamount,2);
}
else{
setlocale(LC_MONETARY, 'en_IN.UTF-8');
echo money_format('%n', $rel->Avlbl_Amt);
//echo number_format($rel->Avlbl_Amt, 2);
}
?></span></td>
</tr> </tr>
<?php <?php
} }

View File

@ -6,6 +6,10 @@ $(document).ready(function(){
// $("#desigination").select2(); // $("#desigination").select2();
// $("#departmentname").select2(); // $("#departmentname").select2();
// $("#eduqualifaction").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 driver_designition() function driver_designition()
{ {
@ -75,7 +79,7 @@ $(function(){
function isNumberKey(evt) function isNumberKey(evt)
{ {
var charCode = (evt.which) ? evt.which : evt.keyCode; var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 if (charCode != 46 && charCode != 32 && charCode >= 33
&& (charCode < 48 || charCode > 57)) && (charCode < 48 || charCode > 57))
return false; return false;
@ -85,7 +89,7 @@ $(function(){
function alpha(evt) { function alpha(evt) {
var k; var k;
document.all ? k = evt.keyCode : k = evt.which; document.all ? k = evt.keyCode : k = evt.which;
return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 32 || (k >= 48 && k <= 57)); return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 33 || (k >= 48 && k <= 57));
} }
//PAN Validate //PAN Validate
@ -109,6 +113,44 @@ 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 != '')
{
//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)
{
//alert('alskdjsakjf');
alert('Please Enter Valid Aadhar Number');
return (false);
}
else
{
//alert('value inserted into database');
return true;
}
}
// else
// {
// //alert('aadhar is blank');
// alert('please Enter Aadhar number');
// }
}
function getMobileValidation() { function getMobileValidation() {
var contactNumber = $('#ContactNumber').val().length; var contactNumber = $('#ContactNumber').val().length;
if(contactNumber < 10) if(contactNumber < 10)
@ -191,39 +233,6 @@ function validatecomEmail() {
} }
} }
function ValidateAadhar(){
//alert('validation entered');
var reg = /^\d{12}$/
var aadhar = $('#aadharno').val();
var aadhar_count = $('#aadharno').val().length;
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)
{
//alert('alskdjsakjf');
alert('Please Enter Valid Aadhar Number');
}
else
{
//alert('value inserted into database');
return true;
}
}
else
{
//alert('aadhar is blank');
alert('please Enter Aadhar number');
}
}
function validateDriverLicense() { function validateDriverLicense() {
@ -323,13 +332,17 @@ function resetphoto()
function ValidatePassport() function ValidatePassport()
{ {
var regsaid = /^[A-PR-WY][1-9]\d\s?\d{4}[1-9]$/ig; var regsaid = /^[aA-prPR-wyWY][1-9]\d\s?\d{4}[1-9]$/ig;
var passport = $("#passportno").val(); var passport = $("#passportno").val();
//alert(passport); //alert(passport);
if(regsaid.test(passport) == false) if(regsaid.test(passport) == false)
{ {
alert('You have entered invalid Passport.'); alert('You have entered invalid Passport.');
return; return (false);
}
else
{
return true;
} }
} }
@ -448,7 +461,7 @@ function onlyAlphabets(evt) {
<input type="text" name="age" id="age" class="form-control" readonly> <input type="text" name="age" id="age" class="form-control" readonly>
</div> </div>
<div class="col-md-6 pad"><span>Contact Number</span><span class="badge">*</span> <div class="col-md-6 pad"><span>Contact Number</span><span class="badge">*</span>
<input type="text" name="ContactNumber" onchange="return getMobileValidation();" id="ContactNumber" required pattern="(.){10,10}" maxlength="10" class="form-control"> <input type="text" name="ContactNumber" onchange="return getMobileValidation();" id="ContactNumber" required pattern="(.){10,10}" maxlength="10" class="form-control" onkeypress="return isNumberKey(event)">
</div> </div>
</div> </div>
@ -555,7 +568,7 @@ function onlyAlphabets(evt) {
<input type="text" id="emergencycontactname" onkeypress="return onlyAlphabets(event);" maxlength="100" required name="emergencycontactname" class="form-control"> <input type="text" id="emergencycontactname" onkeypress="return onlyAlphabets(event);" maxlength="100" required name="emergencycontactname" class="form-control">
</div> </div>
<div class="col-md-6"><span>Emergency Contact Number</span><span class="badge">*</span> <div class="col-md-6"><span>Emergency Contact Number</span><span class="badge">*</span>
<input type="text" id="emergencycontactnumber" name="emergencycontactnumber" onchange="return getValidEmergencyNumber();" required pattern="(.){10,10}" maxlength="10" class="form-control"> <input type="text" id="emergencycontactnumber" name="emergencycontactnumber" onchange="return getValidEmergencyNumber();" required pattern="(.){10,10}" maxlength="10" class="form-control" onkeypress="return isNumberKey(event)">
</div> </div>
</div> </div>
@ -662,14 +675,14 @@ function onlyAlphabets(evt) {
<div class="col-md-12 pad"> <div class="col-md-12 pad">
<div class="col-md-3"><span>Aadhar Number</span> <div class="col-md-3"><span>Aadhar Number</span>
<input type="text" id="aadharno" name="aadharno" maxlength="14" onchange="ValidateAadhar();" pattern="\d{4}\s\d{4}\s\d{4}" class="form-control" onkeypress="return isNumberKey(event)"> <input type="text" id="aadharno" name="aadharno" maxlength="14" onchange="ValidateAadhar();" class="form-control" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3"><span>PAN Number</span> <div class="col-md-3"><span>PAN Number</span>
<input type="text" id="panno" maxlength="10" style="text-transform:uppercase" name="panno" onchange="validatePAN();" class="form-control"> <input type="text" id="panno" maxlength="10" style="text-transform:uppercase" name="panno" onchange="validatePAN();" class="form-control">
</div> </div>
<div class="col-md-3"><span>Passport Number</span> <div class="col-md-3"><span>Passport Number</span>
<input type="text" id="passportno" maxlength="9" onchange="ValidatePassport();" name="passportno" class="form-control" pattern="[A-PR-WY]{1}[1-9]{1}\d{1}\s\d{4}[1-9]{1}" title="The first digit or the last digit will never be 0 <input type="text" id="passportno" maxlength="9" onchange="ValidatePassport();" name="passportno" style="text-transform:uppercase" class="form-control" pattern="[A-PR-WY]{1}[1-9]{1}\d{1}\s\d{4}[1-9]{1}" title="The first digit or the last digit will never be 0
The first character cannot be Q, X or Z. (eg:A12 34567)"> The first character cannot be Q, X or Z. (eg:A12 34567)" onkeypress="return alpha(event);">
</div> </div>
<div class="col-md-3"><span>Passport Expiry Date</span> <div class="col-md-3"><span>Passport Expiry Date</span>
<input id="ValidTill" name="ValidTill" onkeypress="return false;" maxlength="10" class="form-control"> <input id="ValidTill" name="ValidTill" onkeypress="return false;" maxlength="10" class="form-control">
@ -678,10 +691,10 @@ function onlyAlphabets(evt) {
<div class="col-md-12 pad"> <div class="col-md-12 pad">
<div class="col-md-3"><span>Voter ID</span> <div class="col-md-3"><span>Voter ID</span>
<input type="text" id="VoterID" name="voterID" maxlength="12" class="form-control"> <input type="text" id="VoterID" name="voterID" maxlength="12" class="form-control" onkeypress="return alpha(event);" style="text-transform: uppercase">
</div> </div>
<div class="col-md-3"><span>Driving License</span> <div class="col-md-3"><span>Driving License</span>
<input type="text" id="Driverlicense" onchange="validateDriverLicense();" pattern="[A-Z]{2}[0-9]{2}\s[0-9]{11}" title="EX:TN82 12345678900"maxlength="16" name="driverlicense" class="form-control"> <input type="text" id="Driverlicense" onchange="validateDriverLicense();" style="text-transform:uppercase" pattern="[a-zA-Z]{2}[0-9]{2}\s[0-9]{11}" title="EX:TN82 12345678900"maxlength="16" name="driverlicense" class="form-control" onkeypress="return alpha(event);">
</div> </div>
<div class="col-md-3"><span>Driving License Expiry Date</span> <div class="col-md-3"><span>Driving License Expiry Date</span>
@ -888,6 +901,9 @@ function Validate()
success:function(data) { success:function(data) {
if(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 ?") var answer = confirm(data+""+" Employee already exists in the database.Do you want to change the Email id ?")
if (answer) { if (answer) {
@ -896,6 +912,7 @@ function Validate()
} }
else else
{ {
alert('please edit the emailid in the edit employee screen');
window.location = 'employeedetails/employeeListing'; window.location = 'employeedetails/employeeListing';
} }
@ -921,6 +938,9 @@ function Validate()
success:function(data) { success:function(data) {
if(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?") var answer = confirm(data + " " +" Employee details is already exists in the database.Do you want to change the Employee details?")
if (answer) if (answer)
@ -931,6 +951,7 @@ function Validate()
} }
else else
{ {
alert('please edit the PAN number in the Edit employee screen');
window.location = 'employeedetails/employeeListing'; window.location = 'employeedetails/employeeListing';
} }
@ -941,13 +962,14 @@ function Validate()
} }
else else
{ {
//alert();
alert('Please enter the PAN Number'); alert('Please enter the PAN Number');
$('#panno').focus(); $('#panno').focus();
return false; return false;
} }
}); });
//
$('#aadharno').change(function() { $('#aadharno').change(function() {
var id = $('#aadharno').val(); var id = $('#aadharno').val();
@ -955,11 +977,15 @@ function Validate()
{ {
$.ajax({ $.ajax({
data:{id:id}, data:{id:id},
type:"POST", type:"POST",
url:"<?php echo base_url();?>employeedetails/checkAadharNo", url:"<?php echo base_url();?>employeedetails/checkAadharNo",
success:function(data) { 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) if (answer)
@ -970,6 +996,7 @@ function Validate()
} }
else else
{ {
alert('please edit the aadhar number in the edit employee screen');
window.location = 'employeedetails/employeeListing'; window.location = 'employeedetails/employeeListing';
} }
@ -980,10 +1007,12 @@ function Validate()
} }
else else
{ {
//alert();
alert('Please enter the Aadhar Number'); alert('Please enter the Aadhar Number');
$('#aadharno').focus(); $('#aadharno').focus();
return false; return false;
} }
}); });
</script> </script>

View File

@ -40,11 +40,11 @@ function alpha(e) {
return false; return false;
} }
} }
//charCode <= 31 && charCode != 32 && charCode => 33
function isNumberKey(evt) function isNumberKey(evt)
{ {
var charCode = (evt.which) ? evt.which : evt.keyCode; var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 if (charCode != 46 && charCode != 32 && charCode >= 33
&& (charCode < 48 || charCode > 57)) && (charCode < 48 || charCode > 57))
return false; return false;
@ -340,11 +340,11 @@ $(function() {
<div class="col-md-3"> <div class="col-md-3">
<span for="ContactNumber">Contact Number</span><span class="badge">*</span> <span for="ContactNumber">Contact Number</span><span class="badge">*</span>
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number"> <input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<span for="AlternateContactNumber">Alternate Contact Number</span> <span for="AlternateContactNumber">Alternate Contact Number</span>
<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number"> <input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
@ -380,7 +380,7 @@ $(function() {
<div class="col-md-12" > <div class="col-md-12" >
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="PAN">PAN</span> <!--<span class="badge">*</span>--> <span for="PAN">PAN</span> <!--<span class="badge">*</span>-->
<input type="text" id="panno" maxlength="10" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)"> <input type="text" id="panno" maxlength="10" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)" onkeypress="return alpha(event)" style="text-transform: uppercase">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="TIN">TIN</span><span class="badge">*</span> <span for="TIN">TIN</span><span class="badge">*</span>
@ -388,7 +388,7 @@ $(function() {
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="UANumber">UA Number</span> <span for="UANumber">UA Number</span>
<input type="text" class="form-control" id="UANumber" name="UANumber" maxlength="15" title="Please Enter Valid UA Number" > <input type="text" class="form-control" id="UANumber" name="UANumber" maxlength="15" title="Please Enter Valid UA Number" onkeypress="return alpha(event)" >
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
@ -398,15 +398,15 @@ $(function() {
</div> </div>
<div class="col-md-12" > <div class="col-md-12" >
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="GSTNo">CST Number</span> <span for="CSTNo">CST Number</span>
<input type="text" class="form-control " id="CSTNo" name="CSTNo" maxlength="15"> <input type="text" class="form-control " id="CSTNo" name="CSTNo" maxlength="15" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3 pad"><span>CST Registration Date</span> <div class="col-md-3 pad"><span>CST Registration Date</span>
<input id="dateofCST" name="dateofCST" onkeypress="return false;" maxlength="10" class="form-control"> <input id="dateofCST" name="dateofCST" onkeypress="return false;" maxlength="10" class="form-control">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="GSTNo">GST Number</span><span class="badge">*</span> <span for="GSTNo">GST Number</span><span class="badge">*</span>
<input type="text" id="GSTNo" name="GSTNo" class="form-control" maxlength="15" required onchange="validateGST();" style="text-transform:uppercase;" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' and 1 Number or Character"> <input type="text" id="GSTNo" name="GSTNo" class="form-control" maxlength="15" required onchange="validateGST();" style="text-transform:uppercase;" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' and 1 Number or Character" onkeypress="return alpha(event)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="Range">GST Range</span><!--<span class="badge">*</span>--> <span for="Range">GST Range</span><!--<span class="badge">*</span>-->
@ -453,7 +453,7 @@ $(function() {
<input type="text" id="accno" name="accno" maxlength="20" class="form-control" onkeypress="return isNumberKey(event)" > <input type="text" id="accno" name="accno" maxlength="20" class="form-control" onkeypress="return isNumberKey(event)" >
</div> </div>
<div class="col-md-3"><span>IFSC Code</span> <div class="col-md-3"><span>IFSC Code</span>
<input type="text" id="ifsc" name="ifsc" maxlength="12" class="form-control"> <input type="text" id="ifsc" name="ifsc" maxlength="12" class="form-control" onkeypress="return alpha(event)" style="text-transform: uppercase">
</div> </div>
<div class="col-md-3"><span>Bank Branch Name</span> <div class="col-md-3"><span>Bank Branch Name</span>
<input type="text" id="branchname" name="branchname" maxlength="200" class="form-control"> <input type="text" id="branchname" name="branchname" maxlength="200" class="form-control">

View File

@ -164,7 +164,7 @@ $(function(){
function isNumberKey(evt) function isNumberKey(evt)
{ {
var charCode = (evt.which) ? evt.which : evt.keyCode; var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 if (charCode != 46 && charCode != 32 && charCode >= 33
&& (charCode < 48 || charCode > 57)) && (charCode < 48 || charCode > 57))
return false; return false;
@ -205,24 +205,27 @@ function validatePAN() {
} }
function ValidateAadhar(){ function ValidateAadhar(){
//alert('validation entered'); //alert('validation entered');
var reg = /^\d{12}$/ var reg = /^\d{4}\s\d{4}\s\d{4}$/
var aadhar = $('#aadharno').val(); var aadhar = $('#aadharno').val();
var aadhar_count = $('#aadharno').val().length; var aadhar_count = $('#aadharno').val().length;
if(aadhar != '' && aadhar_count != '') if(aadhar != '' )// && aadhar_count != '')
{ {
//alert('this is aadhar :'+aadhar); //alert('this is aadhar :'+aadhar);
if(aadhar_count < 12) // if(aadhar_count < 14)
{ // {
//alert(aadhar1); // //alert(aadhar1);
alert('Aadhar card should be in 12 digits'); // alert('Aadhar card should be in 12 digits');
} // }
else if(reg.test(aadhar)== false) // else
if(reg.test(aadhar)== false)
{ {
//alert('alskdjsakjf'); //alert('alskdjsakjf');
alert('Please Enter Valid Aadhar Number'); alert('Please Enter Valid Aadhar Number');
return (false);
} }
else else
{ {
@ -230,12 +233,12 @@ function ValidateAadhar(){
return true; return true;
} }
} }
else //else
{ //{
//alert('aadhar is blank'); //alert('aadhar is blank');
alert('please Enter Aadhar number'); //alert('please Enter Aadhar number');
} //}
} }
@ -530,6 +533,9 @@ $(document).ready(function(){
// $("#desigination").select2(); // $("#desigination").select2();
// $("#departmentname").select2(); // $("#departmentname").select2();
// $("#eduqualifaction").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) { function onlyAlphabets(evt) {
@ -609,7 +615,7 @@ function onlyAlphabets(evt) {
<input type='file' onchange="readURL(this);" id="photo" value="<?php echo $ProfilePic ; ?>" name="photo"/> <input type='file' onchange="readURL(this);" id="photo" value="<?php echo $ProfilePic ; ?>" name="photo"/>
<label for="photo">Select profile picture<br/><small>(only .jpg or .png)</small></label> <label for="photo">Select profile picture<br/><small>(only .jpg or .png)</small></label>
<!-- <input type="hidden" name="Image" id="Image" value="<?php echo $ProfilePic ; ?>" class="form-control" readonly> --> <input type="hidden" name="Image" id="Image" value="<?php echo $ProfilePic ; ?>" class="form-control" readonly>
<input type="text" name="employeeid" id="employeeid" value="<?php echo $EmpID ; ?>" placeholder="Employee ID" class="form-control" readonly> <input type="text" name="employeeid" id="employeeid" value="<?php echo $EmpID ; ?>" placeholder="Employee ID" class="form-control" readonly>
<input type="checkbox" id="isactive" <?php echo $IsActive;?> name="isactive" value="1"> IS ACTIVE <input type="checkbox" id="isactive" <?php echo $IsActive;?> name="isactive" value="1"> IS ACTIVE
@ -641,7 +647,7 @@ function onlyAlphabets(evt) {
<input type="text" name="age" placeholder="Age" id="age" value="<?php echo $Age ; ?>" class="form-control" readonly> <input type="text" name="age" placeholder="Age" id="age" value="<?php echo $Age ; ?>" class="form-control" readonly>
</div> </div>
<div class="col-md-6 pad"><span>Contact Number</span><span class="badge">*</span> <div class="col-md-6 pad"><span>Contact Number</span><span class="badge">*</span>
<input type="text" name="ContactNumber" value="<?php echo $ContactNumber ; ?>" onchange="getMobileValidation();" id="ContactNumber" required placeholder="Contact Number" maxlength="10" class="form-control"> <input type="text" name="ContactNumber" value="<?php echo $ContactNumber ; ?>" onchange="getMobileValidation();" id="ContactNumber" required placeholder="Contact Number" maxlength="10" class="form-control" onkeypress="return isNumberKey(event)">
</div> </div>
</div> </div>
@ -755,7 +761,7 @@ function onlyAlphabets(evt) {
<input type="text" id="emergencycontactname" maxlength="100" required name="emergencycontactname" value="<?php echo $EmergencyContactName ; ?>" placeholder="Emergency Contact Name" class="form-control"> <input type="text" id="emergencycontactname" maxlength="100" required name="emergencycontactname" value="<?php echo $EmergencyContactName ; ?>" placeholder="Emergency Contact Name" class="form-control">
</div> </div>
<div class="col-md-6"><span>Emergency Contact Number</span><span class="badge">*</span> <div class="col-md-6"><span>Emergency Contact Number</span><span class="badge">*</span>
<input type="text" id="emergencycontactnumber" required name="emergencycontactnumber" onchange="getValidEmergencyNumber();" maxlength="10" value="<?php echo $EmergencyContactNumber; ?>" placeholder="Emergency Contact Number" class="form-control"> <input type="text" id="emergencycontactnumber" required name="emergencycontactnumber" onchange="getValidEmergencyNumber();" maxlength="10" value="<?php echo $EmergencyContactNumber; ?>" placeholder="Emergency Contact Number" class="form-control" onkeypress="return isNumberKey(event)">
</div> </div>
</div> </div>
@ -869,14 +875,14 @@ function onlyAlphabets(evt) {
<div class="form-group"> <div class="form-group">
<div class="col-md-12 pad"> <div class="col-md-12 pad">
<div class="col-md-3"><span>Aadhar Number</span> <div class="col-md-3"><span>Aadhar Number</span>
<input type="text" id="aadharno" name="aadharno" maxlength="14" placeholder="Aadhar Number" onchange="ValidateAadhar();" pattern="\d{4}\s\d{4}\s\d{4}" class="form-control num" value="<?php echo $AadharNo ; ?>" title=" : 12 digit number"><!-- onkeypress="return isNumberKey(event)"> --> <input type="text" id="aadharno" name="aadharno" maxlength="14" placeholder="Aadhar Number" onchange="ValidateAadhar();" class="form-control num" value="<?php echo $AadharNo ; ?>" title=" : 12 digit number"><!-- onkeypress="return isNumberKey(event)"> -->
</div> </div>
<div class="col-md-3"><span>PAN Number</span> <div class="col-md-3"><span>PAN Number</span>
<input type="text" id="panno" style="text-transform: uppercase" maxlength="10" name="panno" placeholder="PAN Number" onchange="validatePAN();" class="form-control" value="<?php echo $PANNo ; ?>"> <input type="text" id="panno" style="text-transform: uppercase" maxlength="10" name="panno" placeholder="PAN Number" onchange="validatePAN();" class="form-control" value="<?php echo $PANNo ; ?>" onkeypress="return alpha(event);">
</div> </div>
<div class="col-md-3"><span>Passport Number</span> <div class="col-md-3"><span>Passport Number</span>
<input type="text" id="passportno" maxlength="9" onchange="ValidatePassport();" name="passportno" placeholder="Passport Number" class="form-control" value="<?php echo $PassportNo ; ?>" pattern="[A-PR-WY]{1}[1-9]{1}\d{1}\s\d{4}[1-9]{1}" title="The first digit or the last digit will never be 0 <input type="text" id="passportno" name="passportno" maxlength="9" placeholder="Passport Number" onkeypress="return alpha(event);" onchange="ValidatePassport();" class="form-control" value="<?php echo $PassportNo ; ?>" pattern="[A-PR-WY]{1}[1-9]{1}\d{1}\s\d{4}[1-9]{1}" title="The first digit or the last digit will never be 0
The first character cannot be Q, X or Z. (eg:A12 34567)"> The first character cannot be Q, X or Z. (eg:A12 34567)" style="text-transform: uppercase">
</div> </div>
<div class="col-md-3"><span>Passport Expiry Date</span> <div class="col-md-3"><span>Passport Expiry Date</span>
@ -885,10 +891,13 @@ function onlyAlphabets(evt) {
</div> </div>
<div class="col-md-12 pad"> <div class="col-md-12 pad">
<div class="col-md-3"><span>Voter ID</span> <div class="col-md-3"><span>Voter ID</span>
<input type="text" id="VoterID" name="VoterID" maxlength="12" value="<?php echo $VoterID;?>" class="form-control" placeholder="VoterID" value=""> <input type="text" id="VoterID" name="VoterID" maxlength="12" value="<?php echo $VoterID;?>" class="form-control" placeholder="VoterID" onkeypress="return alpha(event);" style="text-transform: uppercase">
</div> </div>
<div class="col-md-3"><span>Driving License</span> <div class="col-md-3"><span>Driving License</span>
<input type="text" id="Driverlicense" maxlength="16" onchange="validateDriverLicense();" pattern="[A-Z]{2}[0-9]{2}\s[0-9]{11}" value="<?php echo $DriverLicense;?>"name="Driverlicense" title="EX:TN82 12345678900" class="form-control" value=""placeholder="Driverlicense"> <!-- <input type="text" id="Driverlicense" maxlength="16" onchange="validateDriverLicense();" pattern="[A-Z]{2}[0-9]{2}\s[0-9]{11}" value="<?php echo $DriverLicense;?>"name="Driverlicense" title="EX:TN82 12345678900" class="form-control" value=""placeholder="Driverlicense"> -->
<input type="text" id="Driverlicense" maxlength="16" onchange="validateDriverLicense();" pattern="[a-zA-Z]{2}[0-9]{2}\s[0-9]{11}" value="<?php echo $DriverLicense;?>"
name="Driverlicense" title="EX:TN82 12345678900" class="form-control" placeholder="Driverlicense" style="text-transform: uppercase" onkeypress="return alpha(event);">
</div> </div>
<div class="col-md-3"><span>Driving License Expiry Date</span> <div class="col-md-3"><span>Driving License Expiry Date</span>
@ -900,6 +909,7 @@ function onlyAlphabets(evt) {
<!-- Command --> <!-- Command -->
<div class="form-group"> <div class="form-group">
@ -992,7 +1002,9 @@ function onlyAlphabets(evt) {
success:function(data) { success:function(data) {
if(data) if(data)
{alert( data+""+" Employee already exists in the database.Please Change the Pan Card Number"); {alert( data+""+" Employee already exists in the database.Please Change the Pan Card Number");
return false; $('#panno').val('');
$('#panno').focus();
//return false;
//window.location = 'Employeedetails/employeeListing'; //window.location = 'Employeedetails/employeeListing';
} }
@ -1014,7 +1026,9 @@ function onlyAlphabets(evt) {
if(data) if(data)
{ {
alert( data+""+" Employee already exists in the database.Please Change the Aadhar card Number"); alert( data+""+" Employee already exists in the database.Please Change the Aadhar card Number");
return false; $('#aadharno').val('');
$('#aadharno').focus();
//return false;
//window.location = 'Employeedetails/employeeListing'; //window.location = 'Employeedetails/employeeListing';
} }
} }

View File

@ -386,9 +386,8 @@ $(function() {
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<input name="AddYear" class="form-control required" id="AddYear" type="text" ,'required="true"'> <!-- <input name="AddYear" class="form-control required" id="AddYear" type="text" ,'required="true"' value=""> -->
<input type="text" name="AddYear" id="AddYear" class="form-control" readonly>
</div> </div>
</div> </div>
</div> </div>
@ -524,8 +523,9 @@ $(function() {
Budget Year : Budget Year :
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<input type="text" class="form-control" readonly id="EditYear" name="EditYear">
<input name="EditYear" class="form-control required" id="EditYear" type="text" ,'required="true"'> <!-- <input name="EditYear" class="form-control required" id="EditYear" type="text" ,'required="true"'> -->
<!-- <?php <!-- <?php
$data = array('name' => '', 'value' => set_value(''),'id'=>'EditYear', 'class' => 'form-control',); $data = array('name' => '', 'value' => set_value(''),'id'=>'EditYear', 'class' => 'form-control',);
@ -697,7 +697,7 @@ $("#Edit").on("shown.bs.modal", function(e) {
var BudAmount = $("#AddAmout").val(); var BudAmount = $("#AddAmout").val();
$('#Addbudget option[value='+BudType+']').remove(); $('#Addbudget option[value='+BudType+']').remove();
var BudRemarks = $('#AddRemarks').val(); var BudRemarks = $('#AddRemarks').val();
$('#AddYear').val(''); //$('#AddYear').val('');
$('#AddAmout').val(''); $('#AddAmout').val('');
$('#AddRemarks').val(''); $('#AddRemarks').val('');

View File

@ -155,7 +155,7 @@ function alpha(e) {
function isNumberKey(evt) function isNumberKey(evt)
{ {
var charCode = (evt.which) ? evt.which : evt.keyCode; var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 if (charCode != 46 && charCode != 32 && charCode >= 33
&& (charCode < 48 || charCode > 57)) && (charCode < 48 || charCode > 57))
return false; return false;
@ -432,12 +432,12 @@ function onlyAlphabets(evt) {
<div class="col-md-2 pad"> <div class="col-md-2 pad">
<span for="ContactNumber">Contact Number</span><span class="badge">*</span> <span for="ContactNumber">Contact Number</span><span class="badge">*</span>
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" value="<?php echo $ContactNumber;?>" title="Please Enter Contact Number (or) Telephone Number"> <input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" value="<?php echo $ContactNumber;?>" title="Please Enter Contact Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="AlternateContactNumber">Alternate Contact Number</span> <span for="AlternateContactNumber">Alternate Contact Number</span>
<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" value="<?php echo $AlternateContactNumber;?>" title="Please Enter Contact Number (or) Telephone Number"> <input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" value="<?php echo $AlternateContactNumber;?>" title="Please Enter Contact Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-2 pad"> <div class="col-md-2 pad">
@ -474,7 +474,7 @@ function onlyAlphabets(evt) {
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="PAN">PAN</span> <!--<span class="badge">*</span>--> <span for="PAN">PAN</span> <!--<span class="badge">*</span>-->
<input type="text" id="panno" maxlength="10" name="panno" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]}).{1,}" onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" style="text-transform:uppercase;"> <input type="text" id="panno" maxlength="10" name="panno" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]}).{1,}" onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" onkeypress="return alpha(event)" style="text-transform:uppercase;">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="TIN">TIN</span><span class="badge">*</span> <span for="TIN">TIN</span><span class="badge">*</span>
@ -493,15 +493,15 @@ function onlyAlphabets(evt) {
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="GSTNo">CST Number</span> <span for="CSTNo">CST Number</span>
<input type="text" class="form-control " value="<?php echo $CSTNO;?>" id="CSTNo" name="CSTNo" maxlength="15"> <input type="text" class="form-control " value="<?php echo $CSTNO;?>" id="CSTNo" name="CSTNo" maxlength="15" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3 pad"><span>CST Registration Date</span> <div class="col-md-3 pad"><span>CST Registration Date</span>
<input id="dateofCST" name="dateofCST" value="<?php echo $CSTDate;?>" onkeypress="return false;" maxlength="10" class="form-control"> <input id="dateofCST" name="dateofCST" value="<?php echo $CSTDate;?>" onkeypress="return false;" maxlength="10" class="form-control">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="GSTNo">GST Number</span><span class="badge">*</span> <span for="GSTNo">GST Number</span><span class="badge">*</span>
<input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" required maxlength="15" class="form-control" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character "> <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" required maxlength="15" class="form-control" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alpha(event)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
@ -553,7 +553,7 @@ function onlyAlphabets(evt) {
<input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno;?>" class="form-control" onkeypress="return isNumberKey(event)" > <input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno;?>" class="form-control" onkeypress="return isNumberKey(event)" >
</div> </div>
<div class="col-md-3"><span>IFSC Code</span> <div class="col-md-3"><span>IFSC Code</span>
<input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode;?>" class="form-control" maxlength="12" onkeypress="return alpha(event);"> <input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode;?>" class="form-control" maxlength="12" onkeypress="return alpha(event);" style="text-transform: uppercase">
</div> </div>
<div class="col-md-3"><span>Bank Branch Name</span> <div class="col-md-3"><span>Bank Branch Name</span>
<input type="text" id="branchname" name="branchname" value="<?php echo $branchname;?>" class="form-control" maxlength="200" onkeypress="return alpha(event);"> <input type="text" id="branchname" name="branchname" value="<?php echo $branchname;?>" class="form-control" maxlength="200" onkeypress="return alpha(event);">
@ -709,18 +709,21 @@ if(!validateGST())
success:function(data) { success:function(data) {
if(data) if(data)
{ {
alert(data+""+" supplier details is already exists in the database.Do you want to change the SUPPLIER details?");
var answer = confirm(data+""+" supplier details is already exists in the database.Do you want to change the SUPPLIER details?")
if (answer) {
$('#panno').val(''); $('#panno').val('');
$('#panno').focus(); $('#panno').focus();
return false;
} // var answer = confirm(data+""+" supplier details is already exists in the database.Do you want to change the SUPPLIER details?")
else // if (answer) {
{ // $('#panno').val('');
alert('Please edit the supplier details in the Edit screen and change the supplier status to Active'); // $('#panno').focus();
window.location = 'supplier/supplierListing'; // return false;
} // }
// else
// {
// alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
// window.location = 'supplier/supplierListing';
// }
} }
} }
@ -731,7 +734,7 @@ if(!validateGST())
{ {
alert('Please enter the PAN Number'); alert('Please enter the PAN Number');
$('#panno').focus(); $('#panno').focus();
return false; // return false;
} }
}); });
@ -748,19 +751,23 @@ if(!validateGST())
success:function(data) { success:function(data) {
if(data) if(data)
{ {
alert(data + " " +" supplier details is already exists in the database.Do you want to change the SUPPLIER details?");
var answer = confirm(data + " " +" supplier details is already exists in the database.Do you want to change the SUPPLIER details?")
if (answer)
{
$('#GSTNo').val(''); $('#GSTNo').val('');
$('#GSTNo').focus(); $('#GSTNo').focus();
return false;
}
else // var answer = confirm(data + " " +" supplier details is already exists in the database.Do you want to change the SUPPLIER details?")
{ // if (answer)
alert('Please edit the supplier details in the Edit screen and change the supplier status to Active'); // {
window.location = 'supplier/supplierListing'; // $('#GSTNo').val('');
} // $('#GSTNo').focus();
// return false;
// }
// else
// {
// alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
// window.location = 'supplier/supplierListing';
// }
} }
} }