asset and material page changed
This commit is contained in:
parent
1202900301
commit
ce38b59864
@ -1,3 +1,37 @@
|
||||
<script>
|
||||
|
||||
$(function() {
|
||||
var d = new Date();
|
||||
|
||||
var month = d.getMonth();
|
||||
var day = d.getDate();
|
||||
var year = d.getFullYear() ;
|
||||
var SIAStartYear = year - 2015;
|
||||
var mindt = year-70;
|
||||
var maxdt = year-15;
|
||||
|
||||
$("#DateOfCreated").datepicker({
|
||||
minDate : new Date(mindt,1,1),
|
||||
maxDate : 'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
|
||||
|
||||
|
||||
});
|
||||
$("#DateOfUpdated").datepicker({
|
||||
minDate : new Date(year-SIAStartYear,1,1),
|
||||
maxDate :'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
<div class="content-wrapper">
|
||||
<!-- Content Header (Page header) -->
|
||||
<section class="content-header">
|
||||
@ -21,33 +55,27 @@
|
||||
|
||||
|
||||
<div class="box box-primary">
|
||||
<div class="box-header">
|
||||
<center><h3 class="box-title">Add Material Master Details</h3></center>
|
||||
</div><!-- /.box-header -->
|
||||
|
||||
<!-- form start -->
|
||||
|
||||
<form role="form" id="addUser" action="<?php echo base_url() ?>rawmaterialdetails/addNewRawMaterial" method="post" role="form">
|
||||
<div class="box-body">
|
||||
<div class="row">
|
||||
<!--<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label for="CostCentreID">Cost Center ID</label>
|
||||
<input type="text" class="form-control required" id="CostCentreID" name="CostCentreID" maxlength="128">
|
||||
<span for="MaterialName">Material Code</span>
|
||||
<input type="text" class="form-control required " id="MaterialCode" name="MaterialCode" maxlength="10" readonly>
|
||||
</div>
|
||||
|
||||
</div>-->
|
||||
|
||||
|
||||
|
||||
<div class="col-md-6">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label for="MaterialName">Material Name</label>
|
||||
<span for="MaterialName">Material Name</span>
|
||||
<input type="text" class="form-control required " id="MaterialName" name="MaterialName" maxlength="255">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label for="MaterialType">Material Type</label>
|
||||
<span for="MaterialType">Material Type</span>
|
||||
<select class="form-control required" id="MaterialType" name="MaterialType">
|
||||
<option value="null" required>Select Material Type</option>
|
||||
<?php
|
||||
@ -64,9 +92,9 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label for="UOM">Unit of Mesurement</label>
|
||||
<span for="UOM">Unit of Mesurement</span>
|
||||
<select class="form-control required" id="UOM" name="UOM">
|
||||
<option value="0" required>Select UOM</option>
|
||||
<?php
|
||||
@ -83,10 +111,47 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<input type="hidden" class="form-control required " value="<?php echo $name; ?>"id="CreatedBy" name="CreatedBy">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="DateOfCreated">Created Date</span>
|
||||
<input id="DateOfCreated" required name="DateOfCreated" onkeypress="return false;" maxlength="10" class="form-control">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="Createdby">Created By</span>
|
||||
|
||||
<input type="text" class="form-control required" id="Createdby" name="Createdby" maxlength="255">
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="DateOfUpdated">Updated Date</span>
|
||||
<input id="DateOfUpdated" required name="DateOfUpdated" onkeypress="return false;" maxlength="10" class="form-control">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="updatedby">Updated By</span>
|
||||
|
||||
<input type="text" class="form-control required" id="Createdby" name="Createdby" maxlength="255">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<input type="checkbox" id="isactive" name="isactive" onclick="checkactive"> IsActive
|
||||
</div>
|
||||
</div><!-- /.box-body -->
|
||||
|
||||
<div class="box-footer" style="text-align:right">
|
||||
|
||||
@ -1,3 +1,45 @@
|
||||
<script>
|
||||
|
||||
$(function() {
|
||||
var d = new Date();
|
||||
|
||||
var month = d.getMonth();
|
||||
var day = d.getDate();
|
||||
var year = d.getFullYear() ;
|
||||
var SIAStartYear = year - 2015;
|
||||
var mindt = year-70;
|
||||
var maxdt = year-15;
|
||||
|
||||
$("#DateOfCreated").datepicker({
|
||||
minDate : new Date(mindt,1,1),
|
||||
maxDate : 'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
|
||||
|
||||
|
||||
});
|
||||
$("#DateOfCommission").datepicker({
|
||||
minDate : new Date(year-SIAStartYear,1,1),
|
||||
maxDate :'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
|
||||
|
||||
|
||||
|
||||
});
|
||||
$("#DateOfPurchase").datepicker({
|
||||
minDate : new Date(year-SIAStartYear,1,1),
|
||||
maxDate :'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<div class="content-wrapper">
|
||||
<!-- Content Header (Page header) -->
|
||||
<section class="content-header">
|
||||
@ -20,28 +62,27 @@
|
||||
|
||||
|
||||
<div class="box box-primary">
|
||||
<div class="box-header">
|
||||
<center><h3 class="box-title">Add Asset Details</h3></center>
|
||||
</div><!-- /.box-header -->
|
||||
|
||||
<!-- form start -->
|
||||
|
||||
<form role="form" id="addUser" action="<?php echo base_url() ?>addNewasset" method="post" role="form">
|
||||
|
||||
<div class="box-body">
|
||||
<div class="row">
|
||||
<!--<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<label for="Asset_Code">Asset Code</label>
|
||||
<span for="Asset_Code">Asset Code</span>
|
||||
<input type="text" class="form-control required" id="Asset_Code" name="Asset_Code">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>-->
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<label for="Asset_Name">Asset Name</label>
|
||||
<span for="Asset_Name">Asset Name</span>
|
||||
<input type="text" class="form-control required" id="Asset_Name" name="Asset_Name">
|
||||
</div>
|
||||
</div>
|
||||
@ -53,16 +94,16 @@
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<label for="Description">Description</label>
|
||||
<span for="Description">Description</span>
|
||||
<input type="text" class="form-control required" id="Description" name="Description">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<label for="Department">Department</label>
|
||||
<span for="Department">Department</span>
|
||||
<select class="form-control required" id="Department" name="Department">
|
||||
<option>Department</option>
|
||||
<?php
|
||||
@ -81,27 +122,27 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<label for="Location">Location</label>
|
||||
<span for="Location">Location</span>
|
||||
<input type="text" class="form-control required" id="Location" name="Location">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<label for="AssetOwner">Asset Owner</label>
|
||||
<span for="AssetOwner">Asset Owner</span>
|
||||
<input type="text" class="form-control required" id="User" name="User">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label for="SupplierName">Supplier Name</label>
|
||||
<span for="SupplierName">Supplier Name</span>
|
||||
<select class="form-control required" id="SupplierName" name="SupplierName">
|
||||
<option >Select Supplier Name</option>
|
||||
<?php
|
||||
@ -118,29 +159,76 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
|
||||
<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="" />
|
||||
<span for="DateOfPurchase">Date Of Purchase</span>
|
||||
<input id="DateOfPurchase" required name="DateOfPurchase" onkeypress="return false;" maxlength="10" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<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="" />
|
||||
<span for="DateOfCommission">Date Of Commission</span>
|
||||
<input id="DateOfCommission" required name="DateOfCommission" onkeypress="return false;" maxlength="10" class="form-control">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label for="Assetvalue">Asset Value</label>
|
||||
<span for="DateOfCreated">Created Date</span>
|
||||
<input id="DateOfCreated" required name="DateOfCreated" onkeypress="return false;" maxlength="10" class="form-control">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="Assetvalue">Asset Value</span>
|
||||
<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">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="Assetvalue">Created By</span>
|
||||
|
||||
<input type="text" class="form-control required" id="Createdby" name="Createdby" maxlength="255">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="AssetStatus">Asset Status</span>
|
||||
<select class="form-control required" id="AssetStatus" name="AssetStatus">
|
||||
<option >Select Asset Status</option>
|
||||
<?php
|
||||
if(!empty($AssetStatus))
|
||||
{
|
||||
foreach ($AssetStatus as $SID)
|
||||
{
|
||||
?>
|
||||
<option value="<?php echo $SID->AssetStatus; ?>"> <?php echo $SID->AssetStatus ?></option>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<span for="Remarks">Remarks</span>
|
||||
|
||||
<input type="text" class="form-control required" id="Remarks" name="Remarks" maxlength="500">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<input type="checkbox" id="isactive" name="isactive" onclick="checkactive"> IsActive
|
||||
</div>
|
||||
</div><!-- /.box-body -->
|
||||
|
||||
<div class="box-footer" style="text-align:right">
|
||||
@ -183,4 +271,5 @@
|
||||
</section>
|
||||
|
||||
</div>
|
||||
<script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>
|
||||
<script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>
|
||||
|
||||
@ -251,7 +251,8 @@ function onlyAlphabets(evt) {
|
||||
|
||||
<legend>Tax Related Data</legend>
|
||||
<!-- Text input-->
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-3 pad">
|
||||
<span for="PAN">PAN</span> <span class="badge">*</span>
|
||||
@ -271,7 +272,8 @@ function onlyAlphabets(evt) {
|
||||
<input type="text" class="form-control required" onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}">
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3">
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<div class="row">
|
||||
<div class="col-xs-12 text-right">
|
||||
<div class="form-group">
|
||||
<a class="btn btn-primary" href="<?php echo base_url(); ?>addasset">AddNew</a>
|
||||
<a class="btn btn-primary" href="<?php echo base_url(); ?>addasset">Add New Asset</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -166,12 +166,12 @@
|
||||
<span>Users</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
</li>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
||||
<li class="treeview">
|
||||
<span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Requisition form <span class="caret"></span></span>
|
||||
<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<div class="row">
|
||||
<div class="col-xs-12 text-right">
|
||||
<div class="form-group">
|
||||
<a class="btn btn-primary" href="<?php echo base_url(); ?>addRawmaterial">Add New</a>
|
||||
<a class="btn btn-primary" href="<?php echo base_url(); ?>addRawmaterial">Add New Material</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -35,12 +35,8 @@
|
||||
<th>Material Code</th>
|
||||
<th>Material Name</th>
|
||||
<th>Material Type</th>
|
||||
<th>UOM</th>
|
||||
|
||||
<th>Edit</th>
|
||||
|
||||
|
||||
|
||||
<th>UOM</th>
|
||||
<th>Edit</th>
|
||||
</tr>
|
||||
<?php
|
||||
if(!empty($userRecords))
|
||||
@ -52,10 +48,7 @@
|
||||
<td><?php echo $record->MaterialCode ?></td>
|
||||
<td><?php echo $record->MaterialName ?></td>
|
||||
<td><?php echo $record->MaterialType ?></td>
|
||||
<td><?php echo $record->UOM ?></td>
|
||||
|
||||
|
||||
|
||||
<td><?php echo $record->UOM ?></td>
|
||||
<td>
|
||||
<a href="<?php echo base_url().'rawmaterialdetails/editOldrawmaterial/'.$record->MaterialCode; ?>"><i class="fa fa-pencil"></i> </a>
|
||||
<a href="<?php echo base_url().'rawmaterialdetails/viewrawmaterial/'.$record->MaterialCode; ?>"><i class="fa fa-eye"></i> </a>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user