M FrmZaposleni: popravi učitavanje OZ dodatno

M FrmZaposlenja: dodaj kolonu ImaDokument (ugovor) M README.md: dodaj nove snimke ekrana
bvujovic · Mar 3, 2023 · d82a18a · d82a18a
1 parent e803378
commit d82a18a
Show file tree

Hide file tree

Showing 15 changed files with 423 additions and 351 deletions.
diff --git a/JISP.sln b/JISP.sln
@@ -13,6 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScreenShots", "ScreenShots", "{2C8CDB9D-1259-459B-9E27-F03BB9DB7C10}"
 	ProjectSection(SolutionItems) = preProject
+		ScreenShots\pocetna.png = ScreenShots\pocetna.png
+		ScreenShots\prostorije.png = ScreenShots\prostorije.png
+		ScreenShots\sistematizacija.png = ScreenShots\sistematizacija.png
 		ScreenShots\ucenici.png = ScreenShots\ucenici.png
 		ScreenShots\zaposleni.png = ScreenShots\zaposleni.png
 		ScreenShots\zaposlenja.png = ScreenShots\zaposlenja.png

diff --git a/JISP/Data/DataGetter.cs b/JISP/Data/DataGetter.cs
@@ -104,6 +104,7 @@ public static async Task GetZaposlenjaAsync(Ds.ZaposleniRow zaposleni)
                 if (obj.noksNivo != null)
                     z.NoksNivoNaziv = obj.noksNivo.naziv;
                 z.Aktivan = obj.statusUgovora != null && obj.statusUgovora == 19292;
+                z.ImaDokument = obj.ugovorORaduDokumentNaziv != null && obj.ugovorORaduDokumentNaziv != "";
                 if (isNew)
                     zaposlenja.AddZaposlenjaRow(z);
             }

diff --git a/JISP/Data/Ds.Designer.cs b/JISP/Data/Ds.Designer.cs