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

changes in stock module 12-03-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-03-12 11:30:42 +05:30
parent caa0314ef7
commit 56f42d6bdf
2 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/StockController.php
View File

@ -346,7 +346,8 @@ class StockController extends BaseController
'clayOrLossOfIgnition' => $postData['clayOrLossOfIgnition'], 'clayOrLossOfIgnition' => $postData['clayOrLossOfIgnition'],
'reportComments' => $postData['reportComments'], 'reportComments' => $postData['reportComments'],
'gradeRange' => $postData['gradeRange'], 'gradeRange' => $postData['gradeRange'],
'reportTime' => $postData['reportTime'] 'reportTime' => $postData['reportTime'],
'remark' => $postData['remark']
]; ];

78
app/Views/stock/incomingSilicaSandDetails.php
View File

@ -366,7 +366,7 @@
<th class="celda_encabezado_general" style="padding: 10px;">Moisture loss Qty</th> <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;">Sieve Loss Qty</th>
<th class="celda_encabezado_general" style="padding: 10px;">Salable 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;">MaterialCode</th>
<th class="celda_encabezado_general" style="display:none">id</th> <th class="celda_encabezado_general" style="display:none">id</th>
<th class="celda_encabezado_general" style="display:none">testedBy</th> <th class="celda_encabezado_general" style="display:none">testedBy</th>
@ -595,7 +595,7 @@
<!-- need to check the status and select values before hand --> <!-- need to check the status and select values before hand -->
<!-- 'td:eq(33)' --> <!-- 'td:eq(33)' -->
<td class="celda_normal" style="color:#02d0eb; background:white; min-width : 200px; max-width:200px;" contenteditable="true"> <td class="celda_normal" style="display:none;" >
<select class="status sand-status select2" style=" min-width : 180px; max-width:180px;"> <select class="status sand-status select2" style=" min-width : 180px; max-width:180px;">
<option value="noRemark">Select</option> <option value="noRemark">Select</option>
<option value="accepted" <option value="accepted"
@ -608,7 +608,6 @@
<?php echo ($record['remark'] == 'rejected') ? "selected":''; ?> <?php echo ($record['remark'] == 'rejected') ? "selected":''; ?>
>Rejected</option> >Rejected</option>
</select> </select>
</td> </td>
<!-- 'td:eq(34)' --> <!-- 'td:eq(34)' -->
@ -1054,6 +1053,8 @@
</table> </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> </main>
</div> </div>
@ -1091,6 +1092,16 @@
<input type="hidden" name="reportTime" id="reportTime" value=""> <input type="hidden" name="reportTime" id="reportTime" value="">
<div class="modal-footer"> <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" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="button" id="labReportSubmitId" class="btn btn-success" >Save</button> <button type="button" id="labReportSubmitId" class="btn btn-success" >Save</button>
<button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button> <button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button>
@ -1274,11 +1285,11 @@
if(remark == "accepted"){ if(remark == "accepted"){
$('#dwnldAcceptedId').text("Ok"); $('#dwnldAcceptedId').text("Yes");
}else if(remark == "conditionallyAccepted"){ }else if(remark == "conditionallyAccepted"){
$('#dwnldAcceptedUnderDeviationId').text("Ok"); $('#dwnldAcceptedUnderDeviationId').text("Yes");
}else if(remark == "rejected"){ }else if(remark == "rejected"){
$('#dwnldRejectedId').text("Ok"); $('#dwnldRejectedId').text("Yes");
} }
@ -1314,6 +1325,7 @@
$('#reportComments').val(reportComments); $('#reportComments').val(reportComments);
$('#gradeRange').val(gradeRange); $('#gradeRange').val(gradeRange);
$('#reportTime').val(reportTime); $('#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"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
$('#save').click(function() { $('#save').click(function() {
var incomingSilicaSandDetailsData = $("#incomingSilicaSandDetailsTable").tableToJSON(); var incomingSilicaSandDetailsData = $("#incomingSilicaSandDetailsTable").tableToJSON();
@ -1563,10 +1571,16 @@
<!-- adding select 2 --> <!-- adding select 2 -->
<script> <script>
$(document).ready(function() { $(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({ $('.test-or-approve' ).select2({
placeholder: "Select", placeholder: "Select",
@ -1574,9 +1588,6 @@ $(document).ready(function() {
}); });
</script> </script>
@ -1612,7 +1623,7 @@ $(document).ready(function() {
plus30Loss : $('#plus30Loss').val(), plus30Loss : $('#plus30Loss').val(),
sieveLossQty : $('#sieveLossQty').val(), sieveLossQty : $('#sieveLossQty').val(),
salableQty : $('#salableQty').val(), salableQty : $('#salableQty').val(),
remark : $('#dwnldAcceptedId').text(), remark : $('#remarkInFormId').val(),
gradeCondition : $('#dwnldGradeId').text(), gradeCondition : $('#dwnldGradeId').text(),
testedBy : $('#testedById').val(), testedBy : $('#testedById').val(),
approvedBy : $('#approvedById').val(), approvedBy : $('#approvedById').val(),
@ -1668,9 +1679,8 @@ $(document).ready(function() {
</script> </script>
<!-- excel export option -->
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
function exportTableToExcel(tableID, filename = '') { function exportTableToExcel(tableID, filename = '') {
@ -1731,11 +1741,9 @@ $(document).ready(function() {
}) })
</script> </script>
<!-- on enter key press allowing user to go next line instead of submitting any form here -->
<script> <script>
document.addEventListener("keydown", function (event) { document.addEventListener("keydown", function (event) {
@ -1774,6 +1782,7 @@ $(document).ready(function() {
</script> </script>
<!-- fixing pasting of xcel values inside the table to prevent table element breakage -->
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("resultTableId td ,#basicDetailsTableId td, #meshTableId td, #incomingSilicaSandDetailsTable td").on("paste", function (e) { $("resultTableId td ,#basicDetailsTableId td, #meshTableId td, #incomingSilicaSandDetailsTable td").on("paste", function (e) {
@ -1799,3 +1808,28 @@ $(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>