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

bug fixed

Browse Source
This commit is contained in:
sriramv 2017-04-05 17:07:55 +05:30
parent be53b84383
commit c4cd8c26b5
14 changed files with 313 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/controllers/assetdetails.php
View File

@ -129,7 +129,7 @@ class assetdetails extends BaseController
$this->session->set_flashdata('error', 'Asset Not Create');
}
redirect('assetdetails/assetListing');
redirect('assetListing');
}
}
@ -198,7 +198,7 @@ class assetdetails extends BaseController
$SupplierName = $this->input->post('SupplierName');
$DateOfPurchase = $this->input->post('DateOfPurchase');
$DateOfCommission = $this->input->post('DateOfCommission');
$Createdby = $this->input->post('Createdby');
$Createdby = $this->input->post('Createdby');
$AssetValue = $this->input->post('AssetValue');
$asset = array();
@ -218,8 +218,8 @@ class assetdetails extends BaseController
{
$this->session->set_flashdata('error', 'Asset updation failed');
}
echo $asset;
// redirect('assetListing');
//echo success;
redirect('assetListing');
}
}
@ -227,8 +227,8 @@ class assetdetails extends BaseController
/**
* This function is used to delete the user using userId
* @return boolean $result : TRUE / FALSE
function deleteUser()
*/
function deleteasset()
{
if($this->isAdmin() == TRUE)
{
@ -237,15 +237,15 @@ class assetdetails extends BaseController
else
{
$userId = $this->input->post('userId');
$userInfo = array('isDeleted'=>1,'updatedBy'=>$this->vendorId, 'updatedDtm'=>date('Y-m-d H:i:sa'));
$userInfo = array('isActive'=>1,'updatedBy'=>$this->vendorId, 'updatedDtm'=>date('Y-m-d H:i:sa'));
$result = $this->user_model->deleteUser($userId, $userInfo);
$result = $this->assetdetails_model->deleteUser($userId, $userInfo);
if ($result > 0) { echo(json_encode(array('status'=>TRUE))); }
else { echo(json_encode(array('status'=>FALSE))); }
}
}
*/
function viewasset($Asset_code = NULL)
{

12
application/controllers/rawmaterialdetails.php
View File

@ -218,8 +218,8 @@ class rawmaterialdetails extends BaseController
/**
* This function is used to delete the user using userId
* @return boolean $result : TRUE / FALSE
function deleteUser()
*/
function deleterawmaterial()
{
if($this->isAdmin() == TRUE)
{
@ -227,15 +227,15 @@ class rawmaterialdetails extends BaseController
}
else
{
$userId = $this->input->post('userId');
$userInfo = array('isDeleted'=>1,'updatedBy'=>$this->vendorId, 'updatedDtm'=>date('Y-m-d H:i:sa'));
$MaterialCode = $this->input->post('MaterialCode');
$Material = array('isActive'=>1,'updatedBy'=>$this->vendorId, 'updatedDate'=>date('Y-m-d H:i:sa'));
$result = $this->user_model->deleteUser($userId, $userInfo);
$result = $this->rawmaterialdetails_model->deleterawmaterial($MaterialCode, $Material);
if ($result > 0) { echo(json_encode(array('status'=>TRUE))); }
else { echo(json_encode(array('status'=>FALSE))); }
}
}*/
}

18
application/controllers/supplier.php
View File

@ -287,7 +287,23 @@ class supplier extends BaseController
}
function deletesupplier()
{
if($this->isAdmin() == TRUE)
{
echo(json_encode(array('status'=>'access')));
}
else
{
$supplierID = $this->input->post('SupplierID');
$supplier = array('isActive'=>1,'updatedBy'=>$this->vendorId, 'updatedON'=>date('Y-m-d H:i:sa'));
$result = $this->supplier_model->deletesupplier($supplierID, $supplier);
if ($result > 0) { echo(json_encode(array('status'=>TRUE))); }
else { echo(json_encode(array('status'=>FALSE))); }
}
}
function pageNotFound()

10
application/models/assetdetails_model.php
View File

@ -157,13 +157,13 @@ function addNewasset($asset)
* This function is used to delete the user information
* @param number $userId : This is user id
* @return boolean $result : TRUE / FALSE
function deletePO($PO, $POinfo)
*/
function deleteasset($Asset_Code, $asset)
{
$this->db->where('PO', $PO);
$this->db->update('T_PurchaseOrderDetails', $POInfo);
$this->db->where('Asset_Code', $Asset_Code);
$this->db->update('T_AssetDetails', $asset);
return $this->db->affected_rows();
}*/
}
}
?>

14
application/models/rawmaterialdetails_model.php
View File

