changes in stock module 12-03-2025
This commit is contained in:
vadivelJ96
parent
caa0314ef7
commit
56f42d6bdf
@ -346,7 +346,8 @@ class StockController extends BaseController
|
||||
'clayOrLossOfIgnition' => $postData['clayOrLossOfIgnition'],
|
||||
'reportComments' => $postData['reportComments'],
|
||||
'gradeRange' => $postData['gradeRange'],
|
||||
'reportTime' => $postData['reportTime']
|
||||
'reportTime' => $postData['reportTime'],
|
||||
'remark' => $postData['remark']
|
||||
|
||||
];
|
||||
|
||||
|
||||
@ -366,7 +366,7 @@
|
||||
<th class="celda_encabezado_general" style="padding: 10px;">Moisture loss Qty</th>
|
||||
<th class="celda_encabezado_general" style="padding: 10px;">Sieve Loss Qty</th>
|
||||
<th class="celda_encabezado_general" style="padding: 10px;">Salable Qty</th>
|
||||
<th class="celda_encabezado_general" style="padding: 10px; min-width : 200px; max-width:200px;">Remark</th>
|
||||
<th class="celda_encabezado_general" style="display:none; ">Remark</th>
|
||||
<th class="celda_encabezado_general" style="display:none;">MaterialCode</th>
|
||||
<th class="celda_encabezado_general" style="display:none">id</th>
|
||||
<th class="celda_encabezado_general" style="display:none">testedBy</th>
|
||||
@ -595,20 +595,19 @@
|
||||
<!-- need to check the status and select values before hand -->
|
||||
|
||||
<!-- 'td:eq(33)' -->
|
||||
<td class="celda_normal" style="color:#02d0eb; background:white; min-width : 200px; max-width:200px;" contenteditable="true">
|
||||
<select class="status sand-status select2" style=" min-width : 180px; max-width:180px;">
|
||||
<option value="noRemark">Select</option>
|
||||
<option value="accepted"
|
||||
<?php echo ($record['remark'] == 'accepted') ? "selected":''; ?>
|
||||
>Accepted</option>
|
||||
<option value="conditionallyAccepted"
|
||||
<?php echo ($record['remark'] == 'conditionallyAccepted') ? "selected":''; ?>
|
||||
>Conditionally Accepted</option>
|
||||
<option value="rejected"
|
||||
<?php echo ($record['remark'] == 'rejected') ? "selected":''; ?>
|
||||
>Rejected</option>
|
||||
</select>
|
||||
|
||||
<td class="celda_normal" style="display:none;" >
|
||||
<select class="status sand-status select2" style=" min-width : 180px; max-width:180px;">
|
||||
<option value="noRemark">Select</option>
|
||||
<option value="accepted"
|
||||
<?php echo ($record['remark'] == 'accepted') ? "selected":''; ?>
|
||||
>Accepted</option>
|
||||
<option value="conditionallyAccepted"
|
||||
<?php echo ($record['remark'] == 'conditionallyAccepted') ? "selected":''; ?>
|
||||
>Conditionally Accepted</option>
|
||||
<option value="rejected"
|
||||
<?php echo ($record['remark'] == 'rejected') ? "selected":''; ?>
|
||||
>Rejected</option>
|
||||
</select>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(34)' -->
|
||||
@ -1053,7 +1052,9 @@
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<b><small> * This is a system generated </small></b>
|
||||
<b><small> * This is a system generated </small></b>
|
||||
<br>
|
||||
<b><small id="reportNotice"> </small></b>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
@ -1091,6 +1092,16 @@
|
||||
<input type="hidden" name="reportTime" id="reportTime" value="">
|
||||
|
||||
<div class="modal-footer">
|
||||
|
||||
<span style="min-width: 150px; max-width: 150px;">
|
||||
<select class="form-control select2" name="remark" id="remarkInFormId" required>
|
||||
<option value="">select</option>
|
||||
<option value="noRemark">No Remark</option>
|
||||
<option value="accepted" >Accepted</option>
|
||||
<option value="conditionallyAccepted" >Conditionally Accepted</option>
|
||||
<option value="rejected" >Rejected</option>
|
||||
</select>
|
||||
</span>
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
|
||||
<button type="button" id="labReportSubmitId" class="btn btn-success" >Save</button>
|
||||
<button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button>
|
||||
@ -1274,11 +1285,11 @@
|
||||
|
||||
|
||||
if(remark == "accepted"){
|
||||
$('#dwnldAcceptedId').text("Ok");
|
||||
$('#dwnldAcceptedId').text("Yes");
|
||||
}else if(remark == "conditionallyAccepted"){
|
||||
$('#dwnldAcceptedUnderDeviationId').text("Ok");
|
||||
$('#dwnldAcceptedUnderDeviationId').text("Yes");
|
||||
}else if(remark == "rejected"){
|
||||
$('#dwnldRejectedId').text("Ok");
|
||||
$('#dwnldRejectedId').text("Yes");
|
||||
}
|
||||
|
||||
|
||||
@ -1314,6 +1325,7 @@
|
||||
$('#reportComments').val(reportComments);
|
||||
$('#gradeRange').val(gradeRange);
|
||||
$('#reportTime').val(reportTime);
|
||||
$('#remarkInFormId').val(remark);
|
||||
|
||||
|
||||
|
||||
@ -1395,14 +1407,10 @@
|
||||
|
||||
|
||||
|
||||
<!-- Save All Data in Incoming Silica Sand Details -->
|
||||
<!-- Save All Data in Incoming Silica Sand Details from table -->
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
$(document).ready(function()
|
||||
{
|
||||
|
||||
|
||||
$('#save').click(function() {
|
||||
|
||||
var incomingSilicaSandDetailsData = $("#incomingSilicaSandDetailsTable").tableToJSON();
|
||||
@ -1563,19 +1571,22 @@
|
||||
|
||||
<!-- adding select 2 -->
|
||||
<script>
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
|
||||
$('#remarkSelectId').select2({
|
||||
placeholder: "Select",
|
||||
data: [
|
||||
{ id: 'accepted', text: 'Accepted' },
|
||||
{ id: 'conditionallyAccepted', text: 'Accepted Under Deviation' },
|
||||
{ id: 'rejected', text: 'Rejected' }
|
||||
]
|
||||
});
|
||||
|
||||
$('.test-or-approve' ).select2({
|
||||
placeholder: "Select",
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
@ -1612,7 +1623,7 @@ $(document).ready(function() {
|
||||
plus30Loss : $('#plus30Loss').val(),
|
||||
sieveLossQty : $('#sieveLossQty').val(),
|
||||
salableQty : $('#salableQty').val(),
|
||||
remark : $('#dwnldAcceptedId').text(),
|
||||
remark : $('#remarkInFormId').val(),
|
||||
gradeCondition : $('#dwnldGradeId').text(),
|
||||
testedBy : $('#testedById').val(),
|
||||
approvedBy : $('#approvedById').val(),
|
||||
@ -1668,9 +1679,8 @@ $(document).ready(function() {
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
<!-- excel export option -->
|
||||
<script>
|
||||
|
||||
$(document).ready(function(){
|
||||
|
||||
function exportTableToExcel(tableID, filename = '') {
|
||||
@ -1731,11 +1741,9 @@ $(document).ready(function() {
|
||||
|
||||
})
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
<!-- on enter key press allowing user to go next line instead of submitting any form here -->
|
||||
<script>
|
||||
document.addEventListener("keydown", function (event) {
|
||||
|
||||
@ -1774,6 +1782,7 @@ $(document).ready(function() {
|
||||
|
||||
</script>
|
||||
|
||||
<!-- fixing pasting of xcel values inside the table to prevent table element breakage -->
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$("resultTableId td ,#basicDetailsTableId td, #meshTableId td, #incomingSilicaSandDetailsTable td").on("paste", function (e) {
|
||||
@ -1798,4 +1807,29 @@ $(document).ready(function() {
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</script>
|
||||
|
||||
<!-- remark onchange -->
|
||||
<script>
|
||||
$('#remarkInFormId').change(function(){
|
||||
|
||||
let remark = $(this).val();
|
||||
|
||||
$('#dwnldAcceptedId').text("");
|
||||
$('#dwnldAcceptedUnderDeviationId').text("");
|
||||
$('#dwnldRejectedId').text("");
|
||||
|
||||
if(remark == "accepted"){
|
||||
$('#dwnldAcceptedId').text("Yes");
|
||||
}else if(remark == "conditionallyAccepted"){
|
||||
$('#dwnldAcceptedUnderDeviationId').text("Yes");
|
||||
}else if(remark == "rejected"){
|
||||
$('#dwnldRejectedId').text("Yes");
|
||||
}
|
||||
|
||||
//without saving current change , cannot download the pdf
|
||||
$('#pdfGenerateId').css('display', 'none');
|
||||
$('#reportNotice').text("* Please save the changes to download");
|
||||
|
||||
})
|
||||
</script>
|
||||
Loading…
Reference in New Issue
Block a user