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

igr material received date changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-05-26 15:47:36 +05:30
parent 0d39ee5faf
commit 0b380c3d03
10 changed files with 96 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/emergencypurchaseorder.php
View File

@ -679,7 +679,7 @@ $RequestedBy = $this->input->post('drpDepartment');
$igr = array(); $igr = array();
$igr = array('PONO'=>$PONO,'VehicleNo'=>$Vehicle,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'CourierNo'=>$Courier,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt); $igr = array('PONO'=>$PONO,'VehicleNo'=>$Vehicle,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'MaterialRcvdDate'=>$DeliveryChellanDate,'CourierNo'=>$Courier,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt);
//print_r($igr); //print_r($igr);

7
application/controllers/inwardgateregister.php
View File

@ -250,7 +250,10 @@ class inwardgateregister extends BaseController
$DeliveryChellan = $this->input->post('InvoiceDate'); $DeliveryChellan = $this->input->post('InvoiceDate');
$DeliveryChellanDate = $this->getDateformat($DeliveryChellan); $DeliveryChellanDate = $this->getDateformat($DeliveryChellan);
$Mat_Rcvd_Dt = $this->input->post('MaterialRcvdDate');
$MaterialRcvdDt = $this->getDateformat($Mat_Rcvd_Dt);
$VehicleNo = $this->input->post('VehicleNo'); $VehicleNo = $this->input->post('VehicleNo');
$CourierNo = $this->input->post('CourierNo'); $CourierNo = $this->input->post('CourierNo');
@ -285,7 +288,7 @@ class inwardgateregister extends BaseController
$igr = array(); $igr = array();
$igr = array('PONO'=>$PONO,'VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'CourierNo'=>$CourierNo,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt,'file'=>$document); $igr = array('PONO'=>$PONO,'VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'MaterialRcvdDate'=>$MaterialRcvdDt,'CourierNo'=>$CourierNo,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt,'file'=>$document);
//print_r($igr);die(); //print_r($igr);die();
$igrM = $this->inwardgateregister_model->addigrM($igr); $igrM = $this->inwardgateregister_model->addigrM($igr);

2
application/models/dahsboard_model.php
View File

