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

stock module - 25-03-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-03-25 15:42:50 +05:30
parent 40d64e1bcf
commit f4c73c6bc3
2 changed files with 80 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Views/rawmaterialListing.php
View File

@ -52,7 +52,6 @@
<div class="col-12"> <div class="col-12">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Material Master Details</h4> <h4 class="page-title">Material Master Details</h4>
<a class="btn btn-success" href="<?php echo base_url(); ?>addRawmaterial">Add New Material</a>
</div> </div>
</div> </div>
</div> </div>
@ -73,6 +72,9 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="row">
<div class="col-8">
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px; margin-bottom: -11px; margin-left: 33px;"> <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px; margin-bottom: -11px; margin-left: 33px;">
<input type="hidden" name="table" value="requisition"> <input type="hidden" name="table" value="requisition">
@ -113,11 +115,13 @@
<div class="error" id="error"></div> <div class="error" id="error"></div>
</form> </form>
</div>
<div class="col-2">
<a class="btn btn-success mt-3" href="<?php echo base_url(); ?>addRawmaterial">Add New Material</a>
</div>
<div class="col-2">
<div style="margin-left:auto"> <div style="margin-left:auto">
<div class="form-check" style="margin-right: 25px;"> <div class="form-check mt-4" style="margin-right: 25px;">
<form id="archiveFormId" action="<?php echo base_url()?>/rawmaterialListing" method="post"> <form id="archiveFormId" action="<?php echo base_url()?>/rawmaterialListing" method="post">
<input class="form-check-input" type="checkbox" id="showArchiveId" <input class="form-check-input" type="checkbox" id="showArchiveId"
name="showArchive" value="1" <?php echo $showArchive ? "checked" : " " ?> name="showArchive" value="1" <?php echo $showArchive ? "checked" : " " ?>
@ -129,6 +133,15 @@
</form> </form>
</div> </div>
</div> </div>
</div>
</div>
<div class="card-body" style="overflow-x:scroll;"> <div class="card-body" style="overflow-x:scroll;">
<table id="raw_material_list_table" class="table dt-responsive nowrap w-100"> <table id="raw_material_list_table" class="table dt-responsive nowrap w-100">

21
app/Views/stock/trpProductionStockDetails.php
View File

@ -160,6 +160,22 @@
.celda_normal { .celda_normal {
/*background-color: #fff;*/
/* <!-- ad9271 into ffffff brown-light to green-light --> */
text-align: center;
border: 1px solid #ccc;
padding: 2px 4px;
}
#abstractTableId tbody td.celda_normal {
/*background-color: #fff;*/
/* <!-- ad9271 into ffffff brown-light to green-light --> */
text-align: center;
border: 1px solid #ccc;
padding: 10px 4px;
}
#trpProductionStockDetailsTableId tfoot tr td.celda_normal {
/*background-color: #fff;*/ /*background-color: #fff;*/
/* <!-- ad9271 into ffffff brown-light to green-light --> */ /* <!-- ad9271 into ffffff brown-light to green-light --> */
text-align: center; text-align: center;
@ -2063,6 +2079,11 @@ $timeOtions[] = "12:00 AM";
if (trpOnTime != '' && trpOffTime != '') { if (trpOnTime != '' && trpOffTime != '') {
if(trpOnTime == trpOffTime){
document.querySelector(`td.totalHours[data-id="${date} totalHours"]`).innerText = '24.0';
return;
}
const startDate = new Date(`1970-01-01T${convertTo24Hour(trpOnTime)}`); const startDate = new Date(`1970-01-01T${convertTo24Hour(trpOnTime)}`);
const endDate = new Date(`1970-01-01T${convertTo24Hour(trpOffTime)}`); const endDate = new Date(`1970-01-01T${convertTo24Hour(trpOffTime)}`);