Skip to content

Commit d82a18a

Browse files
committed
M FrmZaposleni: popravi učitavanje OZ dodatno
M FrmZaposlenja: dodaj kolonu ImaDokument (ugovor) M README.md: dodaj nove snimke ekrana
1 parent e803378 commit d82a18a

15 files changed

+423
-351
lines changed

JISP.sln

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScreenShots", "ScreenShots", "{2C8CDB9D-1259-459B-9E27-F03BB9DB7C10}"
1515
ProjectSection(SolutionItems) = preProject
16+
ScreenShots\pocetna.png = ScreenShots\pocetna.png
17+
ScreenShots\prostorije.png = ScreenShots\prostorije.png
18+
ScreenShots\sistematizacija.png = ScreenShots\sistematizacija.png
1619
ScreenShots\ucenici.png = ScreenShots\ucenici.png
1720
ScreenShots\zaposleni.png = ScreenShots\zaposleni.png
1821
ScreenShots\zaposlenja.png = ScreenShots\zaposlenja.png

JISP/Data/DataGetter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public static async Task GetZaposlenjaAsync(Ds.ZaposleniRow zaposleni)
104104
if (obj.noksNivo != null)
105105
z.NoksNivoNaziv = obj.noksNivo.naziv;
106106
z.Aktivan = obj.statusUgovora != null && obj.statusUgovora == 19292;
107+
z.ImaDokument = obj.ugovorORaduDokumentNaziv != null && obj.ugovorORaduDokumentNaziv != "";
107108
if (isNew)
108109
zaposlenja.AddZaposlenjaRow(z);
109110
}

JISP/Data/Ds.Designer.cs

Lines changed: 47 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)