RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'CI4-Application' of bitbucket.org:venbainformationtechnology/ria into CI4-Application

Browse Source
This commit is contained in:
bitbucket 2024-07-26 17:25:24 +05:30
commit 9a2935c592
3 changed files with 298 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/Controllers/Inwardgateregister.php
View File

@ -436,8 +436,8 @@ class Inwardgateregister extends BaseController
$TareWeight= $this->request->getPost('txtTareWeight' . $i); $TareWeight= $this->request->getPost('txtTareWeight' . $i);
$tareWeightDate= $this->request->getPost('txtTareWeightDate' . $i); $tareWeightDate= $this->request->getPost('txtTareWeightDate' . $i);
$NetWeight= $this->request->getPost('txtNetWeight' . $i); $NetWeight= $this->request->getPost('txtNetWeight' . $i);
var_dump($grossWeightDate); // var_dump($grossWeightDate);
var_dump($tareWeightDate); // var_dump($tareWeightDate);
if (is_string($grossWeightDate) && is_string($tareWeightDate)) { if (is_string($grossWeightDate) && is_string($tareWeightDate)) {
$GrossWeightDate = date('Y-m-d H:i:s', strtotime($grossWeightDate)); $GrossWeightDate = date('Y-m-d H:i:s', strtotime($grossWeightDate));
@ -612,12 +612,12 @@ function viewIGRDetails()
$IGRStatus = (int)$this->request->getPost('status') == 1 ? IGR_CREATED : IGR_DRAFT; $IGRStatus = (int)$this->request->getPost('status') == 1 ? IGR_CREATED : IGR_DRAFT;
$tableData = $this->request->getPost('tableData'); $tableData = $this->request->getPost('tableData');
$updateby = $this->session->get('userId'); $updateby = $this->session->get('userId');
$igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'Status' => $IGRStatus,'UpdateBY' => $updateby); $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby);
log_message('error', 'UpdateIGR igrarr: ' . json_encode($igrarr));
$data = $this->inwardgateregister_model->updateigr($igrarr, $IGRNo); $updateigrmaster = $this->inwardgateregister_model->updateigr($igrarr, $IGRNo);
if(!empty($tableData )){
if($VehicleNo){ if($VehicleNo){
$vecno = $this->inwardgateregister_model->get_igr_history('VehicleNo',$IGRNo); $vecno = $this->inwardgateregister_model->get_igr_history('VehicleNo',$IGRNo);
@ -675,7 +675,6 @@ function viewIGRDetails()
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
}} }}
foreach ($tableData as $row) { foreach ($tableData as $row) {
$materialCode = $row['MaterialCode'];
$quantityAsPerInvoice = $row['QuantityAsPerInvoice']; $quantityAsPerInvoice = $row['QuantityAsPerInvoice'];
$remarks = $row['Remarks']; $remarks = $row['Remarks'];
$grossWeight = $row['GrossWeight']; $grossWeight = $row['GrossWeight'];
@ -688,20 +687,20 @@ function viewIGRDetails()
$TareWtDt = get_date_time_format($tareWeightDate); $TareWtDt = get_date_time_format($tareWeightDate);
$igrline = array( $igrline = array(
'IGRNO' => $IGRNo,
'MaterialCode' => $materialCode,
'QuantityAsPerInvoice' => $quantityAsPerInvoice, 'QuantityAsPerInvoice' => $quantityAsPerInvoice,
'Remarks' => $remarks, 'Remarks' => $remarks,
'GrossWeight' => $grossWeight, 'GrossWeight' => $grossWeight,
'GrossWeightDate' => $grossWeightDate, 'GrossWeightDate' => $GrossWtDt,
'TareWeight' => $tareWeight, 'TareWeight' => $tareWeight,
'TareWeightDate' => $tareWeightDate, 'TareWeightDate' => $TareWtDt,
'NetWeight' => $netWeight, 'NetWeight' => $netWeight,
'IGRItemNo' => $igrItemNo, 'IGRItemNo' => $igrItemNo,
'UpdateBY' => $updateby 'UpdateBY' => $updateby
); );
$lineitemupdated = $this->inwardgateregister_model->updateIGRLineItem($igrline, $igrItemNo); $updateigrlineitem = $this->inwardgateregister_model->updateIGRLineItem($igrline, $igrItemNo);
log_message('error', "lineitem updated successfully: " . $$lineitemupdated); log_message('error', "lineitem updated successfully: " . $updateigrlineitem);
log_message('error', 'UpdateIGR updateigrlineitem: ' . json_encode($igrline));
if($quantityAsPerInvoice){ if($quantityAsPerInvoice){
$qu = $this->inwardgateregister_model->get_igr_history('QuantityAsPerInvoice',$IGRNo,$igrItemNo); $qu = $this->inwardgateregister_model->get_igr_history('QuantityAsPerInvoice',$IGRNo,$igrItemNo);
@ -721,7 +720,7 @@ function viewIGRDetails()
$history_id = $this->inwardgateregister_model->igr_history($igr_history); $history_id = $this->inwardgateregister_model->igr_history($igr_history);
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
}} }}
if($Remarks){ if($remarks){
$remak = $this->inwardgateregister_model->get_igr_history('Remarks',$IGRNo,$igrItemNo); $remak = $this->inwardgateregister_model->get_igr_history('Remarks',$IGRNo,$igrItemNo);
if(!empty($remak)){ if(!empty($remak)){
@ -731,11 +730,11 @@ function viewIGRDetails()
$old_data = $row->new_data; $old_data = $row->new_data;
} }
} }
$igr_history = array('field' => 'Remarks','new_data' => $Remarks,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNo,'IGRItem_No' => $igrItemNo); $igr_history = array('field' => 'Remarks','new_data' => $remarks,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNo,'IGRItem_No' => $igrItemNo);
($old_data != NULL) ? $igr_history['is_edit'] = 1 : $igr_history['is_add'] = 1 ; ($old_data != NULL) ? $igr_history['is_edit'] = 1 : $igr_history['is_add'] = 1 ;
$history_id = $this->inwardgateregister_model->igr_history($igr_history); $history_id = $this->inwardgateregister_model->igr_history($igr_history);
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
} else{$igr_history = array('field' => 'Remarks','is_add' => 1,'new_data' => $Remarks,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNo,'IGRItem_No' => $igrItemNo); } else{$igr_history = array('field' => 'Remarks','is_add' => 1,'new_data' => $remarks,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNo,'IGRItem_No' => $igrItemNo);
$history_id = $this->inwardgateregister_model->igr_history($igr_history); $history_id = $this->inwardgateregister_model->igr_history($igr_history);
log_message('error', "History updated successfully. History id: " . $history_id); log_message('error', "History updated successfully. History id: " . $history_id);
}} }}
@ -848,10 +847,12 @@ function viewIGRDetails()
} }
}
if ($data > 0) { if ($updateigrmaster > 0) {
echo "Updated Succefully!"; echo "Updated Succefully!";
} else { } else if($updateigrlineitem >0){
echo "Updated Succefully!";
}else{
echo "Not Updated!"; echo "Not Updated!";
} }
} }

