SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

employee,asset and supplier validation and user screen and material master changes and cost details

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-24 16:44:15 +05:30
parent 14ca5217cd
commit f7933a6338
16 changed files with 130 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/controllers/assetdetails.php
View File

@ -253,14 +253,15 @@ class assetdetails extends BaseController
if($result > 0)
{
// $this->session->set_flashdata('success', 'New Asset created successfully');
redirect('assetListing','refresh');
echo "<script>alert('Asset Created successfully!');</script>";
redirect('assetListing','refresh');
}
else
{
echo "<script>alert('Asset Not Created!');</script>";
redirect('assetListing','refresh');
echo "<script>alert('Asset Not Created!');</script>";
}
}
@ -385,14 +386,14 @@ class assetdetails extends BaseController
$result = $this->assetdetails_model->editasset($asset, $Asset_Code);
if($result == true)
{
{echo "<script>alert('Asset updated successfully!');</script>";
redirect('assetListing','refresh');
echo "<script>alert('Asset updated successfully!');</script>";
}
else
{
{echo "<script>alert('Asset Not updated !');</script>";
redirect('assetListing','refresh');
echo "<script>alert('Asset Not updated !');</script>";
}
}

38
application/controllers/employeedetails.php
View File

@ -211,9 +211,8 @@ class employeedetails extends BaseController
$this->load->library('form_validation');
$this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]');
$this->form_validation->set_rules('emailid', 'emailid', 'trim|valid_email');
$this->form_validation->set_rules('comemailid', 'emailid', 'trim|valid_email');
$this->form_validation->set_rules('gender', 'gender', 'callback_Gender_validate');
$this->form_validation->set_rules('emailid', 'emailid', 'trim|required|valid_email');
$this->form_validation->set_rules('gender', 'gender', 'callback_Gender_validate');
$this->form_validation->set_rules('MartialStatus', 'MartialStatus', 'callback_Martial_validate');
$this->form_validation->set_rules('bloodgroup', 'bloodgroup', 'callback_Blood_validate');
$this->form_validation->set_rules('emergencycontactnumber', 'emergencycontactnumber', 'trim|required|min_length[10]|max_length[10]');
@ -221,9 +220,9 @@ class employeedetails extends BaseController
$this->form_validation->set_rules('departmentname', 'departmentname', 'callback_Dep_validate');
$this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate');
$this->form_validation->set_rules('referrercontno', 'referrercontno', 'trim|min_length[10]|max_length[10]');
$this->form_validation->set_rules('aadharno', 'aadharno', 'trim|min_length[12]|max_length[12]');
$this->form_validation->set_rules('aadharno', 'aadharno', 'trim|min_length[14]|max_length[14]');
$this->form_validation->set_rules('panno', 'panno', 'trim|min_length[10]|max_length[10]');
$this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[8]|max_length[8]');
$this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[9]|max_length[9]');
$this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]');
@ -318,7 +317,7 @@ class employeedetails extends BaseController
'Additional_Qualification'=>$addqualification,'AadharNo'=>$aadharno,'PANNo'=>$panno,
'BankAccountNo'=>$accountno,'IFSCCode'=>$ifsccode,'BankBranchName'=>$bankbranchname,
'BankAddress'=>$bankaddress,'PassportNo'=>$passportno,'Passport_Valid_till'=>$Valid,
'IsActive'=>$IsActive,'ProfilePic'=>$Profile,'Reference_Name'=>$referredby,
'IsActive'=>$IsActive,'ProfilePic'=>$Picture,'Reference_Name'=>$referredby,
'Reference_ContactNumber'=>$referrercontno,'Remarks'=>$addinfo,'CreatedBy'=>$createdby,
'personalEmailId'=>$comEmailId,'DriverLicense'=>$driverlicense,
'LicenseValidtill'=>$License_ExpiryDate,'VoterID'=>$VoterID);
@ -329,15 +328,15 @@ class employeedetails extends BaseController
{
// $this->session->set_flashdata('Success', 'New Employee created successfully!');
redirect('employeeListing','refresh');
echo "<script>alert('New Employee Created successfully!');</script>";
echo "<script>alert('New Employee Created successfully!');</script>";redirect('employeeListing','refresh');
}
else
{
$this->session->set_flashdata('Error', 'New Employee details not saved');
redirect('employeeListing','refresh');
echo "<script>alert('Record Not Saved!');</script>";
echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','refresh');
}
}
@ -580,11 +579,8 @@ echo "<script>alert('Record Not Saved!');</script>";
//$mail = $this->this->.post('emailid');
$this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]');
//if($mail == ''){
$this->form_validation->set_rules('emailid', 'emailid', 'trim');
//}else{
//$this->form_validation->set_rules('emailid', 'emailid', 'trim|callback_checkMailEmp');
//}
$this->form_validation->set_rules('emailid', 'emailid', 'trim|required|valid_email|callback_checkMailEmp');
$this->form_validation->set_rules('gender', 'gender', 'callback_Gender_validate');
$this->form_validation->set_rules('MartialStatus', 'MartialStatus', 'callback_Martial_validate');
$this->form_validation->set_rules('bloodgroup', 'bloodgroup', 'callback_Blood_validate');
@ -593,9 +589,9 @@ echo "<script>alert('Record Not Saved!');</script>";
$this->form_validation->set_rules('departmentname', 'departmentname', 'callback_Dep_validate');
$this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate');
$this->form_validation->set_rules('referrercontno', 'referrercontno', 'trim|min_length[10]|max_length[10]');
$this->form_validation->set_rules('aadharno', 'aadharno ','trim|max_length[12]');
$this->form_validation->set_rules('aadharno', 'aadharno ','trim|max_length[14]');
$this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]');
$this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[8]|max_length[8]');
$this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[9]|max_length[9]');
$this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]');
if($this->form_validation->run() == FALSE)
@ -709,15 +705,15 @@ echo "<script>alert('Record Not Saved!');</script>";
{
// $this->session->set_flashdata('Success', $EmpId.'Employee Updated successfully!');
redirect('employeeListing','refresh');
echo "<script>alert('You Have Successfully updated the Employee Record!');</script>";
echo "<script>alert('You Have Successfully updated the Employee Record!');</script>";redirect('employeeListing','refresh');
}
else
{
$this->session->set_flashdata('Error', $EmpId.'Employee details not saved');
redirect('employeeListing','refresh');
echo "<script>alert('Record Not Updated!');</script>";
echo "<script>alert('Record Not Updated!');</script>"; redirect('employeeListing','refresh');
}
// redirect('employeeListing');

