UI cleanup
This commit is contained in:
+148
-111
@@ -52,7 +52,7 @@
|
||||
<div class="right-panel">
|
||||
<!-- Tab Navigation -->
|
||||
<div class="tab-nav">
|
||||
<button class="tab-nav-btn active" onclick="switchTab('logs', event)">Dnevnik skeniranja</button>
|
||||
<button class="tab-nav-btn active" onclick="switchTab('logs', event)">Dnevnik</button>
|
||||
<button class="tab-nav-btn" onclick="switchTab('participants', event)">Člani</button>
|
||||
<button class="tab-nav-btn" onclick="switchTab('documents', event)">Dokumenti</button>
|
||||
<button class="tab-nav-btn" onclick="switchTab('store', event)">Trgovina</button>
|
||||
@@ -60,9 +60,11 @@
|
||||
|
||||
<!-- Participants Tab -->
|
||||
<div id="participants-tab" class="tab-panel">
|
||||
<div class="panel-header">
|
||||
<h2>Člani</h2>
|
||||
<button class="btn btn-primary" onclick="openAddParticipantModal()">Dodaj udeleženca</button>
|
||||
<div class="toolbar">
|
||||
<span class="toolbar-title">Člani</span>
|
||||
<div class="toolbar-actions">
|
||||
<button class="tb-btn tb-btn-primary" onclick="openAddParticipantModal()">+ Dodaj udeleženca</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-content">
|
||||
<div class="table-container">
|
||||
@@ -78,8 +80,7 @@
|
||||
<th>Dejanja</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="participantsTable">
|
||||
</tbody>
|
||||
<tbody id="participantsTable"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@@ -87,49 +88,43 @@
|
||||
|
||||
<!-- Scan Logs Tab -->
|
||||
<div id="logs-tab" class="tab-panel active">
|
||||
<div class="panel-header">
|
||||
<h2>Zgodovina skeniranja</h2>
|
||||
<div class="header-actions">
|
||||
<button class="btn btn-primary" onclick="exportLogs()">Izvozi v Excel</button>
|
||||
<button class="btn btn-primary" onclick="printLogs()">Natisni</button>
|
||||
<button id="addUnregisteredBtn" class="btn btn-primary" onclick="openAddUnregisteredModal()">Dodaj neregistriranega</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel-filters">
|
||||
<div class="filters-row">
|
||||
<div class="filter-group">
|
||||
<label>Rezultat:</label>
|
||||
<div class="toolbar">
|
||||
<div class="toolbar-filters">
|
||||
<div class="tf-group">
|
||||
<label>Rezultat</label>
|
||||
<select id="filterSelect" onchange="refreshLogs()">
|
||||
<option value="All">Vse</option>
|
||||
<option value="PASS">Samo PASS</option>
|
||||
<option value="FAIL">Samo FAIL</option>
|
||||
<option value="PASS">PASS</option>
|
||||
<option value="FAIL">FAIL</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="filter-group">
|
||||
<label>Udeleženec:</label>
|
||||
<div class="tf-group">
|
||||
<label>Udeleženec</label>
|
||||
<select id="participantFilter" onchange="refreshLogs()">
|
||||
<option value="">Vsi udeleženci</option>
|
||||
<option value="">Vsi</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="filter-group">
|
||||
<label>Od:</label>
|
||||
<div class="tf-group">
|
||||
<label>Od</label>
|
||||
<input type="date" id="startDateFilter" onchange="refreshLogs()">
|
||||
</div>
|
||||
<div class="filter-group">
|
||||
<label>Do:</label>
|
||||
<div class="tf-group">
|
||||
<label>Do</label>
|
||||
<input type="date" id="endDateFilter" onchange="refreshLogs()">
|
||||
</div>
|
||||
<div class="tf-quick">
|
||||
<button class="btn-quick-filter" onclick="filterByToday()">Danes</button>
|
||||
<button class="btn-quick-filter" onclick="filterByLastWeek()">Teden</button>
|
||||
<button class="btn-quick-filter" onclick="filterByLastMonth()">Mesec</button>
|
||||
<button class="btn-quick-filter" onclick="filterByLastYear()">Leto</button>
|
||||
<button class="btn-filter" onclick="resetFilters()">×</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="filters-quick">
|
||||
<button class="btn-quick-filter" onclick="filterByToday()">Danes</button>
|
||||
<button class="btn-quick-filter" onclick="filterByLastWeek()">Teden</button>
|
||||
<button class="btn-quick-filter" onclick="filterByLastMonth()">Mesec</button>
|
||||
<button class="btn-quick-filter" onclick="filterByLastYear()">Leto</button>
|
||||
<button class="btn-filter" onclick="resetFilters()">Resetiraj</button>
|
||||
<div class="toolbar-actions">
|
||||
<button class="tb-btn" onclick="printLogs()">Natisni</button>
|
||||
<button id="addUnregisteredBtn" class="tb-btn tb-btn-primary" onclick="openAddUnregisteredModal()">+ Neregistriran</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel-content">
|
||||
<div class="table-container">
|
||||
<table>
|
||||
@@ -145,8 +140,7 @@
|
||||
<th id="logs-actions-header">Dejanja</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="logsTable">
|
||||
</tbody>
|
||||
<tbody id="logsTable"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@@ -154,8 +148,8 @@
|
||||
|
||||
<!-- Documents Tab -->
|
||||
<div id="documents-tab" class="tab-panel">
|
||||
<div class="panel-header">
|
||||
<h2>Dokumenti</h2>
|
||||
<div class="toolbar">
|
||||
<span class="toolbar-title">Dokumenti</span>
|
||||
</div>
|
||||
<div class="panel-content">
|
||||
<div id="documentsGrid" class="documents-grid">
|
||||
@@ -166,82 +160,77 @@
|
||||
|
||||
<!-- Store Tab -->
|
||||
<div id="store-tab" class="tab-panel">
|
||||
<div class="panel-header">
|
||||
<h2>Trgovina</h2>
|
||||
<div class="header-actions">
|
||||
<div class="store-balance-display">
|
||||
<span class="store-balance-label">Stanje:</span>
|
||||
<span id="storeBalanceDisplay" class="store-balance-value">€0.00</span>
|
||||
<button id="editBalanceBtn" class="btn btn-primary" onclick="openEditBalanceModal()" style="display:none;">Uredi stanje</button>
|
||||
</div>
|
||||
<button class="btn btn-primary" onclick="togglePaymentHistory()">Zgodovina plačil</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="store-tab-scroll panel-content">
|
||||
<div class="store-layout">
|
||||
<!-- Inventory -->
|
||||
<div class="store-inventory">
|
||||
<div class="store-section-header">
|
||||
<h3>Zaloga</h3>
|
||||
<button id="addItemBtn" class="btn btn-primary" onclick="openAddItemModal()" style="display:none;">+ Dodaj artikel</button>
|
||||
</div>
|
||||
<div class="inventory-grid" id="inventoryGrid">
|
||||
<p style="color: var(--text-secondary);">Nalaganje...</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Cart -->
|
||||
<div class="store-cart">
|
||||
<div class="store-section-header">
|
||||
<h3>Košarica</h3>
|
||||
<button class="btn btn-primary" onclick="clearCart()">Počisti</button>
|
||||
</div>
|
||||
<div class="cart-items" id="cartItems">
|
||||
<p style="color: var(--text-secondary); text-align: center; padding: 20px;">Košarica je prazna</p>
|
||||
</div>
|
||||
<div class="cart-total">
|
||||
<div class="cart-total-row">
|
||||
<span>Skupaj:</span>
|
||||
<span id="cartTotal" class="cart-total-amount">€0.00</span>
|
||||
<!-- Single shared toolbar -->
|
||||
<div class="toolbar">
|
||||
<span class="toolbar-title">Trgovina</span>
|
||||
<div class="toolbar-actions">
|
||||
<div class="store-balance-chip">
|
||||
<span class="store-balance-label">Stanje</span>
|
||||
<span id="storeBalanceDisplay" class="store-balance-value">€0.00</span>
|
||||
</div>
|
||||
<button id="editBalanceBtn" class="tb-btn" onclick="openEditBalanceModal()" style="display:none;">Uredi stanje</button>
|
||||
<button id="addItemBtn" class="tb-btn tb-btn-primary" onclick="openAddItemModal()" style="display:none;">+ Artikel</button>
|
||||
<button id="storeViewToggleBtn" class="tb-btn" onclick="toggleStoreView()">Zgodovina plačil</button>
|
||||
</div>
|
||||
<div class="cart-total-row cart-balance-row">
|
||||
<span>Stanje po plačilu:</span>
|
||||
<span id="cartBalanceAfter" class="cart-balance-after">€0.00</span>
|
||||
</div>
|
||||
|
||||
<!-- Shop view -->
|
||||
<div id="storeShopView" class="store-tab-scroll panel-content">
|
||||
<div class="store-layout">
|
||||
<div class="store-inventory">
|
||||
<div class="inventory-grid" id="inventoryGrid">
|
||||
<p style="color: var(--text-secondary);">Nalaganje...</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="store-cart">
|
||||
<div class="store-cart-header">
|
||||
<span class="store-cart-title">Košarica</span>
|
||||
<button class="tb-btn" onclick="clearCart()">Počisti</button>
|
||||
</div>
|
||||
<div class="cart-items" id="cartItems">
|
||||
<p style="color: var(--text-secondary); text-align: center; padding: 20px;">Košarica je prazna</p>
|
||||
</div>
|
||||
<div class="cart-total">
|
||||
<div class="cart-total-row">
|
||||
<span>Skupaj:</span>
|
||||
<span id="cartTotal" class="cart-total-amount">€0.00</span>
|
||||
</div>
|
||||
<div class="cart-total-row cart-balance-row">
|
||||
<span>Stanje po plačilu:</span>
|
||||
<span id="cartBalanceAfter" class="cart-balance-after">€0.00</span>
|
||||
</div>
|
||||
<button class="btn btn-primary cart-pay-btn" onclick="processPayment()">Plačaj</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- History view -->
|
||||
<div id="storeHistoryView" class="panel-content" style="display:none;">
|
||||
<div class="history-toolbar">
|
||||
<button class="tb-btn" onclick="openMonthlyOverview()">Mesečni pregled</button>
|
||||
<button id="clearHistoryBtn" class="tb-btn" onclick="clearPaymentHistory()" style="display:none;color:var(--accent-red);border-color:#fca5a5;">Izbriši zgodovino</button>
|
||||
</div>
|
||||
<div class="table-container" style="height:calc(100% - 46px);">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Prodajalec</th>
|
||||
<th>Datum</th>
|
||||
<th>Čas</th>
|
||||
<th>Artikli</th>
|
||||
<th>Skupaj</th>
|
||||
<th>Stanje pred</th>
|
||||
<th>Stanje po</th>
|
||||
<th>Potrdilo</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="paymentHistoryTable"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
<button class="btn btn-primary cart-pay-btn" onclick="processPayment()">Plačaj</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div><!-- end store-layout -->
|
||||
|
||||
<!-- Payment History Panel -->
|
||||
<div id="paymentHistoryPanel" class="payment-history-panel" style="display:none;">
|
||||
<div class="store-section-header" style="padding: 0 16px 12px;">
|
||||
<h3>Zgodovina plačil</h3>
|
||||
<button id="clearHistoryBtn" class="action-btn delete-btn" onclick="clearPaymentHistory()" style="display:none;">Izbriši zgodovino</button>
|
||||
</div>
|
||||
<div class="table-container" style="margin: 0 16px 16px;">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Datum</th>
|
||||
<th>Čas</th>
|
||||
<th>Artikli</th>
|
||||
<th>Skupaj</th>
|
||||
<th>Stanje pred</th>
|
||||
<th>Stanje po</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="paymentHistoryTable">
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Add Item Modal -->
|
||||
<div id="addItemModal" class="modal">
|
||||
@@ -367,6 +356,54 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Checkout Modal -->
|
||||
<div id="checkoutModal" class="modal">
|
||||
<div class="modal-content">
|
||||
<span class="close" onclick="closeCheckoutModal()">×</span>
|
||||
<h2>Podatki prodajalca</h2>
|
||||
<div class="form-group">
|
||||
<label>Ime:</label>
|
||||
<input type="text" id="checkoutFirstName" placeholder="Ime">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Priimek:</label>
|
||||
<input type="text" id="checkoutLastName" placeholder="Priimek" onkeydown="if(event.key==='Enter')confirmCheckout()">
|
||||
</div>
|
||||
<div class="checkout-summary">
|
||||
<div class="checkout-summary-row">
|
||||
<span>Skupaj za plačilo:</span>
|
||||
<span id="checkoutTotal" class="checkout-total-val"></span>
|
||||
</div>
|
||||
<div class="checkout-summary-row">
|
||||
<span>Stanje po plačilu:</span>
|
||||
<span id="checkoutBalanceAfter" class="checkout-balance-val"></span>
|
||||
</div>
|
||||
</div>
|
||||
<button class="btn btn-primary" onclick="confirmCheckout()">Potrdi plačilo</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Monthly Overview Modal -->
|
||||
<div id="monthlyModal" class="modal">
|
||||
<div class="modal-content modal-content-wide">
|
||||
<div class="monthly-modal-header">
|
||||
<h2>Mesečni pregled</h2>
|
||||
<span class="close" onclick="closeMonthlyOverview()">×</span>
|
||||
</div>
|
||||
<div class="monthly-modal-toolbar">
|
||||
<div class="filter-group" style="flex:0 0 auto;min-width:180px;">
|
||||
<label>Mesec:</label>
|
||||
<input type="month" id="monthlyPickerInput" onchange="renderMonthlyOverview()">
|
||||
</div>
|
||||
<button class="btn btn-primary" onclick="printMonthlyOverview()" style="width:auto;padding:10px 18px;margin:0;font-size:12px;flex-shrink:0;">Natisni pregled</button>
|
||||
</div>
|
||||
<div id="monthlyOverviewContent" class="monthly-modal-body"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Hidden receipt for printing -->
|
||||
<div id="receiptPrintArea" style="display:none;"></div>
|
||||
|
||||
<div id="print-header" style="visibility:hidden;position:fixed;">
|
||||
<img src="{{ url_for('static', filename='assets/logo.png') }}" alt="Logo">
|
||||
<p id="print-date-range" style="font-size:13px;color:#444;margin-top:4px;"></p>
|
||||
|
||||
Reference in New Issue
Block a user