Dodati obrazovanje zaposlenih

bvujovic · Jun 16, 2023 · cefb20a · cefb20a
1 parent bd5edfa
commit cefb20a
Show file tree

Hide file tree

Showing 15 changed files with 2,272 additions and 524 deletions.
diff --git a/JISP/Classes/Utils.cs b/JISP/Classes/Utils.cs
@@ -206,10 +206,11 @@ public static void AdjustWidth(this ComboBox cmb)
             cmb.DropDownWidth = (int)maxWidth + 5;
         }
 
-        public static async System.Threading.Tasks.Task PreuzmiDokumentResenja(Controls.UcDGV dgv, DataGridViewCellEventArgs e)
+        public static async System.Threading.Tasks.Task PreuzmiDokument(Controls.UcDGV dgv, DataGridViewCellEventArgs e)
         {
-            var res = dgv.CurrDataRow<Data.Ds.ResenjaRow>();
-            if (res.IsDokumentNull())
+            var docIdColName = "DokumentId";
+            var row = (dgv.CurrentRow.DataBoundItem as System.Data.DataRowView).Row;
+            if (row == null || row.IsNull(docIdColName))
                 return;
             var cell = dgv.Rows[e.RowIndex].Cells[e.ColumnIndex];
             var originalText = (string)cell.Value;
@@ -218,7 +219,7 @@ public static async System.Threading.Tasks.Task PreuzmiDokumentResenja(Controls.
             {
                 var filePath = GetDownloadsFolder(originalText);
                 await Data.WebApi.PostForFile(filePath, "Upload/PreuzmiDokument"
-                    , $"{{'documentId':'{res.DokumentId}'}}", true);
+                    , $"{{'documentId':'{row[docIdColName]}'}}", true);
             }
             catch (Exception ex) { ShowMbox(ex, "Preuzimanje rešenja"); }
             cell.Value = originalText;

diff --git a/JISP/Data/DataGetter.cs b/JISP/Data/DataGetter.cs
@@ -202,7 +202,40 @@ public static async Task GetResenjaAsync(IEnumerable<Ds.ZaposlenjaRow> zaposlenj
             }
         }
 
-        /// <summary>Učitava podateke u tabelu Sistematizacija.</summary>
+        /// <summary>Dohvatanje dela podataka u tabelu Obrazovanja.</summary>
+        public static async Task GetObrazovanjaAsync(int idZaposlenog)
+        {
+            var url = "https://jisp.mpn.gov.rs/webapi/api/Zaposleni/VratiStecenaObrazovanjaZaposlenog";
+            var json = await WebApi.PostForJson(url, $"{{\"regZapZaposleniId\":{idZaposlenog}}}");
+            dynamic arr = Newtonsoft.Json.Linq.JArray.Parse(json);
+            foreach (var obj in arr)
+            {
+                Ds.ObrazovanjaRow o = AppData.Ds.Obrazovanja.FindByIdObrazovanja((int)obj.id);
+                bool novo;
+                if (novo = o == null)
+                    o = AppData.Ds.Obrazovanja.NewObrazovanjaRow();
+
+                o.IdZaposlenog = idZaposlenog;
+                o.IdObrazovanja = obj.id;
+                o.NoksNivo = obj.noksNivo != null;
+                o.Klasnoks = obj.klasnoks != null;
+                o.Stepen = obj.stepen != null;
+                o.NazivSteceneKvalifikacije = obj.nazivSteceneKvalifikacije;
+                o.StrucniAkademskiNazivIzDiplome = obj.strucniAkademskiNazivIzDiplome;
+                o.DatumSticanjaDiplome = obj.datumSticanjaDiplome;
+                o.DrzavaZavrseneSkole = obj.drzavaZavrseneSkole;
+                o.MestoZavrseneSkoleNaziv = obj.mestoZavrseneSkoleSlobodanUnos;
+                o.NazivSkole = obj.nazivSkole;
+                o.JezikNaKomJeStecenoObrazovanje = obj.jezikNaKomJeStecenoObrazovanje != null;
+                o.DokumentId = obj.dokumentId;
+                o.DokumentNaziv = obj.dokumentNaziv;
+
+                if (novo)
+                    AppData.Ds.Obrazovanja.AddObrazovanjaRow(o);
+            }
+        }
+
+        /// <summary>Učitava podatke u tabelu Sistematizacija.</summary>
         public static async Task GetSistematizacijaAsync()
         {
             var json = await WebApi.GetJson(WebApi.ReqEnum.Zap_Sistematizacija);

diff --git a/JISP/Data/Ds.Designer.cs b/JISP/Data/Ds.Designer.cs
diff --git a/JISP/Data/Ds.cs b/JISP/Data/Ds.cs
@@ -8,6 +8,10 @@ namespace JISP.Data
 {
     partial class Ds
     {
+        partial class ObrazovanjaDataTable
+        {
+        }
+
         partial class ObracunZaradaRow
         {
             /// <summary>Ukupan broj meseci po formuli: 12*Godina + MesecBroj</summary>

diff --git a/JISP/Data/Ds.xsd b/JISP/Data/Ds.xsd
diff --git a/JISP/Data/WebApi.cs b/JISP/Data/WebApi.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Security.Policy;
 using System.Threading.Tasks;
+using static JISP.Data.WebApi;
 
 namespace JISP.Data
 {
@@ -102,13 +104,11 @@ public static async Task<string> GetJson(ReqEnum reqEnum, string param = null)
             return await GetJson(UrlForReq(reqEnum, param));
         }
 
-        /// <summary>Dohvata (POST) JSON podatke od JISP WebAPI-a.</summary>
-        public static async Task<string> PostForJson(ReqEnum reqEnum, string body, string param = null)
+        public static async Task<string> PostForJson(string url, string body)
         {
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", Token);
-                var url = UrlForReq(reqEnum, param);
                 var content = new StringContent(body, System.Text.Encoding.UTF8, "application/json");
                 var res = await client.PostAsync(url, content);
 
@@ -119,17 +119,30 @@ public static async Task<string> PostForJson(ReqEnum reqEnum, string body, strin
             }
         }
 
+        /// <summary>Dohvata (POST) JSON podatke od JISP WebAPI-a.</summary>
+        public static async Task<string> PostForJson(ReqEnum reqEnum, string body, string param = null)
+        {
+            return await PostForJson(UrlForReq(reqEnum, param), body);
+        }
+
         /// <summary>Dohvata (POST) trazeni objekat od JISP WebAPI-a.</summary>
         public async static Task<T> PostForObject<T>(ReqEnum reqEnum, string param = null)
         {
             var json = await PostForJson(reqEnum, param);
             return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(json);
         }
 
+        ///// <summary>Dohvata (POST) listu trazenih objekata od JISP WebAPI-a.</summary>
+        //public async static Task<List<T>> PostForList<T>(ReqEnum reqEnum, string body, string param = null)
+        //{
+        //    var json = await PostForJson(reqEnum, body, param);
+        //    return DeserializeList<T>(json);
+        //}
+
         /// <summary>Dohvata (POST) listu trazenih objekata od JISP WebAPI-a.</summary>
-        public async static Task<List<T>> PostForList<T>(ReqEnum reqEnum, string body, string param = null)
+        public async static Task<List<T>> PostForList<T>(string url, string body)
         {
-            var json = await PostForJson(reqEnum, body, param);
+            var json = await PostForJson(url, body);
             return DeserializeList<T>(json);
         }