15
application/controllers/rawmaterialdetails.php
View File

@ -191,14 +191,15 @@ class rawmaterialdetails extends BaseController
if($result > 0)
{
redirect('rawmaterialListing','refresh');
echo "<script>alert('RawMaterial Created successfully!');</script>";
echo "<script>alert('RawMaterial Created successfully!');</script>";redirect('rawmaterialListing','refresh');
}
else
{
redirect('rawmaterialListing','refresh');
echo "<script>alert('RawMaterial Not Created!');</script>";
redirect('rawmaterialListing','refresh');
}
@ -322,14 +323,12 @@ class rawmaterialdetails extends BaseController
if($result == true)
{
redirect('rawmaterialListing','refresh');
echo "<script>alert('RawMaterial Updated successfully!');</script>";
echo "<script>alert('RawMaterial Updated successfully!');</script>"; redirect('rawmaterialListing','refresh');
}
else
{
redirect('rawmaterialListing','refresh');
echo "<script>alert('RawMaterial Record Not updated!');</script>";
echo "<script>alert('RawMaterial Record Not updated!');</script>";redirect('rawmaterialListing','refresh');
}

12
application/controllers/supplier.php
View File

@ -249,14 +249,16 @@ class supplier extends BaseController
if($result > 0)
{
redirect('supplierListing','refresh');
echo "<script>alert('New Supplier Created successfully!');</script>";
redirect('supplierListing','refresh');
}
else
{
redirect('supplierListing','refresh');
echo "<script>alert('Supplier Record Not Created!');</script>";
redirect('supplierListing','refresh');
}
}
@ -380,14 +382,16 @@ class supplier extends BaseController
if($result == True)
{
redirect('supplierListing','refresh');
echo "<script>alert('Supplier updated successfully!');</script>";
redirect('supplierListing','refresh');
}
else
{
redirect('supplierListing','refresh');
echo "<script>alert('Supplier Record Not updated!');</script>";
redirect('supplierListing','refresh');
}
}