@ -17,7 +17,7 @@ class rawmaterialdetails_model extends CI_Model
$likeCriteria = "(BaseT.MaterialCode LIKE '%".$searchText."%'
OR BaseT.MaterialName LIKE '%".$searchText."%'
OR BaseT.MaterialType LIKE '%".$searchText."%'
OR BaseT.SupplierID LIKE '%".$searchText."%')";
OR BaseT.UOM LIKE '%".$searchText."%')";
$this->db->where($likeCriteria);
}
//$this->db->where('BaseT.isDeleted', 0);
@ -43,7 +43,7 @@ class rawmaterialdetails_model extends CI_Model
$likeCriteria = "(BaseT.MaterialCode LIKE '%".$searchText."%'
OR BaseT.MaterialName LIKE '%".$searchText."%'
OR BaseT.MaterialType LIKE '%".$searchText."%'
OR BaseT.SupplierID LIKE '%".$searchText."%')";
OR BaseT.UOM LIKE '%".$searchText."%')";
$this->db->where($likeCriteria);
}
//$this->db->where('BaseT.isDeleted', 0);
@ -138,13 +138,13 @@ function addNewRawMaterial($RawMaterial)
* This function is used to delete the user information
* @param number $userId : This is user id
* @return boolean $result : TRUE / FALSE
function deletePO($PO, $POinfo)
*/
function deleterawmaterial($RawMaterial, $MaterialCode)
{
$this->db->where('PO', $PO);
$this->db->update('T_PurchaseOrderDetails', $POInfo);
$this->db->where('MaterialCode', $MaterialCode);
$this->db->update('T_MaterialMaster', $RawMaterial);
return $this->db->affected_rows();
}*/
}
}
?>

8
application/models/supplier_model.php
View File

@ -172,7 +172,13 @@ function addNewsupplier($supplier)
}
function deletesupplier($supplierID, $supplier)
{
$this->db->where('supplierID', $supplierID);
$this->db->update('T_SupplierDetailsN', $supplier);
return $this->db->affected_rows();
}
}

24
application/views/addRawMaterial.php
View File

