From 056d7f033b876b8d37a5437f156ba37a3f990214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Markovi=C4=87?= Date: Fri, 26 Jun 2026 00:04:45 +0200 Subject: [PATCH] =?UTF-8?q?Servis:=20ispravka=20=E2=80=94=20.Delovi?= =?UTF-8?q?=E2=86=92.ServisniDelovi,=20.Radovi=E2=86=92.ServisniRadovi=20(?= =?UTF-8?q?pogre=C5=A1na=20imena=20promenljivih)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fisk/data/counters/pp.txt | 1 + Fisk/data/counters/total.txt | 1 + web/templates/stranice/servis_detalji.html | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 Fisk/data/counters/pp.txt create mode 100644 Fisk/data/counters/total.txt diff --git a/Fisk/data/counters/pp.txt b/Fisk/data/counters/pp.txt new file mode 100644 index 0000000..d8263ee --- /dev/null +++ b/Fisk/data/counters/pp.txt @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/Fisk/data/counters/total.txt b/Fisk/data/counters/total.txt new file mode 100644 index 0000000..d8263ee --- /dev/null +++ b/Fisk/data/counters/total.txt @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/web/templates/stranice/servis_detalji.html b/web/templates/stranice/servis_detalji.html index c852f95..c4810c5 100644 --- a/web/templates/stranice/servis_detalji.html +++ b/web/templates/stranice/servis_detalji.html @@ -830,29 +830,29 @@ {{if or (eq .Nalog.Status "Završeno") (eq .Nalog.Status "Preuzeto")}} - {{if .Radovi}} + {{if .ServisniRadovi}}
Obavljeni radovi
- {{range .Radovi}}{{if not .Predlozeno}} + {{range .ServisniRadovi}}
{{.Naziv}}{{if gt .Kolicina 1.0}} ×{{.Kolicina}}{{end}} {{dinari .Ukupno}} din
- {{end}}{{end}} + {{end}}
{{end}} - {{if .Delovi}} + {{if .ServisniDelovi}}
Ugrađeni delovi
- {{range .Delovi}}{{if and (not .Predlozeno) .ArtikalNaziv}} + {{range .ServisniDelovi}}
{{.ArtikalNaziv}}{{if gt .Kolicina 1}} ×{{.Kolicina}}{{end}} {{dinari .Ukupno}} din
- {{end}}{{end}} + {{end}}
{{end}}