Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

This commit is contained in:
VE10-Sanjeev 2025-03-25 09:12:01 +00:00
commit 6cc5a1d135
13 changed files with 914 additions and 556 deletions

View File

@ -184,22 +184,26 @@ class TrpProductionModel extends Model
// Convert array to a comma-separated string // Convert array to a comma-separated string
$caseSQLCrs = implode(', ', $caseStatementsCrs); $caseSQLCrs = implode(', ', $caseStatementsCrs);
// Subquery: Get unique invoice_id with item_date_added and total item_quantity per invoice
$subquery = $this->db->table('ip_invoice_items')
->select('invoice_id, item_date_added, item_quantity')
->whereIn('item_product_id', [81, 93])
->groupBy(['invoice_id'])
->getCompiledSelect(); // Convert to raw SQL for subquery
// Main Query: Use the subquery as invItems and join with ip_invoices and ip_clients
$subquery3 = $this->db->table('ip_invoice_items invItems') $subquery3 = $this->db->table("($subquery) invItems")
->select([ ->select(array_merge(['invItems.item_date_added'], $caseStatementsCrs)) // Add dynamic SUM(CASE WHEN..)
'invItems.item_date_added',
$caseSQLCrs
])
->join('ip_invoices inv', 'inv.invoice_id = invItems.invoice_id', 'left') ->join('ip_invoices inv', 'inv.invoice_id = invItems.invoice_id', 'left')
->join('ip_clients clients', 'clients.client_id = inv.client_id', 'left') ->join('ip_clients clients', 'clients.client_id = inv.client_id', 'left')
->whereIn('invItems.item_product_id', [81, 93])
->where("invItems.item_date_added BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering ->where("invItems.item_date_added BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering
->groupBy('invItems.item_date_added') ->groupBy('invItems.item_date_added')
->getCompiledSelect(false); // Convert Query Builder to raw SQL; ->getCompiledSelect(false); // Convert Query Builder to raw SQL;
$builder->join("({$subquery3}) invItems", 'invItems.item_date_added = tpmd.date', 'left'); $builder->join("({$subquery3}) invItems", 'invItems.item_date_added = tpmd.date', 'left');

View File

@ -69,7 +69,7 @@ if (!empty($master)) {
echo form_open(base_url() . 'configurationctrl/updateconfig', $attributes); ?> echo form_open(base_url() . 'configurationctrl/updateconfig', $attributes); ?>
<div class="form-row" style="margin-top:10px"> <div class="form-row" style="margin-top:10px">
<div class="col-md-3"> <div class="col-md-2">
<label class="col-form-label" for="ConfigId">Configuration ID</label> <label class="col-form-label" for="ConfigId">Configuration ID</label>
<font color="Red">*</font> <font color="Red">*</font>
<?php <?php
@ -78,7 +78,7 @@ if (!empty($master)) {
?> ?>
</div> </div>
<div class="col-md-3"> <div class="col-md-2">
<label class="col-form-label" for="ConfigName">Configuration Name</label> <label class="col-form-label" for="ConfigName">Configuration Name</label>
<font color="Red">*</font> <font color="Red">*</font>
<?php <?php
@ -87,7 +87,7 @@ if (!empty($master)) {
?> ?>
</div> </div>
<div class="col-md-3"> <div class="col-md-2">
<label class="col-form-label" for="Remarks"> Comments </label> <label class="col-form-label" for="Remarks"> Comments </label>
<font color="Red">*</font> <font color="Red">*</font>
<?php <?php
@ -95,23 +95,14 @@ if (!empty($master)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="col-md-3 mt-3">
</div>
<div class="form-row" style="margin-top:10px">
<div class="col-md-12 text-right">
<a data-toggle="modal" href="#AddConfiguration" style="margin-right: 10px;" <a data-toggle="modal" href="#AddConfiguration" style="margin-right: 10px;"
class="btn btn-success"><i class="fa fa-plus"></i>&nbsp;&nbsp; class="btn btn-success"><i class="fa fa-plus"></i>&nbsp;&nbsp;
Configuration Value</a> Configuration Value</a>
</div> </div>
</div>
<?php echo form_close(); ?> <?php echo form_close(); ?>
<br> <div class="col-md-3 mt-4" align="right">
<div>
<div align="right">
<div class="form-check" style="margin-right: 25px;">
<form id="archiveFormId" action="<?php echo base_url("/configurationctrl/editconfig")?>" method="post"> <form id="archiveFormId" action="<?php echo base_url("/configurationctrl/editconfig")?>" 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" : " " ?>
@ -125,6 +116,7 @@ if (!empty($master)) {
</div> </div>
</div> </div>
<div>
</div> </div>
@ -599,7 +591,8 @@ if (!empty($master)) {
style="cursor: pointer; color: #4d3a6d;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"> style="cursor: pointer; color: #4d3a6d;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
<u>${item.MaterialCode}</u> <u>${item.MaterialCode}</u>
</td> </td>
<td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.MaterialName}</td> <td style="text-align:left; overflow: hidden;text-overflow: ellipsis; word-wrap: break-word !important;
white-space: normal !important; width: 100px !important; ">${item.MaterialName}</td>
<td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.MaterialType}</td> <td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.MaterialType}</td>
<td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.IsActive?"Active":"InActive"}</td> <td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.IsActive?"Active":"InActive"}</td>

View File

@ -43,8 +43,15 @@
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.fht-table { .fht-table {
@ -226,7 +233,7 @@
.table-responsive { .table-responsive {
overflow-y: auto; overflow-y: auto;
max-height: 500px; max-height: 700px;
} }
.fht-table thead th { .fht-table thead th {
@ -239,6 +246,13 @@
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{ padding-bottom: 0;}
.card{ margin-bottom: 5px;}
</style> </style>
<div class="content-page"> <div class="content-page">
@ -267,10 +281,7 @@
Add Production Batch Card Add Production Batch Card
</button> --> </button> -->
<button type="button" class="btn btn-success" data-target="#coatingMachineDetailModal"
data-toggle="modal">
Add Shift Record
</button>
</div> </div>
</div> </div>
@ -292,46 +303,54 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<form method='post' action="<?= base_url('/coatingMachineDetails'); ?>"> <form id="changeMonthForm" method='post' action="<?= base_url('/coatingMachineDetails'); ?>">
<div class="card-body"> <div class="card-body">
<div class=form-row> <div class=form-row>
<div class="form-group col-md-3 mt-2 ">
<div class="col-2">
<input type="text" <input type="text"
value="<?= $month; ?>" name="month" value="<?= $month; ?>" name="month"
class="form-control monthpicker" id="monthpicker" readonly> class="form-control monthpicker" id="monthpicker" readonly>
</div> </div>
<div class="form-group col-md-3"> <div class="col-1 ">
<button type="submit" class="btn btn-success"> Change Month </button> <a href="#" >
</div> <i class="fa fa-download btn-lg"
style="font-size: x-large;"
<div class="col-6"> id="coatingMachineDetailsExport">
<div class="dropdown float-right mt-2"> </i>
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right">
<a style="cursor:pointer" </div>
<div class="col-8">
<!-- <a style="cursor:pointer"
class="dropdown-item" data-toggle="modal" data-target="#filterModalId"> class="dropdown-item" data-toggle="modal" data-target="#filterModalId">
Filter Filter
</a> </a> -->
<a style="cursor:pointer"
class="dropdown-item" id="coatingMachineDetailsExport" href="#">Export</a>
</div>
</div> </div>
<div class="col-lg-1 ">
<button type="button" class="btn btn-success m-0" data-target="#coatingMachineDetailModal"
data-toggle="modal">
Add Record
</button>
</div> </div>
</div> </div>
</form> </form>
<div class="table-responsive"> <div class="table-responsive">
<table id="coatingMachineDetailTableId" class="fht-table table-hover table-bordered" <table id="coatingMachineDetailTableId" class="fht-table "
style="background-color:#fff;"> style="background-color:#fff;">
<thead> <thead>
@ -1548,6 +1567,11 @@
</script> </script>
<script> <script>
$('#monthpicker').change(function(){
$('#changeMonthForm').submit();
})
$('#monthpicker').datepicker({ $('#monthpicker').datepicker({
format: 'M-yyyy', format: 'M-yyyy',
viewMode: 'months', viewMode: 'months',
@ -1726,3 +1750,5 @@ $(document).ready(function () {
}); });
</script> </script>
<!-- onchange of month submit will happen -->

View File

@ -26,8 +26,15 @@
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.fht-table { .fht-table {
@ -239,6 +246,14 @@
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{
padding-top : 0;
padding-bottom: 0;
}
.card{ margin-bottom: 5px;}
@ -302,45 +317,66 @@
<div class="card-body"> <div class="card-body">
<form action="<?= base_url('bagStockDetails'); ?>" method="post"> <form id="changeMonthForm" action="<?= base_url('bagStockDetails'); ?>" method="post">
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-2">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
class="form-control mt-2" class="form-control mt-2"
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly> style="z-index:30;" readonly>
</div> </div>
<div class="form-group col-md-3">
<button type="submit" class="btn btn-success"> Change Month </button> <div class="col-1 ">
<a href="#" >
<i class="fa fa-download btn-lg mt-2"
style="font-size: x-large;"
id="bagStockExport">
</i>
</a>
</div>
<?php <?php
//check it is current month , then only show the custom option //check it is current month , then only show the custom option
if($month == date('M-Y') ){ if($month == date('M-Y') ){
?> ?>
<div class="col-7">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-2 m-0">
<button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId" <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
Customize Customize
</button> </button>
<?php <?php
} else { ?>
<div class="col-8">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-1">
<?php
} }
?> ?>
<input type="button" class="btn btn-success px-4" id="saveId" value="Save">
</div> </div>
<div class="col-6">
<div class="dropdown float-right">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<a class="dropdown-item" id="bagStockExport" href="#">Export</a>
</div>
</div>
</div>
</div> </div>
</form> </form>
<form action="<?= base_url('bagStockDetails'); ?>" method="post"> <form action="<?= base_url('bagStockDetails'); ?>" method="post">
@ -422,16 +458,14 @@
</div> </div>
<!-- hidden fields --> <!-- hidden fields -->
<input type="hidden" name="month" value="<?php echo "$month" ?>" <input type="hidden" name="month" value="<?php echo "$month" ?>" >
class="form-control mt-2" data-provide="datepicker"
data-date-format="M-yyyy" data-date-min-view-mode="1">
</form> </form>
<div class="table-responsive"> <div class="table-responsive">
<table id="bagStockDetailsTableId" class="fht-table table-striped"> <table id="bagStockDetailsTableId" class="fht-table">
<thead class="celda_encabezado_general bag-table-head" style="padding: 10px;"> <thead class="celda_encabezado_general bag-table-head" style="padding: 10px;">
@ -712,14 +746,6 @@
</table> </table>
</div> </div>
<br>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-success px-4" id="saveId" value="save">
</div>
</div>
</div> </div>
</div> <!-- End card-body --> </div> <!-- End card-body -->
@ -1291,6 +1317,10 @@
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#month').change(function(){
$('#changeMonthForm').submit();
})
$('#month').datepicker({ $('#month').datepicker({
format: "M-yyyy", // Format as "Jan-2025" format: "M-yyyy", // Format as "Jan-2025"
minViewMode: 1, // Month-Year Picker minViewMode: 1, // Month-Year Picker

View File

@ -27,8 +27,15 @@
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.fht-table { .fht-table {
@ -217,7 +224,7 @@
.table-responsive { .table-responsive {
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
max-height: 500px; /* Adjust as needed */ max-height: 700px; /* Adjust as needed */
position: relative; position: relative;
} }
@ -230,6 +237,16 @@
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{
padding-top : 0;
padding-bottom: 0;
}
.card{ margin-bottom: 5px;}
@ -293,48 +310,67 @@ foreach ($period as $day) {
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form id="changeMonthForm" action="<?= base_url('dieselMachineDetails'); ?>" method="post">
<form action="<?= base_url('dieselMachineDetails'); ?>" method="post">
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-2">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
class="form-control mt-2" data-provide="datepicker" class="form-control mt-2"
style="z-index:30;" style="z-index:30;" readonly>
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
</div> </div>
<div class="form-group col-md-3">
<button type="submit" class="btn btn-success"> Change Month </button> <div class="col-1 ">
<a href="#" >
<i class="fa fa-download btn-lg mt-2"
style="font-size: x-large;"
id="dieselMachineStockDetailsExport">
</i>
</a>
</div>
<?php <?php
//check it is current month , then only show the custom option //check it is current month , then only show the custom option
if($month == date('M-Y') ){ if($month == date('M-Y') ){
?> ?>
<div class="col-7">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-2 m-0">
<button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId" <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
Customize Customize
</button> </button>
<?php <?php
} else { ?>
<div class="col-8">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-1">
<?php
} }
?> ?>
<input type="button" class="btn btn-success px-4" id="saveId" value="Save">
</div> </div>
<div class="col-6">
<div class="dropdown float-right">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<a class="dropdown-item" id="dieselMachineStockDetailsExport" href="#">Export</a>
</div>
</div>
</div>
</div> </div>
</form> </form>
<form action="<?= base_url('dieselMachineDetails'); ?>" method="post"> <form action="<?= base_url('dieselMachineDetails'); ?>" method="post">
@ -416,16 +452,15 @@ foreach ($period as $day) {
</div> </div>
<!-- hidden fields --> <!-- hidden fields -->
<input type="hidden" name="month" id="month" value="<?php echo "$month" ?>" <input type="hidden" name="month" value="<?php echo "$month" ?>"
class="form-control mt-2" data-provide="datepicker" class="form-control mt-2" >
data-date-format="M-yyyy" data-date-min-view-mode="1">
</form> </form>
<div class="table-responsive"> <div class="table-responsive">
<table id="dieselStockDetailsTableId" class="fht-table table-striped"> <table id="dieselStockDetailsTableId" class="fht-table">
<thead class="celda_encabezado_general" style="padding: 10px;"> <thead class="celda_encabezado_general" style="padding: 10px;">
@ -872,14 +907,6 @@ foreach ($period as $day) {
</table> </table>
</div> </div>
<br>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-success px-4" id="saveId" value="save">
</div>
</div>
</div> </div>
</div> <!-- End card-body --> </div> <!-- End card-body -->
@ -1610,3 +1637,17 @@ foreach ($period as $day) {
}) })
</script> </script>
<script>
$('#month').change(function(){
$('#changeMonthForm').submit();
})
$('#month').datepicker({
format: 'M-yyyy',
viewMode: 'months',
minViewMode: 'months',
autoclose: true,
orientation: 'bottom'
})
</script>

View File

@ -46,8 +46,15 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.fht-table { .fht-table {
@ -242,6 +249,15 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{
padding-top : 10px;
padding-bottom: 0;
}
.card{ margin-bottom: 5px;}
</style> </style>
<div class="content-page"> <div class="content-page">
<div class="content"> <div class="content">
@ -261,12 +277,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
</ol> </ol>
</div> </div>
<div>
<button type="button" class="btn btn-success" data-target="#additionalEntriesModalId"
data-toggle="modal">
Add Drier Entry
</button>
</div>
</div> </div>
@ -293,33 +304,41 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<div class="card-body"> <div class="card-body">
<form action="<?= base_url('drierMachineDetails'); ?>" method="post"> <form id="changeMonthForm" action="<?= base_url('drierMachineDetails'); ?>" method="post">
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-2">
<?php $today = date('M-Y'); ?> <?php $today = date('M-Y'); ?>
<input type="text" name="month" id="month" value="<?php echo $datefordropdown; ?>" class="form-control" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1" readonly> <input type="text" name="month" id="month" value="<?php echo $datefordropdown; ?>" class="form-control" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
</div> </div>
<div class="col-3">
<input type="submit" value="Change Month" class="btn btn-success" style="margin-top:0px;">
</div> <div class="col-1">
<a href="#" >
<div class="col-6"> <i class="fa fa-download btn-lg"
<div class="dropdown float-right"> style="font-size: x-large;"
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown" id="drierMachineDetailsExport">
aria-expanded="false"> </i>
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right">
<a style="cursor:pointer"
class="dropdown-item" data-toggle="modal" data-target="#filterModalId">Filter</a>
<a style="cursor:pointer"
class="dropdown-item" id="drierMachineDetailsExport" href="#">Export</a>
</div> </div>
<div class="col-8">
<!-- right now client is not using this -->
<!-- <a style="cursor:pointer"
class="dropdown-item" data-toggle="modal" data-target="#filterModalId">Filter</a> -->
</div> </div>
<div class="col-lg-1 ">
<button type="button" class="btn btn-success m-0" data-target="#additionalEntriesModalId"
data-toggle="modal">
Add Entry
</button>
</div> </div>
</div> </div>
</form> </form>
@ -327,7 +346,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<!-- Add table-responsive for horizontal scroll --> <!-- Add table-responsive for horizontal scroll -->
<div class="table-responsive"> <div class="table-responsive">
<table id="drierTable" class="fht-table table-hover table-bordered" style="background-color:#fff;"> <table id="drierTable" class="fht-table " style="background-color:#fff;">
<thead> <thead>
<tr> <tr>
@ -1355,3 +1374,39 @@ function convertToDate(dateString) {
<!-- script section ends --> <!-- script section ends -->
<!-- onchange of month submit will happen -->
<script>
$(document).ready(function(){
$('#month').change(function(){
$('#changeMonthForm').submit();
})
})
</script>
<script>
document.addEventListener("fullscreenchange", function () {
if (document.fullscreenElement) {
localStorage.setItem("isFullscreen", "true");
} else {
localStorage.removeItem("isFullscreen");
}
});
document.addEventListener("DOMContentLoaded", function () {
if (localStorage.getItem("isFullscreen") === "true") {
toggleFullscreen(); // Re-enter fullscreen if it was active before refresh
}
});
function toggleFullscreen() {
if (!document.fullscreenElement) {
document.documentElement.requestFullscreen().catch(err => {
console.error(`Error attempting to enable full-screen mode: ${err.message}`);
});
} else {
document.exitFullscreen();
}
}
</script>

View File

@ -31,8 +31,15 @@
} */ } */
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.fht-table { .fht-table {
@ -241,6 +248,19 @@
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{
padding-top : 0;
padding-bottom : 0;
}
.card{ margin-bottom: 5px;}
</style> </style>
@ -277,29 +297,36 @@
<div class="card-body" style="padding-left:300px;"> <div class="card-body" style="padding-left:300px;">
<form action="<?= base_url('dustAndRoughStockDetails'); ?>" method="post"> <form id="changeMonthForm" action="<?= base_url('dustAndRoughStockDetails'); ?>" method="post">
<div class="row" >
<div class="col-3">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <div class="row mt-2">
class="form-control datepicker mt-2 " data-provide="datepicker"
<div class="col-2">
<input type="text" name="month" id="month" value="<?php echo $month; ?>"
class="form-control" data-provide="datepicker"
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly> data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
</div> </div>
<div class="form-group col-md-3"> <div class="col-1">
<button type="submit" class="btn btn-success"> Change Month </button> <a href="#" >
</div> <i class="fa fa-download btn-lg"
<div class="col-6"> style="font-size: x-large;"
<div class="dropdown float-right"> id="dustAndRoughStockExport">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown" </i>
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" id="dustAndRoughStockExport" href="#">Export</a>
</div> </div>
<div class="col-2">
</div> </div>
<div class="col-1">
<button class="btn btn-success m-0 px-3" type="button" id="saveId">Save</button>
</div> </div>
</div> </div>
</form> </form>
@ -308,7 +335,7 @@
<div class="table-responsive"> <div class="table-responsive">
<table style="width: 700px;" id="dustAndRoughStockDetailsTableId" class="fht-table table-striped"> <table style="width: 700px;" id="dustAndRoughStockDetailsTableId" class="fht-table ">
<thead class="celda_encabezado_general" style="padding: 10px;"> <thead class="celda_encabezado_general" style="padding: 10px;">
@ -460,14 +487,6 @@
</table> </table>
</div> </div>
<br>
<div class="row">
<div class="col-md-12 text-left" style="margin-left :350px !important ;" >
<input type="button" class="btn btn-success px-4" id="saveId" value="save">
</div>
</div>
</div> </div>
</div> <!-- End card-body --> </div> <!-- End card-body -->
@ -731,7 +750,13 @@
<script> <script>
$('#month').change(function(){
$('#changeMonthForm').submit();
})
$(document).ready(function () { $(document).ready(function () {
$('#month').datepicker({ $('#month').datepicker({
format: "M-yyyy", // Format as "Jan-2025" format: "M-yyyy", // Format as "Jan-2025"
minViewMode: 1, // Month-Year Picker minViewMode: 1, // Month-Year Picker

View File

@ -18,8 +18,15 @@
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.fht-table { .fht-table {
@ -208,7 +215,7 @@
.table-responsive { .table-responsive {
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
max-height: 500px; /* Adjust as needed */ max-height: 700px; /* Adjust as needed */
position: relative; position: relative;
} }
@ -221,6 +228,11 @@
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{ padding-bottom: 0;}
.card{ margin-bottom: 5px;}
@ -259,31 +271,38 @@
<div class="card-body"> <div class="card-body">
<form action="<?= base_url('gasStockDetails'); ?>" method="post"> <form id="changeMonthForm" action="<?= base_url('gasStockDetails'); ?>" method="post">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-2">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <?php $today = date('M-Y'); ?>
class="form-control mt-2" data-provide="datepicker" <input type="text" name="month" id="month" value="<?php echo $month; ?>" class="form-control" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
</div>
<div class="form-group col-md-3">
<button type="submit" class="btn btn-success"> Change Month </button>
</div> </div>
<div class="col-6"> <div class="col-1 ">
<div class="dropdown float-right"> <a href="#" >
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown" <i class="fa fa-download btn-lg"
aria-expanded="false"> style="font-size: x-large;"
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i> id="gasStockDetailsExport">
</i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right">
<a style="cursor:pointer"
class="dropdown-item" data-toggle="modal" data-target="#filterModalId">Filter</a>
<a style="cursor:pointer"
class="dropdown-item" id="gasStockDetailsExport" href="#">Export</a>
</div> </div>
<div class="col-8">
<!-- right now client is not using this -->
<!-- <a style="cursor:pointer"
class="dropdown-item" data-toggle="modal" data-target="#filterModalId">Filter</a> -->
</div> </div>
<div class="col-1 ">
<button type="button" class="btn btn-success m-0 px-4" id="saveId" >
Save
</button>
</div> </div>
@ -292,9 +311,8 @@
</form> </form>
<div class="table-responsive"> <div class="table-responsive">
<table id="gasStockDetailsTableId" class="fht-table table-striped"> <table id="gasStockDetailsTableId" class="fht-table">
<thead class="celda_encabezado_general" style="padding: 10px;"> <thead class="celda_encabezado_general" style="padding: 10px;">
@ -638,15 +656,8 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<br>
<br>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-success px-4" id="saveId" value="save">
</div>
</div>
@ -1200,3 +1211,11 @@ function convertToDate(dateString) {
}); });
</script> </script>
<script>
$(document).ready(function(){
$('#month').change(function(){
$('#changeMonthForm').submit();
})
})
</script>

View File

@ -25,10 +25,18 @@
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
} }
.fht-table tr:hover {
background-color: rgb(170, 222, 167) ;
color:rgb(2, 2, 2);
}
/* .fht-table td[contenteditable="true"] { /* .fht-table td[contenteditable="true"] {
background-color: lightyellow; background-color: lightyellow;
color:rgb(13, 7, 7); color:rgb(13, 7, 7);
@ -214,7 +222,7 @@
.table-responsive { .table-responsive {
overflow-y: auto; overflow-y: auto;
max-height: 500px; max-height: 700px;
} }
.fht-table thead th { .fht-table thead th {
@ -236,11 +244,17 @@
padding : 3px !important ; padding : 3px !important ;
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{ padding-bottom: 0;}
.card{ margin-bottom: 5px;}
</style> </style>
<div class="content-page"> <div class="content-page">
<div class="content"> <div class="content">
<!-- Start Content--> <!-- Start Content-->
@ -291,50 +305,38 @@
<div class="row"> <div class="row" style="padding:0 px !important;">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body" > <div class="card-body" >
<form id="changeMonthForm" action="<?= base_url('incomingSilicaSandDetails'); ?>" method="post">
<form action="<?= base_url('incomingSilicaSandDetails'); ?>" method="post">
<div class="row"> <div class="row">
<div class="col-2">
<div class="col-3">
<?php $today = date('M-Y'); ?> <?php $today = date('M-Y'); ?>
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" class="form-control " data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
<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" readonly>
<input type="hidden" name="remark" id="remark" value="<?php echo $remark ?>"> <input type="hidden" name="remark" id="remark" value="<?php echo $remark ?>">
</div> </div>
<div class="form-group col-md-3"> <div class="col-1 ">
<button type="submit" class="btn btn-success"> Change Month </button> <a href="#" >
</div> <i class="fa fa-download btn-lg"
<div class="col-6"> style="font-size: x-large;"
<div class="dropdown float-right"> id="incomingSilicaSandDetailsExport">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown" </i>
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right">
<a style="cursor:pointer"
class="dropdown-item" id="incomingSilicaSandDetailsExport" href="#">Export</a>
</div>
</div> </div>
<div class="col-8">
</div>
<div class="col-1">
<input type="button" class="btn btn-success px-4 m-0" id="save" value="Save">
</div> </div>
</div> </div>
</form> </form>
<!-- Add table-responsive for horizontal scroll --> <!-- Add table-responsive for horizontal scroll -->
<div class="table-responsive"> <div class="table-responsive">
<table id="incomingSilicaSandDetailsTable" class="fht-table table table-striped " > <table id="incomingSilicaSandDetailsTable" class="fht-table table " >
<thead > <thead >
<tr> <tr>
@ -448,7 +450,7 @@
</td> </td>
<!-- 'td:eq(5)' --> <!-- 'td:eq(5)' -->
<td class="celda_normal" style="padding: 10px; min-width : 300px; max-width:300px;"> <td class="celda_normal" style="padding: 10px; min-width : 300px; max-width:300px; text-align: left;">
<?php echo $record['SupplierName']??''; ?> <?php echo $record['SupplierName']??''; ?>
</td> </td>
@ -458,8 +460,9 @@
</td> </td>
<!-- 'td:eq(7)' --> <!-- 'td:eq(7)' -->
<td class="celda_normal" style="color:#02d0eb; background:white; min-width : 200px; max-width:200px;" contenteditable="true"> <td class="celda_normal" style=" min-width : 200px; max-width:200px;" contenteditable="true">
<select class="status grade-condition select2" id="gradeCondition" style="min-width : 180px; max-width:180px;"> <select class="status grade-condition select2 "
style=" min-width : 180px; max-width:180px;">
<option value="">Select</option> <option value="">Select</option>
<option value="wet" <option value="wet"
<?php echo ($record['gradeCondition'] == 'wet') ? "selected":''; ?> <?php echo ($record['gradeCondition'] == 'wet') ? "selected":''; ?>
@ -544,9 +547,11 @@
<!-- 'td:eq(22)' --> <!-- 'td:eq(22)' -->
<td class="celda_normal" style="color:#02d0eb; background:white;"> <td class="celda_normal" >
<i <a href="#">
class="fas fa-edit download-lab-report" style="cursor:pointer;"></i> <i class="fas fa-edit download-lab-report" style="cursor:pointer;"></i>
</a>
</td> </td>
@ -728,13 +733,6 @@
</h5> </h5>
<?php }?> <?php }?>
<br>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-success px-4" id="save" value="save">
</div>
</div>
</div> </div>
@ -1634,6 +1632,10 @@ $(document).ready(function() {
placeholder: "Select", placeholder: "Select",
}); });
$('.grade-condition').select2({
placeholder:"Select",
})
}); });
</script> </script>
@ -1891,3 +1893,12 @@ $(document).ready(function() {
}) })
</script> </script>
<!-- onchange of month submit will happen -->
<script>
$(document).ready(function(){
$('#month').change(function(){
$('#changeMonthForm').submit();
})
})
</script>

View File

@ -25,16 +25,19 @@
cursor: grabbing; /* Closed-hand cursor when dragging */ cursor: grabbing; /* Closed-hand cursor when dragging */
} }
/* .fht-table td[contenteditable="true"] {
background-color: lightyellow;
color:rgb(13, 7, 7);
} */
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
} }
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
}
.fht-table { .fht-table {
border: 0 none; border: 0 none;
height: auto; height: auto;
@ -226,7 +229,7 @@
.table-responsive { .table-responsive {
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
max-height: 500px; max-height: 700px;
/* Adjust as needed */ /* Adjust as needed */
position: relative; position: relative;
} }
@ -240,6 +243,15 @@
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{
padding-top : 0;
padding-bottom: 0;
}
.card{ margin-bottom: 5px;}
</style> </style>
@ -302,46 +314,66 @@ foreach ($period as $day) {
<div class="card-body"> <div class="card-body">
<form action="<?= base_url('powerConsumptionDetails'); ?>" method="post"> <form id="changeMonthForm" action="<?= base_url('powerConsumptionDetails'); ?>" method="post">
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-2">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
class="form-control mt-2" data-provide="datepicker" class="form-control mt-2"
style="z-index:30;" style="z-index:30;" readonly>
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
</div> </div>
<div class="form-group col-md-3">
<button type="submit" class="btn btn-success"> Change Month </button> <div class="col-1 ">
<a href="#" >
<i class="fa fa-download btn-lg mt-2"
style="font-size: x-large;"
id="powerConsumptionExport">
</i>
</a>
</div>
<?php <?php
//check it is current month , then only show the custom option //check it is current month , then only show the custom option
if($month == date('M-Y') ){ if($month == date('M-Y') ){
?> ?>
<div class="col-7">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-2 m-0">
<button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId" <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
Customize Customize
</button> </button>
<?php <?php
} else { ?>
<div class="col-8">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-1">
<?php
} }
?> ?>
<input type="button" class="btn btn-success px-4" id="saveId" value="Save">
</div> </div>
<div class="col-6">
<div class="dropdown float-right">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<a class="dropdown-item" id="powerConsumptionExport" href="#">Export</a>
</div>
</div>
</div>
</div> </div>
</form> </form>
<form action="<?= base_url('powerConsumptionDetails'); ?>" method="post"> <form action="<?= base_url('powerConsumptionDetails'); ?>" method="post">
@ -423,16 +455,15 @@ foreach ($period as $day) {
</div> </div>
<!-- hidden fields --> <!-- hidden fields -->
<input type="hidden" name="month" id="month" value="<?php echo "$month" ?>" <input type="hidden" name="month" value="<?php echo "$month" ?>"
class="form-control mt-2" data-provide="datepicker" >
data-date-format="M-yyyy" data-date-min-view-mode="1">
</form> </form>
<div class="table-responsive"> <div class="table-responsive">
<table id="powerStockDetailsTableId" class="fht-table table-striped"> <table id="powerStockDetailsTableId" class="fht-table">
<thead class="celda_encabezado_general" style="padding: 10px;"> <thead class="celda_encabezado_general" style="padding: 10px;">
@ -501,7 +532,7 @@ foreach ($period as $day) {
$currentDate = date('d-m-Y'); $currentDate = date('d-m-Y');
$dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $powerStockDetails[0]['date'])->format('d-m-Y'); $dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $powerStockDetails[0]['date'])->format('d-m-Y');
if ($dateInMonthDmYFormat === $currentDate) { if ($dateInMonthDmYFormat === $currentDate) {
echo 'style="background: #cef0ad;"'; echo 'style="background: rgb(232, 245, 231);"';
} }
?>> ?>>
@ -736,7 +767,7 @@ foreach ($period as $day) {
$currentDate = date('d-m-Y'); $currentDate = date('d-m-Y');
$dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $dateInMonth)->format('d-m-Y'); $dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $dateInMonth)->format('d-m-Y');
if ($dateInMonthDmYFormat === $currentDate) { if ($dateInMonthDmYFormat === $currentDate) {
echo 'style="background: #cef0ad;"'; echo 'style="background: rgb(232, 245, 231);"';
} }
?>> ?>>
@ -881,14 +912,6 @@ foreach ($period as $day) {
</table> </table>
</div> </div>
<br>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-success px-4" id="saveId" value="save">
</div>
</div>
</div> </div>
</div> <!-- End card-body --> </div> <!-- End card-body -->
@ -1542,3 +1565,17 @@ foreach ($period as $day) {
}) })
</script> </script>
<script>
$('#month').change(function(){
$('#changeMonthForm').submit();
})
$('#month').datepicker({
format: 'M-yyyy',
viewMode: 'months',
minViewMode: 'months',
autoclose: true,
orientation: 'bottom'
})
</script>

View File

@ -18,8 +18,15 @@
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.grab { .grab {
@ -226,7 +233,7 @@
.table-responsive { .table-responsive {
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
max-height: 500px; max-height: 700px;
/* Adjust as needed */ /* Adjust as needed */
position: relative; position: relative;
} }
@ -239,6 +246,19 @@
tfoot tr { tfoot tr {
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{
padding-top : 0;
padding-bottom : 0;
}
.card{ margin-bottom: 5px;}
</style> </style>
@ -300,48 +320,66 @@ foreach ($period as $day) {
<div class="card-body"> <div class="card-body">
<form action="<?= base_url('resinStockDetails'); ?>" method="post"> <form id="changeMonthForm" action="<?= base_url('resinStockDetails'); ?>" method="post">
<div class="row" > <div class="row" >
<div class="col-3"> <div class="col-2">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
class="form-control mt-2" data-provide="datepicker" class="form-control mt-2"
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly> style="z-index:30;" readonly>
</div> </div>
<div class="form-group col-md-3">
<button type="submit" class="btn btn-success"> Change Month </button> <div class="col-1 ">
<a href="#" >
<i class="fa fa-download btn-lg mt-2"
style="font-size: x-large;"
id="resinStockExport">
</i>
</a>
</div>
<?php <?php
//check it is current month , then only show the custom option //check it is current month , then only show the custom option
if($month == date('M-Y') ){ if($month == date('M-Y') ){
?> ?>
<div class="col-7">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-2 m-0">
<button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId" <button type="button" class="btn " style="background-color:maroon;color:white" data-target="#customizeModalId"
data-toggle="modal"> data-toggle="modal">
Customize Customize
</button> </button>
<input type="button" class="btn btn-success px-4" id="saveId" value="save"> <?php
} else { ?>
<div class="col-8">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-1">
<?php <?php
} }
?> ?>
</div>
<div class="col-6"> <input type="button" class="btn btn-success px-4" id="saveId" value="Save">
<div class="dropdown float-right">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<a class="dropdown-item" id="resinStockExport" href="#">Export</a>
</div>
</div>
</div>
</div> </div>
</div>
</form> </form>
@ -433,7 +471,7 @@ foreach ($period as $day) {
<div class="table-responsive" > <div class="table-responsive" >
<table id="resinStockDetailsTableId" class="fht-table table-striped"> <table id="resinStockDetailsTableId" class="fht-table ">
<thead class="celda_encabezado_general" style="padding: 10px;"> <thead class="celda_encabezado_general" style="padding: 10px;">
@ -487,7 +525,7 @@ foreach ($period as $day) {
$currentDate = date('d-m-Y'); $currentDate = date('d-m-Y');
$dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $resinStockDetails[0]['date'])->format('d-m-Y'); $dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $resinStockDetails[0]['date'])->format('d-m-Y');
if ($dateInMonthDmYFormat === $currentDate) { if ($dateInMonthDmYFormat === $currentDate) {
echo 'style="background: #cef0ad;"'; echo 'style="background: rgb(232, 245, 231);"';
} }
?>> ?>>
<?php foreach ($resinStockDetails as $resinStockIndex => $resinStock) { <?php foreach ($resinStockDetails as $resinStockIndex => $resinStock) {
@ -609,7 +647,7 @@ foreach ($period as $day) {
$currentDate = date('d-m-Y'); $currentDate = date('d-m-Y');
$dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $dateInMonth)->format('d-m-Y'); $dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $dateInMonth)->format('d-m-Y');
if ($dateInMonthDmYFormat === $currentDate) { if ($dateInMonthDmYFormat === $currentDate) {
echo 'style="background: #cef0ad;"'; echo 'style="background: rgb(232, 245, 231);"';
} }
?>> ?>>
<?php <?php
@ -698,14 +736,6 @@ foreach ($period as $day) {
</table> </table>
</div> </div>
<br>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-success px-4" id="saveId" value="save">
</div>
</div>
</div> </div>
</div> <!-- End card-body --> </div> <!-- End card-body -->
@ -1244,3 +1274,17 @@ foreach ($period as $day) {
}) })
</script> </script>
<script>
$('#month').change(function(){
$('#changeMonthForm').submit();
})
$('#month').datepicker({
format: 'M-yyyy',
viewMode: 'months',
minViewMode: 'months',
autoclose: true,
orientation: 'bottom'
})
</script>

View File

@ -19,8 +19,15 @@
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.fht-table { .fht-table {
@ -157,7 +164,7 @@
/* <!-- ad9271 into ffffff brown-light to green-light --> */ /* <!-- ad9271 into ffffff brown-light to green-light --> */
text-align: center; text-align: center;
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 10px 6px; padding: 6px 4px;
} }
@ -203,7 +210,7 @@
.table-responsive { .table-responsive {
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
max-height: 500px; /* Adjust as needed */ max-height: 700px; /* Adjust as needed */
position: relative; position: relative;
} }
@ -226,6 +233,18 @@
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{
padding-top : 0;
padding-bottom : 0;
}
.card{ margin-bottom: 5px;}
</style> </style>
@ -311,39 +330,47 @@ $timeOtions[] = "12:00 AM";
<div class="card-body"> <div class="card-body">
<form action="<?= base_url('trpProductionDetails'); ?>" method="post"> <form id="changeMonthForm" action="<?= base_url('trpProductionDetails'); ?>" method="post">
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-2">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
class="form-control mt-2" data-provide="datepicker" class="form-control mt-2"
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly> style="z-index:30;" readonly>
</div> </div>
<div class="form-group col-md-2">
<button type="submit" class="btn btn-success"> Change Month </button> <div class="col-1 ">
</div> <a href="#" >
<div class="col-md-1"></div> <i class="fa fa-download btn-lg mt-2"
<div class="col-6"> style="font-size: x-large;"
<div class="dropdown float-right"> id="trpProductionDetailsExport">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown" </i>
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> </div>
<a style="cursor:pointer"
class="dropdown-item" id="trpProductionDetailsExport" href="#">Export</a> <div class="col-8">
</div> <!-- right now client is not using this -->
</div> <!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
</div>
<div class="col-1">
<input type="button" class="btn btn-success px-4" id="saveId" value="Save">
</div> </div>
</div> </div>
</form> </form>
<div class="table-responsive"> <div class="table-responsive">
<table id="trpProductionStockDetailsTableId" class="fht-table table-striped"> <table id="trpProductionStockDetailsTableId" class="fht-table ">
<thead class="celda_encabezado_general" style="padding: 10px;"> <thead class="celda_encabezado_general" style="padding: 10px;">
@ -1283,20 +1310,10 @@ $timeOtions[] = "12:00 AM";
</div> </div>
</div>
<br> <br>
<hr>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-success px-4" id="saveId" value="save">
</div>
</div>
</div>
<div class="row"> <div class="row">
@ -1305,28 +1322,38 @@ $timeOtions[] = "12:00 AM";
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-2">
</div>
<div class="col"> <div class="col">
<!-- right now client is not using this -->
<!-- <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a> -->
<h4 class="mt-3" style="text-align:center">Abstract for the month <?=$month?></h4>
</div>
<div class="dropdown float-right"> <div class="col-2">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown" <a href="#" >
aria-expanded="false"> <i class="fa fa-download btn-lg mt-2"
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i> style="font-size: x-large;"
id="trpAbstractDetailsExport">
</i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right">
<a style="cursor:pointer"
class="dropdown-item" id="trpAbstractDetailsExport" href="#">Export
</a>
</div>
</div>
</div>
</div>
<h4 style="text-align:center">Abstract for the month <?=$month?></h4>
<div class="table-responsive">
<table id="abstractTableId" class="fht-table table-striped"> <input type="button" class="btn btn-success px-4 mb-3" id="abstractSaveId" value="Save">
</div>
<div class="col-1">
</div>
</div>
<div class="table-responsive" align="center">
<table id="abstractTableId" class="fht-table ">
<thead class="celda_encabezado_general" style="padding: 10px ;"> <thead class="celda_encabezado_general" style="padding: 10px ;">
<tr> <tr>
<th class="celda_encabezado_general" style="width: 200px;">Particulars</th> <th class="celda_encabezado_general" style="width: 200px;">Particulars</th>
@ -1662,12 +1689,6 @@ $timeOtions[] = "12:00 AM";
</table> </table>
</div> </div>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-success px-4" id="abstractSaveId" value="save">
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -2341,8 +2362,19 @@ $timeOtions[] = "12:00 AM";
<script>
$('#month').change(function(){
$('#changeMonthForm').submit();
})
$('#month').datepicker({
format: 'M-yyyy',
viewMode: 'months',
minViewMode: 'months',
autoclose: true,
orientation: 'bottom'
})
</script>

View File

@ -18,8 +18,15 @@
} }
.fht-table td:hover { .fht-table td:hover {
background-color: #50bbd9; background-color: rgb(170, 222, 167);
color: #ffffff; color:rgb(2, 2, 2);
transform: scale(1.25); /* Increases size by 25% */
transition: transform 0.5s ease-in-out; /* Smooth scaling effect */
}
.fht-table tr:hover {
background-color: rgb(170, 222, 167);
color:rgb(2, 2, 2);
} }
.fht-table { .fht-table {
@ -227,6 +234,21 @@
background-color:rgb(235, 236, 203); background-color:rgb(235, 236, 203);
} }
body[data-layout-mode = horizontal] .container-fluid{
max-width: 100%;
}
.card-body{
padding-top : 0;
padding-bottom : 0;
}
.card{ margin-bottom: 5px;}
</style> </style>
@ -264,37 +286,45 @@
<div class="card-body" style="padding-left:300px;"> <div class="card-body" style="padding-left:300px;">
<form action="<?= base_url('trpSandUseStockDetails'); ?>" method="post"> <form id="changeMonthForm" action="<?= base_url('trpSandUseStockDetails'); ?>" method="post">
<div class="row" >
<div class="row mt-2">
<div class="col-2">
<input type="text" name="month" id="month" value="<?php echo $month; ?>"
class="form-control" data-provide="datepicker"
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
</div>
<div class="col-1">
<a href="#" >
<i class="fa fa-download btn-lg"
style="font-size: x-large;"
id="trpSandUseStockExport">
</i>
</a>
</div>
<div class="col-3"> <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" readonly>
</div>
<div class="form-group col-md-2">
<button type="submit" class="btn btn-success"> Change Month </button>
</div>
<div class="col-md-1"></div>
<div class="col-6">
<div class="dropdown float-right">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
aria-expanded="false">
<i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
<a class="dropdown-item" id="trpSandUseStockExport" href="#">Export</a>
</div>
</div> </div>
<div class="col-1">
<button class="btn btn-success m-0 px-3" type="button" id="saveId">Save</button>
</div> </div>
</div> </div>
</form> </form>
<div class="table-responsive"> <div class="table-responsive">
<table style="width: 700px;" id="trpSandUseStockDetailsTableId" class="fht-table table-striped"> <table style="width: 700px;" id="trpSandUseStockDetailsTableId" class="fht-table ">
<thead class="celda_encabezado_general" > <thead class="celda_encabezado_general" >
@ -485,13 +515,6 @@
</table> </table>
</div> </div>
<br>
<div class="row">
<div class="col-md-12 text-left" style="margin-left :350px !important ;" >
<input type="button" class="btn btn-success px-4" id="saveId" value="save">
</div>
</div>
</div> </div>
@ -759,4 +782,22 @@
</script> </script>
<script>
$('#month').change(function(){
$('#changeMonthForm').submit();
})
$(document).ready(function () {
$('#month').datepicker({
format: "M-yyyy", // Format as "Jan-2025"
minViewMode: 1, // Month-Year Picker
autoclose: true,
todayHighlight: true,
orientation: "auto" // Adjusts automatically, or use "top" / "bottom"
}).on('focus', function() {
$(this).datepicker('show'); // Ensure it opens on focus
});
});
</script>