@ -49,7 +49,7 @@
<div class="form-group">
<label for="MaterialType">Material Type</label>
<select class="form-control required" id="MaterialType" name="MaterialType">
<option value="null" required>Select Material Type</option>
<option selected disabled value="">Select Material Type</option>
<?php
if(!empty($material))
{
@ -68,7 +68,7 @@
<div class="form-group">
<label for="UOM">Unit of Mesurement</label>
<select class="form-control required" id="UOM" name="UOM">
<option value="0" required>Select UOM</option>
<option selected disabled value="" >Select UOM</option>
<?php
if(!empty($UOM))
{
@ -90,7 +90,7 @@
</div><!-- /.box-body -->
<div class="box-footer" style="text-align:right">
<input type="submit" class="btn btn-info" value="Submit" />
<input type="submit" class="btn btn-info" onclick="Validate()"value="Submit" />
<input type="reset" class="btn btn-info" value="Cancel" />
</div>
</form>
@ -129,4 +129,22 @@
</section>
</div>
<script>
function Validate()
{
if($("option:selected", $("#MaterialType")).val() == '0')
{
alert('Please Select Material Type');
return ;
}
if($("option:selected", $("#UOM")).val() == '0')
{
return ;
alert('Please Select UOM');
}
}
</script>
<script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>

48
application/views/addasset.php
View File

@ -1,4 +1,4 @@
<div class="content-wrapper">
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
@ -42,7 +42,7 @@
<div class="form-group">
<div class="form-group">
<label for="Asset_Name">Asset Name</label>
<input type="text" class="form-control required" id="Asset_Name" name="Asset_Name">
<input type="text" class="form-control required" id="Asset_Name" name="Asset_Name" required="true">
</div>
</div>
@ -53,7 +53,7 @@
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<label for="Description">Description</label>
<label for="Description" required="true">Description</label>
<input type="text" class="form-control required" id="Description" name="Description">
</div>
</div>
@ -64,7 +64,7 @@
<div class="form-group">
<label for="Department">Department</label>
<select class="form-control required" id="Department" name="Department">
<option>Department</option>
<option value="0">Department</option>
<?php
if(!empty($Department))
{
@ -84,8 +84,8 @@
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<label for="Location">Location</label>
<input type="text" class="form-control required" id="Location" name="Location">
<label for="Location" >Location</label>
<input type="text" class="form-control required" id="Location" name="Location" required="true">
</div>
</div>
@ -93,8 +93,8 @@
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<label for="AssetOwner">Asset Owner</label>
<input type="text" class="form-control required" id="User" name="User">
<label for="AssetOwner">User</label>
<input type="text" class="form-control required" id="User" name="User" required="true">
</div>
</div>
@ -102,8 +102,8 @@
<div class="col-md-6">
<div class="form-group">
<label for="SupplierName">Supplier Name</label>
<select class="form-control required" id="SupplierName" name="SupplierName">
<option >Select Supplier Name</option>
<select class="form-control required" id="SupplierName" name="SupplierName" required="true">
<option value="0">Select Supplier Name</option>
<?php
if(!empty($SupplierName))
{
@ -122,29 +122,29 @@
<div class="form-group">
<label for="DateOfPurchase">Date Of Purchase</label>
<input type="date" name="DateOfPurchase" min=<?php $week = date("Y-m-d",mktime(0, 0, 0, date("m"), date("d")-7,date("Y")));echo $week;?> max=<?php echo date('Y-m-d'); ?> value="<?php echo date('Y-m-d'); ?>" class="form-control" placeholder="" />
<input type="date" name="DateOfPurchase" min=<?php $week = date("Y-m-d",mktime(0, 0, 0, date("m"), date("d")-7,date("Y")));echo $week;?> max=<?php echo date('Y-m-d'); ?> value="<?php echo date('Y-m-d'); ?>" class="form-control" placeholder="" / required="true">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="DateOfCommission">Date Of Commission</label>
<input type="date" name="DateOfCommission" min=<?php $week = date("Y-m-d",mktime(0, 0, 0, date("m"), date("d")-7,date("Y")));echo $week;?> max=<?php echo date('Y-m-d'); ?> value="<?php echo date('Y-m-d'); ?>" class="form-control" placeholder="" />
<input type="date" name="DateOfCommission" min=<?php $week = date("Y-m-d",mktime(0, 0, 0, date("m"), date("d")-7,date("Y")));echo $week;?> max=<?php echo date('Y-m-d'); ?> value="<?php echo date('Y-m-d'); ?>" class="form-control" placeholder="" / required="true">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="Assetvalue">Asset Value</label>
<input type="text" class="form-control required" id="Assetvalue" name="Assetvalue" maxlength="255">
<input type="hidden" class="form-control required" id="Createdby" name="Createdby" maxlength="255">
<input type="text" class="form-control required" id="Assetvalue" name="AssetValue" maxlength="255" required="true">
<input type="hidden" class="form-control required" id="Createdby" value="<?php echo $name;?>" name="Createdby" maxlength="255">
</div>
</div>
</div><!-- /.box-body -->
<div class="box-footer" style="text-align:right">
<input type="submit" class="btn btn-info" value="Submit" />
<input type="submit" class="btn btn-info" onclick="Validate()" value="Submit" />
<input type="reset" class="btn btn-info" value="Reset" />
</div>
</form>
@ -183,4 +183,22 @@
</section>
</div>
<script>
function Validate()
{
if($("option:selected", $("#Department")).val() == '0')
{
alert('Please Select Department');
return ;
}
if($("option:selected", $("#SupplierName")).val() == '0')
{
alert('Please Select Supplier Name');
return ;
}
}
</script>
<script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>

76
application/views/addsupplier.php
View File

@ -32,13 +32,13 @@
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="PAN">PAN</label>
<input type="text" class="form-control" id="PAN" name="PAN" style="text-transform:uppercase" onchange="validatePAN()"title="please correct enter the pan number"maxlength="10">
<input type="text" class="form-control" id="PAN" name="PAN" style="text-transform:uppercase" onchange="validatePAN()"title="please correct enter the pan number"maxlength="10" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="SupplierName">Supplier Name</label>
<input type="text" class="form-control " id="SupplierName" onchange="validatesuppliername()"name="SupplierName" maxlength="128" >
<input type="text" class="form-control " id="SupplierName" onchange="validatesuppliername()"name="SupplierName" maxlength="128" required="true">
</div>
</div>
@ -46,7 +46,7 @@
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="Address2">Address</label>
<input type="text" class="form-control required" id="Address" name="Address" maxlength="250"></textarea>
<input type="text" class="form-control required" id="Address" name="Address" maxlength="250"required="true"></textarea>
</div>
</div>
@ -56,13 +56,13 @@
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="ContactNumber">Contact Number</label>
<input type="text" class="form-control" pattern="^\d{10,11}$" id="number" title="please enter valid phone number" name="ContactNumber" minlength="10" maxlength="11">
<input type="text" class="form-control" pattern="^\d{10,11}$" id="number" title="please enter valid phone number" name="ContactNumber" minlength="10" maxlength="11" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="AlternateContactNumber">Alternate Contact Number</label>
<input type="tel" class="form-control" pattern="^\d{10,11}$" id="Number" name="AlternateContactNumber" minlength="10" maxlength="11">
<input type="tel" class="form-control" pattern="^\d{10,11}$" id="Number" name="AlternateContactNumber" minlength="10" maxlength="11" required="true">
</div>
</div>
@ -71,19 +71,19 @@
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="EmailAddress">Email Address</label>
<input type="email" class="form-control required email" id="EmailAddress" onchange="validateEmail()"name="EmailAddress" maxlength="128">
<input type="email" class="form-control required email" id="EmailAddress" onchange="validateEmail()"name="EmailAddress" maxlength="128" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="Exiseregistration">Exise Registration</label>
<input type="text" class="form-control required" id="Exiseregistration" name="Exiseregistration" minlength="10" maxlength="10">
<input type="text" class="form-control required" id="Exiseregistration" name="Exiseregistration" maxlength="15" required="true" title="ex:XXXX00000XX000" style="text-transform:uppercase" onchange="validateexcise()">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="TIN">TIN</label>
<input type="text" class="form-control required" id="TIN" pattern="^\d{2}-\d{7}$"name="TIN" minlength="10" maxlength="10">
<input type="text" class="form-control required" id="TIN" pattern="^\d{2}-\d{7}$"name="TIN" minlength="10" maxlength="10" title="ex:xx-xxxxxxx" required="true">
</div>
</div>
@ -92,7 +92,7 @@
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="GSTNo">GST No</label>
<input type="text" class="form-control " id="GSTNo" name="GSTNo" maxlength="10">
<input type="text" class="form-control " id="GSTNo" name="GSTNo" maxlength="10" required="true">
</div>
</div>
@ -100,20 +100,20 @@
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="Range">GSTRange</label>
<input type="text" class="form-control " id="Range" name="GSTRange" "maxlength="10">
<label for="Range">GST Range</label>
<input type="text" class="form-control " id="Range" name="GSTRange" "maxlength="10" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="CollectrateAddress">Colletrate Address</label>
<input type="text" class="form-control " id="CollectrateAddress" name="CollectrateAddress" maxlength="255">
<input type="text" class="form-control " id="CollectrateAddress" name="CollectrateAddress" maxlength="255" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="UANumber">UA Number</label>
<input type="text" class="form-control " pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12">
<input type="text" class="form-control " pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12" required="true">
</div>
</div>
@ -126,42 +126,45 @@
<div class="col-md-6 col-xs-6">
<label for="payablefrom">Payable From</label>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option >Select Payment method</option>
<select class="form-control required" id="PaymentTerms" onchange="Validate()" name="PaymentTerms" required>
<option value="0"> Please select </option>
<?php
if(!empty($payment))
{
foreach ($payment as $rl)
{
?>
<option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
<?php
<?php echo 'required="true"';
}
}
?>
</select>
</div>
<div class="col-md-3 col-xs-6">
<div class="form">
<label for="PaymentDays">Payment Date</label><br/>
<label for="PaymentDays" >Payment Date</label><br/>
<span> Before</span>
<input type="radio" name="PaymentDays" value="before"/>
<input type="radio" name="PaymentDays" value="before"/ required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<span> After</span>
<input type="radio" name="PaymentDays" value="after"/>
<input type="radio" name="PaymentDays" value="after"/ >
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="PayableAT">Payable AT</label>
<input type="text" class="form-control required" id="PayableAT" name="PayableAT" >
<input type="hidden" value="<?php echo $name;?>" class="form-control required" id="Createdby" name="Createdby" >
<input type="text" class="form-control required" id="PayableAT" name="PayableAT" required="true">
<input type="hidden" value="<?php echo $name;?>" class="form-control required" id="Createdby" name="Createdby">
</div>
</div>
</div>
@ -170,7 +173,7 @@
</div><!-- /.box-body -->
<div class="box-footer" style="text-align:right">
<input type="submit" class="btn btn-primary" value="Submit" />
<input type="submit" class="btn btn-primary" onclick="Validate()" value="Submit" />
<input type="reset" class="btn btn-primary" value="Reset" />
</div>
</form>
@ -274,9 +277,27 @@ function validatePAN() {
}
}
}
function validateexcise() {
var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{5,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/;
var Exiseregistration = $('#Exiseregistration').val();
if(Exiseregistration != "")
{
if (reg.test(Exiseregistration) == false)
{
alert('Please Enter Valid Exise registration Number');
return (false);
}
else
{
return true;
}
}
}
//Validate Supplier Name
function validatesuppliername() {
var reg = /^[A-Za-z ]{3,30}$/;
var reg = /^[A-Za-z ()]{3,30}$/;
var suppliername = $('#SupplierName').val();
if(suppliername != "")
@ -310,5 +331,12 @@ function validatenumbers() {
}
}
function Validate()
{
if($("option:selected", $("#PaymentTerms")).val() == '0')
{
alert('Please Select Payment Terms');
return ;
}
}
</script>

4
application/views/editOldRawmaterial.php
View File

@ -56,8 +56,8 @@ if(!empty($userRecords))
<div class="col-md-6">
<div class="form-group">
<label for="MaterialName">Material Name</label>
<input type="text" class="form-control required " id="MaterialName" name="MaterialName" maxlength="255" value="<?php echo $MaterialCode;?>">
<input type="hidden" class="form-control required " id="MaterialCode" value="<?php echo $MaterialCode;?>"name="MaterialCode" maxlength="255">
<input type="text" class="form-control required " id="MaterialName" name="MaterialName" maxlength="255" value="<?php echo $MaterialName;?>" required="true">
<input type="hidden" class="form-control required " id="MaterialCode" value="<?php echo $MaterialCode;?>"name="MaterialCode" maxlength="255" >
</div>
</div>
<div class="col-md-6">

170
application/views/editOldasset.php
View File

@ -9,11 +9,9 @@ $User = '';
$SupplierName = '';
$DateOfPurchase = '';
$DateOfCommission = '';
$CreatedDate = '';
$AssetValue = '';
$Createdby = '';
if(!empty($asset))
{
foreach ($asset as $uf)
@ -21,27 +19,21 @@ if(!empty($asset))
$Asset_Code = $uf->Asset_Code;
$Asset_Name = $uf->Asset_Name;
$Description = $uf->Description;
$Department = $uf->Department;
$Department = $uf->Department;
$Location = $uf->Location;
$User = $uf->User;
$SupplierName = $uf->SupplierName;
$DateOfPurchase = $uf->DateOfPurchase;
$DateOfCommission = $uf->DateOfCommission;
$Createdby = $uf->Createdby;
$CreatedDate = $uf->CreatedDate;
$AssetValue = $uf->AssetValue;
$Createdby = $uf->Createdby;
}
}
?>
<script>
function demo(){
alert("Update this records");
}
</script>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
@ -49,11 +41,12 @@ function demo(){
<center>Asset Details</center>
</h1>
</section>
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>assetListing" class="btn btn-info" value="Back"/>Back</a>
<a href="<?php echo base_url() ?>assetListing" class="btn btn-info" value="Back">Back</a>
</div>
<br/>
<div class="row">
@ -65,42 +58,34 @@ function demo(){
<div class="box box-primary">
<div class="box-header">
<center> <h3 class="box-title">Edit Asset Details</h3><center>
<center><h3 class="box-title">Edit Asset Details</h3></center>
</div><!-- /.box-header -->
<!-- form start -->
<form role="form" action="<?php echo base_url() ?>assetdetails/editasset" method="post" id="editsupplier" role="form">
<form role="form" action="<?php echo base_url() ?>editasset" method="post" id="editasset" role="form">
<div class="box-body">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<label for="Asset_Name">Asset Name</label>
<input type="text" class="form-control required" id="Asset_Name" name="Asset_Name" value="<?php echo $Asset_Name;?>" required>
<input type="hidden" value="<?php echo $Asset_Code; ?>" name="Asset_Code" id="Asset_Code" readonly>
</div>
<label for="Asset_Name">Asset_Name</label>
<input type="text" class="form-control" id="fname" placeholder="Asset_Name" name="Asset_Name" value="<?php echo $Asset_Name; ?>" maxlength="128" required="true">
<input type="hidden" value="<?php echo $Asset_Code; ?>" name="Asset_Code" id="Asset_Code" required="true"/>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<label for="Description">Description</label>
<input type="text" class="form-control required" id="Description" name="Description" value="<?php echo $Description; ?>">
<input type="text" class="form-control" id="Description" placeholder="Description" name="Description" value="<?php echo $Description; ?>" maxlength="255"required="true">
</div>
</div>
</div>
<div class="col-md-6">
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<label for="Department">Department</label>
<select class="form-control required" id="Department" name="Department">
<option value="<?php echo $Department;?>"><?php echo $Department;?></option>
<label for="DepartmentList">DepartmentList</label>
<select class="form-control" id="Department" name="Department" required="true">
<option value="<?php echo $Department ?>"><?php echo $Department ?></option>
<?php
if(!empty($DepartmentList))
{
@ -114,32 +99,27 @@ function demo(){
?>
</select>
</div>
</div>
</div>
<div class="col-md-6">
</div>
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<label for="Location">Location</label>
<input type="text" class="form-control required" id="Location" name="Location"value="<?php echo $Location;?>">
<input type="text" class="form-control" value="<?php echo $Location; ?>"id="Location" placeholder="Location" name="Location"required="true" >
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<label for="User">User</label>
<input type="text" class="form-control required" id="AssetOwner" name="User" value="<?php echo $User;?>">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="SupplierName">Supplier Name</label>
<select class="form-control required" id="SupplierName" name="SupplierName">
<option value="<?php echo $SupplierName;?>"><?php echo $SupplierName;?></option>
<label for="User">User</label>
<input type="text" class="form-control" value="<?php echo $User;?>"id="User" placeholder="User" name="User" required="true">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="SupplierName">SupplierName</label>
<select class="form-control" id="SupplierName"required="true" name="SupplierName">
<option value="<?php echo $SupplierName; ?>"><?php echo $SupplierName; ?></option>
<?php
if(!empty($SupplierList))
@ -153,41 +133,87 @@ function demo(){
}
?>
</select>
</div>
</div>
<div class="col-md-6">
</div>
<div class="col-md-6">
<div class="form-group">
<label for="DateOfPurchase">Date Of Purchase</label>
<input type="date" name="DateOfPurchase" min=<?php $week = date("Y-m-d",mktime(0, 0, 0, date("m"), date("d")-60,date("Y")));echo $week;?> max=<?php echo date('Y-m-d'); ?> value="<?php echo $DateOfPurchase; ?>" class="form-control" placeholder="" />
<input type="date" name="DateOfPurchase" min=<?php $week = date("Y-m-d",mktime(0, 0, 0, date("m"), date("d")-60,date("Y")));echo $week;?> max=<?php echo date('Y-m-d'); ?> value="<?php echo $DateOfPurchase; ?>" class="form-control" placeholder="" required="true"/>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6">
<div class="form-group">
<label for="DateOfCommission">Date Of Commission</label>
<input type="date" name="DateOfCommission" min=<?php $week = date("Y-m-d",mktime(0, 0, 0, date("m"), date("d")-60,date("Y")));echo $week;?> max=<?php echo date('Y-m-d'); ?> value="<?php echo $DateOfCommission;?>" class="form-control" placeholder="" />
<input type="date" name="DateOfCommission" min=<?php $week = date("Y-m-d",mktime(0, 0, 0, date("m"), date("d")-60,date("Y")));echo $week;?> max=<?php echo date('Y-m-d'); ?> value="<?php echo $DateOfCommission;?>" class="form-control" placeholder="" required="true"/>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6">
<div class="form-group">
<label for="Assetvalue">Asset Value</label>
<input type="text" value="<?php echo $AssetValue;?>"class="form-control required" id="Assetvalue" name="Assetvalue" maxlength="255">
<input type="hidden" class="form-control required" value="<?php echo $Createdby;?>"id="Createdby" name="Createdby" maxlength="255">
<label for="AssetValue">AssetValue</label>
<input type="text" class="form-control" id="User" placeholder="AssetValue" name="AssetValue" Value="<?php echo $AssetValue;?>" required="true">
<input type="hidden" class="form-control" id="Createdby" placeholder="Createdby" name="Createdby" Value="<?php echo $Createdby;?>"readonly>
</div>
</div>
</div><!-- /.box-body -->
</div>
</div>
<!-- /.box-body -->
<div class="box-footer" style="text-align:right">
<input type="submit" class="btn btn-info" onclick="demo()" value="Submit" />
<input type="reset" class="btn btn-info" value="Cancel" />
<!--<input type="reset" class="btn btn-default" value="Reset" />-->
<input type="submit" class="btn btn-info" value="Submit" />
<input type="reset" class="btn btn-info" value="Cancel" />
</div>
</form>
</div>
</div>
</div>
<div class="col-md-4">
<?php
$this->load->helper('form');
$error = $this->session->flashdata('error');
if($error)
{
?>
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo $this->session->flashdata('error'); ?>
</div>
<?php } ?>
<?php
$success = $this->session->flashdata('success');
if($success)
{
?>
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo $this->session->flashdata('success'); ?>
</div>
<?php } ?>
<div class="row">
<div class="col-md-12">
<?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
</div>
</div>
</div>
</section>
</div>
<script>
function Validate()
{
if($("option:selected", $("#Department")).val() == '0')
{
alert('Please Select Department');
return ;
}
if($("option:selected", $("#SupplierName")).val() == '0')
{
alert('Please Select Supplier Name');
return ;
}
}
</script>
<script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>

63
application/views/editOldsupplier.php
View File

@ -15,7 +15,7 @@ $UANumber = '';
$PaymentTerms = '';
$PaymentDays = '';
$PayableAT = '';
$Createdby = '';
if(!empty($supplier))
@ -38,6 +38,7 @@ if(!empty($supplier))
$PaymentTerms = $uf->PaymentTerms;
$PaymentDays = $uf->PaymentDays;
$PayableAT = $uf->PayableAT;
$Createdby = $uf->Createdby;
}
@ -86,14 +87,14 @@ function demo(){
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="PAN">PAN</label>
<input type="text" class="form-control" id="PAN" name="PAN"style="text-transform:uppercase" onchange="validatePAN()"title="please correct enter the pan number"maxlength="10" value="<?php echo $PAN;?>">
<input type="text" class="form-control" id="PAN" name="PAN"style="text-transform:uppercase" onchange="validatePAN()"title="please correct enter the pan number"maxlength="10" value="<?php echo $PAN;?>" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="SupplierName">Supplier Name</label>
<input type="hidden" class="form control" name="SupplierID" value="<?php echo $SupplierID;?>">
<input type="text" class="form-control " id="SupplierName" onchange="validatesuppliername()"name="SupplierName" maxlength="128" value="<?php echo $SupplierName;?>"value="<?php echo $SupplierName;?>" >
<input type="text" class="form-control " id="SupplierName" onchange="validatesuppliername()"name="SupplierName" maxlength="128" value="<?php echo $SupplierName;?>"value="<?php echo $SupplierName;?>" required="true">
</div>
</div>
@ -101,7 +102,7 @@ function demo(){
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="Address">Address</label>
<input type="text" class="form-control required" id="Address" name="Address" value="<?php echo $Address;?>"maxlength="250"></textarea>
<input type="text" class="form-control required" id="Address" name="Address" value="<?php echo $Address;?>"maxlength="250" required="true"></textarea>
</div>
</div>
@ -111,13 +112,13 @@ function demo(){
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="ContactNumber">Contact Number</label>
<input type="text" class="form-control" pattern="^\d{10}$""onchange="validatenumbers()" id="number" title="please enter valid phone number" name="ContactNumber" value="<?php echo $ContactNumber;?>">
<input type="text" class="form-control" pattern="^\d{10}$""onchange="validatenumbers()" id="number" title="please enter valid phone number" minlength="10" maxlength="11"name="ContactNumber" required="true" value="<?php echo $ContactNumber;?>">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="AlternateContactNumber">Alternate Contact Number</label>
<input type="tel" class="form-control" pattern="^\d{10}$"value="<?php echo $AlternateContactNumber;?>" id="Number" name="AlternateContactNumber" minlength="10" maxlength="11">
<input type="tel" class="form-control" pattern="^\d{10}$"value="<?php echo $AlternateContactNumber;?>" id="Number" name="AlternateContactNumber" minlength="10" maxlength="11" required="true">
</div>
</div>
@ -126,19 +127,19 @@ function demo(){
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="EmailAddress">Email Address</label>
<input type="email" class="form-control required email" value="<?php echo $EmailAddress;?>"id="EmailAddress" onchange="validateEmail()"name="EmailAddress" maxlength="128">
<input type="email" class="form-control required email" value="<?php echo $EmailAddress;?>"id="EmailAddress" onchange="validateEmail()"name="EmailAddress" maxlength="128" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="Exiseregistration">Exise Registration</label>
<input type="text" class="form-control required"value="<?php echo $Exiseregistration;?>" id="Exiseregistration" name="Exiseregistration" minlength="10" maxlength="10">
<input type="text" class="form-control required"value="<?php echo $Exiseregistration;?>" id="Exiseregistration" name="Exiseregistration" maxlength="15" required="true"onchange="validateexcise()" title="ex:XXXX00000XX000" style="text-transform:uppercase">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="TIN">TIN</label>
<input type="text" class="form-control required" pattern="^\d{2}-\d{7}$"value="<?php echo $TIN;?>" onchange="validateTIN"id="TIN" title="ex:xx-xxxxxxx"name="TIN" minlength="10" maxlength="10">
<input type="text" class="form-control required" pattern="^\d{2}-\d{7}$"value="<?php echo $TIN;?>" onchange="validateTIN"id="TIN" title="ex:xx-xxxxxxx"name="TIN" minlength="10" maxlength="10" required="true">
</div>
</div>
@ -147,7 +148,7 @@ function demo(){
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="GSTNO">GST No</label>
<input type="text" class="form-control " value="<?php echo $GSTNO;?>"id="GSTNo" name="GSTNo" maxlength="10">
<input type="text" class="form-control " value="<?php echo $GSTNO;?>"id="GSTNo" name="GSTNo" maxlength="10" required="true">
</div>
</div>
@ -155,20 +156,20 @@ function demo(){
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="Range">Range</label>
<input type="text" class="form-control " value="<?php echo $GSTRange;?>"id="Range" name="GSTRange" "maxlength="10">
<label for="Range">GST Range</label>
<input type="text" class="form-control " value="<?php echo $GSTRange;?>"id="Range" name="GSTRange" "maxlength="10" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="CollectrateAddress">Colletrate Address</label>
<input type="text" class="form-control " value="<?php echo $CollectrateAddress;?>"id="CollectrateAddress" name="CollectrateAddress" maxlength="255">
<input type="text" class="form-control " value="<?php echo $CollectrateAddress;?>"id="CollectrateAddress" name="CollectrateAddress" maxlength="255" required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="UANumber">UA Number</label>
<input type="text" class="form-control " pattern="^\d{12}$"value="<?php echo $UANumber;?>" id="UANumber" name="UANumber" maxlength="12">
<input type="text" class="form-control " pattern="^\d{12}$"value="<?php echo $UANumber;?>" id="UANumber" name="UANumber" maxlength="12" required="true">
</div>
</div>
@ -201,21 +202,22 @@ function demo(){
<div class="form">
<label for="PaymentDays" >Payment Date</label><br/>
<span> Before</span>
<input type="radio" <?php echo($PaymentDays?'checked="checked"':''); ?> name="PaymentDays" value="before"/>
<input type="radio" <?php echo($PaymentDays =='before')?'checked':''; ?> name="PaymentDays" value="before"/ required="true">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<span> After</span>
<input type="radio" <?php echo($PaymentDays?'checked="checked"':''); ?> name="PaymentDays" value="after"/>
<input type="radio" <?php echo($PaymentDays =='after')?'checked':''; ?> name="PaymentDays" value="after"/>
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="PayableAT">Payable AT</label>
<input type="text" value="<?php echo $PayableAT;?>"class="form-control required" id="PayableAT" name="PayableAT" >
<input type="text" value="<?php echo $PayableAT;?>"class="form-control required" id="PayableAT" name="PayableAT" required="true">
<input type="hidden" value="<?php echo $Createdby;?>"class="form-control required" id="Createdby" name="Createdby" >
<input type="hidden" value="<?php echo $name;?>"class="form-control required" id="UpdatedBy" name="UpdatedBy" >
</div>
@ -332,7 +334,7 @@ function validatePAN() {
}
//Validate Supplier Name
function validatesuppliername() {
var reg = /^[A-Za-z ]{3,30}$/;
var reg = /^[A-Za-z ()]{3,30}$/;
var suppliername = $('#SupplierName').val();
if(suppliername != "")
@ -385,5 +387,30 @@ function validatesuppliername() {
}
}
function validateexcise() {
var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{5,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/;
var Exiseregistration = $('#Exiseregistration').val();
if(Exiseregistration != "")
{
if (reg.test(Exiseregistration) == false)
{
alert('Please Enter Valid Exise registration Number');
return (false);
}
else
{
return true;
}
}
}
function Validate()
{
if($("option:selected", $("#PaymentTerms")).val() == '0')
{
alert('Please Select Payment Terms');
return ;
}
}
</script>

4
application/views/rawmaterialListing.php
View File

@ -37,7 +37,7 @@
<th>Material Type</th>
<th>UOM</th>
<th>Edit</th>
<th>Action</th>
@ -59,7 +59,7 @@
<td>
<a href="<?php echo base_url().'rawmaterialdetails/editOldrawmaterial/'.$record->MaterialCode; ?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
<a href="<?php echo base_url().'rawmaterialdetails/viewrawmaterial/'.$record->MaterialCode; ?>"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a>
<!-- <a href="#" data-userid="<?php echo $record->userId; ?>" class="deleteUser"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>-->
<a href="#" data-userid="<?php echo $record->MaterialCode; ?>" class="deleteUser"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
</td>
</tr>
<?php

17
application/views/supplierListing.php
View File

@ -39,16 +39,16 @@
<th>Contact Number</th>
<th>Alternate Contact Number</th>
<th>Email Address</th>
<th>Exiseregistration</th>
<th>Exise Registration</th>
<th>TIN</th>
<th>PAN</th>
<th>GSTNO</th>
<th>GSTRange</th>
<th>CollectrateAddress</th>
<th>GST NO</th>
<th>GST Range</th>
<th>Collectrate Address</th>
<th>UANumber</th>
<th>PaymentTerms</th>
<th>PaymentDays</th>
<th>PayableAT</th>
<th>Payment Terms</th>
<th>Payment Days</th>
<th>Payable AT</th>
<th>Create Date</th>
<th>Action</th>
@ -81,7 +81,8 @@
<td>
<a href="<?php echo base_url().'supplier/editOldsupplier/'.$record->SupplierID; ?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
<a href="<?php echo base_url().'supplier/viewsupplier/'.$record->SupplierID; ?>"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a>
<!-- <a href="#" data-userid="<?php echo $record->userId; ?>" class="deleteUser"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>-->
<a href="#" data-userid="<?php echo $record->SupplierID; ?>" class="deleteUser"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
</td>
</tr>
<?php