finished dust and rough module
This commit is contained in:
parent
5860aae863
commit
c6821967d6
@ -443,4 +443,9 @@ $routes->post('updateIncomingSilicaSandDetails', 'StockController::updateIncomin
|
||||
|
||||
//Bag stock details
|
||||
$routes->match(['GET','POST'],'bagStockDetails', 'StockController::loadView_bagStockDetails');
|
||||
$routes->post('updateBagStockDetails', 'StockController::updateBagStockDetails');
|
||||
$routes->post('updateBagStockDetails', 'StockController::updateBagStockDetails');
|
||||
|
||||
//Dust And Rough Stock Details
|
||||
$routes->match(['GET','POST'],'dustAndRoughStockDetails', 'StockController::loadView_dustAndRoughStockDetails');
|
||||
$routes->post('updateDustAndRoughStockDetails', 'StockController::updateDustAndRoughStockDetails');
|
||||
|
||||
|
||||
@ -12,6 +12,7 @@ use App\Models\IncomingSilicaSandDetailsModel;
|
||||
use App\Models\Inwardgateregister_model;
|
||||
use App\Models\Rawmaterialdetails_model;
|
||||
use App\Models\BagStockDetailsModel;
|
||||
use App\Models\DustAndRoughModel;
|
||||
use CodeIgniter\HTTP\ResponseInterface;
|
||||
use DateTime;
|
||||
|
||||
@ -29,6 +30,7 @@ class StockController extends BaseController
|
||||
protected $rawmaterialdetails_model;
|
||||
protected $bagStockDetails_model;
|
||||
protected $Rawmaterialdetails_model;
|
||||
protected $dustAndRoughStockDetails_model;
|
||||
|
||||
/**
|
||||
* This is default constructor of the class
|
||||
@ -46,6 +48,7 @@ class StockController extends BaseController
|
||||
$this->incomingSilicaSandDetails_model = new IncomingSilicaSandDetailsModel();
|
||||
$this->inwardGateRegister_model = new Inwardgateregister_model();
|
||||
$this->bagStockDetails_model = new BagStockDetailsModel();
|
||||
$this->dustAndRoughStockDetails_model = new DustAndRoughModel();
|
||||
|
||||
|
||||
$this->session = session();
|
||||
@ -405,6 +408,88 @@ class StockController extends BaseController
|
||||
echo "Data Saved Successfully";
|
||||
|
||||
}
|
||||
|
||||
|
||||
//Dust And Rough Stock Details
|
||||
|
||||
public function loadView_dustAndRoughStockDetails(){
|
||||
|
||||
if ($this->request->getMethod() === 'POST'){
|
||||
$month = $this->request->getPost('month');
|
||||
|
||||
$date = DateTime::createFromFormat('M-Y', $month);
|
||||
|
||||
$formattedDate = $date->format('Y-m');
|
||||
|
||||
$month=$formattedDate;
|
||||
}
|
||||
else{
|
||||
$month = date('Y-m');
|
||||
}
|
||||
|
||||
$data=[];
|
||||
|
||||
$data['month']=$month;
|
||||
|
||||
$this->global['pageTitle']='Dust And Rough Stock Details';
|
||||
|
||||
$startDate = "$month-01";
|
||||
$endDate = date("Y-m-t", strtotime($startDate));
|
||||
$data['dustAndRoughStockDetails'] = $this->dustAndRoughStockDetails_model
|
||||
->where('date >=', $startDate)
|
||||
->where('date <=', $endDate)
|
||||
->orderBy('date','asc')
|
||||
->findAll();
|
||||
|
||||
|
||||
|
||||
$date = DateTime::createFromFormat('Y-m', $month);
|
||||
|
||||
$formattedDate = $date->format('M-Y');
|
||||
|
||||
$data['month']=$formattedDate;
|
||||
|
||||
return $this->loadViews("dustAndRoughStockDetails", $this->global, $data, NULL);
|
||||
|
||||
}
|
||||
|
||||
public function updateDustAndRoughStockDetails(){
|
||||
|
||||
$postData = $this->request->getPost();
|
||||
|
||||
$updateDustAndRoughStockDetailsData = json_decode($postData['updateDustAndRoughStockDetails'], true);
|
||||
|
||||
foreach($updateDustAndRoughStockDetailsData as $data){
|
||||
|
||||
$date = $data['date'];
|
||||
|
||||
$dbData= [
|
||||
'date' => $data['date'],
|
||||
'finalRough' => $data['finalRough'],
|
||||
'dust' => $data['dust'],
|
||||
'total' => $data['total']
|
||||
|
||||
];
|
||||
|
||||
$resultExists=$this->dustAndRoughStockDetails_model
|
||||
->where('date',$date)
|
||||
->first();
|
||||
|
||||
|
||||
if(empty($resultExists)){
|
||||
$inserted = $this->dustAndRoughStockDetails_model->insert($dbData);
|
||||
}else{
|
||||
$updated=$this->dustAndRoughStockDetails_model
|
||||
->where('date',$date)
|
||||
->set($dbData)
|
||||
->update();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
echo "Data Saved Successfully";
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
46
app/Models/DustAndRoughModel.php
Normal file
46
app/Models/DustAndRoughModel.php
Normal file
@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use CodeIgniter\Model;
|
||||
|
||||
class DustAndRoughModel extends Model
|
||||
{
|
||||
protected $table = 't_dustAndRoughStockDetails';
|
||||
protected $primaryKey = 'date';
|
||||
protected $useAutoIncrement = true;
|
||||
protected $returnType = 'array';
|
||||
protected $useSoftDeletes = false;
|
||||
protected $protectFields = true;
|
||||
protected $allowedFields = ['date','finalRough','dust','total'];
|
||||
|
||||
protected bool $allowEmptyInserts = false;
|
||||
protected bool $updateOnlyChanged = true;
|
||||
|
||||
protected array $casts = [];
|
||||
protected array $castHandlers = [];
|
||||
|
||||
// Dates
|
||||
protected $useTimestamps = false;
|
||||
protected $dateFormat = 'datetime';
|
||||
protected $createdField = 'created_at';
|
||||
protected $updatedField = 'updated_at';
|
||||
protected $deletedField = 'deleted_at';
|
||||
|
||||
// Validation
|
||||
protected $validationRules = [];
|
||||
protected $validationMessages = [];
|
||||
protected $skipValidation = false;
|
||||
protected $cleanValidationRules = true;
|
||||
|
||||
// Callbacks
|
||||
protected $allowCallbacks = true;
|
||||
protected $beforeInsert = [];
|
||||
protected $afterInsert = [];
|
||||
protected $beforeUpdate = [];
|
||||
protected $afterUpdate = [];
|
||||
protected $beforeFind = [];
|
||||
protected $afterFind = [];
|
||||
protected $beforeDelete = [];
|
||||
protected $afterDelete = [];
|
||||
}
|
||||
@ -626,10 +626,6 @@
|
||||
})
|
||||
}
|
||||
|
||||
function updateCustomerForMaterial(){
|
||||
return
|
||||
}
|
||||
|
||||
function customerChange(thElement){
|
||||
let materialCode = thElement.getAttribute('data-materialCode');
|
||||
let newCustomerValue = thElement.innerText;
|
||||
|
||||
458
app/Views/dustAndRoughStockDetails.php
Normal file
458
app/Views/dustAndRoughStockDetails.php
Normal file
@ -0,0 +1,458 @@
|
||||
<style type="text/css">
|
||||
.num {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.fht-table,
|
||||
.fht-table thead,
|
||||
.fht-table tfoot,
|
||||
.fht-table tbody,
|
||||
.fht-table tr,
|
||||
.fht-table th,
|
||||
.fht-table td {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.fht-table td {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.fht-table td:hover {
|
||||
background-color: #00a65a;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.fht-table {
|
||||
border: 0 none;
|
||||
height: auto;
|
||||
width: auto;
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
/*table-layout: fixed; Algoritmo de distribucion fijo */
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.fht-table th,
|
||||
.fht-table td {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.fht-table-wrapper,
|
||||
.fht-table-wrapper .fht-thead,
|
||||
.fht-table-wrapper .fht-tfoot,
|
||||
.fht-table-wrapper .fht-fixed-column .fht-tbody,
|
||||
.fht-table-wrapper .fht-fixed-body .fht-tbody,
|
||||
.fht-table-wrapper .fht-tbody {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.fht-table-wrapper .fht-fixed-body .fht-tbody,
|
||||
.fht-table-wrapper .fht-tbody {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.fht-table-wrapper .fht-table .fht-cell {
|
||||
overflow: hidden;
|
||||
height: 1px;
|
||||
}
|
||||
|
||||
.fht-table-wrapper .fht-fixed-column,
|
||||
.fht-table-wrapper .fht-fixed-body {
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.fht-table-wrapper .fht-fixed-column {
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.fht-fixed-body .fht-thead table {
|
||||
margin-right: 20px;
|
||||
border: 0 none;
|
||||
}
|
||||
|
||||
/*For Examples*/
|
||||
|
||||
.ContenedorTabla {
|
||||
height: 500px;
|
||||
margin: 0 auto;
|
||||
overflow: auto;
|
||||
width: auto;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.header,
|
||||
.main {
|
||||
display: inline-block;
|
||||
height: auto;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.titulosHeader {
|
||||
border-bottom: 1px solid #e8bb25;
|
||||
height: auto;
|
||||
margin-bottom: 10px;
|
||||
padding-bottom: 8px;
|
||||
padding-top: 8px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
.celda_encabezado_general {
|
||||
background-color: #00a65a;
|
||||
border: 1px solid #ccc;
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
padding: 6px 10px;;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
||||
._Separador {
|
||||
background-color: #fff;
|
||||
height: 12px;
|
||||
border-left: 1px solid #ccc;
|
||||
border-right: 1px solid #ccc;
|
||||
width: 7px;
|
||||
}
|
||||
|
||||
._Separador div {
|
||||
width: 4px;
|
||||
}
|
||||
|
||||
.celda_normal {
|
||||
/*background-color: #fff;*/
|
||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||
text-align: center;
|
||||
border: 1px solid #ccc;
|
||||
padding: 2px 4px;
|
||||
}
|
||||
|
||||
/*style excel*/
|
||||
.excel_cell {
|
||||
border: 1px solid #CCC;
|
||||
color: #222;
|
||||
text-align: center;
|
||||
font-size: 13px;
|
||||
font-weight: normal;
|
||||
padding: 4px;
|
||||
white-space: pre-line;
|
||||
empty-cells: show;
|
||||
}
|
||||
|
||||
._cell_header {
|
||||
background-color: #EEE;
|
||||
}
|
||||
|
||||
._cell_Default {
|
||||
background-color: #FFF;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.excel_cell div {
|
||||
width: 30px;
|
||||
height: 20px;
|
||||
}
|
||||
|
||||
.modal {
|
||||
padding-right: 30% ! important;
|
||||
}
|
||||
</style>
|
||||
<div class="content-page">
|
||||
<div class="content">
|
||||
<!-- Start Content-->
|
||||
<div class="container-fluid">
|
||||
<!-- start page title -->
|
||||
<div>
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<div class="page-title-right">
|
||||
<ol class="breadcrumb m-0">
|
||||
<li class="breadcrumb-item"><a href="javascript: void(0);">Stocks</a></li>
|
||||
<li class="breadcrumb-item active">
|
||||
<h4 class="page-title">Dust And Rough Stock Details </h4>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 text-right">
|
||||
<!-- Right-aligned buttons or links can be added here -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
|
||||
|
||||
<form action="<?= base_url('dustAndRoughStockDetails'); ?>" method="post">
|
||||
<div class="row">
|
||||
|
||||
<div class="col-3">
|
||||
<input type="text" name="month" id="month" value="<?php echo "$month" ?>"
|
||||
class="form-control mt-2" data-provide="datepicker"
|
||||
data-date-format="M-yyyy" data-date-min-view-mode="1">
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<button type="submit" class="btn btn-success"> Change Month </button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
|
||||
<div class="table-responsive">
|
||||
<table id="dustAndRoughStockDetailsTableId" class="fht-table table-striped">
|
||||
|
||||
<thead class="celda_encabezado_general" style="padding: 10px;">
|
||||
|
||||
<tr>
|
||||
<th class="celda_encabezado_general" rowspan="2" colspan="1">Date </th>
|
||||
<th class="celda_encabezado_general" colspan="1">Final Rough </th>
|
||||
<th class="celda_encabezado_general" colspan="1">Dust </th>
|
||||
<th class="celda_encabezado_general" rowspan="2" colspan="1">Total </th>
|
||||
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="celda_encabezado_general" colspan="1">+16 Mesh </th>
|
||||
<th class="celda_encabezado_general" colspan="1">10 Ton Dryer </th>
|
||||
</tr>
|
||||
|
||||
</thead>
|
||||
|
||||
<tbody style="background-color: #fff;" >
|
||||
|
||||
<?php
|
||||
if(!empty($dustAndRoughStockDetails)){
|
||||
|
||||
foreach($dustAndRoughStockDetails as $dustAndRoughStockDetailsIndex => $dustAndRoughStockDetail){
|
||||
?>
|
||||
<tr>
|
||||
<td class="celda_normal"><?= $dustAndRoughStockDetail['date'] ?></td>
|
||||
|
||||
<td class="celda_normal finalRough"
|
||||
data-id="<?= $dustAndRoughStockDetail['date'] ?>"
|
||||
oninput="finalRoughStockChange(this)"
|
||||
contenteditable="true"
|
||||
><?= $dustAndRoughStockDetail['finalRough'] ?></td>
|
||||
|
||||
<td class="celda_normal dust"
|
||||
data-id="<?= $dustAndRoughStockDetail['date'] ?>"
|
||||
oninput="dustStockChange(this)"
|
||||
contenteditable="true"
|
||||
><?= $dustAndRoughStockDetail['dust'] ?></td>
|
||||
|
||||
<td class="celda_normal total"
|
||||
data-id="<?= $dustAndRoughStockDetail['date'] ?>"
|
||||
><?= $dustAndRoughStockDetail['total'] ?></td>
|
||||
</tr>
|
||||
|
||||
<?php
|
||||
}
|
||||
|
||||
}else{
|
||||
|
||||
$date = DateTime::createFromFormat('M-Y', $month);
|
||||
|
||||
$startDate = $date->modify('first day of this month')->format('Y-m-d');
|
||||
$endDate = $date->modify('last day of this month')->format('Y-m-d');
|
||||
|
||||
$datesInMonth = [];
|
||||
|
||||
|
||||
$period = new DatePeriod(
|
||||
new DateTime($startDate),
|
||||
new DateInterval('P1D'),
|
||||
(new DateTime($endDate))->modify('+1 day')
|
||||
);
|
||||
|
||||
foreach ($period as $day) {
|
||||
$datesInMonth[] = $day->format('Y-m-d');
|
||||
}
|
||||
|
||||
foreach($datesInMonth as $datesInMonthIndex => $dateInMonth){
|
||||
?>
|
||||
<tr>
|
||||
<td class="celda_normal"><?= $dateInMonth?></td>
|
||||
|
||||
<td class="celda_normal finalRough"
|
||||
data-id="<?= $dateInMonth ?>"
|
||||
oninput="finalRoughStockChange(this)"
|
||||
contenteditable="true"
|
||||
><?= 0 ?></td>
|
||||
|
||||
<td class="celda_normal dust"
|
||||
data-id="<?= $dateInMonth ?>"
|
||||
oninput="dustStockChange(this)"
|
||||
contenteditable="true"
|
||||
><?= 0 ?></td>
|
||||
|
||||
<td class="celda_normal total"
|
||||
data-id="<?= $dateInMonth ?>"
|
||||
><?= 0 ?></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 text-right">
|
||||
<input type="button" class="btn btn-success" id="saveId" value="save">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div> <!-- End card-body -->
|
||||
</div> <!-- End card -->
|
||||
</div> <!-- End col -->
|
||||
</div> <!-- End row -->
|
||||
</div>
|
||||
</div> <!-- End container-fluid -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
$(document).ready(function () {
|
||||
|
||||
$('#saveId').click(function () {
|
||||
|
||||
//table to json function
|
||||
|
||||
var updateDustAndRoughStockDetails = tableToJson();
|
||||
|
||||
alert('Updation may take a while, And we appreciate your patience..!!');
|
||||
|
||||
$('#loader').show();
|
||||
$.ajax({
|
||||
data: {
|
||||
updateDustAndRoughStockDetails
|
||||
},
|
||||
type: "POST",
|
||||
url: "<?php echo base_url() ?>updateDustAndRoughStockDetails",
|
||||
|
||||
success: function (data) {
|
||||
if (data) {
|
||||
$('#loader').hide();
|
||||
console.log(data);
|
||||
alert(data);
|
||||
}
|
||||
|
||||
},
|
||||
error: function(xhr, status, error) {
|
||||
|
||||
alert("An error occurred while processing the request. Please try again.");
|
||||
console.error("Error Code:", xhr.status);
|
||||
console.error("Error Message:", error);
|
||||
console.error("Response Text:", xhr.responseText);
|
||||
},
|
||||
complete: function() {
|
||||
$('#loader').hide();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<script>
|
||||
function tableToJson() {
|
||||
const table = $('#dustAndRoughStockDetailsTableId');
|
||||
const rows = [];
|
||||
|
||||
//this table to json is customized for bagstock not for all
|
||||
|
||||
table.find('tbody tr').each(function() {
|
||||
const rowCells = $(this).find('td');
|
||||
|
||||
/** we get eight entries against a material so we loop from 1 to 7 and so on
|
||||
in a single row **/
|
||||
|
||||
const rowData = {
|
||||
date: rowCells.eq(0).text().trim(),
|
||||
finalRough: rowCells.eq(1).text().trim(),
|
||||
dust: rowCells.eq(2).text().trim(),
|
||||
total: rowCells.eq(3).text().trim(),
|
||||
|
||||
};
|
||||
|
||||
rows.push(rowData);
|
||||
|
||||
|
||||
});
|
||||
|
||||
return JSON.stringify(rows, null, 2);
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<script>
|
||||
|
||||
function finalRoughStockChange(tdElement) {
|
||||
|
||||
try{
|
||||
console.log("just an alert from finalRoughStockChange..!!")
|
||||
console.log(tdElement.innerText)
|
||||
let dataId = tdElement.getAttribute('data-id')
|
||||
let finalRoughStock = tdElement.innerText;
|
||||
let dustStock = document.querySelector(`td.dust[data-id="${dataId}"]`).innerText;
|
||||
let total = (Number(finalRoughStock) + Number(dustStock)) ;
|
||||
document.querySelector(`td.total[data-id="${dataId}"]`).innerText=total;
|
||||
|
||||
|
||||
} catch(error){
|
||||
console.error("There is an error updating stock ..!!" + error);
|
||||
}
|
||||
}
|
||||
|
||||
function dustStockChange(tdElement) {
|
||||
try{
|
||||
|
||||
console.log("just an alert from dustStockChange..!!")
|
||||
console.log(tdElement.innerText)
|
||||
let dataId = tdElement.getAttribute('data-id')
|
||||
let finalRoughStock = document.querySelector(`td.finalRough[data-id="${dataId}"]`).innerText;
|
||||
let dustStock = tdElement.innerText;
|
||||
let total = (Number(finalRoughStock) + Number(dustStock)) ;
|
||||
document.querySelector(`td.total[data-id="${dataId}"]`).innerText = total;
|
||||
|
||||
|
||||
} catch(error){
|
||||
|
||||
console.error("There is an error updating stock ..!!" + error);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
@ -776,6 +776,8 @@
|
||||
<a href="<?php echo base_url(); ?>factoryVehicleDieselDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Diesel - Factory Vehicle </a>
|
||||
|
||||
<a href="<?php echo base_url(); ?>bagStockDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Bag Stock Details</a>
|
||||
|
||||
<a href="<?php echo base_url(); ?>dustAndRoughStockDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Dust And Rough Stock Details</a>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user