From 65c07172f9e71b27d02eee893cceb89846fbdf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dalibor=20Markovi=C4=87?= <dalibor31@gmail.com>
Date: Mon, 22 Jun 2026 16:47:08 +0200
Subject: [PATCH] =?UTF-8?q?Servis:=20pojednostavljena=20forma=20Izmeni=20n?=
 =?UTF-8?q?alog=20Izmeni=20nalog=20sada=20ima=20samo:=20Ure=C4=91aj,=20Teh?=
 =?UTF-8?q?ni=C4=8Dar,=20Avans,=20Napomena.=20Uklonjene=20kartice=20Klijen?=
 =?UTF-8?q?t=20i=20Status=20i=20datumi=20(status=20se=20menja=20u=20detalj?=
 =?UTF-8?q?ima,=20klijent=20je=20vezan=20pri=20prijemu),=20procena=20od/do?=
 =?UTF-8?q?,=20cena=20rada=20(ra=C4=8Duna=20se=20iz=20radova)=20i=20garanc?=
 =?UTF-8?q?ija.=20Nazad/Odustani=20vode=20na=20detalje=20naloga.=20Handler?=
 =?UTF-8?q?=20=C4=8Duva=20postoje=C4=87e=20vrednosti=20(status,=20cene,=20?=
 =?UTF-8?q?klijent,=20garancija,=20datum=20zavr=C5=A1etka)=20da=20ih=20pra?=
 =?UTF-8?q?zna=20forma=20ne=20pregazi.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/handler/servis.go               |  13 +++
 web/templates/stranice/servis_forma.html | 130 ++++-------------------
 2 files changed, 36 insertions(+), 107 deletions(-)

