From 3c5c8060c10e78a71c0eb6f0a73bf6d131dcfd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Markovi=C4=87?= Date: Tue, 16 Jun 2026 02:04:32 +0200 Subject: [PATCH] Magacin: pretraga po nazivu, lokaciji i kategoriji; ispravka skakanja dashboard kartica MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - artikal.go: pretraga obuhvata naziv, lokaciju i naziv kategorije (OR LIKE) - main.css: dashboard stat kartice dobijaju stagger delay da ne krenemo pre view-transition - base.html: vraćen za sliku pozadine (uklonjen greškom) --- internal/db/sqlite/artikal.go | 5 +++-- web/static/css/main.css | 7 +++++++ web/templates/teme/podrazumevana/base.html | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/internal/db/sqlite/artikal.go b/internal/db/sqlite/artikal.go index 6ed7f68..d7c9bbb 100644 --- a/internal/db/sqlite/artikal.go +++ b/internal/db/sqlite/artikal.go @@ -34,8 +34,9 @@ func (r *ArtikalRepo) Lista(ctx context.Context, filter db.ArtikalFilter) ([]mod args := []any{} if filter.Pretraga != "" { - upit += " AND a.naziv LIKE ?" - args = append(args, "%"+filter.Pretraga+"%") + upit += " AND (a.naziv LIKE ? OR a.lokacija LIKE ? OR k.naziv LIKE ?)" + t := "%" + filter.Pretraga + "%" + args = append(args, t, t, t) } if filter.KategorijaID != nil { diff --git a/web/static/css/main.css b/web/static/css/main.css index c482709..748a10d 100644 --- a/web/static/css/main.css +++ b/web/static/css/main.css @@ -1017,6 +1017,13 @@ select { .stranica-stack .animiraj:nth-child(4) { animation-delay: 0.28s; } .stranica-stack .animiraj:nth-child(5) { animation-delay: 0.34s; } +/* Dashboard stat kartice — delay da ne krenemo pre nego što view-transition završi */ +.dash-stat.animiraj:nth-child(1) { animation-delay: 0.08s; } +.dash-stat.animiraj:nth-child(2) { animation-delay: 0.13s; } +.dash-stat.animiraj:nth-child(3) { animation-delay: 0.18s; } +.dash-stat.animiraj:nth-child(4) { animation-delay: 0.23s; } +.dash-stat.animiraj:nth-child(5) { animation-delay: 0.28s; } + /* Bedž statusa servisnog naloga — JEDNO mesto za izgled i boje statusa (lista i detalji). Mora biti u main.css: HTMX navigacija odbacuje , pa page