From 677b94be9848d12def18bf95cfd2c6dd7a095083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Markovi=C4=87?= Date: Tue, 16 Jun 2026 01:40:43 +0200 Subject: [PATCH] =?UTF-8?q?Ispravka=20boje=20ta=C4=8Dke=20na=20kriti=C4=8D?= =?UTF-8?q?nim=20zalihama=20i=20uklanjanje=20CSS=20warning-a=20-=20Boja=20?= =?UTF-8?q?ta=C4=8Dke=20na=20kriti=C4=8Dnim=20zalihama:=20crvena=20kad=20j?= =?UTF-8?q?e=20koli=C4=8Dina=20upola=20manja=20od=20minimalne=20-=20Uklonj?= =?UTF-8?q?en=20preload=20pozadinske=20slike=20(nepotreban,=20izazivao=20w?= =?UTF-8?q?arning=20u=20konzoli)=20-=20@view-transition=20umotan=20u=20@su?= =?UTF-8?q?pports=20da=20ne=20izaziva=20warning=20u=20browserima=20koji=20?= =?UTF-8?q?ne=20podr=C5=BEavaju?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/sqlite/izvestaj.go | 4 ++-- internal/handler/dashboard.go | 2 +- internal/model/izvestaj.go | 5 +++-- web/static/css/main.css | 8 +++++--- web/templates/stranice/dashboard.html | 2 +- web/templates/teme/podrazumevana/base.html | 2 -- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/internal/db/sqlite/izvestaj.go b/internal/db/sqlite/izvestaj.go index 79d08c6..4999d98 100644 --- a/internal/db/sqlite/izvestaj.go +++ b/internal/db/sqlite/izvestaj.go @@ -75,7 +75,7 @@ func (r *sqliteIzvestajRepo) PoslednjiServisi(ctx context.Context, limit int) ([ func (r *sqliteIzvestajRepo) KriticneZalihe(ctx context.Context, limit int) ([]model.ZalihaRed, error) { rows, err := r.db.QueryContext(ctx, ` - SELECT naziv, kolicina FROM artikli + SELECT naziv, kolicina, kolicina_min FROM artikli WHERE kolicina <= kolicina_min ORDER BY kolicina ASC LIMIT ?`, limit) if err != nil { @@ -85,7 +85,7 @@ func (r *sqliteIzvestajRepo) KriticneZalihe(ctx context.Context, limit int) ([]m var lista []model.ZalihaRed for rows.Next() { var z model.ZalihaRed - if err := rows.Scan(&z.Naziv, &z.Kolicina); err != nil { + if err := rows.Scan(&z.Naziv, &z.Kolicina, &z.KolicinaMin); err != nil { return nil, fmt.Errorf("ntech: izvestaj.KriticneZalihe: %w", err) } lista = append(lista, z) diff --git a/internal/handler/dashboard.go b/internal/handler/dashboard.go index eb5622e..30acb91 100644 --- a/internal/handler/dashboard.go +++ b/internal/handler/dashboard.go @@ -95,7 +95,7 @@ func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) { } else { for _, z := range redovi { boja := "#f97316" - if z.Kolicina == 0 { + if z.Kolicina == 0 || (z.KolicinaMin > 0 && z.Kolicina <= z.KolicinaMin/2) { boja = "#dc2626" } kriticneZalihe = append(kriticneZalihe, model.StavkaZalihe{ diff --git a/internal/model/izvestaj.go b/internal/model/izvestaj.go index 27f68aa..39f0b77 100644 --- a/internal/model/izvestaj.go +++ b/internal/model/izvestaj.go @@ -15,8 +15,9 @@ type ServisRedDashboard struct { // ZalihaRed je artikal sa kritičnom zalihom (naziv + količina) type ZalihaRed struct { - Naziv string - Kolicina int + Naziv string + Kolicina int + KolicinaMin int } // ProdajaRedDashboard je jedan red za listu poslednjih prodaja na dashboardu diff --git a/web/static/css/main.css b/web/static/css/main.css index 4623bab..c482709 100644 --- a/web/static/css/main.css +++ b/web/static/css/main.css @@ -1153,9 +1153,11 @@ select { position: relative; } -/* sprečava treperenje pozadine pri navigaciji između stranica (Chrome/Opera/noviji Firefox) */ -@view-transition { - navigation: auto; +/* sprečava treperenje pozadine pri navigaciji između stranica (samo browseri koji podržavaju) */ +@supports (view-transition-name: none) { + @view-transition { + navigation: auto; + } } /* pomoćne klase (ranije iz Tailwind-a, sada lokalno da ne zavisimo od CDN-a) */ diff --git a/web/templates/stranice/dashboard.html b/web/templates/stranice/dashboard.html index e25d9e9..6f96cfa 100644 --- a/web/templates/stranice/dashboard.html +++ b/web/templates/stranice/dashboard.html @@ -103,7 +103,7 @@ {{ range .KriticneZalihe }}
-
+
{{ .Naziv }} {{ .Kolicina }} kom
diff --git a/web/templates/teme/podrazumevana/base.html b/web/templates/teme/podrazumevana/base.html index 425982e..f48a70d 100644 --- a/web/templates/teme/podrazumevana/base.html +++ b/web/templates/teme/podrazumevana/base.html @@ -14,8 +14,6 @@ } - {{if .AppPozadina}}{{end}} -