This commit is contained in:
oliver
2026-09-03 13:23:11 -03:00
parent 69a9370104
commit b299bf3627
3 changed files with 146 additions and 18 deletions
+86 -13
View File
@@ -7,7 +7,8 @@ let allData = [];
let filteredData = []; let filteredData = [];
let currentSort = { column: null, direction: null }; let currentSort = { column: null, direction: null };
let filters = {}; let filters = {};
let globalSearch = ''; let columnTextFilters = {};
let hideOkFilter = false;
let apiCredentials = null; let apiCredentials = null;
// API Configuration // API Configuration
@@ -140,14 +141,21 @@ async function loadData() {
// =================================== // ===================================
function applyFilters() { function applyFilters() {
let result = filteredData.filter(item => { let result = [...filteredData];
if (!globalSearch) return true;
const searchLower = globalSearch.toLowerCase(); // Apply column text filters
return Object.values(item).some(value => Object.entries(columnTextFilters).forEach(([column, searchText]) => {
value !== null && value.toString().toLowerCase().includes(searchLower) if (searchText && searchText.trim()) {
); const searchLower = searchText.toLowerCase().trim();
result = result.filter(item => {
const value = item[column];
return value !== null && value !== undefined &&
String(value).toLowerCase().includes(searchLower);
});
}
}); });
// Apply checkbox filters
Object.entries(filters).forEach(([column, selectedValues]) => { Object.entries(filters).forEach(([column, selectedValues]) => {
if (selectedValues.length > 0) { if (selectedValues.length > 0) {
result = result.filter(item => result = result.filter(item =>
@@ -156,12 +164,25 @@ function applyFilters() {
} }
}); });
// Apply "hide OK" filter
if (hideOkFilter) {
result = result.filter(item => {
const remark = item.Remark || '';
return !String(remark).trim().toLowerCase().includes('ok');
});
}
renderTable(result); renderTable(result);
updateStats(result.length); updateStats(result.length);
console.group('%c Table View', 'background: #06b6d4; color: white; padding: 4px 8px; border-radius: 4px; font-weight: bold;'); console.group('%c Table View', 'background: #06b6d4; color: white; padding: 4px 8px; border-radius: 4px; font-weight: bold;');
console.log('%c Rendering', 'font-weight: bold;', result.length, 'records'); console.log('%c Rendering', 'font-weight: bold;', result.length, 'records');
console.log('%c View range:', 'color: #64748b;', '1-', result.length); console.log('%c Active text filters:', Object.entries(columnTextFilters)
.filter(([_, v]) => v && v.trim())
.map(([k, v]) => `${k}: "${v}"`), 'color: #64748b;');
if (hideOkFilter) {
console.log('%c Filter:', 'color: #10b981;', 'Hide OK remarks is ON');
}
console.groupEnd(); console.groupEnd();
} }
@@ -292,9 +313,9 @@ function getRemarkIcon(remark) {
// Recheck Action // Recheck Action
// =================================== // ===================================
async function handleRecheck(orderId, isChecked) { async function handleRecheck(id, isChecked) {
console.group('%c Recheck', 'background: #6366f1; color: white; padding: 4px 8px; border-radius: 4px; font-weight: bold;'); console.group('%c Recheck', 'background: #6366f1; color: white; padding: 4px 8px; border-radius: 4px; font-weight: bold;');
console.log('%c Order ID:', 'font-weight: bold;', orderId); console.log('%c ID:', 'font-weight: bold;', id);
console.log('%c Status:', isChecked ? 'color: #10b981' : 'color: #94a3b8', isChecked ? 'Checked' : 'Unchecked'); console.log('%c Status:', isChecked ? 'color: #10b981' : 'color: #94a3b8', isChecked ? 'Checked' : 'Unchecked');
try { try {
@@ -307,7 +328,7 @@ async function handleRecheck(orderId, isChecked) {
} : {}) } : {})
}, },
body: JSON.stringify({ body: JSON.stringify({
Order_ID: orderId, ID: id,
recheck: isChecked recheck: isChecked
}) })
}); });
@@ -461,11 +482,63 @@ function setupClickOutside() {
}); });
} }
function handleGlobalSearch(search) { function handleColumnFilter(input) {
globalSearch = search; const column = input.dataset.column;
const value = input.value;
if (value) {
columnTextFilters[column] = value;
input.parentElement.classList.add('filter-active');
} else {
delete columnTextFilters[column];
input.parentElement.classList.remove('filter-active');
}
applyFilters(); applyFilters();
} }
function clearAllFilters() {
// Clear column text filters
columnTextFilters = {};
// Clear checkbox filters
filters = {};
// Reset hide OK filter
hideOkFilter = false;
updateHideOkButton();
// Clear all input fields
document.querySelectorAll('.column-filter').forEach(input => {
input.value = '';
input.parentElement.classList.remove('filter-active');
});
// Reset filter indicators
document.querySelectorAll('.filter-indicator').forEach(indicator => {
indicator.classList.remove('active');
});
applyFilters();
}
function toggleHideOkFilter() {
hideOkFilter = !hideOkFilter;
updateHideOkButton();
applyFilters();
}
function updateHideOkButton() {
const btn = document.getElementById('hideOkBtn');
if (!btn) return;
if (hideOkFilter) {
btn.style.boxShadow = '0 0 0 2px var(--danger)';
} else {
btn.style.boxShadow = 'none';
}
}
// =================================== // ===================================
// Statistics // Statistics
// =================================== // ===================================
+31 -4
View File
@@ -39,10 +39,12 @@
<button class="refresh-btn" id="authBtn" onclick="toggleAuth()" style="background: var(--secondary);"> <button class="refresh-btn" id="authBtn" onclick="toggleAuth()" style="background: var(--secondary);">
<i class="fas fa-key"></i> <span id="authBtnText">Enter Credentials</span> <i class="fas fa-key"></i> <span id="authBtnText">Enter Credentials</span>
</button> </button>
<div class="search-box"> <button class="refresh-btn" id="hideOkBtn" onclick="toggleHideOkFilter()" style="background: var(--success);">
<i class="fas fa-search"></i> <i class="fas fa-check-circle"></i> <span>Hide OK Remarks</span>
<input type="text" id="globalSearch" placeholder="Search orders, countries, VAT numbers..." oninput="handleGlobalSearch(this.value)"> </button>
</div> <button class="refresh-btn" onclick="clearAllFilters()" style="background: var(--warning);">
<i class="fas fa-filter"></i> <span>Clear Filters</span>
</button>
</div> </div>
<div class="table-container"> <div class="table-container">
@@ -59,6 +61,11 @@
<tr> <tr>
<th> <th>
Month Month
<input type="text"
class="column-filter"
placeholder="Filter Month"
data-column="Month"
oninput="handleColumnFilter(this)">
<div class="filter-indicator" onclick="toggleFilter('Month')"> <div class="filter-indicator" onclick="toggleFilter('Month')">
<i class="fas fa-filter"></i> <i class="fas fa-filter"></i>
</div> </div>
@@ -69,6 +76,11 @@
</th> </th>
<th> <th>
Odoo AR Nr Odoo AR Nr
<input type="text"
class="column-filter"
placeholder="Filter Odoo AR Nr"
data-column="Odoo_AR_Nr"
oninput="handleColumnFilter(this)">
<div class="filter-indicator" onclick="toggleFilter('Odoo_AR_Nr')"> <div class="filter-indicator" onclick="toggleFilter('Odoo_AR_Nr')">
<i class="fas fa-filter"></i> <i class="fas fa-filter"></i>
</div> </div>
@@ -79,6 +91,11 @@
</th> </th>
<th> <th>
Order ID Order ID
<input type="text"
class="column-filter"
placeholder="Filter Order ID"
data-column="Order_ID"
oninput="handleColumnFilter(this)">
<div class="filter-indicator" onclick="toggleFilter('Order_ID')"> <div class="filter-indicator" onclick="toggleFilter('Order_ID')">
<i class="fas fa-filter"></i> <i class="fas fa-filter"></i>
</div> </div>
@@ -89,6 +106,11 @@
</th> </th>
<th> <th>
Country Country
<input type="text"
class="column-filter"
placeholder="Filter Country"
data-column="Country_Name"
oninput="handleColumnFilter(this)">
<div class="filter-indicator" onclick="toggleFilter('Country_Name')"> <div class="filter-indicator" onclick="toggleFilter('Country_Name')">
<i class="fas fa-filter"></i> <i class="fas fa-filter"></i>
</div> </div>
@@ -109,6 +131,11 @@
</th> </th>
<th> <th>
Remark Remark
<input type="text"
class="column-filter"
placeholder="Filter Remark"
data-column="Remark"
oninput="handleColumnFilter(this)">
<div class="filter-indicator" onclick="toggleFilter('Remark')"> <div class="filter-indicator" onclick="toggleFilter('Remark')">
<i class="fas fa-filter"></i> <i class="fas fa-filter"></i>
</div> </div>
+29 -1
View File
@@ -211,7 +211,7 @@ thead {
} }
th { th {
padding: 1rem 1.5rem; padding: 0.75rem 1rem;
text-align: left; text-align: left;
font-weight: 600; font-weight: 600;
color: var(--dark); color: var(--dark);
@@ -220,12 +220,40 @@ th {
top: 0; top: 0;
background: var(--light); background: var(--light);
z-index: 10; z-index: 10;
display: flex;
flex-direction: column;
gap: 0.5rem;
} }
th:hover { th:hover {
background: var(--hover); background: var(--hover);
} }
.column-filter {
width: 100%;
padding: 0.4rem 0.6rem;
border: 1px solid var(--border);
border-radius: 4px;
font-size: 0.8rem;
transition: border-color 0.2s ease, box-shadow 0.2s ease;
background: white;
}
.column-filter:focus {
outline: none;
border-color: var(--primary);
box-shadow: 0 0 0 2px rgba(99, 102, 241, 0.1);
}
.column-filter::placeholder {
color: #94a3b8;
}
th.filter-active .column-filter {
border-color: var(--primary);
background-color: rgba(99, 102, 241, 0.05);
}
th .sort-indicator { th .sort-indicator {
display: inline-flex; display: inline-flex;
flex-direction: column; flex-direction: column;