GWM : code merge

This commit is contained in:
Gowtham M 2025-04-07 15:27:28 +05:30
parent cfc3745d98
commit 7291373b39

View File

@ -237,7 +237,7 @@ $currentday = date('d');
<div class="card" id="fullscreenDiv">
<div class="card-body">
<div id="successMessage" style="display: none; position: absolute; top: 10px; left: 50%; transform: translateX(-50%);background: green; color: white; padding: 10px; border-radius: 5px; z-index: 1000;"></div>
<div id="successMessage" style="display: none; position: absolute; top: 10px; left: 50%; transform: translateX(-50%);background: green; color: white; padding: 10px; border-radius: 5px; z-index: 1000;"></div>
<?php
$attributes = array('id' => 'atten');
echo form_open('attendance', $attributes); ?>
@ -257,6 +257,8 @@ $currentday = date('d');
<div class="col-9 text-right d-flex" style="justify-content: end;" id="savebutton">
<input type="text" id="searchInput" placeholder="Search..." style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc;border-radius: 5px;margin-right:15px;">
<i id="exportButton" class="fas fa-download download-icon" style="margin-right: 15px;margin-top: 8px;font-size:25px;" title="Export Excel"></i>
@ -267,15 +269,6 @@ $currentday = date('d');
</div>
<!--
<div class="col-1 text-right">
<i id="exportButton" class="fas fa-download download-icon" style="font-size: x-large; margin-top:12px;" title="Export Excel"></i>
</div>
<div class="col-8 text-right">
<input type="button" class="btn btn-success" id="c" value="save" style="margin-top:0px;">
</div> -->
</div>
<?php echo form_close(); ?>
@ -561,11 +554,7 @@ $currentday = date('d');
</div><!-- End table-responsive -->
<!-- <div class="row">
<div class="col-md-12 text-right">
<input type="button" class="btn btn-success" id="c" value="save">
</div>
</div> -->
</div>
</div> <!-- End card-body -->
@ -583,7 +572,7 @@ $currentday = date('d');
<!-- <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script> -->
<script type="text/javascript">
@ -591,56 +580,57 @@ $currentday = date('d');
// Click event for the button
$('#c').click(function() {
var s = findInvalidData();
var s = findInvalidData();
//alert(s);
if (s == 0) {
//alert(s);
if (s == 0) {
resetFinalValues();
var Totalnoofdays = <?php echo $monthdays ?>;
var alldata = $("#attendance").tableToJSON();
resetFinalValues();
var Totalnoofdays = <?php echo $monthdays ?>;
var alldata = $("#attendance").tableToJSON();
alldata = JSON.stringify(alldata);
alldata = JSON.stringify(alldata);
var month = $('#month').val();
var currentmonth = month.substr(0, 3);
var currentyear = month.substr(4, 4);
var month = $('#month').val();
var currentmonth = month.substr(0, 3);
var currentyear = month.substr(4, 4);
var montharray = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
var currentmonth = jQuery.inArray(currentmonth, montharray); //!== -1
currentmonth++;
var montharray = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
var currentmonth = jQuery.inArray(currentmonth, montharray); //!== -1
currentmonth++;
var currentdate = '01-' + currentmonth + '-' + currentyear;
var currentdate = '01-' + currentmonth + '-' + currentyear;
var totaldata = 0;
showMessage('Processing , Please wait a moment....');
$.ajax({
data: {
param1: alldata,
param2: currentdate,
param3: Totalnoofdays
},
//dataType:"json",
type: "POST",
url: "<?php echo base_url() ?>monthlypay/saveAttendance",
success: function(data) {
if (data) {
showMessage(data);
var totaldata = 0;
}
showMessage('Processing , Please wait a moment....');
$.ajax({
data: {
param1: alldata,
param2: currentdate,
param3: Totalnoofdays
},
//dataType:"json",
type: "POST",
url: "<?php echo base_url() ?>monthlypay/saveAttendance",
success: function(data) {
if (data) {
showMessage(data);
}
}
});
} else {
alert('Plesae Provide Working Hrs and OT Hrs Correctly..!');
}
});
} else {
alert('Plesae Provide Working Hrs and OT Hrs Correctly..!');
}
}); });
});
});
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
@ -711,10 +701,7 @@ $(document).ready(function () {
$(document).ready(function() {
// $("#attendance").CongelarFilaColumna({
// lboHoverTr: true
// });
$('html').bind('keypress', function(e) {
$('table').bind('keypress', function(e) {
if (((e.which || e.keyCode) == 8) || ((e.which || e.keyCode) == 9) || ((e.which || e.keyCode) ==
@ -1102,6 +1089,11 @@ function showMessage(msg) {
msgBox.style.display = "none";
}, 3000);
}
$(document).ready(function() {
document.getElementById("searchInput").addEventListener("input", function () {
this.value = this.value.replace(/[^a-zA-Z0-9 ]/g, ''); // Allows letters, numbers, and spaces
});
});
$("#searchInput").on("keyup", function () {
let value = $(this).val().toLowerCase(); // Convert input to lowercase for case-insensitive search