SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

listing issues fix

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-07 11:39:12 +05:30
parent 383c0cf8bc
commit d07a318b15
22 changed files with 208 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
application/logs/log-2017-07-28.php Normal file → Executable file
View File

0
application/logs/log-2017-07-31.php Normal file → Executable file
View File

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

0
application/third_party/dompdf/lib/fonts/Times-BoldItalic.afm.php vendored Normal file → Executable file
View File

0
application/third_party/dompdf/lib/fonts/Times-Italic.afm.php vendored Normal file → Executable file
View File

359
application/views/MaterialIssueList.php
View File

@ -1,52 +1,29 @@
<?php <div class="content-wrapper">
//print_r($AppList); <section class="content">
?> <div class="box">
<div class="box-header">
<style> <CENTER><h3 class="box-title">Siddharth Industries - Material Distribution List</h3></CENTER>
.table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;} </div>
</style>
<div class="content-wrapper">
<section class="content">
<div>
<center><b><h2> SIA - Material Distribution List </h2></b></center>
<?php <?php
$attributes = array('class' => 'form-label-left Approve ','name' => 'Approve','id' => 'Approve'); $attributes = array('class' => 'form-label-left Approve ','name' => 'Approve','id' => 'Approve');
echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?> echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
</div>
</div>
<br/>
<table id="Requisition" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
</div> <div align="right" style="padding-right:10px">
</div> <div id="content" > </div>
<thead style="background-color:#ddf">
<tr>
<th>Purchase Order Number</th>
<br/> <th>Requisition Number</th>
<th>Requested By</th>
<th>Requested Department</th>
<table id="Requisition" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<div align="right" style="padding-right:10px">
<div id="content" > </div>
<thead style="background-color:#ddf">
<tr>
<th>Purchase Order Number</th>
<th>Requisition Number</th>
<th>Requested By</th>
<th>Requested Department</th>
<th>Requested Date</th> <th>Requested Date</th>
<th>Material Code</th> <th>Material Code</th>
<th>Material Name</th> <th>Material Name</th>
@ -57,18 +34,18 @@
<th>Accepted Quantity </th> <th>Accepted Quantity </th>
<th>Remarks</th> <th>Remarks</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody id="ApprovalList"> <tbody id="ApprovalList">
<?php <?php
if(!empty($Distribution)) if(!empty($Distribution))
{ {
$index = 0; $index = 0;
foreach($Distribution as $record) foreach($Distribution as $record)
{ {
$index = $index +1; $index = $index +1;
?> ?>
<tr id="<?php echo $index ?>" > <tr id="<?php echo $index ?>" >
<td><?php echo $record->PONO ?></td> <td><?php echo $record->PONO ?></td>
<td><?php echo $record->ReqNo ?></td> <td><?php echo $record->ReqNo ?></td>
@ -85,27 +62,22 @@
<td><?php echo $record->OrderedQuantity ?></td> <td><?php echo $record->OrderedQuantity ?></td>
<td><?php echo $record->AcceptedQty; ?> </td> <td><?php echo $record->AcceptedQty; ?> </td>
<?php if($record->ReqStatus != REQ_DELIVERED) { ?>
<?php if($record->ReqStatus != REQ_DELIVERED) { ?>
<td contenteditable="true"><input type="text" id="Remarks<?php echo $index ?>" name="Remarks<?php echo $index ?>"class="form-control" maxlength="100" value="<?php echo $record->Remarks ?>"></td> <td contenteditable="true"><input type="text" id="Remarks<?php echo $index ?>" name="Remarks<?php echo $index ?>"class="form-control" maxlength="100" value="<?php echo $record->Remarks ?>"></td>
<td data-name="sel" contenteditable="true" id="Action<?php echo $index ?>" onchange="saveToDatabase(this,'question','<?php echo $record->ReqNo ; ?>','<?php echo $index ; ?>')"> <td data-name="sel" contenteditable="true" id="Action<?php echo $index ?>" onchange="saveToDatabase(this,'question','<?php echo $record->ReqNo ; ?>','<?php echo $index ; ?>')">
<select name="status<?php echo $index ?>" id="status<?php echo $index ?>">
<option value="<?php echo $record->ReqStatus; ?>"><?php echo $record->StatusName; ?></option>
<select name="status<?php echo $index ?>" id="status<?php echo $index ?>">
<option value="<?php echo $record->ReqStatus; ?>"><?php echo $record->StatusName; ?></option>
<?php <?php
if(!empty($status)) if(!empty($status))
{ {
foreach ($status as $rl) foreach ($status as $rl)
{ {
if($rl->StatusCode != $record->ReqStatus) { ?> if($rl->StatusCode != $record->ReqStatus) { ?>
<option value="<?php echo $rl->StatusCode ?>"><?php echo $rl->StatusName ?></option> <option value="<?php echo $rl->StatusCode ?>"><?php echo $rl->StatusName ?></option>
<?php } <?php }
} }
} }
?> ?>
</select> </select>
</td> </td>
@ -115,45 +87,37 @@
<?php } ?> <?php } ?>
</tr> </tr>
<?php <?php
} }
} }
?> ?>
</tbody>
</table>
</tbody> <br>
</div>
</table> </div>
</section>
</div>
<script>
<br> var startDate = '';
</div> var endDate = '';
</div>
</section>
</div>
<script> function Reset()
var startDate = ''; {
var endDate = ''; $('#RequisitionStatus').val("-1");
$('#SearchDate').val('');
function Reset() }
{ $("#myModal").on("shown.bs.modal", function(e) {
$('#RequisitionStatus').val("-1"); var ReqId = $(e.relatedTarget).data('userid');
$('#SearchDate').val(''); $("#CostCenter").val('');
} $("#tbleAppend").empty();
$("#myModal").on("shown.bs.modal", function(e) { $("#ReqType").val('');
var ReqId = $(e.relatedTarget).data('userid'); $("#ReqBy").val('');
$("#CostCenter").val(''); $("#ReqDate").val('');
$("#tbleAppend").empty(); $("#Desigination").val('');
$("#ReqType").val(''); $("#AvlBudgetAmount").val('');
$("#ReqBy").val(''); $('#AlertImg').attr("style","display:none;");
$("#ReqDate").val('');
$("#Desigination").val(''); $('#content').loader('show');
$("#AvlBudgetAmount").val('');
$('#AlertImg').attr("style","display:none;");
$('#content').loader('show');
$.ajax({ $.ajax({
data:{id:ReqId}, data:{id:ReqId},
type:"POST", type:"POST",
@ -171,39 +135,39 @@ $("#myModal").on("shown.bs.modal", function(e) {
$("#AvlBudgetAmount").val(json.AvilBudAmount); $("#AvlBudgetAmount").val(json.AvilBudAmount);
$("#tbleAppend").append(json.Items); $("#tbleAppend").append(json.Items);
} }
}); });
}); });
function saveToDatabase(editableObj,column,ReqId,Index) { function saveToDatabase(editableObj,column,ReqId,Index) {
var tr= document.getElementById(Index); var tr= document.getElementById(Index);
var Actulqty = 0.0; var Actulqty = 0.0;
var cellval = tr.cells; var cellval = tr.cells;
Actulqty = parseFloat(cellval[6].innerHTML); Actulqty = parseFloat(cellval[6].innerHTML);
var id = $('#Remarks'+Index).val(); var id = $('#Remarks'+Index).val();
var StatusCode = $('#status'+Index).val(); var StatusCode = $('#status'+Index).val();
var Remarks = $('#Remarks'+Index).val(); var Remarks = $('#Remarks'+Index).val();
var MaterialCode = cellval[5].innerHTML; var MaterialCode = cellval[5].innerHTML;
var ReqNo = cellval[1].innerHTML; var ReqNo = cellval[1].innerHTML;
var Sendvalues = []; var Sendvalues = [];
Sendvalues[0] = StatusCode; Sendvalues[0] = StatusCode;
Sendvalues[1] = MaterialCode; Sendvalues[1] = MaterialCode;
Sendvalues[2] = ReqNo; Sendvalues[2] = ReqNo;
Sendvalues[3] = Remarks; Sendvalues[3] = Remarks;
//alert(MaterialCode); //alert(MaterialCode);
alert(StatusCode); alert(StatusCode);
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:{id:Sendvalues}, data:{id:Sendvalues},
@ -220,69 +184,64 @@ function saveToDatabase(editableObj,column,ReqId,Index) {
{ {
alert("Error"); alert("Error");
} }
} }
});
}
});
}
$(function() {
var d = new Date();
var month = d.getMonth();
$(function() { var day = d.getDate();
var d = new Date(); var year = d.getFullYear() ;
var SIAStartYear = year - 2015;
var month = d.getMonth(); var mindt = year-70;
var day = d.getDate(); var maxdt = year-15;
var year = d.getFullYear() ; $( ".datePicker" ).datepicker(
var SIAStartYear = year - 2015; {
var mindt = year-70; minDate : new Date(year-SIAStartYear,1,1),
var maxdt = year-15;
$( ".datePicker" ).datepicker(
{
minDate : new Date(year-SIAStartYear,1,1),
maxDate :'now', maxDate :'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true, dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
} }
); );
//$('#SearchDate').daterangepicker( ); //$('#SearchDate').daterangepicker( );
//Initialize Select2 Elements //Initialize Select2 Elements
$(".select2").select2(); $(".select2").select2();
//$('#SearchDate').val(''); //$('#SearchDate').val('');
$('#SearchDate').daterangepicker( $('#SearchDate').daterangepicker(
{ {
locale: { locale: {
format: 'DD-MM-YYYY' format: 'DD-MM-YYYY'
}, },
showDropdowns: true showDropdowns: true
}, },
function(start, end, label) { function(start, end, label) {
startDate = start.format('DD-MM-YYYY'); startDate = start.format('DD-MM-YYYY');
endDate = end.format('DD-MM-YYYY'); endDate = end.format('DD-MM-YYYY');
$('#FromDate').val(startDate); $('#FromDate').val(startDate);
$('#ToDate').val(endDate); $('#ToDate').val(endDate);
//alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY'));
});
//alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY'));
}); });
$(function () {
});
$(function () {
$('#Requisition').DataTable({
"paging": true,
"lengthChange": true, $('#Requisition').DataTable({
"searching": true, "paging": true,
"ordering": true, "lengthChange": true,
"info": true, "searching": true,
"autoWidth": true "ordering": true,
"info": true,
}); "autoWidth": true
});
</script> });
});
</script>

