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

Troškovi: zaseban modul (šifrarnik vrsta troškova)

Browse Source 
Opcija 1 — katalog dodatnih troškova (Prevoz, Carina, Ambalaža) koji se vezuju
za radni nalog i ulaze u cenu koštanja. Zaseban entitet: tabela troskovi (šifra
TRO-001…999, naziv, podrazumevana cena, opis), repo, handleri, forma i lista.
Stari tip-filter handler uklonjen iz magacina. (Knjiga rashoda firme je zaseban
budući modul — Opcija 2.)
This commit is contained in:
Dasko
2026-06-21 23:18:44 +02:00
parent 7c365272f4
commit 53de1f3211
12 changed files with 553 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/static/css/main.css
+2
View File
@@ -1224,6 +1224,7 @@ select {
.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; }
.troskovi-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; }
@@ -1278,6 +1279,7 @@ select {
.magacin-tabela { display: none; } .magacin-kartice { display: flex; }
.servis-tabela { display: none; } .servis-kartice { display: flex; }
.usluge-tabela { display: none; } .usluge-kartice { display: flex; }
.troskovi-tabela { display: none; } .troskovi-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/troskovi.html
+110
View File
@@ -0,0 +1,110 @@
{{template "base" .}}
{{define "naslov"}}Troškovi — NTech{{end}}
{{define "sadrzaj"}}
<div class="kolona" style="gap:16px;">
{{if .Sacuvano}}
<div class="poruka-uspeh poruka-animacija">Trošak je uspešno sačuvan.</div>
{{end}}
{{if .Obrisan}}
<div class="poruka-uspeh poruka-animacija">Trošak je uspešno obrisan.</div>
{{end}}
<div style="font-size:13px;color:var(--tekst-sporedni);">
Šifrarnik vrsta troškova (npr. Prevoz, Carina, Ambalaža) koji se vezuju za radni nalog kao dodatni trošak.
</div>
<!-- dugme nov -->
<div style="display:flex;gap:10px;flex-wrap:wrap;">
{{if index .Dozvole "artikal.dodaj"}}
<a href="/troskovi/novi" class="btn-primarno">+ Nov trošak</a>
{{end}}
</div>
<!-- pretraga -->
<form method="GET" action="/troskovi" class="kolona" style="gap:10px;">
<input type="text" name="pretraga" value="{{.Pretraga}}"
placeholder="Pretraži troškove po nazivu ili šifri..."
style="width:100%;"
hx-get="/troskovi" hx-trigger="keyup[target.value.length==0||target.value.length>=3] changed delay:150ms, search"
hx-target="#troskovi-rezultati" hx-select="#troskovi-rezultati" hx-swap="innerHTML" hx-push-url="true">
</form>
<div id="troskovi-rezultati">
<!-- desktop tabela -->
<div class="kartica troskovi-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:right;font-size:12px;font-weight:500;color:var(--tekst-sporedni);">Podrazumevana cena</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 .Troskovi}}
<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;text-align:right;font-size:14px;color:var(--tekst-glavni);">{{dinari .Cena}} din</td>
<td style="padding:12px 16px;text-align:center;">
<div style="display:flex;align-items:center;justify-content:center;gap:8px;">
<a href="/troskovi/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
{{if index $.Dozvole "artikal.obrisi"}}
<form method="POST" action="/troskovi/obrisi/{{.ID}}" style="display:inline;">
<input type="hidden" name="_csrf" value="{{$.CsrfToken}}">
<button type="submit" class="btn-obrisi-malo"
data-potvrda="Obrisati trošak '{{.Naziv}}'?">Obriši</button>
</form>
{{end}}
</div>
</td>
</tr>
{{else}}
<tr>
<td colspan="4" style="padding:32px;text-align:center;font-size:14px;color:var(--tekst-sporedni);">
{{if $.Pretraga}}Za datu pretragu nema troškova u bazi.{{else}}Nema troškova. <a href="/troskovi/novi" style="color:var(--sb-akcent);">Dodaj prvi trošak.</a>{{end}}
</td>
</tr>
{{end}}
</tbody>
</table>
</div>
</div>
<!-- mobilne kartice -->
<div class="troskovi-kartice">
{{range .Troskovi}}
<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>
{{if .Sifra}}<div style="font-size:12px;color:var(--tekst-sporedni);margin-top:2px;font-family:monospace;">{{.Sifra}}</div>{{end}}
</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="/troskovi/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
{{if index $.Dozvole "artikal.obrisi"}}
<form method="POST" action="/troskovi/obrisi/{{.ID}}" style="display:inline;">
<input type="hidden" name="_csrf" value="{{$.CsrfToken}}">
<button type="submit" class="btn-obrisi-malo" data-potvrda="Obrisati trošak '{{.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 troškova u bazi.{{else}}Nema troškova. <a href="/troskovi/novi" style="color:var(--sb-akcent);">Dodaj prvi trošak.</a>{{end}}
</div>
{{end}}
</div>
</div>
</div>
{{end}}
web/templates/stranice/troskovi_forma.html
+62
View File
@@ -0,0 +1,62 @@
{{template "base" .}}
{{define "naslov"}}{{if .Izmena}}Izmena troška{{else}}Nov trošak{{end}} — NTech{{end}}
{{define "sadrzaj"}}
<div class="kolona" style="gap:16px;max-width:680px;">
<a href="/troskovi" 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 troškove
</a>
{{if .Greska}}
<div class="poruka-greska">{{.Greska}}</div>
{{end}}
<form method="POST" action="{{if .Izmena}}/troskovi/izmeni/{{.Trosak.ID}}{{else}}/troskovi/novi{{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 troška{{else}}Nov trošak{{end}}</span>
</div>
<div class="kolona" style="gap:14px;">
<div class="forma-grid-2">
<div>
<label class="polje-labela">Naziv troška</label>
<input type="text" name="naziv" value="{{.Trosak.Naziv}}" style="width:100%;"
placeholder="npr. Prevoz">
</div>
<div>
<label class="polje-labela">Šifra</label>
<input type="text" name="sifra" value="{{.Trosak.Sifra}}" style="width:100%;"
placeholder="npr. TRO-001">
</div>
</div>
<div class="forma-grid-2">
<div>
<label class="polje-labela">Podrazumevana cena (din)</label>
<input type="number" name="cena" min="0" step="0.01"
value="{{if .Trosak.Cena}}{{.Trosak.Cena}}{{end}}" placeholder="0" style="width:100%;">
</div>
<div></div>
</div>
<div>
<label class="polje-labela">Opis</label>
<textarea name="opis" rows="2" placeholder="Kratak opis troška..."
style="width:100%;resize:vertical;">{{.Trosak.Opis}}</textarea>
</div>
</div>
<div style="display:flex;justify-content:flex-end;gap:10px;margin-top:20px;">
<a href="/troskovi" class="btn-sekundarno">Odustani</a>
<button type="submit" class="btn-primarno">Sačuvaj trošak</button>
</div>
</div>
</form>
</div>
{{end}}