\ No newline at end of file
diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php
index 131b3c2e..45db9225 100644
--- a/app/Views/addconfig.php
+++ b/app/Views/addconfig.php
@@ -1,81 +1,82 @@
-
+
-
+
\ No newline at end of file
diff --git a/app/Views/adddepartment.php b/app/Views/adddepartment.php
index f0a5a425..40a585da 100644
--- a/app/Views/adddepartment.php
+++ b/app/Views/adddepartment.php
@@ -20,7 +20,7 @@
+ getFlashdata('error');
if ($error) {
@@ -74,73 +74,73 @@
-
-
-
-
+
+
@@ -171,78 +171,83 @@
var dateSplit = date.split('-');
return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
};
-
+
// Initialize the DataTable
var table = $('#config_list_table').DataTable({
- dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
- buttons: [
- '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
- responsive: true, // Responsive table
- order: [[0, 'desc']], // Default ordering (column index 0, descending)
- language: {
- paginate: {
- next: '', // Next button icon
- previous: '' // Previous button icon
- }
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ '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
+ responsive: true, // Responsive table
+ order: [
+ [0, 'desc']
+ ], // Default ordering (column index 0, descending)
+ language: {
+ paginate: {
+ next: '', // Next button icon
+ previous: '' // Previous button icon
}
+ }
});
// Date range filter function
$.fn.dataTable.ext.search.push(
- function(settings, data, dataIndex) {
- var fromDate = $('#fromDate').val();
- var toDate = $('#toDate').val();
-
- if (!fromDate || !toDate) {
- return true; // If no dates selected, don't filter
- }
-
- var dateStr = data[0]; // Assuming the date is in the first column
- var dateParts = dateStr.split("-");
- var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
-
- var startDate = new Date(fromDate);
- var endDate = new Date(toDate);
-
- // Adjust startDate to include the day before the selected fromDate
- startDate.setDate(startDate.getDate() - 1);
-
- // Ensure endDate includes the entire end date by setting time to the end of the day
- endDate.setHours(23, 59, 59, 999);
+ function(settings, data, dataIndex) {
+ var fromDate = $('#fromDate').val();
+ var toDate = $('#toDate').val();
- // Return true if the date is within the range
- return date >= startDate && date <= endDate;
+ if (!fromDate || !toDate) {
+ return true; // If no dates selected, don't filter
}
+
+ var dateStr = data[0]; // Assuming the date is in the first column
+ var dateParts = dateStr.split("-");
+ var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
+
+ var startDate = new Date(fromDate);
+ var endDate = new Date(toDate);
+
+ // Adjust startDate to include the day before the selected fromDate
+ startDate.setDate(startDate.getDate() - 1);
+
+ // Ensure endDate includes the entire end date by setting time to the end of the day
+ endDate.setHours(23, 59, 59, 999);
+
+ // Return true if the date is within the range
+ return date >= startDate && date <= endDate;
+ }
);
// Handle form submission for the date range filter
$("#DateRangeFilter").submit(function(e) {
- e.preventDefault();
- table.draw(); // Redraw the table to apply the filter
+ e.preventDefault();
+ table.draw(); // Redraw the table to apply the filter
});
// Reset button functionality
$("#resetButton").click(function() {
- $("#fromDate").val('');
- $("#toDate").val('');
- table.draw(); // Redraw the table to clear the filter
+ $("#fromDate").val('');
+ $("#toDate").val('');
+ table.draw(); // Redraw the table to clear the filter
});
// Automatically focus and open the To Date picker when From Date is selected
document.getElementById('fromDate').addEventListener('change', function() {
- var fromDate = this.value;
- var toDateInput = document.getElementById('toDate');
-
- // Set the min attribute of the To Date input to the selected From Date
- toDateInput.min = fromDate;
+ var fromDate = this.value;
+ var toDateInput = document.getElementById('toDate');
- // Optionally reset the To Date input if the current value is before the new min date
- if (toDateInput.value < fromDate) {
- toDateInput.value = fromDate;
- }
+ // Set the min attribute of the To Date input to the selected From Date
+ toDateInput.min = fromDate;
+
+ // Optionally reset the To Date input if the current value is before the new min date
+ if (toDateInput.value < fromDate) {
+ toDateInput.value = fromDate;
+ }
});
-});
+ });
\ No newline at end of file
diff --git a/app/Views/editEmployee.php b/app/Views/editEmployee.php
index 85145b28..4826c3d1 100644
--- a/app/Views/editEmployee.php
+++ b/app/Views/editEmployee.php
@@ -494,7 +494,7 @@ function validateESI() {
}
function validatePF() {
- var regpf = /^([a-zA-Z]){5}([0-9]){17}?$/;
+ var regpf = /^\d{12}$/;
var PF = $('#pfno').val();
@@ -1198,47 +1198,6 @@ legend {
-
-
-
- Allowances
-
-
-
-
-
-
- Food Allowances(Per Day)
-
-
-
-
-
-
-
- Incentives
-
-
-
-
-
-
-
@@ -1307,8 +1266,8 @@ legend {
value=""
onchange="validatePF();" class="form-control"
style="text-transform:uppercase"
- pattern="([a-zA-Z]){5}([0-9]){17}"
- title=" 5 Character and 17 Digit number (ex:ABCDE12345678901234567)"
+ pattern="\d{12}"
+ title="12 Digit number"
onkeypress="return alpha(event);">