gru/lista_zakupowa_live
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Jednostki #16

Merged
gru merged 2 commits from jednostki into master 2026-06-08 13:24:59 +02:00
Conversation 0 Commits 2 Files Changed 13
+18 -24
4 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a3d1e8767f - Show all commits
shopping_app/static/css/split/layout.css
+13 -5
View File
@@ -2111,7 +2111,11 @@ body:not(.sorting-active) .drag-handle {
.endpoint-list .shopping-entry-card .shopping-product-input-group > .form-control,
.endpoint-list_share .shopping-entry-card .shopping-product-input-group > .form-control,
.endpoint-shared_list .shopping-entry-card .shopping-product-input-group > .form-control,
.endpoint-view_list .shopping-entry-card .shopping-product-input-group > .form-control {
.endpoint-view_list .shopping-entry-card .shopping-product-input-group > .form-control,
.endpoint-list .shopping-entry-card .shopping-product-input-group > .form-select,
.endpoint-list_share .shopping-entry-card .shopping-product-input-group > .form-select,
.endpoint-shared_list .shopping-entry-card .shopping-product-input-group > .form-select,
.endpoint-view_list .shopping-entry-card .shopping-product-input-group > .form-select {
border-color: rgba(25, 135, 84, 0.55) !important;
background: rgba(17, 24, 39, 0.95) !important;
}
@@ -2123,10 +2127,14 @@ body:not(.sorting-active) .drag-handle {
color: rgba(255, 255, 255, 0.62);
}
.endpoint-list .shopping-entry-card .shopping-product-input-group > .shopping-product-name-input:focus,
.endpoint-list_share .shopping-entry-card .shopping-product-input-group > .shopping-product-name-input:focus,
.endpoint-shared_list .shopping-entry-card .shopping-product-input-group > .shopping-product-name-input:focus,
.endpoint-view_list .shopping-entry-card .shopping-product-input-group > .shopping-product-name-input:focus {
.endpoint-list .shopping-entry-card .shopping-product-input-group > .form-control:focus,
.endpoint-list_share .shopping-entry-card .shopping-product-input-group > .form-control:focus,
.endpoint-shared_list .shopping-entry-card .shopping-product-input-group > .form-control:focus,
.endpoint-view_list .shopping-entry-card .shopping-product-input-group > .form-control:focus,
.endpoint-list .shopping-entry-card .shopping-product-input-group > .form-select:focus,
.endpoint-list_share .shopping-entry-card .shopping-product-input-group > .form-select:focus,
.endpoint-shared_list .shopping-entry-card .shopping-product-input-group > .form-select:focus,
.endpoint-view_list .shopping-entry-card .shopping-product-input-group > .form-select:focus {
box-shadow: inset 0 0 0 1px rgba(25, 135, 84, 0.25), 0 0 0 .2rem rgba(25, 135, 84, 0.18);
}
shopping_app/static/js/functions.js
-14
View File
@@ -169,17 +169,6 @@ function openEditItemModal(event, id, oldName, oldQuantity, oldUnit = 'szt') {
}, 150);
}
function openQuantityModal(event, id, oldName, oldQuantity, oldUnit = 'szt') {
openEditItemModal(event, id, oldName, oldQuantity, oldUnit);
setTimeout(() => {
const quantityInput = document.getElementById('editItemQuantity');
if (quantityInput) {
quantityInput.focus();
quantityInput.select();
}
}, 200);
}
function submitExpense(listId) {
const amountInput = document.getElementById('expenseAmount');
const amount = parseFloat(amountInput.value);
@@ -453,7 +442,6 @@ function renderItem(item, isShare = window.IS_SHARE, optionsOrShowEditOnly = fal
: '';
const iconBtn = 'btn btn-outline-light btn-sm shopping-action-btn';
const quantityBtn = 'btn btn-outline-light btn-sm shopping-action-btn';
const wideBtn = 'btn btn-outline-light btn-sm shopping-action-btn shopping-action-btn--wide';
const itemNameHtml = canEditListItem
? `<button type="button"
@@ -474,7 +462,6 @@ function renderItem(item, isShare = window.IS_SHARE, optionsOrShowEditOnly = fal
actionButtons += `
${dragHandleButton}
<button type="button" class="${quantityBtn}" title="Zmień ilość / jednostkę" ${isArchived ? 'disabled' : `onclick='openQuantityModal(event, ${item.id}, ${JSON.stringify(String(item.name || ''))}, ${quantityValue}, ${JSON.stringify(quantityUnit)})'`}>⚖️</button>
<button type="button" class="${iconBtn}" ${isArchived ? 'disabled' : `onclick='openEditItemModal(event, ${item.id}, ${JSON.stringify(String(item.name || ''))}, ${quantityValue}, ${JSON.stringify(quantityUnit)})'`}>✏️</button>
<button type="button" class="${iconBtn}" ${isArchived ? 'disabled' : `onclick="deleteItem(${item.id})"`}>🗑️</button>`;
}
@@ -490,7 +477,6 @@ function renderItem(item, isShare = window.IS_SHARE, optionsOrShowEditOnly = fal
if (temporaryShareUndo) {
actionButtons += `
<button type="button" class="${iconBtn} shopping-action-btn--countdown" disabled data-countdown-for="${item.id}">${countdownSeconds}s</button>
<button type="button" class="${quantityBtn}" title="Zmień ilość / jednostkę" ${isArchived ? 'disabled' : `onclick='openQuantityModal(event, ${item.id}, ${nameForEdit}, ${quantityValue}, ${JSON.stringify(quantityUnit)})'`}>⚖️</button>
<button type="button" class="${iconBtn}" ${isArchived ? 'disabled' : `onclick='openEditItemModal(event, ${item.id}, ${nameForEdit}, ${quantityValue}, ${JSON.stringify(quantityUnit)})'`}>✏️</button>
<button type="button" class="${iconBtn}" ${isArchived ? 'disabled' : `onclick="deleteItem(${item.id})"`}>🗑️</button>`;
} else if (canShowShareActions || (!isShare && isOwner)) {
shopping_app/templates/list.html
-3
View File
@@ -148,9 +148,6 @@
</div>
<div class="list-item-actions shopping-item-actions" role="group">
{% if not is_share %}
<button type="button" class="btn btn-outline-light btn-sm shopping-action-btn" title="Zmień ilość / jednostkę" {% if list.is_archived %}disabled{% else
%}onclick='openQuantityModal(event, {{ item.id }}, {{ item.name|tojson }}, {{ item.quantity_value or item.quantity or 1 }}, {{ (item.quantity_unit or "szt")|tojson }})' {% endif %}>⚖️</button>
<button type="button" class="btn btn-outline-light btn-sm shopping-action-btn" {% if list.is_archived %}disabled{% else
%}onclick='openEditItemModal(event, {{ item.id }}, {{ item.name|tojson }}, {{ item.quantity_value or item.quantity or 1 }}, {{ (item.quantity_unit or "szt")|tojson }})' {% endif %}>✏️</button>
shopping_app/templates/list_share.html
+5 -2
View File
@@ -313,12 +313,15 @@
<div class="modal-content bg-dark text-white">
<form id="editItemForm">
<div class="modal-header">
<h5 class="modal-title" id="editItemModalLabel">Zmień ilość / jednostkę</h5>
<h5 class="modal-title" id="editItemModalLabel">Edytuj produkt</h5>
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Zamknij"></button>
</div>
<div class="modal-body">
<input type="hidden" id="editItemId">
<input type="hidden" id="editItemName">
<div class="mb-3">
<label for="editItemName" class="form-label">Nazwa produktu</label>
<input type="text" id="editItemName" class="form-control bg-dark text-white border-secondary" maxlength="255" required>
</div>
<div>
<label for="editItemQuantity" class="form-label">Ilość / waga / objętość</label>
<div class="input-group">