Dasko/GoNtech
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Usluge: zaseban modul (cenovnik usluga)

Browse Source 
Usluga je zaseban entitet, ne artikal: svoja tabela usluge (naziv, šifra,
jedinica mere, cena, PDV, opis), repo, handleri i forma. Auto-šifra USL-001…999,
jedinica mere (usluga/sat/kom). Bez nabavne/prodajne cene, dobavljača, lagera i
marže. /usluge lista + CRUD; stari tip-filter handler uklonjen iz magacina.
This commit is contained in:
Dasko
2026-06-21 23:04:56 +02:00
parent 9cfc1cc4f3
commit 7c365272f4
13 changed files with 637 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/static/css/main.css
+2
View File
@@ -1223,6 +1223,7 @@ select {
.klijenti-kartice { display: none; flex-direction: column; gap: 12px; }
.magacin-kartice { display: none; flex-direction: column; gap: 12px; }
.servis-kartice { display: none; flex-direction: column; gap: 12px; }
.usluge-kartice { display: none; flex-direction: column; gap: 12px; }
.prodaja-kartice { display: none; flex-direction: column; gap: 12px; }
.pod-kartice { display: none; flex-direction: column; gap: 12px; }
.stavke-kartice { display: none; flex-direction: column; gap: 10px; }
@@ -1276,6 +1277,7 @@ select {
.klijenti-tabela { display: none; } .klijenti-kartice { display: flex; }
.magacin-tabela { display: none; } .magacin-kartice { display: flex; }
.servis-tabela { display: none; } .servis-kartice { display: flex; }
.usluge-tabela { display: none; } .usluge-kartice { display: flex; }
.prodaja-tabela { display: none; } .prodaja-kartice { display: flex; }
.pod-tabela { display: none; } .pod-kartice { display: flex; }
.stavke-tabela-wrapper { display: none; } .stavke-kartice { display: flex; }
web/templates/stranice/usluge.html
+110
View File
@@ -0,0 +1,110 @@
{{template "base" .}}
{{define "naslov"}}Usluge — NTech{{end}}
{{define "sadrzaj"}}
<div class="kolona" style="gap:16px;">
{{if .Sacuvano}}
<div class="poruka-uspeh poruka-animacija">Usluga je uspešno sačuvana.</div>
{{end}}
{{if .Obrisan}}
<div class="poruka-uspeh poruka-animacija">Usluga je uspešno obrisana.</div>
{{end}}
<!-- dugme nova -->
<div style="display:flex;gap:10px;flex-wrap:wrap;">
{{if index .Dozvole "artikal.dodaj"}}
<a href="/usluge/nova" class="btn-primarno">+ Nova usluga</a>
{{end}}
</div>
<!-- pretraga -->
<form method="GET" action="/usluge" class="kolona" style="gap:10px;">
<input type="text" name="pretraga" value="{{.Pretraga}}"
placeholder="Pretraži usluge po nazivu ili šifri..."
style="width:100%;"
hx-get="/usluge" hx-trigger="keyup[target.value.length==0||target.value.length>=3] changed delay:150ms, search"
hx-target="#usluge-rezultati" hx-select="#usluge-rezultati" hx-swap="innerHTML" hx-push-url="true">
</form>
<div id="usluge-rezultati">
<!-- desktop tabela -->
<div class="kartica usluge-tabela animiraj" style="padding:0;overflow:hidden;">
<div style="overflow-x:auto;">
<table class="tabela">
<thead>
<tr style="border-bottom:0.5px solid var(--ivica);">
<th style="padding:12px 16px;text-align:left;font-size:12px;font-weight:500;color:var(--tekst-sporedni);">Šifra</th>
<th style="padding:12px 16px;text-align:left;font-size:12px;font-weight:500;color:var(--tekst-sporedni);">Naziv</th>
<th style="padding:12px 16px;text-align:left;font-size:12px;font-weight:500;color:var(--tekst-sporedni);">JM</th>
<th style="padding:12px 16px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-sporedni);">Cena</th>
<th style="padding:12px 16px;text-align:center;font-size:12px;font-weight:500;color:var(--tekst-sporedni);">PDV</th>
<th style="padding:12px 16px;text-align:center;font-size:12px;font-weight:500;color:var(--tekst-sporedni);">Akcije</th>
</tr>
</thead>
<tbody>
{{range .Usluge}}
<tr class="animiraj red-tabele">
<td style="padding:12px 16px;font-size:13px;font-family:monospace;white-space:nowrap;color:var(--tekst-sporedni);">{{if .Sifra}}{{.Sifra}}{{else}}—{{end}}</td>
<td style="padding:12px 16px;font-size:14px;color:var(--tekst-glavni);font-weight:500;">{{.Naziv}}</td>
<td style="padding:12px 16px;font-size:13px;color:var(--tekst-sporedni);">{{.JedinicaMere}}</td>
<td style="padding:12px 16px;text-align:right;font-size:14px;color:var(--tekst-glavni);">{{dinari .Cena}} din</td>
<td style="padding:12px 16px;text-align:center;font-size:13px;color:var(--tekst-sporedni);">{{.PdvStopa}}%</td>
<td style="padding:12px 16px;text-align:center;">
<div style="display:flex;align-items:center;justify-content:center;gap:8px;">
<a href="/usluge/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
{{if index $.Dozvole "artikal.obrisi"}}
<form method="POST" action="/usluge/obrisi/{{.ID}}" style="display:inline;">
<input type="hidden" name="_csrf" value="{{$.CsrfToken}}">
<button type="submit" class="btn-obrisi-malo"
data-potvrda="Obrisati uslugu '{{.Naziv}}'?">Obriši</button>
</form>
{{end}}
</div>
</td>
</tr>
{{else}}
<tr>
<td colspan="6" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
{{if $.Pretraga}}Za datu pretragu nema usluga u bazi.{{else}}Nema usluga. <a href="/usluge/nova" style="color:var(--sb-akcent);">Dodaj prvu uslugu.</a>{{end}}
</td>
</tr>
{{end}}
</tbody>
</table>
</div>
</div>
<!-- mobilne kartice -->
<div class="usluge-kartice">
{{range .Usluge}}
<div class="kartica animiraj">
<div class="red-izmedju" style="align-items:flex-start;gap:12px;margin-bottom:8px;">
<div>
<div style="font-size:15px;font-weight:500;color:var(--tekst-glavni);">{{.Naziv}}</div>
<div style="font-size:12px;color:var(--tekst-sporedni);margin-top:2px;">{{.JedinicaMere}}</div>
</div>
<div style="font-size:15px;font-weight:600;color:var(--sb-akcent);white-space:nowrap;">{{dinari .Cena}} din</div>
</div>
<div style="display:flex;gap:8px;">
<a href="/usluge/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
{{if index $.Dozvole "artikal.obrisi"}}
<form method="POST" action="/usluge/obrisi/{{.ID}}" style="display:inline;">
<input type="hidden" name="_csrf" value="{{$.CsrfToken}}">
<button type="submit" class="btn-obrisi-malo" data-potvrda="Obrisati uslugu '{{.Naziv}}'?">Obriši</button>
</form>
{{end}}
</div>
</div>
{{else}}
<div style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
{{if $.Pretraga}}Za datu pretragu nema usluga u bazi.{{else}}Nema usluga. <a href="/usluge/nova" style="color:var(--sb-akcent);">Dodaj prvu uslugu.</a>{{end}}
</div>
{{end}}
</div>
</div>
</div>
{{end}}
web/templates/stranice/usluge_forma.html
+79
View File
@@ -0,0 +1,79 @@
{{template "base" .}}
{{define "naslov"}}{{if .Izmena}}Izmena usluge{{else}}Nova usluga{{end}} — NTech{{end}}
{{define "sadrzaj"}}
<div class="kolona" style="gap:16px;max-width:680px;">
<a href="/usluge" 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 usluge
</a>
{{if .Greska}}
<div class="poruka-greska">{{.Greska}}</div>
{{end}}
<form method="POST" action="{{if .Izmena}}/usluge/izmeni/{{.Usluga.ID}}{{else}}/usluge/nova{{end}}">
<input type="hidden" name="_csrf" value="{{.CsrfToken}}">
<div class="kartica animiraj">
<div style="margin-bottom:16px;padding-bottom:12px;border-bottom:0.5px solid var(--ivica);">
<span style="font-size:15px;font-weight:500;color:var(--tekst-glavni);">{{if .Izmena}}Izmena usluge{{else}}Nova usluga{{end}}</span>
</div>
<div class="kolona" style="gap:14px;">
<div class="forma-grid-2">
<div>
<label class="polje-labela">Naziv usluge</label>
<input type="text" name="naziv" value="{{.Usluga.Naziv}}" style="width:100%;"
placeholder="npr. Čišćenje laptopa">
</div>
<div>
<label class="polje-labela">Šifra</label>
<input type="text" name="sifra" value="{{.Usluga.Sifra}}" style="width:100%;"
placeholder="npr. USL-001">
</div>
</div>
<div class="forma-grid-3">
<div>
<label class="polje-labela">Jedinica mere</label>
{{$jm := .Usluga.JedinicaMere}}
<select name="jedinica_mere" style="width:100%;">
<option value="usluga" {{if eq $jm "usluga"}}selected{{end}}>usluga (fiksno)</option>
<option value="sat" {{if eq $jm "sat"}}selected{{end}}>sat</option>
<option value="kom" {{if eq $jm "kom"}}selected{{end}}>kom</option>
</select>
</div>
<div>
<label class="polje-labela">Cena usluge (din)</label>
<input type="number" name="cena" min="0" step="0.01"
value="{{if .Usluga.Cena}}{{.Usluga.Cena}}{{end}}" placeholder="0" style="width:100%;">
</div>
<div>
<label class="polje-labela">PDV stopa</label>
{{$pdv := .Usluga.PdvStopa}}
<select name="pdv_stopa" style="width:100%;">
<option value="20" {{if eq $pdv 20.0}}selected{{end}}>20%</option>
<option value="10" {{if eq $pdv 10.0}}selected{{end}}>10%</option>
<option value="0" {{if eq $pdv 0.0}}selected{{end}}>0%</option>
</select>
</div>
</div>
<div>
<label class="polje-labela">Opis</label>
<textarea name="opis" rows="2" placeholder="Kratak opis usluge..."
style="width:100%;resize:vertical;">{{.Usluga.Opis}}</textarea>
</div>
</div>
<div style="display:flex;justify-content:flex-end;gap:10px;margin-top:20px;">
<a href="/usluge" class="btn-sekundarno">Odustani</a>
<button type="submit" class="btn-primarno">Sačuvaj uslugu</button>
</div>
</div>
</form>
</div>
{{end}}