issues fixes in ria
This commit is contained in:
parent
95021c90d2
commit
8effb72313
@ -83,7 +83,6 @@ class servicepurchaseorder extends BaseController
|
|||||||
|
|
||||||
|
|
||||||
$HTML.="<tr id='".$SNo."'>
|
$HTML.="<tr id='".$SNo."'>
|
||||||
<td align='left'>".$SNo."</td>
|
|
||||||
<td align='left'>". $ReqNo."</td>
|
<td align='left'>". $ReqNo."</td>
|
||||||
<td align='left'>".$Reqedby."</td>
|
<td align='left'>".$Reqedby."</td>
|
||||||
<td align='left'>".$ReqDate."</td>
|
<td align='left'>".$ReqDate."</td>
|
||||||
|
|||||||
@ -8,13 +8,14 @@ class configmodel extends CI_Model
|
|||||||
* @return array $result : result of the query(returns config information)
|
* @return array $result : result of the query(returns config information)
|
||||||
*/
|
*/
|
||||||
function Configlisting()
|
function Configlisting()
|
||||||
{
|
{
|
||||||
$this->db->select('Config.Config_ID, Config.ConfigName ,Config.Comments,Config.CreatedDate');
|
$this->db->select('Config.Config_ID, Config.ConfigName ,Config.Comments,Config.CreatedDate');
|
||||||
$this->db->from('T_ConfigMaster as Config');
|
$this->db->from('T_ConfigMaster as Config');
|
||||||
$query = $this->db->get();
|
$this->db->order_by('Config.CreatedDate','desc');
|
||||||
$result = $query->result();
|
$query = $this->db->get();
|
||||||
return $result;
|
$result = $query->result();
|
||||||
}
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
|
<table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
|
||||||
<thead>
|
<thead>
|
||||||
<tr style="background-color:#ad9271">
|
<tr style="background-color:#ad9271">
|
||||||
<th>#</th>
|
<!-- <th>#</th> -->
|
||||||
<th>PONO#</th>
|
<th>PONO#</th>
|
||||||
<th>PO Type</th>
|
<th>PO Type</th>
|
||||||
<th>PO Date</th>
|
<th>PO Date</th>
|
||||||
@ -45,7 +45,7 @@
|
|||||||
$index = $index + 1;
|
$index = $index + 1;
|
||||||
?>
|
?>
|
||||||
<tr id="<?php echo $index ; ?>">
|
<tr id="<?php echo $index ; ?>">
|
||||||
<td align="left"><?php echo $index ; ?></td>
|
<!-- <td align="left"><?php echo $index ; ?></td> -->
|
||||||
<td><?php echo $record->PONO ?></td>
|
<td><?php echo $record->PONO ?></td>
|
||||||
<td><?php echo $record->ReqType ?></td>
|
<td><?php echo $record->ReqType ?></td>
|
||||||
<td align="right"><?php $Pdt = new DateTime($record->PODate);
|
<td align="right"><?php $Pdt = new DateTime($record->PODate);
|
||||||
@ -103,16 +103,18 @@
|
|||||||
<!-- /.content -->
|
<!-- /.content -->
|
||||||
</div>
|
</div>
|
||||||
<!-- /.content-wrapper -->
|
<!-- /.content-wrapper -->
|
||||||
<script>
|
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||||
|
<script>
|
||||||
$(function () {
|
$(function () {
|
||||||
|
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||||
$('#example1').DataTable({
|
$('#example1').DataTable({
|
||||||
"paging": true,
|
"paging": true,
|
||||||
"lengthChange": true,
|
"lengthChange": true,
|
||||||
"searching": true,
|
"searching": true,
|
||||||
"ordering": true,
|
"ordering": true,
|
||||||
"info": true,
|
"info": true,
|
||||||
"autoWidth": false
|
"autoWidth": false,
|
||||||
|
"aaSorting": [[ 2, "desc" ]],
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
@ -73,17 +73,19 @@
|
|||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
|
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
|
||||||
|
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
|
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||||
$('#datatable').DataTable({
|
$('#datatable').DataTable({
|
||||||
"paging": true,
|
"paging": true,
|
||||||
"lengthChange": true,
|
"lengthChange": true,
|
||||||
"searching": true,
|
"searching": true,
|
||||||
"ordering": true,
|
"ordering": true,
|
||||||
"info": true,
|
"info": true,
|
||||||
"autoWidth": true
|
"autoWidth": true,
|
||||||
|
"aaSorting": [[ 7, "desc" ]]
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@ -39,7 +39,13 @@
|
|||||||
<td><?php echo $record->Config_ID?></td>
|
<td><?php echo $record->Config_ID?></td>
|
||||||
<td><?php echo $record->ConfigName ?></td>
|
<td><?php echo $record->ConfigName ?></td>
|
||||||
<td><?php echo $record->Comments ?> </td>
|
<td><?php echo $record->Comments ?> </td>
|
||||||
<td><?php echo $record->CreatedDate?></td>
|
<!-- <td><?php //echo $record->CreatedDate?></td> -->
|
||||||
|
<?php if(date('d-m-Y',strtotime($record->CreatedDate))=="30-11--0001"){
|
||||||
|
$cdate = '00-00-0000';
|
||||||
|
}else{
|
||||||
|
$cdate = date('d-m-Y',strtotime($record->CreatedDate));
|
||||||
|
} ?>
|
||||||
|
<td align="right"><?php echo $cdate;?> </td>
|
||||||
<td><a href="<?php echo base_url().'configurationctrl/editOldconfig?ConfigID='.$record->Config_ID; ?>"><i class="fa fa-pencil"></i> </a>
|
<td><a href="<?php echo base_url().'configurationctrl/editOldconfig?ConfigID='.$record->Config_ID; ?>"><i class="fa fa-pencil"></i> </a>
|
||||||
<a><i class="fa fa-trash"></i> </a></td>
|
<a><i class="fa fa-trash"></i> </a></td>
|
||||||
|
|
||||||
@ -57,16 +63,18 @@
|
|||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
|
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
|
||||||
|
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
|
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||||
$('#configtable').DataTable({
|
$('#configtable').DataTable({
|
||||||
"paging": true,
|
"paging": true,
|
||||||
"lengthChange": true,
|
"lengthChange": true,
|
||||||
"searching": true,
|
"searching": true,
|
||||||
"ordering": true,
|
"ordering": true,
|
||||||
"info": true,
|
"info": true,
|
||||||
|
"aaSorting": [[ 3, "desc" ]],
|
||||||
"autoWidth": true
|
"autoWidth": true
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@ -71,16 +71,18 @@
|
|||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
|
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
|
||||||
|
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
|
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||||
$('#datatable').DataTable({
|
$('#datatable').DataTable({
|
||||||
"paging": true,
|
"paging": true,
|
||||||
"lengthChange": true,
|
"lengthChange": true,
|
||||||
"searching": true,
|
"searching": true,
|
||||||
"ordering": true,
|
"ordering": true,
|
||||||
"info": true,
|
"info": true,
|
||||||
|
"aaSorting": [[ 3, "desc" ]],
|
||||||
"autoWidth": true
|
"autoWidth": true
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@ -110,16 +110,17 @@
|
|||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||||
<script>
|
<script>
|
||||||
$(function () {
|
$(function () {
|
||||||
|
|
||||||
|
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||||
$('#inexlist').DataTable({
|
$('#inexlist').DataTable({
|
||||||
|
|
||||||
"paging": true,
|
"paging": true,
|
||||||
"lengthChange": true,
|
"lengthChange": true,
|
||||||
"searching": true,
|
"searching": true,
|
||||||
"aaSorting": [[ 0, "desc" ]],
|
"aaSorting": [[ 1, "desc" ]],
|
||||||
"ordering": true,
|
"ordering": true,
|
||||||
"info": true,
|
"info": true,
|
||||||
"autoWidth": true
|
"autoWidth": true
|
||||||
|
|||||||
@ -112,7 +112,7 @@
|
|||||||
<table id="StatusTable" class="table table-bordered table-hover editabletable IGR_Line" style="background-color:#fff;font-size:12px;">
|
<table id="StatusTable" class="table table-bordered table-hover editabletable IGR_Line" style="background-color:#fff;font-size:12px;">
|
||||||
<thead style="background-color:#ddf">
|
<thead style="background-color:#ddf">
|
||||||
<tr>
|
<tr>
|
||||||
<th>S.NO</th>
|
<!-- <th>S.NO</th> -->
|
||||||
<th>Req No</th>
|
<th>Req No</th>
|
||||||
<th>Req By</th>
|
<th>Req By</th>
|
||||||
<th>Req Date</th>
|
<th>Req Date</th>
|
||||||
@ -139,8 +139,22 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||||
<script>
|
<script>
|
||||||
$(function () {
|
$(function () {
|
||||||
|
|
||||||
|
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||||
|
|
||||||
|
$('#Inwardgateregistertable').DataTable({
|
||||||
|
"paging": true,
|
||||||
|
"lengthChange": true,
|
||||||
|
"searching": true,
|
||||||
|
"ordering": true,
|
||||||
|
"aaSorting": [[ 2, "desc" ]],
|
||||||
|
"info": true,
|
||||||
|
"autoWidth": true
|
||||||
|
});
|
||||||
|
|
||||||
$('#PONO').change(function() {
|
$('#PONO').change(function() {
|
||||||
$("#tblAppend").empty();
|
$("#tblAppend").empty();
|
||||||
|
|
||||||
|
|||||||
@ -179,10 +179,9 @@ span.highlight {
|
|||||||
|
|
||||||
<td align="right"><?php $dt = new DateTime($record->ReqDate);
|
<td align="right"><?php $dt = new DateTime($record->ReqDate);
|
||||||
|
|
||||||
$ReqDate = $dt->format('d-m-Y'); echo $ReqDate ?>
|
$ReqDate = $dt->format('d-m-Y'); echo $ReqDate ?>
|
||||||
|
|
||||||
|
|
||||||
|
</td>
|
||||||
|
|
||||||
|
|
||||||
<td> <a data-toggle="tooltip" href="<?php echo base_url().'EditStoreRequisition?StoreReqNo='.$record->StoreReqNo; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->StoreReqNo; ?> - Click here to view addstorerequisitionslip"></i> </a> <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->StoreReqNo; ?>' )" ><span class="glyphicon glyphicon-trash" title="<?php echo $record->StoreReqNo; ?> - Click here to Delete Requisition details"></span></a> </td>
|
<td> <a data-toggle="tooltip" href="<?php echo base_url().'EditStoreRequisition?StoreReqNo='.$record->StoreReqNo; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->StoreReqNo; ?> - Click here to view addstorerequisitionslip"></i> </a> <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->StoreReqNo; ?>' )" ><span class="glyphicon glyphicon-trash" title="<?php echo $record->StoreReqNo; ?> - Click here to Delete Requisition details"></span></a> </td>
|
||||||
@ -294,7 +293,7 @@ $ReqDate = $dt->format('d-m-Y'); echo $ReqDate ?>
|
|||||||
$(function () {
|
$(function () {
|
||||||
|
|
||||||
|
|
||||||
|
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||||
$('#Requisition').DataTable({
|
$('#Requisition').DataTable({
|
||||||
|
|
||||||
"paging": true,
|
"paging": true,
|
||||||
@ -307,6 +306,8 @@ $ReqDate = $dt->format('d-m-Y'); echo $ReqDate ?>
|
|||||||
|
|
||||||
"info": true,
|
"info": true,
|
||||||
|
|
||||||
|
"aaSorting": [[ 5, "desc" ]],
|
||||||
|
|
||||||
"autoWidth": true
|
"autoWidth": true
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -223,7 +223,7 @@
|
|||||||
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
|
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
|
||||||
<thead style="background-color:#ddf">
|
<thead style="background-color:#ddf">
|
||||||
<tr>
|
<tr>
|
||||||
<th>SNo</th>
|
<!-- <th>SNo</th> -->
|
||||||
<th>Item Code</th>
|
<th>Item Code</th>
|
||||||
<th>Item Description</th>
|
<th>Item Description</th>
|
||||||
<th>UOM</th>
|
<th>UOM</th>
|
||||||
@ -341,7 +341,6 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
|
|||||||
|
|
||||||
i=i+1;
|
i=i+1;
|
||||||
trHTML += '<tr>' +
|
trHTML += '<tr>' +
|
||||||
'<td align="right">' + i + '</td>' +
|
|
||||||
'<td name="MaterialName" id="MaterialCode" onchange="test('+i+')">' + item.MaterialCode + '</td>' +
|
'<td name="MaterialName" id="MaterialCode" onchange="test('+i+')">' + item.MaterialCode + '</td>' +
|
||||||
'<td>' + item.MaterialName + '</td>' +
|
'<td>' + item.MaterialName + '</td>' +
|
||||||
'<td name="UOM">' + item.UOM + '</td>' +
|
'<td name="UOM">' + item.UOM + '</td>' +
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user