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

105
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,63 +72,77 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px; margin-bottom: -11px; margin-left: 33px;">
<input type="hidden" name="table" value="requisition">
<label for="fromDate">From:</label> <div class="row">
<input class="form-control date_range form-date-search" id="fromDate" name="fromDate" <div class="col-8">
placeholder="Select From Date" autocomplete="off"> <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px; margin-bottom: -11px; margin-left: 33px;">
<input type="hidden" name="table" value="requisition">
<label for="toDate">To:</label> <label for="fromDate">From:</label>
<input class="form-control date_range to-date-search" id="toDate" name="toDate" <input class="form-control date_range form-date-search" id="fromDate" name="fromDate"
placeholder="Select To Date" autocomplete="off"> placeholder="Select From Date" autocomplete="off">
<!-- New Category Field --> <label for="toDate">To:</label>
<div class="form-row"> <input class="form-control date_range to-date-search" id="toDate" name="toDate"
<label for="category" style="align-content: center !important;">Category:</label> placeholder="Select To Date" autocomplete="off">
<div class="form-group" style="width:180px !important; margin: 12px !important;">
<select class="form-control category-search" autocomplete="off" id="category" name="category"> <!-- New Category Field -->
<option value="">Select Category </option> <div class="form-row">
<?php <label for="category" style="align-content: center !important;">Category:</label>
if (!empty($materialCategoryList)) { <div class="form-group" style="width:180px !important; margin: 12px !important;">
foreach ($materialCategoryList as $record) { <select class="form-control category-search" autocomplete="off" id="category" name="category">
if($record['isActive']){ <option value="">Select Category </option>
?> <?php
<option value="<?php echo $record['ConfigValue']?>"><?php echo $record['ConfigValue']?></option> if (!empty($materialCategoryList)) {
<?php } } } ?> foreach ($materialCategoryList as $record) {
</select> if($record['isActive']){
</div> ?>
</div> <option value="<?php echo $record['ConfigValue']?>"><?php echo $record['ConfigValue']?></option>
<?php } } } ?>
</select>
</div>
</div>
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" <button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true"
class="icon-button" title="Search"></i></button> class="icon-button" title="Search"></i></button>
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton"
title="Reset"></i> title="Reset"></i>
<div class="error" id="error"></div> <div class="error" id="error"></div>
</form>
<div style="margin-left:auto">
<div class="form-check" style="margin-right: 25px;">
<form id="archiveFormId" action="<?php echo base_url()?>/rawmaterialListing" method="post">
<input class="form-check-input" type="checkbox" id="showArchiveId"
name="showArchive" value="1" <?php echo $showArchive ? "checked" : " " ?>
style="width: 18px; height: 18px;">
<label class="form-check-label" for="showArchiveId"
style="font-size: 1rem; margin-left: 8px;">
Show Archive
</label>
</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 class="form-check mt-4" style="margin-right: 25px;">
<form id="archiveFormId" action="<?php echo base_url()?>/rawmaterialListing" method="post">
<input class="form-check-input" type="checkbox" id="showArchiveId"
name="showArchive" value="1" <?php echo $showArchive ? "checked" : " " ?>
style="width: 18px; height: 18px;">
<label class="form-check-label" for="showArchiveId"
style="font-size: 1rem; margin-left: 8px;">
Show Archive
</label>
</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">
<thead> <thead>

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)}`);