diff --git a/internal/handler/servis.go b/internal/handler/servis.go
index f797cde..18b6008 100644
--- a/internal/handler/servis.go
+++ b/internal/handler/servis.go
@@ -327,6 +327,19 @@ func (h *Handler) SacuvajIzmenaNaloga(w http.ResponseWriter, r *http.Request) {
 
 	nalog.ID = id
 
+	// forma izmene više ne šalje status, datume, cene ni klijenta — očuvaj postojeće
+	// vrednosti (status se menja u detaljima, cena rada se računa iz radova, garancija
+	// i datum završetka se postavljaju kasnije). Inače bi prazna polja pregazila bazu.
+	if stari, e := h.ServisRepo.DohvatiID(r.Context(), id); e == nil && stari != nil {
+		nalog.Status = stari.Status
+		nalog.KlijentID = stari.KlijentID
+		nalog.CenaOd = stari.CenaOd
+		nalog.CenaDo = stari.CenaDo
+		nalog.CenaKonacna = stari.CenaKonacna
+		nalog.GarancijaDo = stari.GarancijaDo
+		nalog.DatumZavrsetka = stari.DatumZavrsetka
+	}
+
 	// ako nije izabran postojeći klijent, eventualno kreiraj novog iz polja forme
 	if greska := h.mozdaKreirajKlijenta(r.Context(), r, &nalog); greska != "" {
 		podesavanja, _ := sqlite.DohvatiSvaPodesavanja(r.Context(), h.DB)
diff --git a/web/templates/stranice/servis_forma.html b/web/templates/stranice/servis_forma.html
index 3ec7d2b..3601529 100644
--- a/web/templates/stranice/servis_forma.html
+++ b/web/templates/stranice/servis_forma.html
@@ -12,9 +12,9 @@
     </script>
 
     <!-- nazad dugme -->
-    <a href="/servis" class="nazad-link">
+    <a href="{{if .Izmena}}/servis/{{.Nalog.ID}}{{else}}/servis{{end}}" class="nazad-link">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="15 18 9 12 15 6"/></svg>
-        Nazad na servis
+        {{if .Izmena}}Nazad na nalog{{else}}Nazad na servis{{end}}
     </a>
 
     {{if .Greska}}
@@ -88,7 +88,22 @@
             </div>
         </div>
 
-        <!-- ===================== KARTICA: KLIJENT I TEHNIČAR ===================== -->
+        <!-- ===================== KARTICA: TEHNIČAR (izmena) / KLIJENT I TEHNIČAR (novi) ===================== -->
+        {{if .Izmena}}
+        <!-- pri izmeni klijent se ne menja (vezan pri prijemu) — ostaje samo tehničar -->
+        <div class="kartica forma-kartica animiraj">
+            <div class="sekcija-naslov">Tehničar</div>
+            <div>
+                <label class="polje-labela">Tehničar</label>
+                <select name="tehnicar_id" style="width:100%;">
+                    <option value="">— nedodeljen —</option>
+                    {{range .Tehnicari}}
+                    <option value="{{.ID}}"{{if eq .ID $.Nalog.TehnicarIDVrednost}}selected{{end}}>{{.KorisnickoIme}}</option>
+                    {{end}}
+                </select>
+            </div>
+        </div>
+        {{else}}
         <div class="kartica forma-kartica animiraj" x-data="klijentNalog">
             <div class="sekcija-naslov">Klijent</div>
             <div class="kolona" style="gap:12px;">
@@ -242,100 +257,20 @@
                 </div>
             </div>
         </div>
-
-        <!-- ===================== KARTICA: STATUS I DATUMI ===================== -->
-        <!-- prikazuje se samo pri izmeni — pri prijemu (novom nalogu) status je
-             "Primljeno", a datumi i garancija se popunjavaju kasnije -->
-        {{if .Izmena}}
-        <div class="kartica forma-kartica animiraj">
-            <div class="sekcija-naslov">Status i datumi</div>
-            <div class="kolona" style="gap:12px;">
-                <div>
-                    <label class="polje-labela">Status naloga</label>
-                    <select name="status" style="width:100%;">
-                        {{range .SviStatusi}}
-                        <option value="{{.}}" {{if eq . $.Nalog.Status}}selected{{end}}>{{.}}</option>
-                        {{end}}
-                    </select>
-                </div>
-                <div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(140px,1fr));gap:12px;">
-                    <div>
-                        <label class="polje-labela">Datum prijema</label>
-                        <input type="date" name="datum_prijema"
-                            value="{{.Nalog.DatumPrijema.Format "2006-01-02"}}"
-                            style="width:100%;">
-                    </div>
-                    <div>
-                        <label class="polje-labela">Datum završetka</label>
-                        <input type="date" name="datum_zavrsetka"
-                            value="{{if .Nalog.DatumZavrsetka}}{{.Nalog.DatumZavrsetka.Format "2006-01-02"}}{{end}}"
-                            style="width:100%;">
-                    </div>
-                </div>
-                <div>
-                    <label class="polje-labela">Garancija do</label>
-                    <input type="date" name="garancija_do" id="garancija_do_input"
-                        value="{{if .Nalog.GarancijaDo}}{{.Nalog.GarancijaDo.Format "2006-01-02"}}{{end}}"
-                        {{if not .Nalog.GarancijaDo}}disabled{{end}}
-                        style="width:100%;{{if not .Nalog.GarancijaDo}}opacity:0.4;{{end}}">
-                </div>
-                <!-- svič bez garancije -->
-                <div style="display:flex;align-items:center;gap:10px;">
-                    <label class="toggl" style="flex-shrink:0;">
-                        <input type="checkbox" id="bez_garancije_chk"
-                            {{if not .Nalog.GarancijaDo}}checked{{end}}
-                            onchange="toggleGarancija(this)">
-                        <span class="toggl-klizac"></span>
-                    </label>
-                    <input type="hidden" name="bez_garancije" id="bez_garancije_val"
-                        value="{{if not .Nalog.GarancijaDo}}1{{else}}0{{end}}">
-                    <span style="font-size:13px;color:var(--tekst-sporedni);">Bez garancije</span>
-                </div>
-            </div>
-        </div>
         {{end}}
 
-        <!-- ===================== KARTICA: CENE I NAPOMENA ===================== -->
+        <!-- ===================== KARTICA: AVANS I NAPOMENA ===================== -->
         <div class="kartica forma-kartica animiraj">
-            <div class="sekcija-naslov">{{if .Izmena}}Cene (din){{else}}Avans i napomena{{end}}</div>
-            {{if .Izmena}}
-<div class="forma-grid-4" style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr;gap:12px;">
-                <div>
-                    <label class="polje-labela">Procena od</label>
-                    <input type="number" name="cena_od" min="0" step="0.01"
-                        value="{{if .Nalog.CenaOd}}{{.Nalog.CenaOd}}{{end}}"
-                        placeholder="0" style="width:100%;">
-                </div>
-                <div>
-                    <label class="polje-labela">Procena do</label>
-                    <input type="number" name="cena_do" min="0" step="0.01"
-                        value="{{if .Nalog.CenaDo}}{{.Nalog.CenaDo}}{{end}}"
-                        placeholder="0" style="width:100%;">
-                </div>
-                <div>
-                    <label class="polje-labela">Cena rada</label>
-                    <input type="number" name="cena_konacna" min="0" step="0.01"
-                        value="{{if .Nalog.CenaKonacna}}{{.Nalog.CenaKonacna}}{{end}}"
-                        placeholder="0" style="width:100%;">
-                </div>
-                <div>
-                    <label class="polje-labela">Avans</label>
-                    <input type="number" name="avans" min="0" step="0.01"
-                        value="{{if .Nalog.Avans}}{{.Nalog.Avans}}{{end}}"
-                        placeholder="0" style="width:100%;">
-                </div>
-            </div>
-            {{else}}
-            <!-- novi nalog: pri prijemu se zna samo eventualni avans/kapara -->
+            <div class="sekcija-naslov">Avans i napomena</div>
+            <!-- cena rada se računa iz radova (usluga) u detaljima naloga; ovde samo avans -->
             <div class="forma-grid-2" style="display:grid;grid-template-columns:1fr 1fr;gap:12px;">
                 <div>
-                    <label class="polje-labela">Avans / kapara</label>
+                    <label class="polje-labela">{{if .Izmena}}Avans{{else}}Avans / kapara{{end}}</label>
                     <input type="number" name="avans" min="0" step="0.01"
                         value="{{if .Nalog.Avans}}{{.Nalog.Avans}}{{end}}"
                         placeholder="0" style="width:100%;">
                 </div>
             </div>
-            {{end}}
             <div style="margin-top:16px;">
                 <label class="polje-labela">Napomena</label>
                 <textarea name="napomena" rows="2"
@@ -345,7 +280,7 @@
 
             <!-- dugmad -->
             <div style="display:flex;justify-content:flex-end;gap:10px;margin-top:18px;">
-                <a href="/servis" class="btn-sekundarno">Odustani</a>
+                <a href="{{if .Izmena}}/servis/{{.Nalog.ID}}{{else}}/servis{{end}}" class="btn-sekundarno">Odustani</a>
                 <button type="submit" class="btn-primarno">
                     {{if .Izmena}}Sačuvaj izmene{{else}}Sačuvaj nalog{{end}}
                 </button>
@@ -366,23 +301,4 @@
     .klijent-stavka:hover { background: var(--pozadina); }
     [x-cloak] { display: none !important; }
 </style>
-
-<script>
-    function toggleGarancija(chk) {
-        var input = document.getElementById('garancija_do_input');
-        var hidden = document.getElementById('bez_garancije_val');
-        if (chk.checked) {
-            if (input.value) input.dataset.sacuvano = input.value;
-            input.value = '';
-            input.disabled = true;
-            input.style.opacity = '0.4';
-            hidden.value = '1';
-        } else {
-            input.disabled = false;
-            input.style.opacity = '1';
-            if (input.dataset.sacuvano) input.value = input.dataset.sacuvano;
-            hidden.value = '0';
-        }
-    }
-</script>
 {{end}}