15
application/views/assetListing.php
View File

@ -1,13 +1,12 @@
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Siddharth industries - Asset Details</center>
</h1>
</section>
<section class="content"> <section class="content">
<div class="box">
<div class="box-header">
<CENTER><h3 class="box-title">Siddharth Industries - Asset Details</h3></CENTER>
</div>
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xs-12 text-right"> <div class="col-xs-12 text-right">
<div class="form-group"> <div class="form-group">
@ -68,6 +67,8 @@
</div> </div>
</div> </div>
</div>
</div>
</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>

0
application/views/capitalpopdf.php Normal file → Executable file
View File

0
application/views/capitalpurchaseorder.php Normal file → Executable file
View File

14
application/views/costListing.php
View File

@ -1,12 +1,12 @@
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Siddharth Industries - Cost Details</center>
</h1>
</section>
<section class="content"> <section class="content">
<div class="box">
<div class="box-header">
<CENTER><h3 class="box-title">Siddharth Industries - Cost Details</h3></CENTER>
</div>
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xs-12 text-right"> <div class="col-xs-12 text-right">
<div class="form-group"> <div class="form-group">
@ -65,6 +65,8 @@
</div> </div>
</div> </div>
</div>
</div>
</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>

0
application/views/editCapitalAmendPO.php Normal file → Executable file
View File