@ -1639,7 +1639,7 @@ $sql.="group by pono,material_name,category,supplier_name";
function ireport_attachment($cname,$fa,$aa,$m,$frm,$t){ function ireport_attachment($cname,$fa,$aa,$m,$frm,$t){
$sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,supplier_name, $sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,date_format(materialrcvddate,'%d-%m-%Y') as materialrcvddate,supplier_name,
sum(total) as total,file,ifile sum(total) as total,file,ifile
from igr from igr
where status != 'ST030' where status != 'ST030'

9
application/views/Report_attach_inward.php
View File

@ -195,9 +195,10 @@ if(!empty($mms))
<thead> <thead>
<tr> <tr>
<th style="text-align:center">PO No</th> <th style="text-align:center">PO No</th>
<th style="text-align:center">Date</th> <th style="text-align:center">IGR Created Date</th>
<th style="text-align:center">Material Received Date</th>
<th style="text-align:center">Supplier Name</th> <th style="text-align:center">Supplier Name</th>
<th style="text-align:center">Total &nbsp;(<i class="fa fa-rupee "></i>)</th> <th style="text-align:center">Total &nbsp;(<i class="fa fa-rupee "></i>)</th>
<th style="text-align:center">Attachments</th> <th style="text-align:center">Attachments</th>
</tr> </tr>
@ -216,6 +217,7 @@ if(!empty($mms))
</span></td> </span></td>
<td style="text-align:center"><span><?php echo $rel->created_date;?></span></td> <td style="text-align:center"><span><?php echo $rel->created_date;?></span></td>
<td style="text-align:center"><span><?php echo $rel->materialrcvddate;?></span></td>
<td><span> <td><span>
<a href="<?= base_url() ?>report/ilink_purchase?po=<?php echo $rel->pono;?>"><?php echo $rel->supplier_name;?> </a> <a href="<?= base_url() ?>report/ilink_purchase?po=<?php echo $rel->pono;?>"><?php echo $rel->supplier_name;?> </a>
</span></td> </span></td>
@ -289,6 +291,7 @@ if(!empty($mms))
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
<script> <script>
@ -297,6 +300,8 @@ if(!empty($mms))
// Set up your table // Set up your table
$(document).ready(function() { $(document).ready(function() {
table = $('#cc').DataTable( { table = $('#cc').DataTable( {
"columnDefs" : [{"targets":1, "type":"date-eu"}],
"columnDefs" : [{"targets":2, "type":"date-eu"}],
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
"<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-6'><'col-md-6'>>" +
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",

2
application/views/addnewIncomeExpense.php
View File

@ -494,7 +494,7 @@ $('#myradio2').click(function(){
}); });
$(document).ready(function(){ $(document).ready(function(){
$("#supplier").select2();
$('#merchant').autocomplete({ $('#merchant').autocomplete({
onSearchStart: function (query) { onSearchStart: function (query) {

1
application/views/bankcashnew.php
View File

@ -78,6 +78,7 @@ function isNumberKey(evt)
$(document).ready(function() $(document).ready(function()
{ {
$("#supplier").select2();
/**** autocomplete ****/ /**** autocomplete ****/
$('#merchant').autocomplete({ $('#merchant').autocomplete({

1
application/views/editincomeexpenses.php
View File

@ -78,6 +78,7 @@ if(!empty($DepDetails))
//var drop=$("input[type=radio][name='range']:checked").val() //var drop=$("input[type=radio][name='range']:checked").val()
$(document).ready(function(){ $(document).ready(function(){
$("#supplier").select2();
var typeofmap = "<?php echo $typeofmap;?>"; var typeofmap = "<?php echo $typeofmap;?>";
//alert(typeofmap+'tom'); //alert(typeofmap+'tom');
if(typeofmap=='Cash') if(typeofmap=='Cash')

34
application/views/inwardgateregister.php
View File

@ -14,6 +14,11 @@
maxDate : 'now', maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
$("#MaterialRcvdDate").datepicker({
maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
}); });
//jquery for vechicle masking //jquery for vechicle masking
@ -65,7 +70,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
<div class="row"><br/><br/> <div class="row"><br/><br/>
<div id="content" > </div> <div id="content" > </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-2"> <div class="col-md-3">
<?php <?php
$attributes = array('class' => 'form-label-left IGR ','name' => 'IGR','id' => 'IGR'); $attributes = array('class' => 'form-label-left IGR ','name' => 'IGR','id' => 'IGR');
@ -93,7 +98,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Supplier Name </label> <label>Supplier Name </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -106,7 +111,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
<div class="col-md-2"> <div class="col-md-3">
<label>Delivery Challan/Inv No</label> <label>Delivery Challan/Inv No</label>
<?php <?php
$data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"','onkeypress'=>'return isNumberKey(event);' ); $data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"','onkeypress'=>'return isNumberKey(event);' );
@ -114,7 +119,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Delivery Challan/Inv Date</label> <label>Delivery Challan/Inv Date</label>
<?php <?php
$data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' ); $data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' );
@ -122,8 +127,19 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
?> ?>
</div> </div>
</div>
<div class="col-md-12">
<div class="col-md-3">
<label>Material Received Date</label>
<?php
$data = array('name' => 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control num', 'required'=>'true' );
echo form_input($data);
?>
</div>
<div class="col-md-2"> <div class="col-md-3">
<label>Vechicle No</label> <label>Vechicle No</label>
<?php <?php
$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo', 'class' => 'form-control', ); $data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo', 'class' => 'form-control', );
@ -131,7 +147,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
?> ?>
<span pattern="" required="true"></span> <span pattern="" required="true"></span>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Courier No</label> <label>Courier No</label>
<?php <?php
$data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo', 'class' => 'form-control','onkeypress'=>'return isNumberKey(event);' ); $data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo', 'class' => 'form-control','onkeypress'=>'return isNumberKey(event);' );
@ -319,6 +335,12 @@ function validate()
$('#InvoiceDate').focus(); $('#InvoiceDate').focus();
return false; return false;
} }
else if($('#MaterialRcvdDate').val() == '' )
{
alert('Please Enter Material Received Date' );
$('#MaterialRcvdDate').focus();
return false;
}
else if (Noval == 0 ) else if (Noval == 0 )
{ {

27
application/views/viewIGRDetails.php
View File

@ -161,6 +161,16 @@
?> ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Supplier Name </label>
<?php
$data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Supplier', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-12" style=" padding-bottom: 10px;">
<div class="col-md-4">
<label>Delivery Challan/Invoice NO </label> <label>Delivery Challan/Invoice NO </label>
<?php <?php
$data = array('name' => 'DeliveryChallan/InvoiceNO','value' => set_value('DeliveryChallan/InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); $data = array('name' => 'DeliveryChallan/InvoiceNO','value' => set_value('DeliveryChallan/InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' );
@ -168,8 +178,6 @@
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="col-md-12" style=" padding-bottom: 10px;">
<div class="col-md-4"> <div class="col-md-4">
<label>Delivery Challan / Invoice Date </label> <label>Delivery Challan / Invoice Date </label>
<?php <?php
@ -179,14 +187,14 @@
?> ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Supplier Name </label> <label>Material Received Date </label>
<?php <?php
$data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Supplier', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); $data = array('name' => 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control' , 'readonly'=>'true' );
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<!-- Table to show the line item of po --> <!-- Table to show the line item of po -->
@ -269,6 +277,13 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
//alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear()); //alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear());
var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear()); var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear());
$("#Invoice_Date").val(dcd2); $("#Invoice_Date").val(dcd2);
if(item.MaterialRcvdDate === null) {
var Mat_rcv_date = ' '; }
else {
var MR_dt = new Date(item.MaterialRcvdDate);
var Mat_rcv_date = (MR_dt.getDate()+ '/' + (MR_dt.getMonth() + 1)+ '/' + MR_dt.getFullYear());
}
$("#MaterialRcvdDate").val(Mat_rcv_date);
$("#ser").val(item.ServiceDescription); $("#ser").val(item.ServiceDescription);
@ -293,4 +308,4 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
}); });
</script> </script>

43
application/views/viewinwardgateregister.php
View File

@ -1,6 +1,4 @@
<style>
<style>
.modal .modal
{ {
padding-right:25% ! important; padding-right:25% ! important;
@ -146,7 +144,17 @@
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Supplier Name </label>
<?php
$data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Supplier', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-12" style=" padding-bottom: 10px;">
<div class="col-md-4">
<label>Delivery Challan/Invoice NO </label> <label>Delivery Challan/Invoice NO </label>
<?php <?php
$data = array('name' => 'DeliveryChallan/InvoiceNO','value' => set_value('DeliveryChallan/InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); $data = array('name' => 'DeliveryChallan/InvoiceNO','value' => set_value('DeliveryChallan/InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' );
@ -154,8 +162,6 @@
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="col-md-12" style=" padding-bottom: 10px;">
<div class="col-md-4"> <div class="col-md-4">
<label>Delivery Challan / Invoice Date </label> <label>Delivery Challan / Invoice Date </label>
<?php <?php
@ -165,13 +171,12 @@
?> ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Supplier Name </label> <label>Material Received Date </label>
<?php <?php
$data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Supplier', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); $data = array('name' => 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control' , 'readonly'=>'true' );
echo form_input($data);
echo form_input($data); ?>
?> </div>
</div>
</div> </div>
@ -247,8 +252,20 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
$("#Invoice_No").val(item.DeliveryChellanOrInvoiceNo); $("#Invoice_No").val(item.DeliveryChellanOrInvoiceNo);
//alert(item.DeliveryChellanDate); //alert(item.DeliveryChellanDate);
var dcd = new Date(item.DeliveryChellanDate); var dcd = new Date(item.DeliveryChellanDate);
console.log(item.MaterialRcvdDate) ;
//alert(item.MaterialRcvdDate);
//alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear()); //alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear());
var dcd2 = (dcd.getDate()+ '-' + (dcd.getMonth() + 1)+ '-' + dcd.getFullYear()); var dcd2 = (dcd.getDate()+ '-' + (dcd.getMonth() + 1)+ '-' + dcd.getFullYear());
//var MR_dt = item.MaterialRcvdDate === null ? ' - ' : new Date(item.MaterialRcvdDate).toDateString("d-m-Y");
if(item.MaterialRcvdDate === null) {
var Mat_rcv_date = ' '; }
else {
var MR_dt = new Date(item.MaterialRcvdDate);
var Mat_rcv_date = (MR_dt.getDate()+ '-' + (MR_dt.getMonth() + 1)+ '-' + MR_dt.getFullYear());
}
$("#MaterialRcvdDate").val(Mat_rcv_date);
$("#Invoice_Date").val(dcd2); $("#Invoice_Date").val(dcd2);
$("#ser").val(item.ServiceDescription); $("#ser").val(item.ServiceDescription);
@ -273,4 +290,4 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
}); });
}); });
</script> </script>