8
app/Views/inwardgateregister.php
View File

@ -793,10 +793,10 @@ function Save(status)
//var tablevalue = $('#specialtable').tableToJSON(); // Convert the table into a javascript object //var tablevalue = $('#specialtable').tableToJSON(); // Convert the table into a javascript object
//var jsondata = JSON.stringify(tablevalue); //var jsondata = JSON.stringify(tablevalue);
//$('#tablevalues').val(jsondata); //$('#tablevalues').val(jsondata);
$("#IGR").attr("method", "post"); // $("#IGR").attr("method", "post");
$("#IGR").attr("enctype", "multipart/form-data"); // $("#IGR").attr("enctype", "multipart/form-data");
$("#IGR").attr("action", "SaveIGR"); // $("#IGR").attr("action", "SaveIGR");
$('#IGR').submit(); // $('#IGR').submit();
}//validate if closed }//validate if closed
}//save function closed }//save function closed

85
app/Views/viewinwardgateregister.php
View File

@ -67,7 +67,7 @@
<div class="box"> <div class="box">
<div class="container-fluid"> <div class="container-fluid">
<div class="box-header"> <div class="box-header">
<center><b><h3 class="box-title">View Inward Gate Register <?php echo $DEPCode; ?></h3></b></center> <center><b><h3 class="box-title">View Inward Gate Register </h3></b></center>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -119,8 +119,10 @@
<i class="fa fa-history" style="text-align: center;"></i> <i class="fa fa-history" style="text-align: center;"></i>
</a> </a>
&nbsp; &nbsp;
<a class="a_tag_for_mrir" href="<?php echo base_url().'MRIRcontroller/igrdatavalues?IGRNO='.$record->IGRNO; ?>" target="_blank" data-id="<%=index%>" title="Generate MRIR"><i class="fa fa-external-link" style="text-align: center;"></i></a> <!-- <a class="a_tag_for_mrir" href="<?php echo base_url().'MRIRcontroller/igrdatavalues?IGRNO='.$record->IGRNO; ?>" target="_blank" data-id="<%=index%>" title="Generate MRIR"><i class="fa fa-external-link" style="text-align: center;"></i></a> -->
<a target="_blank" data-toggle="modal" data-target="#dummyshow" data-id="<%=index%>" title="Generate MRIR" data-igrno="<?php echo $record->IGRNO ?>" data-pono="<?php echo $record->PONO ?>">
<i class="fa fa-external-link" style="text-align: center;"></i>
</a>
</td> </td>
</tr> </tr>
<?php <?php
@ -331,6 +333,25 @@
</div><!-- modal content closed--> </div><!-- modal content closed-->
</div> </div>
<!-- WeightCalculator modal fade closed--> <!-- WeightCalculator modal fade closed-->
<div class="modal fade" id="dummyshow" role="dialog">
<div class="modal-dialog">
<!-- Modal content -->
<div class="modal-content" style="width:800px;">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center>
<h4>MRIR</h4>
</center>
</div>
<div><center> MRIR Work in Inprogress</center></div>
<div style="text-align: right; margin:5px;">
<a class="btn btn-success" data-dismiss="modal" value="Close">Close</a>
</div>
<br />
</div>
</div>
</div>
<!-- History modal fade --> <!-- History modal fade -->
<div class="modal fade" id="Historyshow" role="dialog"> <div class="modal fade" id="Historyshow" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
@ -459,7 +480,7 @@
if(depCode == "DEP27"){ if(depCode == "DEP27"){
if (igrstatus == "ST074") { if (igrstatus == "ST074") {
buttonContainer.find("#draftIGR, #generateIGR").css("display", "inline-block"); buttonContainer.find("#draftIGR, #generateIGR").css("display", "inline-block");
// $(".a_tag_for_mrir).css("display", "inline-block"); $(".a_tag_for_mrir").css("display", "block");
VehicleNoInput.prop('readonly', false); VehicleNoInput.prop('readonly', false);
DriverInput.prop('readonly', false); DriverInput.prop('readonly', false);
DriverMobileNumberInput.prop('readonly', false); DriverMobileNumberInput.prop('readonly', false);
@ -467,7 +488,7 @@
invoiceDateInput.prop('readonly', false); invoiceDateInput.prop('readonly', false);
} else { } else {
buttonContainer.find("#draftIGR, #generateIGR").css("display", "none"); buttonContainer.find("#draftIGR, #generateIGR").css("display", "none");
// $(".a_tag_for_mrir).css("display", "inline-block"); $(".a_tag_for_mrir").css("display", "none");
VehicleNoInput.prop('readonly', true); VehicleNoInput.prop('readonly', true);
DriverInput.prop('readonly', true); DriverInput.prop('readonly', true);
DriverMobileNumberInput.prop('readonly', true); DriverMobileNumberInput.prop('readonly', true);
@ -475,9 +496,9 @@
invoiceDateInput.prop('readonly', true); invoiceDateInput.prop('readonly', true);
} }
}else{ }else{
$(".a_tag_for_mrir").css("display", "none");
if (igrstatus == "ST074") { if (igrstatus == "ST074") {
buttonContainer.find("#draftIGR, #generateIGR").css("display", "inline-block"); buttonContainer.find("#draftIGR, #generateIGR").css("display", "inline-block");
// $(".a_tag_for_mrir).css("display", "inline-block");
} else { } else {
buttonContainer.find("#draftIGR").css("display", "none"); buttonContainer.find("#draftIGR").css("display", "none");
} }
@ -557,7 +578,7 @@
'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' + '<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
'<input type="hidden" id="IGRItemNo' + i + '" name="IGRItemNo' + i + '" value="' + item.IGRItemNo + '">' + '<input type="hidden" id="IGRItemNo' + i + '" name="IGRItemNo' + i + '" value="' + item.IGRItemNo + '">' +
'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' + '<input type="text" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
'<input type="hidden" id="txtQuantityAsPerInvoice' + i + '" name="txtQuantityAsPerInvoice' + i + '" value="' + item.QuantityAsPerInvoice + '">' + '<input type="hidden" id="txtQuantityAsPerInvoice' + i + '" name="txtQuantityAsPerInvoice' + i + '" value="' + item.QuantityAsPerInvoice + '">' +
'<input type="hidden" id="txtOrderedQuantity' + i + '" name="txtOrderedQuantity' + i + '" value="' + item.Quantity + '">' + '<input type="hidden" id="txtOrderedQuantity' + i + '" name="txtOrderedQuantity' + i + '" value="' + item.Quantity + '">' +
'<input type="hidden" id="txtGrossWeight' + i + '" name="txtGrossWeight' + i + '" value="' + item.GrossWeight + '">' + '<input type="hidden" id="txtGrossWeight' + i + '" name="txtGrossWeight' + i + '" value="' + item.GrossWeight + '">' +
@ -595,6 +616,7 @@
'<input type="hidden" id="txtTareWeight' + i + '" name="txtTareWeight' + i + '" value="' + item.TareWeight + '">' + '<input type="hidden" id="txtTareWeight' + i + '" name="txtTareWeight' + i + '" value="' + item.TareWeight + '">' +
'<input type="hidden" id="txtTareWeightDate' + i + '" name="txtTareWeightDate' + i + '" value="' + item.TareWeightDate + '">' + '<input type="hidden" id="txtTareWeightDate' + i + '" name="txtTareWeightDate' + i + '" value="' + item.TareWeightDate + '">' +
'<input type="hidden" id="txtNetWeight' + i + '" name="txtNetWeight' + i + '"value="' + item.NetWeight + '">' + '<input type="hidden" id="txtNetWeight' + i + '" name="txtNetWeight' + i + '"value="' + item.NetWeight + '">' +
'<input type="hidden" id="txtRemarks' + i + '" name="txtRemarks' + i + '"value="' + item.Remarks + '">' +
'<input type="hidden" id="txtIGRLineItem' + i + '" name="txtIGRLineItem' + i + '"value="' + item.IGRItemNo + '">' + '<input type="hidden" id="txtIGRLineItem' + i + '" name="txtIGRLineItem' + i + '"value="' + item.IGRItemNo + '">' +
'</tr>'; '</tr>';
} }
@ -629,7 +651,7 @@
}); });
}); });
$('#draftIGR').click(function(){ $('#draftIGR').click(function(){
$('#content').loader('show'); // $('#content').loader('show');
var igrno = $("#IGRNO1").val(); var igrno = $("#IGRNO1").val();
var materialrcv_date = $("#MaterialRcvdDate").val(); var materialrcv_date = $("#MaterialRcvdDate").val();
var inv_date = $("#Invoice_Date").val(); var inv_date = $("#Invoice_Date").val();
@ -638,23 +660,23 @@
var driver_mobile = $('#DriverMobileNumber').val(); var driver_mobile = $('#DriverMobileNumber').val();
var status = 0; var status = 0;
var tableData = []; var tableData = [];
$('#tbleIGRAppend tr').each(function() { $('#tbleIGRAppend tr').each(function(index) {
var row = $(this); var row = $(this);
++index;
var rowData = { var rowData = {
MaterialCode: row.find('#MaterialCode' + row.index()).val(), Quantity: row.find('#txtOrderedQuantity' + index).val(),
Quantity: row.find('#txtOrderedQuantity' + row.index()).val(), QuantityAsPerInvoice: row.find('#txtQuantityAsPerInvoice' + index).val(),
QuantityAsPerInvoice: row.find('#txtQuantityAsPerInvoice' + row.index()).val(), Remarks: row.find('#txtRemarks' + index).val(),
Remarks: row.find('#txtGrossWeight' + row.index()).val(), GrossWeight: row.find('#txtGrossWeight' + index).val(),
GrossWeight: row.find('#txtGrossWeight' + row.index()).val(), GrossWeightDate: row.find('#txtGrossWeightDate' + index).val(),
GrossWeightDate: row.find('#txtGrossWeightDate' + row.index()).val(), TareWeight: row.find('#txtTareWeight' + index).val(),
TareWeight: row.find('#txtTareWeight' + row.index()).val(), TareWeightDate: row.find('#txtTareWeightDate' + index).val(),
TareWeightDate: row.find('#txtTareWeightDate' + row.index()).val(), NetWeight: row.find('#txtNetWeight' + index).val(),
NetWeight: row.find('#txtNetWeight' + row.index()).val(), IGRItemNo: row.find('#txtIGRLineItem' + index).val()
IGRItemNo: row.find('#txtIGRLineItem' + row.index()).val()
}; };
tableData.push(rowData); tableData.push(rowData);
}); });
console.log(tableData);
$.ajax({ $.ajax({
data:{igr:igrno,mrc:materialrcv_date,invdate:inv_date,vehicle_no:vehicle_no,driver:driver,driver_mobile:driver_mobile,status:status,tableData: tableData}, data:{igr:igrno,mrc:materialrcv_date,invdate:inv_date,vehicle_no:vehicle_no,driver:driver,driver_mobile:driver_mobile,status:status,tableData: tableData},
type:"POST", type:"POST",
@ -666,7 +688,7 @@
}); });
}); });
$('#generateIGR').click(function(){ $('#generateIGR').click(function(){
$('#content').loader('show'); // $('#content').loader('show');
var igrno = $("#IGRNO1").val(); var igrno = $("#IGRNO1").val();
var materialrcv_date = $("#MaterialRcvdDate").val(); var materialrcv_date = $("#MaterialRcvdDate").val();
var inv_date = $("#Invoice_Date").val(); var inv_date = $("#Invoice_Date").val();
@ -675,18 +697,19 @@
var driver_mobile = $('#DriverMobileNumber').val(); var driver_mobile = $('#DriverMobileNumber').val();
var status = 1; var status = 1;
var tableData = []; var tableData = [];
$('#tbleIGRAppend tr').each(function() { $('#tbleIGRAppend tr').each(function(index) {
var row = $(this); var row = $(this);
++index;
var rowData = { var rowData = {
MaterialCode: row.find('#MaterialCode' + row.index()).val(), Quantity: row.find('#txtOrderedQuantity' + index).val(),
Quantity: row.find('#txtOrderedQuantity' + row.index()).val(), QuantityAsPerInvoice: row.find('#txtQuantityAsPerInvoice' + index).val(),
QuantityAsPerInvoice: row.find('#txtQuantityAsPerInvoice' + row.index()).val(), Remarks: row.find('#txtRemarks' + index).val(),
GrossWeight: row.find('#txtGrossWeight' + row.index()).val(), GrossWeight: row.find('#txtGrossWeight' + index).val(),
GrossWeightDate: row.find('#txtGrossWeightDate' + row.index()).val(), GrossWeightDate: row.find('#txtGrossWeightDate' + index).val(),
TareWeight: row.find('#txtTareWeight' + row.index()).val(), TareWeight: row.find('#txtTareWeight' + index).val(),
TareWeightDate: row.find('#txtTareWeightDate' + row.index()).val(), TareWeightDate: row.find('#txtTareWeightDate' + index).val(),
NetWeight: row.find('#txtNetWeight' + row.index()).val(), NetWeight: row.find('#txtNetWeight' + index).val(),
IGRItemNo: row.find('#txtIGRLineItem' + row.index()).val() IGRItemNo: row.find('#txtIGRLineItem' + index).val()
}; };
tableData.push(rowData); tableData.push(rowData);
}); });