0
application/views/editCapitalPo.php Normal file → Executable file
View File

0
application/views/editimportpo.php Normal file → Executable file
View File

16
application/views/employeeListing.php
View File

@ -1,13 +1,12 @@
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<CENTER>Siddharth Industries - Employee Details</CENTER>
</h1>
</section>
<section class="content"> <section class="content">
<div class="box">
<div class="box-header">
<CENTER><h3 class="box-title">Siddharth Industries - Employee Details</h3></CENTER>
</div>
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xs-12 text-right"> <div class="col-xs-12 text-right">
<div class="form-group"> <div class="form-group">
@ -56,7 +55,10 @@
</div> </div>
</div> </div>
</div>
</div>
</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 type="text/javascript"> <script type="text/javascript">

0
application/views/importpo.php Normal file → Executable file
View File

0
application/views/importpopdf.php Normal file → Executable file
View File

0
application/views/mririmportpopdf.php Normal file → Executable file
View File

0
application/views/mrirrevenuepopdf.php Normal file → Executable file
View File

12
application/views/rawmaterialListing.php
View File

@ -1,12 +1,12 @@
<div class="content-wrapper"> <div class="content-wrapper">
<section class="content-header">
<h1>
<center>Siddharth Industries - Material Master Details</CENTER>
</h1>
</section>
<section class="content"> <section class="content">
<div class="box">
<div class="box-header">
<CENTER><h3 class="box-title">Siddharth Industries - Material Master Details</h3></CENTER>
</div>
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xs-12 text-right"> <div class="col-xs-12 text-right">
<div class="form-group"> <div class="form-group">
@ -65,6 +65,8 @@
</table> </table>
</div> </div>
</div> </div>
</div>
</div>
</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>

0
application/views/revenuepopdf.php Normal file → Executable file
View File

17
application/views/supplierListing.php
View File

@ -1,13 +1,12 @@
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Siddharth Industries -Supplier Details</center>
</h1>
</section>
<section class="content"> <section class="content">
<div class="box">
<div class="box-header">
<CENTER><h3 class="box-title">Siddharth Industries - Supplier Details</h3></CENTER>
</div>
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xs-12 text-right"> <div class="col-xs-12 text-right">
<div class="form-group"> <div class="form-group">
@ -19,7 +18,7 @@
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<table class="table table-bordered table-hover" id="datatable" style="background-color:#fff;font-size:12px;" > <table class="table table-bordered table-hover" id="datatable" style="background-color:#fff;font-size:11px;" >
<thead> <thead>
<tr> <tr>
<th>Supplier ID</th> <th>Supplier ID</th>
@ -67,6 +66,8 @@
</div> </div>
</div> </div>
</div>
</div>
</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>

15
application/views/users.php
View File

@ -1,14 +1,13 @@
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Siddharth Industries - User Management</center>
</h1>
</section>
<section class="content"> <section class="content">
<div class="box">
<div class="box-header">
<CENTER><h3 class="box-title">Siddharth Industries - User Management</h3></CENTER>
</div>
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xs-12 text-right"> <div class="col-xs-12 text-right">
<div class="form-group"> <div class="form-group">
@ -61,6 +60,8 @@
</div> </div>
</div> </div>
</div>
</div>
</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>