Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
vadivelJ96
commit
e3c5afeb9c
@ -1,28 +1,33 @@
|
||||
|
||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||
<style>
|
||||
.dataTables_filter input {padding: 4px;}
|
||||
.dataTables_filter input {
|
||||
padding: 4px;
|
||||
}
|
||||
|
||||
.dataTables_filter {
|
||||
width: 50%;
|
||||
float: right;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.dataTables_paginate {
|
||||
width: 50%;
|
||||
float: right;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
div.dt-buttons {
|
||||
position: relative;
|
||||
float: right;
|
||||
|
||||
}
|
||||
|
||||
.btn-success {
|
||||
background-color: #00d976;;
|
||||
border-color: #00d976;;
|
||||
background-color: #00d976;
|
||||
;
|
||||
border-color: #00d976;
|
||||
;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
<section class="content">
|
||||
@ -32,7 +37,11 @@
|
||||
<!-- TABLE: LATEST ORDERS -->
|
||||
<div class="box box-info">
|
||||
<div class="box-header with-border">
|
||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>Report - Month-wise-Inward(<?php echo $mont; ?>)</b></p></h3></center>
|
||||
<center>
|
||||
<h3 class="box-title">
|
||||
<p style="color: #00d976;"><b>Report - Month-wise-Inward(<?php echo $mont; ?>)</b></p>
|
||||
</h3>
|
||||
</center>
|
||||
</div>
|
||||
<!-- /.box-header -->
|
||||
<div class="box-body">
|
||||
@ -55,8 +64,7 @@
|
||||
$ab = $this->input->get('ab');
|
||||
$last = $this->input->get('dat');
|
||||
$new = date("F", strtotime($last)) . "\n";
|
||||
foreach($month as $rel)
|
||||
{
|
||||
foreach ($month as $rel) {
|
||||
?>
|
||||
<tr>
|
||||
<td><span>
|
||||
@ -85,20 +93,16 @@
|
||||
|
||||
<td style="text-align:right">
|
||||
<strong>
|
||||
<?php
|
||||
{
|
||||
<?php {
|
||||
echo round($tr3);
|
||||
|
||||
}
|
||||
?>
|
||||
</strong>
|
||||
</td>
|
||||
<td style="text-align:right">
|
||||
<strong>
|
||||
<?php
|
||||
{
|
||||
<?php {
|
||||
echo number_format($tr4, 2, '.', '');
|
||||
|
||||
}
|
||||
?>
|
||||
</strong>
|
||||
@ -132,8 +136,6 @@
|
||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||
|
||||
<script>
|
||||
|
||||
|
||||
// Bootstrap datepicker
|
||||
// Set up your table
|
||||
$(document).ready(function() {
|
||||
@ -161,7 +163,8 @@ $(document).ready(function() {
|
||||
],
|
||||
,
|
||||
"footerCallback": function(row, data, start, end, display) {
|
||||
var api = this.api(), data;
|
||||
var api = this.api(),
|
||||
data;
|
||||
|
||||
// Remove the formatting to get integer data for summation
|
||||
var intVal = function(i) {
|
||||
@ -172,7 +175,9 @@ $(document).ready(function() {
|
||||
};
|
||||
|
||||
TotalQTY = api
|
||||
.column( 2, { search:'applied' } )
|
||||
.column(2, {
|
||||
search: 'applied'
|
||||
})
|
||||
.data()
|
||||
.reduce(function(a, b) {
|
||||
return intVal(a) + intVal(b);
|
||||
@ -181,7 +186,9 @@ $(document).ready(function() {
|
||||
$(api.column(2).footer()).html(TotalQTY.toFixed().bold());
|
||||
|
||||
TotalVALUE = api
|
||||
.column( 3, { search:'applied' } )
|
||||
.column(3, {
|
||||
search: 'applied'
|
||||
})
|
||||
.data()
|
||||
.reduce(function(a, b) {
|
||||
return intVal(a) + intVal(b);
|
||||
@ -238,13 +245,8 @@ $(document).ready(function() {
|
||||
}
|
||||
});
|
||||
|
||||
function Reset()
|
||||
{
|
||||
function Reset() {
|
||||
$('#mySelect').val('');
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
@ -872,7 +872,7 @@
|
||||
onkeypress="return isNumberKey(event)">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3" style="margin-top: 18px;">
|
||||
<div class="form-group">
|
||||
<span for="ESI_Rate">ESI Rate(%)</span>
|
||||
<font color="Red">*</font>
|
||||
|
||||
@ -55,6 +55,24 @@
|
||||
<form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post" name="addform">
|
||||
<div class="box-body">
|
||||
<!-- Supplier Information -->
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
|
||||
@ -10,7 +10,13 @@ if (!empty($EmpCount)) {
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
<style>
|
||||
@media (min-width: 991.98px) {
|
||||
.avatar-title.bg-soft-primary.rounded {
|
||||
background-color: 'black';
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
<section class="content">
|
||||
<!-- Dashboard for Account department-->
|
||||
@ -630,6 +636,12 @@ if (!empty($EmpCount)) {
|
||||
<!-- Content Header (Page header) -->
|
||||
<!-- <section class="content-header"> -->
|
||||
<!-- <h3>Admin Dashboard</h3> -->
|
||||
|
||||
<!-- </section> -->
|
||||
<!-- Main content -->
|
||||
<section class="content">
|
||||
<br><br>
|
||||
<br><br>
|
||||
<div class="row">
|
||||
<div class="col-12 text-right" style="height: 75px;">
|
||||
<a href="javascript:void(0)" type="button" title="Sync With Zoho Books" class="btn btn-success" onclick="synczohobooks()">
|
||||
@ -637,14 +649,12 @@ if (!empty($EmpCount)) {
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<!-- </section> -->
|
||||
<!-- Main content -->
|
||||
<section class="content">
|
||||
<div class="row">
|
||||
|
||||
<div class="col-xl-3 col-md-3">
|
||||
<div class="col-xl-3">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="d-flex justify-content-between">
|
||||
<div>
|
||||
<h5 class="text-muted font-weight-normal mt-0 text-truncate" title="User Registrations">User Registrations</h5>
|
||||
@ -667,6 +677,10 @@ if (!empty($EmpCount)) {
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- end col -->
|
||||
<!-- </div>
|
||||
|
||||
@ -7,6 +7,36 @@ if (empty($Status)) {
|
||||
?>
|
||||
|
||||
<style>
|
||||
/* Default minimized state */
|
||||
.supplier-content {
|
||||
max-width: 150px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
cursor: pointer;
|
||||
height: 20px;
|
||||
/* Minimized height */
|
||||
transition: height 0.3s ease-out;
|
||||
/* Smooth transition */
|
||||
}
|
||||
|
||||
/* Expanded state with fixed height and scrolling */
|
||||
.supplier-content.expand {
|
||||
height: 100px;
|
||||
/* Fixed height for expanded state */
|
||||
white-space: normal;
|
||||
/* Allows wrapping */
|
||||
overflow-y: auto;
|
||||
/* Enable vertical scrolling */
|
||||
transition: height 0.3s ease-in;
|
||||
/* Smooth transition for height */
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.table-bordered>thead>tr>th,
|
||||
.table-bordered>tbody>tr>th,
|
||||
.table-bordered>tfoot>tr>th,
|
||||
@ -150,8 +180,7 @@ if (empty($Status)) {
|
||||
//echo $index;
|
||||
?>
|
||||
<tr id="<?php echo $index ?>">
|
||||
|
||||
<td align="right" style="width:75px"><?php $podt = new DateTime($record->PODate);
|
||||
<td><?php $podt = new DateTime($record->PODate);
|
||||
$PODate = $podt->format('d-m-Y');
|
||||
echo $PODate;
|
||||
?></td>
|
||||
@ -160,7 +189,11 @@ if (empty($Status)) {
|
||||
<td><?php echo $record->CostCenterName ?> </td>
|
||||
<!-- <td><?php // echo $record->CostCenterCode
|
||||
?></td> -->
|
||||
<td><?php echo $record->SupplierName ?></td>
|
||||
<td class="supplier-name" style="text-wrap: balance;">
|
||||
<div class="supplier-content">
|
||||
<?php echo $record->SupplierName ?>
|
||||
</div>
|
||||
</td>
|
||||
<td><?php echo $record->FirstName ?></td>
|
||||
<td><?php echo $record->DepartmentName ?></td>
|
||||
<!-- <td align="right"><?php // $Cdt = new DateTime($record->CreatedDate);
|
||||
@ -169,7 +202,7 @@ if (empty($Status)) {
|
||||
?></td> -->
|
||||
|
||||
|
||||
<td align="right"><?php echo $record->TotalOrderValue ?></td>
|
||||
<td><?php echo $record->TotalOrderValue ?></td>
|
||||
|
||||
|
||||
<td><?php echo $record->Approver ?></td>
|
||||
@ -519,7 +552,10 @@ $(document).ready(function() {
|
||||
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
|
||||
],
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
lengthMenu: [
|
||||
[10, 20, 30, 50, -1],
|
||||
[10, 20, 30, 50, "All"]
|
||||
], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
@ -527,7 +563,8 @@ $(document).ready(function() {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
|
||||
}
|
||||
}
|
||||
},
|
||||
autoWidth: true
|
||||
});
|
||||
|
||||
// Date range filter function
|
||||
@ -585,4 +622,18 @@ $(document).ready(function() {
|
||||
}
|
||||
});
|
||||
});
|
||||
$(document).ready(function() {
|
||||
$('.supplier-content').on('click', function() {
|
||||
var $this = $(this);
|
||||
|
||||
if (!$this.hasClass('expand')) {
|
||||
// Expand: Set to fixed height with scroll
|
||||
$this.addClass('expand');
|
||||
} else {
|
||||
// Collapse: Reset to minimized height
|
||||
// $this.css('height', '20px').removeClass('expand');
|
||||
$this.removeClass('expand');
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@ -3,15 +3,51 @@
|
||||
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js"></script>
|
||||
<script>
|
||||
$(function() {
|
||||
|
||||
$(document).ready(function() {
|
||||
// Initialize the datepicker with onSelect event
|
||||
$("#hdate").datepicker({
|
||||
minDate: null,
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '-100:+0'
|
||||
yearRange: '-100:+0',
|
||||
});
|
||||
|
||||
|
||||
function isValidDateFormat(date) {
|
||||
var datePattern = /^\d{2}-\d{2}-\d{4}$/;
|
||||
var altDatePattern = /^\d{2}\/\d{2}\/\d{4}$/;
|
||||
return datePattern.test(date) || altDatePattern.test(date);
|
||||
}
|
||||
|
||||
function convertToDDMMYY(date) {
|
||||
if (date.includes("/")) {
|
||||
var parts = date.split("/");
|
||||
return parts[1] + '-' + parts[0] + '-' + parts[2];
|
||||
}
|
||||
return date;
|
||||
}
|
||||
|
||||
// Handle manual input change for the date
|
||||
$("#hdate").on('change', function() {
|
||||
var selectedDate = $(this).val(); // Get the date entered manually (string)
|
||||
if (selectedDate) {
|
||||
if (isValidDateFormat(selectedDate)) {
|
||||
selectedDate = convertToDDMMYY(selectedDate);
|
||||
var dateParts = selectedDate.split("-");
|
||||
var year = dateParts[2];
|
||||
var yearNumber = parseInt(year, 10);
|
||||
console.log("Year as a number: " + yearNumber);
|
||||
$('#page-title-year-selected').html(yearNumber);
|
||||
} else {
|
||||
console.log("Invalid date format. Please enter in 'dd-mm-yy' format.");
|
||||
}
|
||||
} else {
|
||||
console.log("No date selected or entered.");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$('html').bind('keypress', function(e) {
|
||||
//alert('Key Pressed');
|
||||
if (e.keyCode == 13) {
|
||||
@ -35,13 +71,15 @@
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<h4 class="page-title"> Public Holiday Information - <?php echo date('Y'); ?></h4>
|
||||
<!-- <h4 class="page-title"> Public Holiday Information- <span id="page-title-year-selected"><?php echo date('Y'); ?></span></h4> -->
|
||||
<h4 class="page-title"> Public Holiday Information</h4>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<br>
|
||||
<div class="row" style="padding-left: 26px;">
|
||||
<div class="col-md-3">
|
||||
<span>Holiday Name : </span>
|
||||
@ -145,6 +183,7 @@
|
||||
});
|
||||
tr.parentNode.removeChild(tr);
|
||||
}
|
||||
|
||||
$('#Add').click(function() {
|
||||
var index = $('#phdays tr').length;
|
||||
var H_name = $('#hname').val();
|
||||
@ -163,11 +202,10 @@
|
||||
});
|
||||
|
||||
$('#submit').click(function() {
|
||||
|
||||
var jsondata = $('#phdays').tableToJSON();
|
||||
var jsondata = JSON.stringify(jsondata);
|
||||
|
||||
$('#content').loader('show');
|
||||
// $('#content').loader('show');
|
||||
$.ajax({
|
||||
data: {
|
||||
param1: jsondata
|
||||
@ -176,11 +214,13 @@
|
||||
url: "<?php echo base_url() ?>monthlypay/savePublicHolidays",
|
||||
|
||||
success: function(data) {
|
||||
$('#content').loader('hide');
|
||||
// $('#content').loader('hide');
|
||||
alert(data);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
// $('#page-title-year-selected')
|
||||
</script>
|
||||
@ -1547,7 +1547,7 @@ function appendExistingFilesFileds(data){
|
||||
<input type="text" id="file_name" name="file_name[]" maxlength="255" class="form-control" value="${data != null && data != '' ? data.file_name : ''}">
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<span for="emp_file">File</span>
|
||||
<label class="col-form-label" for="emp_file">File</label>
|
||||
<input type="file" id="emp_file" name="emp_file[]" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-4 p-4">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user