0
application/logs/log-2017-08-23.php Normal file → Executable file
View File

2
application/views/addNew.php
View File

@ -31,7 +31,7 @@
<div class="form-group">
<label for="fname">Employee ID</label>
<select class="form-control required select" id="EmpList" name="EmpList">
<option value="0">Select Emp ID</option>
<option value="">Select Emp ID</option>
<?php
if(!empty($EmpList))

2
application/views/addRawMaterial.php
View File

@ -216,7 +216,7 @@ function BlockSpecial(evt) {
<div class="col-md-3">
<div class="form-group">
<label for="HSNcode">HSN code</label>
<input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)" name="HSNcode" maxlength="255">
<input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)" name="HSNcode" maxlength="8">
</div>
</div>
<div class="col-md-6">

11
application/views/addasset.php
View File

@ -348,6 +348,17 @@ $(function() {
$('#PONO').on('change',function(){
var PONO = $(this).val();
$('#SupplierName').val('');
$('#SupID').val('');
$('#MaterialCode').val('');
$('#UOM').val('');
$('#Quantity').val('');
$('#depcode').val('');
$('#AssetDept').val('');
$('#DateOfPurchase').val('');
$('#DeliveryDate').val('');
$('#PODescription').val('');
$('#Assetvalue').val('');
// alert(PONO);
if(PONO){

23
application/views/addemployee.php
View File

@ -81,6 +81,12 @@ $(function(){
return true;
}
function alpha(evt) {
var k;
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));
}
//PAN Validate
function validatePAN() {
@ -447,8 +453,8 @@ function onlyAlphabets(evt) {
</div>
<div class="col-md-12">
<div class="col-md-6 pad"><span>Personal Email ID</span><!--span class="badge">*</span>-->
<input type="email" name="emailid" id="emailid" maxlength="100" class="form-control">
<div class="col-md-6 pad"><span>Personal Email ID</span><span class="badge">*</span>
<input type="email" name="emailid" id="emailid" required maxlength="100" class="form-control">
</div>
<div class="col-md-6 pad"><span>Gender</span><span class="badge">*</span>
@ -641,10 +647,10 @@ function onlyAlphabets(evt) {
<input type="text" id="accountno" onkeypress="return isNumberKey(event)" maxlength="20" name="accountno" class="form-control">
</div>
<div class="col-md-3"><span>IFSC Code</span>
<input type="text" id="ifsccode" style="text-transform: uppercase" name="ifsccode" maxlength="12" class="form-control">
<input type="text" id="ifsccode" onkeypress="return alpha(event);" style="text-transform: uppercase" name="ifsccode" maxlength="12" class="form-control">
</div>
<div class="col-md-3"><span>Bank Branch Name</span>
<input type="text" id="bankbranchname" maxlength="200" name="bankbranchname" class="form-control">
<input type="text" id="bankbranchname" onkeypress="return alpha(event);" maxlength="200" name="bankbranchname" class="form-control">
</div>
<div class="col-md-3"><span>Bank Address</span>
<input type="text" id="bankaddress" maxlength="200" name="bankaddress" class="form-control">
@ -654,17 +660,18 @@ function onlyAlphabets(evt) {
<legend>ID Proof</legend>
<!-- Text input-->
<div class="col-md-12 pad">
<div class="col-md-12 pad">
<div class="col-md-3"><span>Aadhar Number</span>
<input type="text" id="aadharno" name="aadharno" maxlength="12" onchange="ValidateAadhar();" pattern="\d{12}" class="form-control" onkeypress="return isNumberKey(event)">
<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)">
</div>
<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">
</div>
<div class="col-md-3"><span>Passport Number</span>
<input type="text" id="passportno" maxlength="8" onchange="ValidatePassport();" name="passportno" class="form-control">
<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
The first character cannot be Q, X or Z. (eg:A12 34567)">
</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">
</div>
</div>

6
application/views/addsupplier.php
View File

@ -20,6 +20,12 @@ function validateEmail() {
}
}
function alpha(e) {
var k;
document.all ? k = e.keyCode : k = e.which;
return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 32 || (k >= 48 && k <= 57));
}
function blockKeyPress(evt)
{
var charCode = (evt.which) ? evt.which : evt.keyCode;

20
application/views/editEmployee.php
View File

@ -170,6 +170,12 @@ $(function(){
return true;
}
function alpha(e) {
var k;
document.all ? k = e.keyCode : k = e.which;
return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 32 || (k >= 48 && k <= 57));
}
//PAN Validate
//PAN Validate
@ -640,8 +646,8 @@ function onlyAlphabets(evt) {
</div>
<div class="col-md-12">
<div class="col-md-6 pad"><span>Personal Email ID</span><!--<span class="badge">*</span>-->
<input type="mail" name="emailid" value="<?php echo $EmailId ; ?>" id="email" placeholder="Email ID" maxlength="100" class="form-control">
<div class="col-md-6 pad"><span>Personal Email ID</span><span class="badge">*</span>
<input type="mail" name="emailid" value="<?php echo $EmailId ; ?>" id="email" required placeholder="Email ID" maxlength="100" class="form-control">
</div>
<div class="col-md-6 pad"><span>Gender</span><span class="badge">*</span>
@ -846,10 +852,10 @@ function onlyAlphabets(evt) {
<input type="text" id="accountno" maxlength="20" name="accountno" placeholder="Account Number" class="form-control" value="<?php echo $BankAccountNo; ?>" onkeypress="return isNumberKey(event)">
</div>
<div class="col-md-3"><span>IFSC Code</span>
<input type="text" id="ifsccode" style="text-transform: uppercase" name="ifsccode" placeholder="IFSC Code" maxlength="12" class="form-control" value="<?php echo $IFSCCode ; ?>">
<input type="text" id="ifsccode" onkeypress="return alpha(event);" style="text-transform: uppercase" name="ifsccode" placeholder="IFSC Code" maxlength="12" class="form-control" value="<?php echo $IFSCCode ; ?>">
</div>
<div class="col-md-3"><span>Bank Branch Name</span>
<input type="text" id="bankbranchname" maxlength="200" name="bankbranchname" placeholder="Bank Branch Name" class="form-control" value="<?php echo $BankBranchName ; ?>">
<input type="text" id="bankbranchname" onkeypress="return alpha(event);" maxlength="200" name="bankbranchname" placeholder="Bank Branch Name" class="form-control" value="<?php echo $BankBranchName ; ?>">
</div>
<div class="col-md-3"><span>Bank Address</span>
<input type="text" id="bankaddress" maxlength="200" name="bankaddress" placeholder="Bank Address" class="form-control" value="<?php echo $BankAddress ; ?>">
@ -863,14 +869,16 @@ function onlyAlphabets(evt) {
<div class="form-group">
<div class="col-md-12 pad">
<div class="col-md-3"><span>Aadhar Number</span>
<input type="text" id="aadharno" name="aadharno" maxlength="12" placeholder="Aadhar Number" onchange="ValidateAadhar();" pattern= "[0-9]{12}" 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();" 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)"> -->
</div>
<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 ; ?>">
</div>
<div class="col-md-3"><span>Passport Number</span>
<input type="text" id="passportno" maxlength="8" onchange="ValidatePassport();" name="passportno" placeholder="Passport Number" class="form-control" value="<?php echo $PassportNo ; ?>">
<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
The first character cannot be Q, X or Z. (eg:A12 34567)">
</div>
<div class="col-md-3"><span>Passport Expiry Date</span>
<input id="ValidTill" name="ValidTill" maxlength="10" placeholder="Passport Expiry Date" class="form-control" value="<?php echo $DOPassport ; ?>">
</div>

2
application/views/editOldRawmaterial.php
View File

@ -325,7 +325,7 @@ function changeTextBox() {
<div class="col-md-3">
<div class="form-group">
<label for="HSNcode">HSN code</label>
<input type="text" class="form-control" id="HSNcode" name="HSNcode" maxlength="255" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)" >
<input type="text" class="form-control" id="HSNcode" name="HSNcode" maxlength="8" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)" >
</div>
</div>
<div class="col-md-6">

49
application/views/editOldasset.php
View File

@ -227,25 +227,27 @@ $(function() {
<select class="form-control required select2" id="PONO" name="PONO">
<option value="<?php echo $PONO;?>"><?php echo $PONO;?></option>
<?php
if(!empty($PO))
{
foreach ($PO as $po)
{
$PONO = $po->PONO;
if ($_POST['PONO'] == $PONO)
{
if(!empty($PO))
{
foreach ($PO as $po)
{
$PONO1 = $po->PONO;
if(trim($PONO1) != trim($PONO))
{
if ($_POST['PONO'] == $PONO1)
{
echo "<option value=\"".$PONO."\" selected=\"selected\">".$PONO.' - '. $SID->PONO."</option>";
}
else
{
echo "<option value=\"".$PONO."\">".$PONO.' '. $SID->PONO ."</option>";
}
}
}
?>
echo "<option value=\"".$PONO1."\" selected=\"selected\">". $po->PONO."</option>";
}
else
{
echo "<option value=\"".$PONO1."\">". $po->PONO ."</option>";
}
}
}
}
?>
</select>
</div>
</div>
@ -441,6 +443,17 @@ $(function() {
$('#PONO').on('change',function(){
var PONO = $(this).val();
$('#SupplierName').val('');
$('#SupID').val('');
$('#MaterialCode').val('');
$('#UOM').val('');
$('#Quantity').val('');
$('#depcode').val('');
$('#AssetDept').val('');
$('#DateOfPurchase').val('');
$('#DeliveryDate').val('');
$('#PODescription').val('');
$('#Assetvalue').val('');
// alert(PONO);
if(PONO){
//alert("INSIDE IF");

2
application/views/editOldcost.php
View File

@ -693,7 +693,7 @@ $("#Edit").on("shown.bs.modal", function(e) {
// $('#BudgetTable').show();
var BudType = $("#Addbudget option:selected").val();
var BudYear = $("#AddYear").val();
var BudYear = $("#drpBudget option:selected").val();
var BudAmount = $("#AddAmout").val();
$('#Addbudget option[value='+BudType+']').remove();
var BudRemarks = $('#AddRemarks').val();

11
application/views/editSupplier.php
View File

@ -145,6 +145,13 @@ if(!empty($supplier))
}
}
function alpha(e) {
var k;
document.all ? k = e.keyCode : k = e.which;
return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 32 || (k >= 48 && k <= 57));
}
function isNumberKey(evt)
{
var charCode = (evt.which) ? evt.which : evt.keyCode;
@ -546,10 +553,10 @@ function onlyAlphabets(evt) {
<input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno;?>" class="form-control" onkeypress="return isNumberKey(event)" >
</div>
<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" >
<input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode;?>" class="form-control" maxlength="12" onkeypress="return alpha(event);">
</div>
<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" >
<input type="text" id="branchname" name="branchname" value="<?php echo $branchname;?>" class="form-control" maxlength="200" onkeypress="return alpha(event);">
</div>
<div class="col-md-3"><span>Bank Address</span>
<input type="text" id="bankaddress" name="bankaddress" value="<?php echo $bankaddress;?>" class="form-control" maxlength="200" >

BIN
uploads/images/no_pic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.9 KiB