diff --git a/JISP/Classes/Utils.cs b/JISP/Classes/Utils.cs index 1b291cc..3b61d03 100644 --- 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(); - 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 index 0947046..abf1c66 100644 --- a/JISP/Data/DataGetter.cs +++ b/JISP/Data/DataGetter.cs @@ -202,7 +202,40 @@ public static async Task GetResenjaAsync(IEnumerable zaposlenj } } - /// Učitava podateke u tabelu Sistematizacija. + /// Dohvatanje dela podataka u tabelu Obrazovanja. + 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); + } + } + + /// Učitava podatke u tabelu Sistematizacija. 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 index be8aff9..fd19d23 100644 --- a/JISP/Data/Ds.Designer.cs +++ b/JISP/Data/Ds.Designer.cs @@ -64,6 +64,8 @@ public partial class Ds : global::System.Data.DataSet { private SifRazloziPrestankaZapDataTable tableSifRazloziPrestankaZap; + private ObrazovanjaDataTable tableObrazovanja; + private global::System.Data.DataRelation relationFK_Zaposleni_Zaposlenja; private global::System.Data.DataRelation relationZaposleni_ObracunZarada; @@ -82,6 +84,8 @@ public partial class Ds : global::System.Data.DataSet { private global::System.Data.DataRelation relationProstorije_Racunari; + private global::System.Data.DataRelation relationZaposleni_Obrazovanja; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -174,6 +178,9 @@ protected Ds(global::System.Runtime.Serialization.SerializationInfo info, global if ((ds.Tables["SifRazloziPrestankaZap"] != null)) { base.Tables.Add(new SifRazloziPrestankaZapDataTable(ds.Tables["SifRazloziPrestankaZap"])); } + if ((ds.Tables["Obrazovanja"] != null)) { + base.Tables.Add(new ObrazovanjaDataTable(ds.Tables["Obrazovanja"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -393,6 +400,16 @@ public SifRazloziPrestankaZapDataTable SifRazloziPrestankaZap { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public ObrazovanjaDataTable Obrazovanja { + get { + return this.tableObrazovanja; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -521,6 +538,9 @@ protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) if ((ds.Tables["SifRazloziPrestankaZap"] != null)) { base.Tables.Add(new SifRazloziPrestankaZapDataTable(ds.Tables["SifRazloziPrestankaZap"])); } + if ((ds.Tables["Obrazovanja"] != null)) { + base.Tables.Add(new ObrazovanjaDataTable(ds.Tables["Obrazovanja"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -674,6 +694,12 @@ internal void InitVars(bool initTable) { this.tableSifRazloziPrestankaZap.InitVars(); } } + this.tableObrazovanja = ((ObrazovanjaDataTable)(base.Tables["Obrazovanja"])); + if ((initTable == true)) { + if ((this.tableObrazovanja != null)) { + this.tableObrazovanja.InitVars(); + } + } this.relationFK_Zaposleni_Zaposlenja = this.Relations["FK_Zaposleni_Zaposlenja"]; this.relationZaposleni_ObracunZarada = this.Relations["Zaposleni_ObracunZarada"]; this.relationZaposlenja_Angazovanja = this.Relations["Zaposlenja_Angazovanja"]; @@ -683,6 +709,7 @@ internal void InitVars(bool initTable) { this.relationLokacije_Objekti = this.Relations["Lokacije_Objekti"]; this.relationObjekti_Prostorije = this.Relations["Objekti_Prostorije"]; this.relationProstorije_Racunari = this.Relations["Prostorije_Racunari"]; + this.relationZaposleni_Obrazovanja = this.Relations["Zaposleni_Obrazovanja"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -733,6 +760,8 @@ private void InitClass() { base.Tables.Add(this.tablePoruke); this.tableSifRazloziPrestankaZap = new SifRazloziPrestankaZapDataTable(); base.Tables.Add(this.tableSifRazloziPrestankaZap); + this.tableObrazovanja = new ObrazovanjaDataTable(false); + base.Tables.Add(this.tableObrazovanja); global::System.Data.ForeignKeyConstraint fkc; fkc = new global::System.Data.ForeignKeyConstraint("FK_Zaposleni_Zaposlenja", new global::System.Data.DataColumn[] { this.tableZaposleni.IdZaposlenogColumn}, new global::System.Data.DataColumn[] { @@ -784,6 +813,10 @@ private void InitClass() { this.tableProstorije.IdProstorijeColumn}, new global::System.Data.DataColumn[] { this.tableRacunari.IdProstorijeColumn}, false); this.Relations.Add(this.relationProstorije_Racunari); + this.relationZaposleni_Obrazovanja = new global::System.Data.DataRelation("Zaposleni_Obrazovanja", new global::System.Data.DataColumn[] { + this.tableZaposleni.IdZaposlenogColumn}, new global::System.Data.DataColumn[] { + this.tableObrazovanja.IdZaposlenogColumn}, false); + this.Relations.Add(this.relationZaposleni_Obrazovanja); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -906,6 +939,12 @@ private bool ShouldSerializeSifRazloziPrestankaZap() { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private bool ShouldSerializeObrazovanja() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -980,6 +1019,7 @@ private void InitExpressions() { this.UcenikSkGod._GodineColumn.Expression = "parent.Godine"; this.UcenikSkGod._DanaDoRodjColumn.Expression = "parent.DanaDoRodj"; this.Racunari._ProstorijaColumn.Expression = "parent.NazivProstorije"; + this.Obrazovanja._ZaposleniColumn.Expression = "parent.Ime + \' \' + parent.Prezime"; } [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] @@ -1042,6 +1082,9 @@ private void InitExpressions() { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void SifRazloziPrestankaZapRowChangeEventHandler(object sender, SifRazloziPrestankaZapRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public delegate void ObrazovanjaRowChangeEventHandler(object sender, ObrazovanjaRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -9228,305 +9271,806 @@ public void RemoveSifRazloziPrestankaZapRow(SifRazloziPrestankaZapRow row) { } /// - ///Represents strongly named DataRow class. + ///Represents the strongly named DataTable class. /// - public partial class UceniciRow : global::System.Data.DataRow { + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class ObrazovanjaDataTable : global::System.Data.TypedTableBase { - private UceniciDataTable tableUcenici; + private global::System.Data.DataColumn columnIdObrazovanja; + + private global::System.Data.DataColumn columnIdZaposlenog; + + private global::System.Data.DataColumn column_Zaposleni; + + private global::System.Data.DataColumn columnNoksNivo; + + private global::System.Data.DataColumn columnKlasnoks; + + private global::System.Data.DataColumn columnStepen; + + private global::System.Data.DataColumn columnNazivSteceneKvalifikacije; + + private global::System.Data.DataColumn columnStrucniAkademskiNazivIzDiplome; + + private global::System.Data.DataColumn columnDatumSticanjaDiplome; + + private global::System.Data.DataColumn columnDrzavaZavrseneSkole; + + private global::System.Data.DataColumn columnMestoZavrseneSkoleNaziv; + + private global::System.Data.DataColumn columnNazivSkole; + + private global::System.Data.DataColumn columnJezikNaKomJeStecenoObrazovanje; + + private global::System.Data.DataColumn columnDokumentId; + + private global::System.Data.DataColumn columnDokumentNaziv; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal UceniciRow(global::System.Data.DataRowBuilder rb) : - base(rb) { - this.tableUcenici = ((UceniciDataTable)(this.Table)); + public ObrazovanjaDataTable() : + this(false) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int IdUcenika { - get { - return ((int)(this[this.tableUcenici.IdUcenikaColumn])); - } - set { - this[this.tableUcenici.IdUcenikaColumn] = value; + public ObrazovanjaDataTable(bool initExpressions) { + this.TableName = "Obrazovanja"; + this.BeginInit(); + this.InitClass(); + if ((initExpressions == true)) { + this.InitExpressions(); } + this.EndInit(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Ime { - get { - try { - return ((string)(this[this.tableUcenici.ImeColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Ime\' in table \'Ucenici\' is DBNull.", e); - } + internal ObrazovanjaDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; } - set { - this[this.tableUcenici.ImeColumn] = value; + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int RegUceLiceId { + protected ObrazovanjaDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn IdObrazovanjaColumn { get { - try { - return ((int)(this[this.tableUcenici.RegUceLiceIdColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'RegUceLiceId\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.RegUceLiceIdColumn] = value; + return this.columnIdObrazovanja; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string JOB { + public global::System.Data.DataColumn IdZaposlenogColumn { get { - return ((string)(this[this.tableUcenici.JOBColumn])); - } - set { - this[this.tableUcenici.JOBColumn] = value; + return this.columnIdZaposlenog; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string JMBG { + public global::System.Data.DataColumn _ZaposleniColumn { get { - try { - return ((string)(this[this.tableUcenici.JMBGColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'JMBG\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.JMBGColumn] = value; + return this.column_Zaposleni; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Prebivaliste { + public global::System.Data.DataColumn NoksNivoColumn { get { - try { - return ((string)(this[this.tableUcenici.PrebivalisteColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Prebivaliste\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.PrebivalisteColumn] = value; + return this.columnNoksNivo; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Skola { + public global::System.Data.DataColumn KlasnoksColumn { get { - try { - return ((string)(this[this.tableUcenici.SkolaColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Skola\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.SkolaColumn] = value; + return this.columnKlasnoks; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Razred { + public global::System.Data.DataColumn StepenColumn { get { - try { - return ((string)(this[this.tableUcenici.RazredColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Razred\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.RazredColumn] = value; + return this.columnStepen; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Odeljenje { + public global::System.Data.DataColumn NazivSteceneKvalifikacijeColumn { get { - try { - return ((string)(this[this.tableUcenici.OdeljenjeColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Odeljenje\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.OdeljenjeColumn] = value; + return this.columnNazivSteceneKvalifikacije; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public char Pol { + public global::System.Data.DataColumn StrucniAkademskiNazivIzDiplomeColumn { get { - try { - return ((char)(this[this.tableUcenici.PolColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Pol\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.PolColumn] = value; + return this.columnStrucniAkademskiNazivIzDiplome; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public System.DateTime DatumRodjenja { + public global::System.Data.DataColumn DatumSticanjaDiplomeColumn { get { - try { - return ((global::System.DateTime)(this[this.tableUcenici.DatumRodjenjaColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'DatumRodjenja\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.DatumRodjenjaColumn] = value; + return this.columnDatumSticanjaDiplome; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double Godine { + public global::System.Data.DataColumn DrzavaZavrseneSkoleColumn { get { - try { - return ((double)(this[this.tableUcenici.GodineColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Godine\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.GodineColumn] = value; + return this.columnDrzavaZavrseneSkole; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int DanaDoRodj { + public global::System.Data.DataColumn MestoZavrseneSkoleNazivColumn { get { - try { - return ((int)(this[this.tableUcenici.DanaDoRodjColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'DanaDoRodj\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.DanaDoRodjColumn] = value; + return this.columnMestoZavrseneSkoleNaziv; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Napomene { + public global::System.Data.DataColumn NazivSkoleColumn { get { - try { - return ((string)(this[this.tableUcenici.NapomeneColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Napomene\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.NapomeneColumn] = value; + return this.columnNazivSkole; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int BrojOcenaPolu { + public global::System.Data.DataColumn JezikNaKomJeStecenoObrazovanjeColumn { get { - try { - return ((int)(this[this.tableUcenici.BrojOcenaPoluColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'BrojOcenaPolu\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.BrojOcenaPoluColumn] = value; + return this.columnJezikNaKomJeStecenoObrazovanje; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int BrojOcenaKraj { + public global::System.Data.DataColumn DokumentIdColumn { get { - try { - return ((int)(this[this.tableUcenici.BrojOcenaKrajColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'BrojOcenaKraj\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.BrojOcenaKrajColumn] = value; + return this.columnDokumentId; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int Id { + public global::System.Data.DataColumn DokumentNazivColumn { get { - try { - return ((int)(this[this.tableUcenici.IdColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Id\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.IdColumn] = value; + return this.columnDokumentNaziv; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int RegUceLiceObrazovanjeId { + [global::System.ComponentModel.Browsable(false)] + public int Count { get { - try { - return ((int)(this[this.tableUcenici.RegUceLiceObrazovanjeIdColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'RegUceLiceObrazovanjeId\' in table \'Ucenici\' is DBNull.", e); - } - } - set { - this[this.tableUcenici.RegUceLiceObrazovanjeIdColumn] = value; + return this.Rows.Count; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Smer { + public ObrazovanjaRow this[int index] { get { - try { - return ((string)(this[this.tableUcenici.SmerColumn])); - } - catch (global::System.InvalidCastException e) { + return ((ObrazovanjaRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event ObrazovanjaRowChangeEventHandler ObrazovanjaRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event ObrazovanjaRowChangeEventHandler ObrazovanjaRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event ObrazovanjaRowChangeEventHandler ObrazovanjaRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event ObrazovanjaRowChangeEventHandler ObrazovanjaRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void AddObrazovanjaRow(ObrazovanjaRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ObrazovanjaRow AddObrazovanjaRow(int IdObrazovanja, ZaposleniRow parentZaposleniRowByZaposleni_Obrazovanja, string _Zaposleni, bool NoksNivo, bool Klasnoks, bool Stepen, string NazivSteceneKvalifikacije, string StrucniAkademskiNazivIzDiplome, System.DateTime DatumSticanjaDiplome, bool DrzavaZavrseneSkole, string MestoZavrseneSkoleNaziv, string NazivSkole, bool JezikNaKomJeStecenoObrazovanje, string DokumentId, string DokumentNaziv) { + ObrazovanjaRow rowObrazovanjaRow = ((ObrazovanjaRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + IdObrazovanja, + null, + _Zaposleni, + NoksNivo, + Klasnoks, + Stepen, + NazivSteceneKvalifikacije, + StrucniAkademskiNazivIzDiplome, + DatumSticanjaDiplome, + DrzavaZavrseneSkole, + MestoZavrseneSkoleNaziv, + NazivSkole, + JezikNaKomJeStecenoObrazovanje, + DokumentId, + DokumentNaziv}; + if ((parentZaposleniRowByZaposleni_Obrazovanja != null)) { + columnValuesArray[1] = parentZaposleniRowByZaposleni_Obrazovanja[0]; + } + rowObrazovanjaRow.ItemArray = columnValuesArray; + this.Rows.Add(rowObrazovanjaRow); + return rowObrazovanjaRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ObrazovanjaRow AddObrazovanjaRow(int IdObrazovanja, ZaposleniRow parentZaposleniRowByZaposleni_Obrazovanja, bool NoksNivo, bool Klasnoks, bool Stepen, string NazivSteceneKvalifikacije, string StrucniAkademskiNazivIzDiplome, System.DateTime DatumSticanjaDiplome, bool DrzavaZavrseneSkole, string MestoZavrseneSkoleNaziv, string NazivSkole, bool JezikNaKomJeStecenoObrazovanje, string DokumentId, string DokumentNaziv) { + ObrazovanjaRow rowObrazovanjaRow = ((ObrazovanjaRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + IdObrazovanja, + null, + null, + NoksNivo, + Klasnoks, + Stepen, + NazivSteceneKvalifikacije, + StrucniAkademskiNazivIzDiplome, + DatumSticanjaDiplome, + DrzavaZavrseneSkole, + MestoZavrseneSkoleNaziv, + NazivSkole, + JezikNaKomJeStecenoObrazovanje, + DokumentId, + DokumentNaziv}; + if ((parentZaposleniRowByZaposleni_Obrazovanja != null)) { + columnValuesArray[1] = parentZaposleniRowByZaposleni_Obrazovanja[0]; + } + rowObrazovanjaRow.ItemArray = columnValuesArray; + this.Rows.Add(rowObrazovanjaRow); + return rowObrazovanjaRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ObrazovanjaRow FindByIdObrazovanja(int IdObrazovanja) { + return ((ObrazovanjaRow)(this.Rows.Find(new object[] { + IdObrazovanja}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public override global::System.Data.DataTable Clone() { + ObrazovanjaDataTable cln = ((ObrazovanjaDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new ObrazovanjaDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal void InitVars() { + this.columnIdObrazovanja = base.Columns["IdObrazovanja"]; + this.columnIdZaposlenog = base.Columns["IdZaposlenog"]; + this.column_Zaposleni = base.Columns["_Zaposleni"]; + this.columnNoksNivo = base.Columns["NoksNivo"]; + this.columnKlasnoks = base.Columns["Klasnoks"]; + this.columnStepen = base.Columns["Stepen"]; + this.columnNazivSteceneKvalifikacije = base.Columns["NazivSteceneKvalifikacije"]; + this.columnStrucniAkademskiNazivIzDiplome = base.Columns["StrucniAkademskiNazivIzDiplome"]; + this.columnDatumSticanjaDiplome = base.Columns["DatumSticanjaDiplome"]; + this.columnDrzavaZavrseneSkole = base.Columns["DrzavaZavrseneSkole"]; + this.columnMestoZavrseneSkoleNaziv = base.Columns["MestoZavrseneSkoleNaziv"]; + this.columnNazivSkole = base.Columns["NazivSkole"]; + this.columnJezikNaKomJeStecenoObrazovanje = base.Columns["JezikNaKomJeStecenoObrazovanje"]; + this.columnDokumentId = base.Columns["DokumentId"]; + this.columnDokumentNaziv = base.Columns["DokumentNaziv"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitClass() { + this.columnIdObrazovanja = new global::System.Data.DataColumn("IdObrazovanja", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIdObrazovanja); + this.columnIdZaposlenog = new global::System.Data.DataColumn("IdZaposlenog", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIdZaposlenog); + this.column_Zaposleni = new global::System.Data.DataColumn("_Zaposleni", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.column_Zaposleni); + this.columnNoksNivo = new global::System.Data.DataColumn("NoksNivo", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNoksNivo); + this.columnKlasnoks = new global::System.Data.DataColumn("Klasnoks", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnKlasnoks); + this.columnStepen = new global::System.Data.DataColumn("Stepen", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnStepen); + this.columnNazivSteceneKvalifikacije = new global::System.Data.DataColumn("NazivSteceneKvalifikacije", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNazivSteceneKvalifikacije); + this.columnStrucniAkademskiNazivIzDiplome = new global::System.Data.DataColumn("StrucniAkademskiNazivIzDiplome", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnStrucniAkademskiNazivIzDiplome); + this.columnDatumSticanjaDiplome = new global::System.Data.DataColumn("DatumSticanjaDiplome", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDatumSticanjaDiplome); + this.columnDrzavaZavrseneSkole = new global::System.Data.DataColumn("DrzavaZavrseneSkole", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDrzavaZavrseneSkole); + this.columnMestoZavrseneSkoleNaziv = new global::System.Data.DataColumn("MestoZavrseneSkoleNaziv", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnMestoZavrseneSkoleNaziv); + this.columnNazivSkole = new global::System.Data.DataColumn("NazivSkole", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNazivSkole); + this.columnJezikNaKomJeStecenoObrazovanje = new global::System.Data.DataColumn("JezikNaKomJeStecenoObrazovanje", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnJezikNaKomJeStecenoObrazovanje); + this.columnDokumentId = new global::System.Data.DataColumn("DokumentId", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDokumentId); + this.columnDokumentNaziv = new global::System.Data.DataColumn("DokumentNaziv", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDokumentNaziv); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnIdObrazovanja}, true)); + this.columnIdObrazovanja.AllowDBNull = false; + this.columnIdObrazovanja.Unique = true; + this.column_Zaposleni.ReadOnly = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ObrazovanjaRow NewObrazovanjaRow() { + return ((ObrazovanjaRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new ObrazovanjaRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(ObrazovanjaRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitExpressions() { + this._ZaposleniColumn.Expression = "parent.Ime + \' \' + parent.Prezime"; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.ObrazovanjaRowChanged != null)) { + this.ObrazovanjaRowChanged(this, new ObrazovanjaRowChangeEvent(((ObrazovanjaRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.ObrazovanjaRowChanging != null)) { + this.ObrazovanjaRowChanging(this, new ObrazovanjaRowChangeEvent(((ObrazovanjaRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.ObrazovanjaRowDeleted != null)) { + this.ObrazovanjaRowDeleted(this, new ObrazovanjaRowChangeEvent(((ObrazovanjaRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.ObrazovanjaRowDeleting != null)) { + this.ObrazovanjaRowDeleting(this, new ObrazovanjaRowChangeEvent(((ObrazovanjaRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void RemoveObrazovanjaRow(ObrazovanjaRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + Ds ds = new Ds(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "ObrazovanjaDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class UceniciRow : global::System.Data.DataRow { + + private UceniciDataTable tableUcenici; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal UceniciRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableUcenici = ((UceniciDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int IdUcenika { + get { + return ((int)(this[this.tableUcenici.IdUcenikaColumn])); + } + set { + this[this.tableUcenici.IdUcenikaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string Ime { + get { + try { + return ((string)(this[this.tableUcenici.ImeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Ime\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.ImeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int RegUceLiceId { + get { + try { + return ((int)(this[this.tableUcenici.RegUceLiceIdColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'RegUceLiceId\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.RegUceLiceIdColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string JOB { + get { + return ((string)(this[this.tableUcenici.JOBColumn])); + } + set { + this[this.tableUcenici.JOBColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string JMBG { + get { + try { + return ((string)(this[this.tableUcenici.JMBGColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'JMBG\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.JMBGColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string Prebivaliste { + get { + try { + return ((string)(this[this.tableUcenici.PrebivalisteColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Prebivaliste\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.PrebivalisteColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string Skola { + get { + try { + return ((string)(this[this.tableUcenici.SkolaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Skola\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.SkolaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string Razred { + get { + try { + return ((string)(this[this.tableUcenici.RazredColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Razred\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.RazredColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string Odeljenje { + get { + try { + return ((string)(this[this.tableUcenici.OdeljenjeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Odeljenje\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.OdeljenjeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public char Pol { + get { + try { + return ((char)(this[this.tableUcenici.PolColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Pol\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.PolColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public System.DateTime DatumRodjenja { + get { + try { + return ((global::System.DateTime)(this[this.tableUcenici.DatumRodjenjaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DatumRodjenja\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.DatumRodjenjaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double Godine { + get { + try { + return ((double)(this[this.tableUcenici.GodineColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Godine\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.GodineColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int DanaDoRodj { + get { + try { + return ((int)(this[this.tableUcenici.DanaDoRodjColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DanaDoRodj\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.DanaDoRodjColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string Napomene { + get { + try { + return ((string)(this[this.tableUcenici.NapomeneColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Napomene\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.NapomeneColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int BrojOcenaPolu { + get { + try { + return ((int)(this[this.tableUcenici.BrojOcenaPoluColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'BrojOcenaPolu\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.BrojOcenaPoluColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int BrojOcenaKraj { + get { + try { + return ((int)(this[this.tableUcenici.BrojOcenaKrajColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'BrojOcenaKraj\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.BrojOcenaKrajColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int Id { + get { + try { + return ((int)(this[this.tableUcenici.IdColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Id\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.IdColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int RegUceLiceObrazovanjeId { + get { + try { + return ((int)(this[this.tableUcenici.RegUceLiceObrazovanjeIdColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'RegUceLiceObrazovanjeId\' in table \'Ucenici\' is DBNull.", e); + } + } + set { + this[this.tableUcenici.RegUceLiceObrazovanjeIdColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string Smer { + get { + try { + return ((string)(this[this.tableUcenici.SmerColumn])); + } + catch (global::System.InvalidCastException e) { throw new global::System.Data.StrongTypingException("The value for column \'Smer\' in table \'Ucenici\' is DBNull.", e); } } @@ -10379,6 +10923,17 @@ public ZaposlenjaRow[] GetZaposlenjaRows() { return ((ZaposlenjaRow[])(base.GetChildRows(this.Table.ChildRelations["FK_Zaposleni_Zaposlenja"]))); } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ObrazovanjaRow[] GetObrazovanjaRows() { + if ((this.Table.ChildRelations["Zaposleni_Obrazovanja"] == null)) { + return new ObrazovanjaRow[0]; + } + else { + return ((ObrazovanjaRow[])(base.GetChildRows(this.Table.ChildRelations["Zaposleni_Obrazovanja"]))); + } + } } /// @@ -13869,144 +14424,490 @@ public void SetIdSprataNull() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsSpratNull() { - return this.IsNull(this.tableProstorije.SpratColumn); + public bool IsSpratNull() { + return this.IsNull(this.tableProstorije.SpratColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetSpratNull() { + this[this.tableProstorije.SpratColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsIzvorGrejanjaNull() { + return this.IsNull(this.tableProstorije.IzvorGrejanjaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetIzvorGrejanjaNull() { + this[this.tableProstorije.IzvorGrejanjaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsIdVrsteIzvoraGrejanjaNull() { + return this.IsNull(this.tableProstorije.IdVrsteIzvoraGrejanjaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetIdVrsteIzvoraGrejanjaNull() { + this[this.tableProstorije.IdVrsteIzvoraGrejanjaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsVrstaIzvoraGrejanjaNull() { + return this.IsNull(this.tableProstorije.VrstaIzvoraGrejanjaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetVrstaIzvoraGrejanjaNull() { + this[this.tableProstorije.VrstaIzvoraGrejanjaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsIzvorHladjenjaNull() { + return this.IsNull(this.tableProstorije.IzvorHladjenjaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetIzvorHladjenjaNull() { + this[this.tableProstorije.IzvorHladjenjaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsIdVrsteIzvoraHladjenjaNull() { + return this.IsNull(this.tableProstorije.IdVrsteIzvoraHladjenjaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetIdVrsteIzvoraHladjenjaNull() { + this[this.tableProstorije.IdVrsteIzvoraHladjenjaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsVrstaIzvoraHladjenjaNull() { + return this.IsNull(this.tableProstorije.VrstaIzvoraHladjenjaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetVrstaIzvoraHladjenjaNull() { + this[this.tableProstorije.VrstaIzvoraHladjenjaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsProstorijaSeKoristiNull() { + return this.IsNull(this.tableProstorije.ProstorijaSeKoristiColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetProstorijaSeKoristiNull() { + this[this.tableProstorije.ProstorijaSeKoristiColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsBrzinaBezicnogInternetaNull() { + return this.IsNull(this.tableProstorije.BrzinaBezicnogInternetaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetBrzinaBezicnogInternetaNull() { + this[this.tableProstorije.BrzinaBezicnogInternetaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsBrzinaLanPrikljuckaNull() { + return this.IsNull(this.tableProstorije.BrzinaLanPrikljuckaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetBrzinaLanPrikljuckaNull() { + this[this.tableProstorije.BrzinaLanPrikljuckaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsMobilniInternetNull() { + return this.IsNull(this.tableProstorije.MobilniInternetColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetMobilniInternetNull() { + this[this.tableProstorije.MobilniInternetColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public RacunariRow[] GetRacunariRows() { + if ((this.Table.ChildRelations["Prostorije_Racunari"] == null)) { + return new RacunariRow[0]; + } + else { + return ((RacunariRow[])(base.GetChildRows(this.Table.ChildRelations["Prostorije_Racunari"]))); + } + } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class SifSpratoviRow : global::System.Data.DataRow { + + private SifSpratoviDataTable tableSifSpratovi; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal SifSpratoviRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableSifSpratovi = ((SifSpratoviDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int IdSprata { + get { + return ((int)(this[this.tableSifSpratovi.IdSprataColumn])); + } + set { + this[this.tableSifSpratovi.IdSprataColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string NazivSprata { + get { + return ((string)(this[this.tableSifSpratovi.NazivSprataColumn])); + } + set { + this[this.tableSifSpratovi.NazivSprataColumn] = value; + } + } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class SifGrejanjaRow : global::System.Data.DataRow { + + private SifGrejanjaDataTable tableSifGrejanja; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal SifGrejanjaRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableSifGrejanja = ((SifGrejanjaDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int IdGrejanja { + get { + return ((int)(this[this.tableSifGrejanja.IdGrejanjaColumn])); + } + set { + this[this.tableSifGrejanja.IdGrejanjaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string NazivGrejanja { + get { + return ((string)(this[this.tableSifGrejanja.NazivGrejanjaColumn])); + } + set { + this[this.tableSifGrejanja.NazivGrejanjaColumn] = value; + } + } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class SifHladjenjaRow : global::System.Data.DataRow { + + private SifHladjenjaDataTable tableSifHladjenja; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal SifHladjenjaRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableSifHladjenja = ((SifHladjenjaDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int IdHladjenja { + get { + return ((int)(this[this.tableSifHladjenja.IdHladjenjaColumn])); + } + set { + this[this.tableSifHladjenja.IdHladjenjaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string NazivHladjenja { + get { + return ((string)(this[this.tableSifHladjenja.NazivHladjenjaColumn])); + } + set { + this[this.tableSifHladjenja.NazivHladjenjaColumn] = value; + } } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class RacunariRow : global::System.Data.DataRow { + + private RacunariDataTable tableRacunari; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetSpratNull() { - this[this.tableProstorije.SpratColumn] = global::System.Convert.DBNull; + internal RacunariRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableRacunari = ((RacunariDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsIzvorGrejanjaNull() { - return this.IsNull(this.tableProstorije.IzvorGrejanjaColumn); + public int IdRacunara { + get { + return ((int)(this[this.tableRacunari.IdRacunaraColumn])); + } + set { + this[this.tableRacunari.IdRacunaraColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetIzvorGrejanjaNull() { - this[this.tableProstorije.IzvorGrejanjaColumn] = global::System.Convert.DBNull; + public string NazivRacunara { + get { + return ((string)(this[this.tableRacunari.NazivRacunaraColumn])); + } + set { + this[this.tableRacunari.NazivRacunaraColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsIdVrsteIzvoraGrejanjaNull() { - return this.IsNull(this.tableProstorije.IdVrsteIzvoraGrejanjaColumn); + public string _Prostorija { + get { + return ((string)(this[this.tableRacunari._ProstorijaColumn])); + } + set { + this[this.tableRacunari._ProstorijaColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetIdVrsteIzvoraGrejanjaNull() { - this[this.tableProstorije.IdVrsteIzvoraGrejanjaColumn] = global::System.Convert.DBNull; + public int IdProstorije { + get { + return ((int)(this[this.tableRacunari.IdProstorijeColumn])); + } + set { + this[this.tableRacunari.IdProstorijeColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsVrstaIzvoraGrejanjaNull() { - return this.IsNull(this.tableProstorije.VrstaIzvoraGrejanjaColumn); + public string Status { + get { + return ((string)(this[this.tableRacunari.StatusColumn])); + } + set { + this[this.tableRacunari.StatusColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetVrstaIzvoraGrejanjaNull() { - this[this.tableProstorije.VrstaIzvoraGrejanjaColumn] = global::System.Convert.DBNull; + public string Tip { + get { + return ((string)(this[this.tableRacunari.TipColumn])); + } + set { + this[this.tableRacunari.TipColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsIzvorHladjenjaNull() { - return this.IsNull(this.tableProstorije.IzvorHladjenjaColumn); + public string Procesor { + get { + try { + return ((string)(this[this.tableRacunari.ProcesorColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Procesor\' in table \'Racunari\' is DBNull.", e); + } + } + set { + this[this.tableRacunari.ProcesorColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetIzvorHladjenjaNull() { - this[this.tableProstorije.IzvorHladjenjaColumn] = global::System.Convert.DBNull; + public int GodinaProizvodnje { + get { + try { + return ((int)(this[this.tableRacunari.GodinaProizvodnjeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'GodinaProizvodnje\' in table \'Racunari\' is DBNull.", e); + } + } + set { + this[this.tableRacunari.GodinaProizvodnjeColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsIdVrsteIzvoraHladjenjaNull() { - return this.IsNull(this.tableProstorije.IdVrsteIzvoraHladjenjaColumn); + public string Napomene { + get { + try { + return ((string)(this[this.tableRacunari.NapomeneColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Napomene\' in table \'Racunari\' is DBNull.", e); + } + } + set { + this[this.tableRacunari.NapomeneColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetIdVrsteIzvoraHladjenjaNull() { - this[this.tableProstorije.IdVrsteIzvoraHladjenjaColumn] = global::System.Convert.DBNull; + public ProstorijeRow ProstorijeRow { + get { + return ((ProstorijeRow)(this.GetParentRow(this.Table.ParentRelations["Prostorije_Racunari"]))); + } + set { + this.SetParentRow(value, this.Table.ParentRelations["Prostorije_Racunari"]); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsVrstaIzvoraHladjenjaNull() { - return this.IsNull(this.tableProstorije.VrstaIzvoraHladjenjaColumn); + public bool IsProcesorNull() { + return this.IsNull(this.tableRacunari.ProcesorColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetVrstaIzvoraHladjenjaNull() { - this[this.tableProstorije.VrstaIzvoraHladjenjaColumn] = global::System.Convert.DBNull; + public void SetProcesorNull() { + this[this.tableRacunari.ProcesorColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsProstorijaSeKoristiNull() { - return this.IsNull(this.tableProstorije.ProstorijaSeKoristiColumn); + public bool IsGodinaProizvodnjeNull() { + return this.IsNull(this.tableRacunari.GodinaProizvodnjeColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetProstorijaSeKoristiNull() { - this[this.tableProstorije.ProstorijaSeKoristiColumn] = global::System.Convert.DBNull; + public void SetGodinaProizvodnjeNull() { + this[this.tableRacunari.GodinaProizvodnjeColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsBrzinaBezicnogInternetaNull() { - return this.IsNull(this.tableProstorije.BrzinaBezicnogInternetaColumn); + public bool IsNapomeneNull() { + return this.IsNull(this.tableRacunari.NapomeneColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetBrzinaBezicnogInternetaNull() { - this[this.tableProstorije.BrzinaBezicnogInternetaColumn] = global::System.Convert.DBNull; + public void SetNapomeneNull() { + this[this.tableRacunari.NapomeneColumn] = global::System.Convert.DBNull; } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class PorukeRow : global::System.Data.DataRow { + + private PorukeDataTable tablePoruke; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsBrzinaLanPrikljuckaNull() { - return this.IsNull(this.tableProstorije.BrzinaLanPrikljuckaColumn); + internal PorukeRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tablePoruke = ((PorukeDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetBrzinaLanPrikljuckaNull() { - this[this.tableProstorije.BrzinaLanPrikljuckaColumn] = global::System.Convert.DBNull; + public int IdPoruke { + get { + return ((int)(this[this.tablePoruke.IdPorukeColumn])); + } + set { + this[this.tablePoruke.IdPorukeColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsMobilniInternetNull() { - return this.IsNull(this.tableProstorije.MobilniInternetColumn); + public string Tekst { + get { + return ((string)(this[this.tablePoruke.TekstColumn])); + } + set { + this[this.tablePoruke.TekstColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetMobilniInternetNull() { - this[this.tableProstorije.MobilniInternetColumn] = global::System.Convert.DBNull; + public string Tip { + get { + return ((string)(this[this.tablePoruke.TipColumn])); + } + set { + this[this.tablePoruke.TipColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public RacunariRow[] GetRacunariRows() { - if ((this.Table.ChildRelations["Prostorije_Racunari"] == null)) { - return new RacunariRow[0]; + public System.DateTime DatumVreme { + get { + return ((global::System.DateTime)(this[this.tablePoruke.DatumVremeColumn])); } - else { - return ((RacunariRow[])(base.GetChildRows(this.Table.ChildRelations["Prostorije_Racunari"]))); + set { + this[this.tablePoruke.DatumVremeColumn] = value; } } } @@ -14014,36 +14915,36 @@ public RacunariRow[] GetRacunariRows() { /// ///Represents strongly named DataRow class. /// - public partial class SifSpratoviRow : global::System.Data.DataRow { + public partial class SifRazloziPrestankaZapRow : global::System.Data.DataRow { - private SifSpratoviDataTable tableSifSpratovi; + private SifRazloziPrestankaZapDataTable tableSifRazloziPrestankaZap; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal SifSpratoviRow(global::System.Data.DataRowBuilder rb) : + internal SifRazloziPrestankaZapRow(global::System.Data.DataRowBuilder rb) : base(rb) { - this.tableSifSpratovi = ((SifSpratoviDataTable)(this.Table)); + this.tableSifRazloziPrestankaZap = ((SifRazloziPrestankaZapDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int IdSprata { + public int IdRazloga { get { - return ((int)(this[this.tableSifSpratovi.IdSprataColumn])); + return ((int)(this[this.tableSifRazloziPrestankaZap.IdRazlogaColumn])); } set { - this[this.tableSifSpratovi.IdSprataColumn] = value; + this[this.tableSifRazloziPrestankaZap.IdRazlogaColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string NazivSprata { + public string NazivRazloga { get { - return ((string)(this[this.tableSifSpratovi.NazivSprataColumn])); + return ((string)(this[this.tableSifRazloziPrestankaZap.NazivRazlogaColumn])); } set { - this[this.tableSifSpratovi.NazivSprataColumn] = value; + this[this.tableSifRazloziPrestankaZap.NazivRazlogaColumn] = value; } } } @@ -14051,346 +14952,432 @@ public string NazivSprata { /// ///Represents strongly named DataRow class. /// - public partial class SifGrejanjaRow : global::System.Data.DataRow { + public partial class ObrazovanjaRow : global::System.Data.DataRow { - private SifGrejanjaDataTable tableSifGrejanja; + private ObrazovanjaDataTable tableObrazovanja; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal SifGrejanjaRow(global::System.Data.DataRowBuilder rb) : + internal ObrazovanjaRow(global::System.Data.DataRowBuilder rb) : base(rb) { - this.tableSifGrejanja = ((SifGrejanjaDataTable)(this.Table)); + this.tableObrazovanja = ((ObrazovanjaDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int IdGrejanja { + public int IdObrazovanja { get { - return ((int)(this[this.tableSifGrejanja.IdGrejanjaColumn])); + return ((int)(this[this.tableObrazovanja.IdObrazovanjaColumn])); } set { - this[this.tableSifGrejanja.IdGrejanjaColumn] = value; + this[this.tableObrazovanja.IdObrazovanjaColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string NazivGrejanja { + public int IdZaposlenog { get { - return ((string)(this[this.tableSifGrejanja.NazivGrejanjaColumn])); + try { + return ((int)(this[this.tableObrazovanja.IdZaposlenogColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'IdZaposlenog\' in table \'Obrazovanja\' is DBNull.", e); + } } set { - this[this.tableSifGrejanja.NazivGrejanjaColumn] = value; + this[this.tableObrazovanja.IdZaposlenogColumn] = value; } } - } - - /// - ///Represents strongly named DataRow class. - /// - public partial class SifHladjenjaRow : global::System.Data.DataRow { - - private SifHladjenjaDataTable tableSifHladjenja; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal SifHladjenjaRow(global::System.Data.DataRowBuilder rb) : - base(rb) { - this.tableSifHladjenja = ((SifHladjenjaDataTable)(this.Table)); + public string _Zaposleni { + get { + try { + return ((string)(this[this.tableObrazovanja._ZaposleniColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'_Zaposleni\' in table \'Obrazovanja\' is DBNull.", e); + } + } + set { + this[this.tableObrazovanja._ZaposleniColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int IdHladjenja { + public bool NoksNivo { get { - return ((int)(this[this.tableSifHladjenja.IdHladjenjaColumn])); + try { + return ((bool)(this[this.tableObrazovanja.NoksNivoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NoksNivo\' in table \'Obrazovanja\' is DBNull.", e); + } } set { - this[this.tableSifHladjenja.IdHladjenjaColumn] = value; + this[this.tableObrazovanja.NoksNivoColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string NazivHladjenja { + public bool Klasnoks { get { - return ((string)(this[this.tableSifHladjenja.NazivHladjenjaColumn])); + try { + return ((bool)(this[this.tableObrazovanja.KlasnoksColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Klasnoks\' in table \'Obrazovanja\' is DBNull.", e); + } } set { - this[this.tableSifHladjenja.NazivHladjenjaColumn] = value; + this[this.tableObrazovanja.KlasnoksColumn] = value; } } - } - - /// - ///Represents strongly named DataRow class. - /// - public partial class RacunariRow : global::System.Data.DataRow { - - private RacunariDataTable tableRacunari; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal RacunariRow(global::System.Data.DataRowBuilder rb) : - base(rb) { - this.tableRacunari = ((RacunariDataTable)(this.Table)); + public bool Stepen { + get { + try { + return ((bool)(this[this.tableObrazovanja.StepenColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Stepen\' in table \'Obrazovanja\' is DBNull.", e); + } + } + set { + this[this.tableObrazovanja.StepenColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int IdRacunara { + public string NazivSteceneKvalifikacije { get { - return ((int)(this[this.tableRacunari.IdRacunaraColumn])); + try { + return ((string)(this[this.tableObrazovanja.NazivSteceneKvalifikacijeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NazivSteceneKvalifikacije\' in table \'Obrazovanja\' is DBNull" + + ".", e); + } } set { - this[this.tableRacunari.IdRacunaraColumn] = value; + this[this.tableObrazovanja.NazivSteceneKvalifikacijeColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string NazivRacunara { + public string StrucniAkademskiNazivIzDiplome { get { - return ((string)(this[this.tableRacunari.NazivRacunaraColumn])); + try { + return ((string)(this[this.tableObrazovanja.StrucniAkademskiNazivIzDiplomeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'StrucniAkademskiNazivIzDiplome\' in table \'Obrazovanja\' is D" + + "BNull.", e); + } } set { - this[this.tableRacunari.NazivRacunaraColumn] = value; + this[this.tableObrazovanja.StrucniAkademskiNazivIzDiplomeColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string _Prostorija { + public System.DateTime DatumSticanjaDiplome { get { - return ((string)(this[this.tableRacunari._ProstorijaColumn])); + try { + return ((global::System.DateTime)(this[this.tableObrazovanja.DatumSticanjaDiplomeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DatumSticanjaDiplome\' in table \'Obrazovanja\' is DBNull.", e); + } } set { - this[this.tableRacunari._ProstorijaColumn] = value; + this[this.tableObrazovanja.DatumSticanjaDiplomeColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int IdProstorije { + public bool DrzavaZavrseneSkole { get { - return ((int)(this[this.tableRacunari.IdProstorijeColumn])); + try { + return ((bool)(this[this.tableObrazovanja.DrzavaZavrseneSkoleColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DrzavaZavrseneSkole\' in table \'Obrazovanja\' is DBNull.", e); + } } set { - this[this.tableRacunari.IdProstorijeColumn] = value; + this[this.tableObrazovanja.DrzavaZavrseneSkoleColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Status { + public string MestoZavrseneSkoleNaziv { get { - return ((string)(this[this.tableRacunari.StatusColumn])); + try { + return ((string)(this[this.tableObrazovanja.MestoZavrseneSkoleNazivColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'MestoZavrseneSkoleNaziv\' in table \'Obrazovanja\' is DBNull.", e); + } } set { - this[this.tableRacunari.StatusColumn] = value; + this[this.tableObrazovanja.MestoZavrseneSkoleNazivColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Tip { + public string NazivSkole { get { - return ((string)(this[this.tableRacunari.TipColumn])); + try { + return ((string)(this[this.tableObrazovanja.NazivSkoleColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NazivSkole\' in table \'Obrazovanja\' is DBNull.", e); + } } set { - this[this.tableRacunari.TipColumn] = value; + this[this.tableObrazovanja.NazivSkoleColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Procesor { + public bool JezikNaKomJeStecenoObrazovanje { get { try { - return ((string)(this[this.tableRacunari.ProcesorColumn])); + return ((bool)(this[this.tableObrazovanja.JezikNaKomJeStecenoObrazovanjeColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Procesor\' in table \'Racunari\' is DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'JezikNaKomJeStecenoObrazovanje\' in table \'Obrazovanja\' is D" + + "BNull.", e); } } set { - this[this.tableRacunari.ProcesorColumn] = value; + this[this.tableObrazovanja.JezikNaKomJeStecenoObrazovanjeColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int GodinaProizvodnje { + public string DokumentId { get { try { - return ((int)(this[this.tableRacunari.GodinaProizvodnjeColumn])); + return ((string)(this[this.tableObrazovanja.DokumentIdColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'GodinaProizvodnje\' in table \'Racunari\' is DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'DokumentId\' in table \'Obrazovanja\' is DBNull.", e); } } set { - this[this.tableRacunari.GodinaProizvodnjeColumn] = value; + this[this.tableObrazovanja.DokumentIdColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Napomene { + public string DokumentNaziv { get { try { - return ((string)(this[this.tableRacunari.NapomeneColumn])); + return ((string)(this[this.tableObrazovanja.DokumentNazivColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Napomene\' in table \'Racunari\' is DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'DokumentNaziv\' in table \'Obrazovanja\' is DBNull.", e); } } set { - this[this.tableRacunari.NapomeneColumn] = value; + this[this.tableObrazovanja.DokumentNazivColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public ProstorijeRow ProstorijeRow { + public ZaposleniRow ZaposleniRow { get { - return ((ProstorijeRow)(this.GetParentRow(this.Table.ParentRelations["Prostorije_Racunari"]))); + return ((ZaposleniRow)(this.GetParentRow(this.Table.ParentRelations["Zaposleni_Obrazovanja"]))); } set { - this.SetParentRow(value, this.Table.ParentRelations["Prostorije_Racunari"]); + this.SetParentRow(value, this.Table.ParentRelations["Zaposleni_Obrazovanja"]); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsProcesorNull() { - return this.IsNull(this.tableRacunari.ProcesorColumn); + public bool IsIdZaposlenogNull() { + return this.IsNull(this.tableObrazovanja.IdZaposlenogColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetProcesorNull() { - this[this.tableRacunari.ProcesorColumn] = global::System.Convert.DBNull; + public void SetIdZaposlenogNull() { + this[this.tableObrazovanja.IdZaposlenogColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsGodinaProizvodnjeNull() { - return this.IsNull(this.tableRacunari.GodinaProizvodnjeColumn); + public bool Is_ZaposleniNull() { + return this.IsNull(this.tableObrazovanja._ZaposleniColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetGodinaProizvodnjeNull() { - this[this.tableRacunari.GodinaProizvodnjeColumn] = global::System.Convert.DBNull; + public void Set_ZaposleniNull() { + this[this.tableObrazovanja._ZaposleniColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsNapomeneNull() { - return this.IsNull(this.tableRacunari.NapomeneColumn); + public bool IsNoksNivoNull() { + return this.IsNull(this.tableObrazovanja.NoksNivoColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetNapomeneNull() { - this[this.tableRacunari.NapomeneColumn] = global::System.Convert.DBNull; + public void SetNoksNivoNull() { + this[this.tableObrazovanja.NoksNivoColumn] = global::System.Convert.DBNull; } - } - - /// - ///Represents strongly named DataRow class. - /// - public partial class PorukeRow : global::System.Data.DataRow { - private PorukeDataTable tablePoruke; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsKlasnoksNull() { + return this.IsNull(this.tableObrazovanja.KlasnoksColumn); + } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal PorukeRow(global::System.Data.DataRowBuilder rb) : - base(rb) { - this.tablePoruke = ((PorukeDataTable)(this.Table)); + public void SetKlasnoksNull() { + this[this.tableObrazovanja.KlasnoksColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int IdPoruke { - get { - return ((int)(this[this.tablePoruke.IdPorukeColumn])); - } - set { - this[this.tablePoruke.IdPorukeColumn] = value; - } + public bool IsStepenNull() { + return this.IsNull(this.tableObrazovanja.StepenColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Tekst { - get { - return ((string)(this[this.tablePoruke.TekstColumn])); - } - set { - this[this.tablePoruke.TekstColumn] = value; - } + public void SetStepenNull() { + this[this.tableObrazovanja.StepenColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Tip { - get { - return ((string)(this[this.tablePoruke.TipColumn])); - } - set { - this[this.tablePoruke.TipColumn] = value; - } + public bool IsNazivSteceneKvalifikacijeNull() { + return this.IsNull(this.tableObrazovanja.NazivSteceneKvalifikacijeColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public System.DateTime DatumVreme { - get { - return ((global::System.DateTime)(this[this.tablePoruke.DatumVremeColumn])); - } - set { - this[this.tablePoruke.DatumVremeColumn] = value; - } + public void SetNazivSteceneKvalifikacijeNull() { + this[this.tableObrazovanja.NazivSteceneKvalifikacijeColumn] = global::System.Convert.DBNull; } - } - - /// - ///Represents strongly named DataRow class. - /// - public partial class SifRazloziPrestankaZapRow : global::System.Data.DataRow { - private SifRazloziPrestankaZapDataTable tableSifRazloziPrestankaZap; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsStrucniAkademskiNazivIzDiplomeNull() { + return this.IsNull(this.tableObrazovanja.StrucniAkademskiNazivIzDiplomeColumn); + } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal SifRazloziPrestankaZapRow(global::System.Data.DataRowBuilder rb) : - base(rb) { - this.tableSifRazloziPrestankaZap = ((SifRazloziPrestankaZapDataTable)(this.Table)); + public void SetStrucniAkademskiNazivIzDiplomeNull() { + this[this.tableObrazovanja.StrucniAkademskiNazivIzDiplomeColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int IdRazloga { - get { - return ((int)(this[this.tableSifRazloziPrestankaZap.IdRazlogaColumn])); - } - set { - this[this.tableSifRazloziPrestankaZap.IdRazlogaColumn] = value; - } + public bool IsDatumSticanjaDiplomeNull() { + return this.IsNull(this.tableObrazovanja.DatumSticanjaDiplomeColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string NazivRazloga { - get { - return ((string)(this[this.tableSifRazloziPrestankaZap.NazivRazlogaColumn])); - } - set { - this[this.tableSifRazloziPrestankaZap.NazivRazlogaColumn] = value; - } + public void SetDatumSticanjaDiplomeNull() { + this[this.tableObrazovanja.DatumSticanjaDiplomeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsDrzavaZavrseneSkoleNull() { + return this.IsNull(this.tableObrazovanja.DrzavaZavrseneSkoleColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetDrzavaZavrseneSkoleNull() { + this[this.tableObrazovanja.DrzavaZavrseneSkoleColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsMestoZavrseneSkoleNazivNull() { + return this.IsNull(this.tableObrazovanja.MestoZavrseneSkoleNazivColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetMestoZavrseneSkoleNazivNull() { + this[this.tableObrazovanja.MestoZavrseneSkoleNazivColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsNazivSkoleNull() { + return this.IsNull(this.tableObrazovanja.NazivSkoleColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetNazivSkoleNull() { + this[this.tableObrazovanja.NazivSkoleColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsJezikNaKomJeStecenoObrazovanjeNull() { + return this.IsNull(this.tableObrazovanja.JezikNaKomJeStecenoObrazovanjeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetJezikNaKomJeStecenoObrazovanjeNull() { + this[this.tableObrazovanja.JezikNaKomJeStecenoObrazovanjeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsDokumentIdNull() { + return this.IsNull(this.tableObrazovanja.DokumentIdColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetDokumentIdNull() { + this[this.tableObrazovanja.DokumentIdColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsDokumentNazivNull() { + return this.IsNull(this.tableObrazovanja.DokumentNazivColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetDokumentNazivNull() { + this[this.tableObrazovanja.DokumentNazivColumn] = global::System.Convert.DBNull; } } @@ -15073,6 +16060,40 @@ public SifRazloziPrestankaZapRow Row { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public class ObrazovanjaRowChangeEvent : global::System.EventArgs { + + private ObrazovanjaRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ObrazovanjaRowChangeEvent(ObrazovanjaRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ObrazovanjaRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } diff --git a/JISP/Data/Ds.cs b/JISP/Data/Ds.cs index 0880d38..757472d 100644 --- 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 { /// Ukupan broj meseci po formuli: 12*Godina + MesecBroj diff --git a/JISP/Data/Ds.xsd b/JISP/Data/Ds.xsd index 090ab2f..9ecee1d 100644 --- a/JISP/Data/Ds.xsd +++ b/JISP/Data/Ds.xsd @@ -109,7 +109,7 @@ - + @@ -273,12 +273,12 @@ - - - - - - + + + + + + @@ -357,11 +357,32 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + @@ -447,6 +468,10 @@ + + + + @@ -465,6 +490,7 @@ + \ No newline at end of file diff --git a/JISP/Data/WebApi.cs b/JISP/Data/WebApi.cs index c708e64..8563135 100644 --- 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 GetJson(ReqEnum reqEnum, string param = null) return await GetJson(UrlForReq(reqEnum, param)); } - /// Dohvata (POST) JSON podatke od JISP WebAPI-a. - public static async Task PostForJson(ReqEnum reqEnum, string body, string param = null) + public static async Task 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,6 +119,12 @@ public static async Task PostForJson(ReqEnum reqEnum, string body, strin } } + /// Dohvata (POST) JSON podatke od JISP WebAPI-a. + public static async Task PostForJson(ReqEnum reqEnum, string body, string param = null) + { + return await PostForJson(UrlForReq(reqEnum, param), body); + } + /// Dohvata (POST) trazeni objekat od JISP WebAPI-a. public async static Task PostForObject(ReqEnum reqEnum, string param = null) { @@ -126,10 +132,17 @@ public async static Task PostForObject(ReqEnum reqEnum, string param = nul return Newtonsoft.Json.JsonConvert.DeserializeObject(json); } + ///// Dohvata (POST) listu trazenih objekata od JISP WebAPI-a. + //public async static Task> PostForList(ReqEnum reqEnum, string body, string param = null) + //{ + // var json = await PostForJson(reqEnum, body, param); + // return DeserializeList(json); + //} + /// Dohvata (POST) listu trazenih objekata od JISP WebAPI-a. - public async static Task> PostForList(ReqEnum reqEnum, string body, string param = null) + public async static Task> PostForList(string url, string body) { - var json = await PostForJson(reqEnum, body, param); + var json = await PostForJson(url, body); return DeserializeList(json); } diff --git a/JISP/Forms/FrmObrazovanje.Designer.cs b/JISP/Forms/FrmObrazovanje.Designer.cs new file mode 100644 index 0000000..f30e803 --- /dev/null +++ b/JISP/Forms/FrmObrazovanje.Designer.cs @@ -0,0 +1,392 @@ +namespace JISP.Forms +{ + partial class FrmObrazovanje + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.Label lblFilterZaposleni; + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.pnlLeft = new JISP.Controls.UcLeftPanel(); + this.lblIzvorSelZaposlenih = new System.Windows.Forms.Label(); + this.cmbPodaciZaDohvatanje = new System.Windows.Forms.ComboBox(); + this.lblStatus = new System.Windows.Forms.Label(); + this.btnExit = new JISP.Controls.UcExitAppButton(); + this.lblBrojRedova = new System.Windows.Forms.Label(); + this.gbFilter = new System.Windows.Forms.GroupBox(); + this.txtFilterZaposleni = new JISP.Controls.UcFilterTextBox(); + this.btnDohvatiPodatke = new JISP.Controls.UcButton(); + this.dgvObrazovanja = new JISP.Controls.UcDGV(); + this.bsObrazovanja = new System.Windows.Forms.BindingSource(this.components); + this.ds = new JISP.Data.Ds(); + this.zaposleniDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.noksNivoDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.dgvcKlasnoks = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.stepenDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.NazivSteceneKvalifikacije = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.StrucniAkademskiNazivIzDiplome = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcDatumSticanjaDiplome = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DrzavaZavrseneSkole = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.MestoZavrseneSkoleNaziv = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.NazivSkole = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.JezikNaKomJeStecenoObrazovanje = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.dgvcDokument = new System.Windows.Forms.DataGridViewButtonColumn(); + lblFilterZaposleni = new System.Windows.Forms.Label(); + this.pnlLeft.SuspendLayout(); + this.gbFilter.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvObrazovanja)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsObrazovanja)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ds)).BeginInit(); + this.SuspendLayout(); + // + // lblFilterZaposleni + // + lblFilterZaposleni.AutoSize = true; + lblFilterZaposleni.Location = new System.Drawing.Point(5, 32); + lblFilterZaposleni.Name = "lblFilterZaposleni"; + lblFilterZaposleni.Size = new System.Drawing.Size(72, 18); + lblFilterZaposleni.TabIndex = 1; + lblFilterZaposleni.Text = "Zaposleni"; + // + // pnlLeft + // + this.pnlLeft.Controls.Add(this.lblIzvorSelZaposlenih); + this.pnlLeft.Controls.Add(this.cmbPodaciZaDohvatanje); + this.pnlLeft.Controls.Add(this.lblStatus); + this.pnlLeft.Controls.Add(this.btnExit); + this.pnlLeft.Controls.Add(this.lblBrojRedova); + this.pnlLeft.Controls.Add(this.gbFilter); + this.pnlLeft.Controls.Add(this.btnDohvatiPodatke); + this.pnlLeft.Dock = System.Windows.Forms.DockStyle.Left; + this.pnlLeft.Location = new System.Drawing.Point(0, 0); + this.pnlLeft.Margin = new System.Windows.Forms.Padding(4); + this.pnlLeft.Name = "pnlLeft"; + this.pnlLeft.PanelWidthState = JISP.Controls.PanelWidthState.Expanded; + this.pnlLeft.RightWingWidth = 9; + this.pnlLeft.Size = new System.Drawing.Size(150, 347); + this.pnlLeft.TabIndex = 0; + // + // lblIzvorSelZaposlenih + // + this.lblIzvorSelZaposlenih.AutoSize = true; + this.lblIzvorSelZaposlenih.Location = new System.Drawing.Point(8, 233); + this.lblIzvorSelZaposlenih.Name = "lblIzvorSelZaposlenih"; + this.lblIzvorSelZaposlenih.Size = new System.Drawing.Size(124, 18); + this.lblIzvorSelZaposlenih.TabIndex = 21; + this.lblIzvorSelZaposlenih.Text = "Sel. zaposleni sa:"; + // + // cmbPodaciZaDohvatanje + // + this.cmbPodaciZaDohvatanje.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbPodaciZaDohvatanje.DropDownWidth = 300; + this.cmbPodaciZaDohvatanje.FormattingEnabled = true; + this.cmbPodaciZaDohvatanje.Location = new System.Drawing.Point(8, 254); + this.cmbPodaciZaDohvatanje.Name = "cmbPodaciZaDohvatanje"; + this.cmbPodaciZaDohvatanje.Size = new System.Drawing.Size(126, 26); + this.cmbPodaciZaDohvatanje.TabIndex = 20; + // + // lblStatus + // + this.lblStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.lblStatus.AutoSize = true; + this.lblStatus.Location = new System.Drawing.Point(8, 318); + this.lblStatus.Name = "lblStatus"; + this.lblStatus.Size = new System.Drawing.Size(0, 18); + this.lblStatus.TabIndex = 19; + // + // btnExit + // + this.btnExit.BackColor = System.Drawing.Color.Red; + this.btnExit.ForeColor = System.Drawing.Color.White; + this.btnExit.Location = new System.Drawing.Point(8, 12); + this.btnExit.Name = "btnExit"; + this.btnExit.Size = new System.Drawing.Size(128, 28); + this.btnExit.TabIndex = 18; + this.btnExit.Text = "Izlaz"; + this.btnExit.ToolTipText = "Izlaz iz aplikacije"; + this.btnExit.UseVisualStyleBackColor = false; + // + // lblBrojRedova + // + this.lblBrojRedova.AutoSize = true; + this.lblBrojRedova.Location = new System.Drawing.Point(8, 64); + this.lblBrojRedova.Name = "lblBrojRedova"; + this.lblBrojRedova.Size = new System.Drawing.Size(59, 18); + this.lblBrojRedova.TabIndex = 17; + this.lblBrojRedova.Text = "Redova"; + // + // gbFilter + // + this.gbFilter.Controls.Add(this.txtFilterZaposleni); + this.gbFilter.Controls.Add(lblFilterZaposleni); + this.gbFilter.Location = new System.Drawing.Point(3, 90); + this.gbFilter.Name = "gbFilter"; + this.gbFilter.Size = new System.Drawing.Size(135, 87); + this.gbFilter.TabIndex = 16; + this.gbFilter.TabStop = false; + this.gbFilter.Text = "Filteri"; + // + // txtFilterZaposleni + // + this.txtFilterZaposleni.BindingSource = null; + this.txtFilterZaposleni.Location = new System.Drawing.Point(7, 54); + this.txtFilterZaposleni.Name = "txtFilterZaposleni"; + this.txtFilterZaposleni.ShouldBeCyrillic = false; + this.txtFilterZaposleni.Size = new System.Drawing.Size(122, 24); + this.txtFilterZaposleni.TabIndex = 2; + this.txtFilterZaposleni.TextChanged += new System.EventHandler(this.TxtFilterZaposleni_TextChanged); + // + // btnDohvatiPodatke + // + this.btnDohvatiPodatke.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnDohvatiPodatke.Location = new System.Drawing.Point(8, 201); + this.btnDohvatiPodatke.Name = "btnDohvatiPodatke"; + this.btnDohvatiPodatke.Size = new System.Drawing.Size(126, 30); + this.btnDohvatiPodatke.TabIndex = 15; + this.btnDohvatiPodatke.Text = "Dohvati podatke"; + this.btnDohvatiPodatke.ToolTipText = "Dohvatanje rešenja za selekto"; + this.btnDohvatiPodatke.UseVisualStyleBackColor = true; + this.btnDohvatiPodatke.Click += new System.EventHandler(this.BtnDohvatiPodatke_Click); + // + // dgvObrazovanja + // + this.dgvObrazovanja.AllowUserToAddRows = false; + this.dgvObrazovanja.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvObrazovanja.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvObrazovanja.AutoGenerateColumns = false; + this.dgvObrazovanja.BackgroundColor = System.Drawing.Color.WhiteSmoke; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvObrazovanja.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvObrazovanja.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvObrazovanja.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.zaposleniDataGridViewTextBoxColumn, + this.noksNivoDataGridViewCheckBoxColumn, + this.dgvcKlasnoks, + this.stepenDataGridViewCheckBoxColumn, + this.NazivSteceneKvalifikacije, + this.StrucniAkademskiNazivIzDiplome, + this.dgvcDatumSticanjaDiplome, + this.DrzavaZavrseneSkole, + this.MestoZavrseneSkoleNaziv, + this.NazivSkole, + this.JezikNaKomJeStecenoObrazovanje, + this.dgvcDokument}); + this.dgvObrazovanja.ColumnsForCopyOnClick = null; + this.dgvObrazovanja.CopyOnCellClick = false; + this.dgvObrazovanja.CtrlDisplayPositionRowCount = this.lblBrojRedova; + this.dgvObrazovanja.DataSource = this.bsObrazovanja; + this.dgvObrazovanja.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvObrazovanja.Location = new System.Drawing.Point(150, 0); + this.dgvObrazovanja.Name = "dgvObrazovanja"; + this.dgvObrazovanja.ReadOnly = true; + this.dgvObrazovanja.RowHeadersWidth = 30; + this.dgvObrazovanja.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dgvObrazovanja.Size = new System.Drawing.Size(1310, 347); + this.dgvObrazovanja.StandardSort = null; + this.dgvObrazovanja.TabIndex = 1; + this.dgvObrazovanja.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DgvObrazovanja_CellClick); + // + // bsObrazovanja + // + this.bsObrazovanja.DataMember = "Obrazovanja"; + this.bsObrazovanja.DataSource = this.ds; + this.bsObrazovanja.Sort = "_Zaposleni"; + // + // ds + // + this.ds.DataSetName = "Ds"; + this.ds.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // zaposleniDataGridViewTextBoxColumn + // + this.zaposleniDataGridViewTextBoxColumn.DataPropertyName = "_Zaposleni"; + this.zaposleniDataGridViewTextBoxColumn.HeaderText = "Zaposleni"; + this.zaposleniDataGridViewTextBoxColumn.Name = "zaposleniDataGridViewTextBoxColumn"; + this.zaposleniDataGridViewTextBoxColumn.ReadOnly = true; + this.zaposleniDataGridViewTextBoxColumn.Width = 185; + // + // noksNivoDataGridViewCheckBoxColumn + // + this.noksNivoDataGridViewCheckBoxColumn.DataPropertyName = "NoksNivo"; + this.noksNivoDataGridViewCheckBoxColumn.HeaderText = "NOKS nivo"; + this.noksNivoDataGridViewCheckBoxColumn.Name = "noksNivoDataGridViewCheckBoxColumn"; + this.noksNivoDataGridViewCheckBoxColumn.ReadOnly = true; + this.noksNivoDataGridViewCheckBoxColumn.ToolTipText = "Unet NOKS nivo"; + // + // dgvcKlasnoks + // + this.dgvcKlasnoks.DataPropertyName = "Klasnoks"; + this.dgvcKlasnoks.HeaderText = "Klasa NOKS"; + this.dgvcKlasnoks.Name = "dgvcKlasnoks"; + this.dgvcKlasnoks.ReadOnly = true; + this.dgvcKlasnoks.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dgvcKlasnoks.ToolTipText = "Uneta Klasa NOKS"; + // + // stepenDataGridViewCheckBoxColumn + // + this.stepenDataGridViewCheckBoxColumn.DataPropertyName = "Stepen"; + this.stepenDataGridViewCheckBoxColumn.HeaderText = "Stepen"; + this.stepenDataGridViewCheckBoxColumn.Name = "stepenDataGridViewCheckBoxColumn"; + this.stepenDataGridViewCheckBoxColumn.ReadOnly = true; + this.stepenDataGridViewCheckBoxColumn.ToolTipText = "Unet Stepen"; + // + // NazivSteceneKvalifikacije + // + this.NazivSteceneKvalifikacije.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.NazivSteceneKvalifikacije.DataPropertyName = "NazivSteceneKvalifikacije"; + this.NazivSteceneKvalifikacije.HeaderText = "Kvalifikacija"; + this.NazivSteceneKvalifikacije.MinimumWidth = 100; + this.NazivSteceneKvalifikacije.Name = "NazivSteceneKvalifikacije"; + this.NazivSteceneKvalifikacije.ReadOnly = true; + // + // StrucniAkademskiNazivIzDiplome + // + this.StrucniAkademskiNazivIzDiplome.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.StrucniAkademskiNazivIzDiplome.DataPropertyName = "StrucniAkademskiNazivIzDiplome"; + this.StrucniAkademskiNazivIzDiplome.HeaderText = "Stručni ak. naziv"; + this.StrucniAkademskiNazivIzDiplome.MinimumWidth = 100; + this.StrucniAkademskiNazivIzDiplome.Name = "StrucniAkademskiNazivIzDiplome"; + this.StrucniAkademskiNazivIzDiplome.ReadOnly = true; + // + // dgvcDatumSticanjaDiplome + // + this.dgvcDatumSticanjaDiplome.DataPropertyName = "DatumSticanjaDiplome"; + this.dgvcDatumSticanjaDiplome.HeaderText = "Datum"; + this.dgvcDatumSticanjaDiplome.Name = "dgvcDatumSticanjaDiplome"; + this.dgvcDatumSticanjaDiplome.ReadOnly = true; + // + // DrzavaZavrseneSkole + // + this.DrzavaZavrseneSkole.DataPropertyName = "DrzavaZavrseneSkole"; + this.DrzavaZavrseneSkole.HeaderText = "Država"; + this.DrzavaZavrseneSkole.Name = "DrzavaZavrseneSkole"; + this.DrzavaZavrseneSkole.ReadOnly = true; + this.DrzavaZavrseneSkole.ToolTipText = "Uneta Država"; + // + // MestoZavrseneSkoleNaziv + // + this.MestoZavrseneSkoleNaziv.DataPropertyName = "MestoZavrseneSkoleNaziv"; + this.MestoZavrseneSkoleNaziv.HeaderText = "Mesto"; + this.MestoZavrseneSkoleNaziv.Name = "MestoZavrseneSkoleNaziv"; + this.MestoZavrseneSkoleNaziv.ReadOnly = true; + this.MestoZavrseneSkoleNaziv.Resizable = System.Windows.Forms.DataGridViewTriState.True; + // + // NazivSkole + // + this.NazivSkole.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.NazivSkole.DataPropertyName = "NazivSkole"; + this.NazivSkole.HeaderText = "Škola"; + this.NazivSkole.MinimumWidth = 100; + this.NazivSkole.Name = "NazivSkole"; + this.NazivSkole.ReadOnly = true; + // + // JezikNaKomJeStecenoObrazovanje + // + this.JezikNaKomJeStecenoObrazovanje.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; + this.JezikNaKomJeStecenoObrazovanje.DataPropertyName = "JezikNaKomJeStecenoObrazovanje"; + this.JezikNaKomJeStecenoObrazovanje.HeaderText = "Jezik"; + this.JezikNaKomJeStecenoObrazovanje.Name = "JezikNaKomJeStecenoObrazovanje"; + this.JezikNaKomJeStecenoObrazovanje.ReadOnly = true; + this.JezikNaKomJeStecenoObrazovanje.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.JezikNaKomJeStecenoObrazovanje.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.JezikNaKomJeStecenoObrazovanje.ToolTipText = "Unet Jezik"; + this.JezikNaKomJeStecenoObrazovanje.Width = 68; + // + // dgvcDokument + // + this.dgvcDokument.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dgvcDokument.DataPropertyName = "DokumentNaziv"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dgvcDokument.DefaultCellStyle = dataGridViewCellStyle3; + this.dgvcDokument.HeaderText = "Dokument"; + this.dgvcDokument.MinimumWidth = 100; + this.dgvcDokument.Name = "dgvcDokument"; + this.dgvcDokument.ReadOnly = true; + // + // FrmObrazovanje + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1460, 347); + this.Controls.Add(this.dgvObrazovanja); + this.Controls.Add(this.pnlLeft); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.Margin = new System.Windows.Forms.Padding(4); + this.Name = "FrmObrazovanje"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Obrazovanje"; + this.Load += new System.EventHandler(this.FrmObrazovanje_Load); + this.pnlLeft.ResumeLayout(false); + this.pnlLeft.PerformLayout(); + this.gbFilter.ResumeLayout(false); + this.gbFilter.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvObrazovanja)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsObrazovanja)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ds)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Controls.UcLeftPanel pnlLeft; + private Controls.UcDGV dgvObrazovanja; + private Controls.UcButton btnDohvatiPodatke; + private Controls.UcExitAppButton btnExit; + private System.Windows.Forms.Label lblBrojRedova; + private System.Windows.Forms.GroupBox gbFilter; + private System.Windows.Forms.Label lblStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn nazivSteceneKvalifikacijeDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn strucniAkademskiNazivIzDiplomeDataGridViewTextBoxColumn; + private System.Windows.Forms.BindingSource bsObrazovanja; + private Data.Ds ds; + private Controls.UcFilterTextBox txtFilterZaposleni; + private System.Windows.Forms.ComboBox cmbPodaciZaDohvatanje; + private System.Windows.Forms.Label lblIzvorSelZaposlenih; + private System.Windows.Forms.DataGridViewTextBoxColumn zaposleniDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewCheckBoxColumn noksNivoDataGridViewCheckBoxColumn; + private System.Windows.Forms.DataGridViewCheckBoxColumn dgvcKlasnoks; + private System.Windows.Forms.DataGridViewCheckBoxColumn stepenDataGridViewCheckBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn NazivSteceneKvalifikacije; + private System.Windows.Forms.DataGridViewTextBoxColumn StrucniAkademskiNazivIzDiplome; + private System.Windows.Forms.DataGridViewTextBoxColumn dgvcDatumSticanjaDiplome; + private System.Windows.Forms.DataGridViewCheckBoxColumn DrzavaZavrseneSkole; + private System.Windows.Forms.DataGridViewTextBoxColumn MestoZavrseneSkoleNaziv; + private System.Windows.Forms.DataGridViewTextBoxColumn NazivSkole; + private System.Windows.Forms.DataGridViewCheckBoxColumn JezikNaKomJeStecenoObrazovanje; + private System.Windows.Forms.DataGridViewButtonColumn dgvcDokument; + } +} \ No newline at end of file diff --git a/JISP/Forms/FrmObrazovanje.cs b/JISP/Forms/FrmObrazovanje.cs new file mode 100644 index 0000000..2014443 --- /dev/null +++ b/JISP/Forms/FrmObrazovanje.cs @@ -0,0 +1,73 @@ +using JISP.Classes; +using JISP.Data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; + +namespace JISP.Forms +{ + public partial class FrmObrazovanje : Form + { + public FrmObrazovanje() + { + InitializeComponent(); + } + + private const string CmbDohvatiZapSaGlavne = "glavne forme"; + private const string CmbDohvatiZapSaOveForme = "ove forme"; + + private void FrmObrazovanje_Load(object sender, EventArgs e) + { + cmbPodaciZaDohvatanje.Items.AddRange(new[] { + CmbDohvatiZapSaGlavne, + CmbDohvatiZapSaOveForme + }); + cmbPodaciZaDohvatanje.SelectedIndex = 0; + cmbPodaciZaDohvatanje.AdjustWidth(); + + bsObrazovanja.DataSource = AppData.Ds.Obrazovanja; + dgvObrazovanja.StandardSort = bsObrazovanja.Sort; + this.FormStandardSettings(); + } + + private async void BtnDohvatiPodatke_Click(object sender, EventArgs e) + { + try + { + var frmZaposleni = Application.OpenForms.OfType().FirstOrDefault(); + IEnumerable selZaposleni = null; + if ((string)cmbPodaciZaDohvatanje.SelectedItem == CmbDohvatiZapSaOveForme) + selZaposleni = (dgvObrazovanja.SelectedRows.Count > 0) + ? dgvObrazovanja.SelectedDataRows().Select(it => it.ZaposleniRow).Distinct() + : new List { dgvObrazovanja.CurrDataRow().ZaposleniRow }; + else + selZaposleni = frmZaposleni.SelektovaniZaposleni; + + foreach (var zaposleni in selZaposleni) + await (sender as Controls.UcButton).RunAsync(async () => + { + lblStatus.Text = zaposleni.ToString(); + await DataGetter.GetObrazovanjaAsync(zaposleni.IdZaposlenog); + }); + lblStatus.Text = ""; + } + catch (Exception ex) { Utils.ShowMbox(ex, Text); } + } + + private void TxtFilterZaposleni_TextChanged(object sender, EventArgs e) + { + try + { + bsObrazovanja.Filter = $"_Zaposleni LIKE '%{txtFilterZaposleni.Text}%'"; + } + catch (Exception ex) { Utils.ShowMbox(ex, this.Text); } + } + + private async void DgvObrazovanja_CellClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex >= 0 && e.ColumnIndex == dgvcDokument.Index) + await Utils.PreuzmiDokument(dgvObrazovanja, e); + } + } +} diff --git a/JISP/Forms/FrmObrazovanje.resx b/JISP/Forms/FrmObrazovanje.resx new file mode 100644 index 0000000..ca464ed --- /dev/null +++ b/JISP/Forms/FrmObrazovanje.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + 81, 17 + + + 17, 17 + + + 58 + + \ No newline at end of file diff --git a/JISP/Forms/FrmResenja.Designer.cs b/JISP/Forms/FrmResenja.Designer.cs index 29937ad..0566fd2 100644 --- a/JISP/Forms/FrmResenja.Designer.cs +++ b/JISP/Forms/FrmResenja.Designer.cs @@ -37,6 +37,14 @@ private void InitializeComponent() this.bsResenja = new System.Windows.Forms.BindingSource(this.components); this.ds = new JISP.Data.Ds(); this.dgvResenjaSva = new JISP.Controls.UcDGV(); + this.dgvcZaposleni = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.brojResenjaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.skolskaGodinaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tipResenjaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.procenatAngPoResDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.datumPodnosenjaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcAktivnoResenje = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.dgvcDokument = new System.Windows.Forms.DataGridViewButtonColumn(); this.lblBrojRedova = new System.Windows.Forms.Label(); this.pnlBottomLeftRes = new JISP.Controls.UcLeftPanel(); this.chkSamoAktivnaZaposlenja = new System.Windows.Forms.CheckBox(); @@ -51,14 +59,6 @@ private void InitializeComponent() this.cmbTipoviResenja = new System.Windows.Forms.ComboBox(); this.btnUcitajResenja = new JISP.Controls.UcButton(); this.ttSamoAktivnaZaposlenja = new System.Windows.Forms.ToolTip(this.components); - this.dgvcZaposleni = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.brojResenjaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.skolskaGodinaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.tipResenjaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.procenatAngPoResDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.datumPodnosenjaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcAktivnoResenje = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.dgvcDokument = new System.Windows.Forms.DataGridViewButtonColumn(); label1 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bsResenja)).BeginInit(); @@ -140,6 +140,73 @@ private void InitializeComponent() this.dgvResenjaSva.TabIndex = 2; this.dgvResenjaSva.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DgvResenjaSva_CellClick); // + // dgvcZaposleni + // + this.dgvcZaposleni.DataPropertyName = "_Zaposleni"; + this.dgvcZaposleni.HeaderText = "Zaposleni"; + this.dgvcZaposleni.Name = "dgvcZaposleni"; + this.dgvcZaposleni.ReadOnly = true; + this.dgvcZaposleni.Width = 175; + // + // brojResenjaDataGridViewTextBoxColumn + // + this.brojResenjaDataGridViewTextBoxColumn.DataPropertyName = "BrojResenja"; + this.brojResenjaDataGridViewTextBoxColumn.HeaderText = "Broj Rešenja"; + this.brojResenjaDataGridViewTextBoxColumn.Name = "brojResenjaDataGridViewTextBoxColumn"; + this.brojResenjaDataGridViewTextBoxColumn.ReadOnly = true; + this.brojResenjaDataGridViewTextBoxColumn.Width = 115; + // + // skolskaGodinaDataGridViewTextBoxColumn + // + this.skolskaGodinaDataGridViewTextBoxColumn.DataPropertyName = "SkolskaGodina"; + this.skolskaGodinaDataGridViewTextBoxColumn.HeaderText = "Šk. God"; + this.skolskaGodinaDataGridViewTextBoxColumn.Name = "skolskaGodinaDataGridViewTextBoxColumn"; + this.skolskaGodinaDataGridViewTextBoxColumn.ReadOnly = true; + // + // tipResenjaDataGridViewTextBoxColumn + // + this.tipResenjaDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.tipResenjaDataGridViewTextBoxColumn.DataPropertyName = "TipResenja"; + this.tipResenjaDataGridViewTextBoxColumn.FillWeight = 250F; + this.tipResenjaDataGridViewTextBoxColumn.HeaderText = "Tip Rešenja"; + this.tipResenjaDataGridViewTextBoxColumn.Name = "tipResenjaDataGridViewTextBoxColumn"; + this.tipResenjaDataGridViewTextBoxColumn.ReadOnly = true; + // + // procenatAngPoResDataGridViewTextBoxColumn + // + this.procenatAngPoResDataGridViewTextBoxColumn.DataPropertyName = "ProcenatAngPoRes"; + this.procenatAngPoResDataGridViewTextBoxColumn.HeaderText = "Procenat"; + this.procenatAngPoResDataGridViewTextBoxColumn.Name = "procenatAngPoResDataGridViewTextBoxColumn"; + this.procenatAngPoResDataGridViewTextBoxColumn.ReadOnly = true; + // + // datumPodnosenjaDataGridViewTextBoxColumn + // + this.datumPodnosenjaDataGridViewTextBoxColumn.DataPropertyName = "DatumPodnosenja"; + this.datumPodnosenjaDataGridViewTextBoxColumn.HeaderText = "Podneto"; + this.datumPodnosenjaDataGridViewTextBoxColumn.Name = "datumPodnosenjaDataGridViewTextBoxColumn"; + this.datumPodnosenjaDataGridViewTextBoxColumn.ReadOnly = true; + // + // dgvcAktivnoResenje + // + this.dgvcAktivnoResenje.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; + this.dgvcAktivnoResenje.DataPropertyName = "AktivnoResenje"; + this.dgvcAktivnoResenje.HeaderText = "Aktivno"; + this.dgvcAktivnoResenje.Name = "dgvcAktivnoResenje"; + this.dgvcAktivnoResenje.ReadOnly = true; + this.dgvcAktivnoResenje.Width = 62; + // + // dgvcDokument + // + this.dgvcDokument.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dgvcDokument.DataPropertyName = "Dokument"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dgvcDokument.DefaultCellStyle = dataGridViewCellStyle3; + this.dgvcDokument.HeaderText = "Dokument"; + this.dgvcDokument.Name = "dgvcDokument"; + this.dgvcDokument.ReadOnly = true; + this.dgvcDokument.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dgvcDokument.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // // lblBrojRedova // this.lblBrojRedova.AutoSize = true; @@ -288,73 +355,6 @@ private void InitializeComponent() this.btnUcitajResenja.UseVisualStyleBackColor = true; this.btnUcitajResenja.Click += new System.EventHandler(this.BtnUcitajResenja_Click); // - // dgvcZaposleni - // - this.dgvcZaposleni.DataPropertyName = "_Zaposleni"; - this.dgvcZaposleni.HeaderText = "Zaposleni"; - this.dgvcZaposleni.Name = "dgvcZaposleni"; - this.dgvcZaposleni.ReadOnly = true; - this.dgvcZaposleni.Width = 175; - // - // brojResenjaDataGridViewTextBoxColumn - // - this.brojResenjaDataGridViewTextBoxColumn.DataPropertyName = "BrojResenja"; - this.brojResenjaDataGridViewTextBoxColumn.HeaderText = "Broj Rešenja"; - this.brojResenjaDataGridViewTextBoxColumn.Name = "brojResenjaDataGridViewTextBoxColumn"; - this.brojResenjaDataGridViewTextBoxColumn.ReadOnly = true; - this.brojResenjaDataGridViewTextBoxColumn.Width = 115; - // - // skolskaGodinaDataGridViewTextBoxColumn - // - this.skolskaGodinaDataGridViewTextBoxColumn.DataPropertyName = "SkolskaGodina"; - this.skolskaGodinaDataGridViewTextBoxColumn.HeaderText = "Šk. God"; - this.skolskaGodinaDataGridViewTextBoxColumn.Name = "skolskaGodinaDataGridViewTextBoxColumn"; - this.skolskaGodinaDataGridViewTextBoxColumn.ReadOnly = true; - // - // tipResenjaDataGridViewTextBoxColumn - // - this.tipResenjaDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.tipResenjaDataGridViewTextBoxColumn.DataPropertyName = "TipResenja"; - this.tipResenjaDataGridViewTextBoxColumn.FillWeight = 250F; - this.tipResenjaDataGridViewTextBoxColumn.HeaderText = "Tip Rešenja"; - this.tipResenjaDataGridViewTextBoxColumn.Name = "tipResenjaDataGridViewTextBoxColumn"; - this.tipResenjaDataGridViewTextBoxColumn.ReadOnly = true; - // - // procenatAngPoResDataGridViewTextBoxColumn - // - this.procenatAngPoResDataGridViewTextBoxColumn.DataPropertyName = "ProcenatAngPoRes"; - this.procenatAngPoResDataGridViewTextBoxColumn.HeaderText = "Procenat"; - this.procenatAngPoResDataGridViewTextBoxColumn.Name = "procenatAngPoResDataGridViewTextBoxColumn"; - this.procenatAngPoResDataGridViewTextBoxColumn.ReadOnly = true; - // - // datumPodnosenjaDataGridViewTextBoxColumn - // - this.datumPodnosenjaDataGridViewTextBoxColumn.DataPropertyName = "DatumPodnosenja"; - this.datumPodnosenjaDataGridViewTextBoxColumn.HeaderText = "Podneto"; - this.datumPodnosenjaDataGridViewTextBoxColumn.Name = "datumPodnosenjaDataGridViewTextBoxColumn"; - this.datumPodnosenjaDataGridViewTextBoxColumn.ReadOnly = true; - // - // dgvcAktivnoResenje - // - this.dgvcAktivnoResenje.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; - this.dgvcAktivnoResenje.DataPropertyName = "AktivnoResenje"; - this.dgvcAktivnoResenje.HeaderText = "Aktivno"; - this.dgvcAktivnoResenje.Name = "dgvcAktivnoResenje"; - this.dgvcAktivnoResenje.ReadOnly = true; - this.dgvcAktivnoResenje.Width = 62; - // - // dgvcDokument - // - this.dgvcDokument.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.dgvcDokument.DataPropertyName = "Dokument"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dgvcDokument.DefaultCellStyle = dataGridViewCellStyle3; - this.dgvcDokument.HeaderText = "Dokument"; - this.dgvcDokument.Name = "dgvcDokument"; - this.dgvcDokument.ReadOnly = true; - this.dgvcDokument.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dgvcDokument.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // // FrmResenja // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); @@ -364,6 +364,7 @@ private void InitializeComponent() this.Controls.Add(this.pnlBottomLeftRes); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F); this.Name = "FrmResenja"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Rešenja"; ((System.ComponentModel.ISupportInitialize)(this.bsResenja)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ds)).EndInit(); diff --git a/JISP/Forms/FrmResenja.cs b/JISP/Forms/FrmResenja.cs index 0b3994a..c2b53f8 100644 --- a/JISP/Forms/FrmResenja.cs +++ b/JISP/Forms/FrmResenja.cs @@ -108,7 +108,7 @@ private void BtnAkcijaPokreni_Click(object sender, EventArgs e) private async void DgvResenjaSva_CellClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex >= 0 && e.ColumnIndex == dgvcDokument.Index) - await Utils.PreuzmiDokumentResenja(dgvResenjaSva, e); + await Utils.PreuzmiDokument(dgvResenjaSva, e); } private void FiltriranjeResenja() diff --git a/JISP/Forms/FrmZaposleni.Designer.cs b/JISP/Forms/FrmZaposleni.Designer.cs index 27e58ba..ba9fc9f 100644 --- a/JISP/Forms/FrmZaposleni.Designer.cs +++ b/JISP/Forms/FrmZaposleni.Designer.cs @@ -31,15 +31,15 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label lblFilterCaption; + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); this.lblRowCount = new System.Windows.Forms.Label(); this.bsZaposleni = new System.Windows.Forms.BindingSource(this.components); this.splitContainer = new System.Windows.Forms.SplitContainer(); @@ -88,6 +88,7 @@ private void InitializeComponent() this.chkCopyOnClick = new System.Windows.Forms.CheckBox(); this.btnSaveData = new JISP.Controls.UcButton(); this.btnExit = new JISP.Controls.UcExitAppButton(); + this.btnObrazovanje = new JISP.Controls.UcButton(); lblFilterCaption = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bsZaposleni)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); @@ -149,18 +150,18 @@ private void InitializeComponent() // this.dgvZaposleni.AllowUserToAddRows = false; this.dgvZaposleni.AllowUserToOrderColumns = true; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.White; - this.dgvZaposleni.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.White; + this.dgvZaposleni.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvZaposleni.AutoGenerateColumns = false; this.dgvZaposleni.BackgroundColor = System.Drawing.Color.WhiteSmoke; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvZaposleni.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvZaposleni.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dgvZaposleni.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvZaposleni.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvcIme, @@ -229,10 +230,10 @@ private void InitializeComponent() // dgvcGodine // this.dgvcGodine.DataPropertyName = "Godine"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle3.Format = "N1"; - dataGridViewCellStyle3.NullValue = null; - this.dgvcGodine.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle12.Format = "N1"; + dataGridViewCellStyle12.NullValue = null; + this.dgvcGodine.DefaultCellStyle = dataGridViewCellStyle12; this.dgvcGodine.HeaderText = "Godine"; this.dgvcGodine.MinimumWidth = 6; this.dgvcGodine.Name = "dgvcGodine"; @@ -242,8 +243,8 @@ private void InitializeComponent() // dgvcDanaDoRodj // this.dgvcDanaDoRodj.DataPropertyName = "DanaDoRodj"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.dgvcDanaDoRodj.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.dgvcDanaDoRodj.DefaultCellStyle = dataGridViewCellStyle13; this.dgvcDanaDoRodj.HeaderText = "Do Rođ."; this.dgvcDanaDoRodj.MinimumWidth = 6; this.dgvcDanaDoRodj.Name = "dgvcDanaDoRodj"; @@ -253,8 +254,8 @@ private void InitializeComponent() // dgvcPol // this.dgvcPol.DataPropertyName = "Pol"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dgvcPol.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dgvcPol.DefaultCellStyle = dataGridViewCellStyle14; this.dgvcPol.HeaderText = "Pol"; this.dgvcPol.MinimumWidth = 6; this.dgvcPol.Name = "dgvcPol"; @@ -345,8 +346,8 @@ private void InitializeComponent() // dgvcStazGodine // this.dgvcStazGodine.DataPropertyName = "StazGodine"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.dgvcStazGodine.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.dgvcStazGodine.DefaultCellStyle = dataGridViewCellStyle15; this.dgvcStazGodine.HeaderText = "god"; this.dgvcStazGodine.MinimumWidth = 6; this.dgvcStazGodine.Name = "dgvcStazGodine"; @@ -356,8 +357,8 @@ private void InitializeComponent() // dgvcStazMeseci // this.dgvcStazMeseci.DataPropertyName = "StazMeseci"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.dgvcStazMeseci.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.dgvcStazMeseci.DefaultCellStyle = dataGridViewCellStyle16; this.dgvcStazMeseci.HeaderText = "mes"; this.dgvcStazMeseci.MinimumWidth = 6; this.dgvcStazMeseci.Name = "dgvcStazMeseci"; @@ -415,18 +416,18 @@ private void InitializeComponent() this.dgvZaposlenja.AllowUserToAddRows = false; this.dgvZaposlenja.AllowUserToDeleteRows = false; this.dgvZaposlenja.AllowUserToOrderColumns = true; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; - this.dgvZaposlenja.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.White; + this.dgvZaposlenja.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvZaposlenja.AutoGenerateColumns = false; this.dgvZaposlenja.BackgroundColor = System.Drawing.Color.WhiteSmoke; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvZaposlenja.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvZaposlenja.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvZaposlenja.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvZaposlenja.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvcNjaAktivan, @@ -512,6 +513,7 @@ private void InitializeComponent() // // pnlLeft // + this.pnlLeft.Controls.Add(this.btnObrazovanje); this.pnlLeft.Controls.Add(this.cmbIzracunajStatuse); this.pnlLeft.Controls.Add(this.btnIzracunajStatuse); this.pnlLeft.Controls.Add(this.gbIzvestaji); @@ -556,7 +558,7 @@ private void InitializeComponent() this.gbIzvestaji.Controls.Add(this.btnSistematizacija); this.gbIzvestaji.Controls.Add(this.btnKvalifStruktura); this.gbIzvestaji.Controls.Add(this.BtnCsvZaposlenja); - this.gbIzvestaji.Location = new System.Drawing.Point(3, 342); + this.gbIzvestaji.Location = new System.Drawing.Point(3, 375); this.gbIzvestaji.Name = "gbIzvestaji"; this.gbIzvestaji.Size = new System.Drawing.Size(136, 150); this.gbIzvestaji.TabIndex = 8; @@ -672,6 +674,17 @@ private void InitializeComponent() this.btnExit.ToolTipText = "Izlaz iz aplikacije"; this.btnExit.UseVisualStyleBackColor = false; // + // btnObrazovanje + // + this.btnObrazovanje.Location = new System.Drawing.Point(8, 324); + this.btnObrazovanje.Name = "btnObrazovanje"; + this.btnObrazovanje.Size = new System.Drawing.Size(128, 40); + this.btnObrazovanje.TabIndex = 9; + this.btnObrazovanje.Text = "Obrazovanje"; + this.btnObrazovanje.ToolTipText = "Obrazovanje zaposlenih"; + this.btnObrazovanje.UseVisualStyleBackColor = true; + this.btnObrazovanje.Click += new System.EventHandler(this.BtnObrazovanje_Click); + // // FrmZaposleni // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); @@ -754,5 +767,6 @@ private void InitializeComponent() private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNapomene; private System.Windows.Forms.ComboBox cmbIzracunajStatuse; private Controls.UcButton btnIzracunajStatuse; + private Controls.UcButton btnObrazovanje; } } \ No newline at end of file diff --git a/JISP/Forms/FrmZaposleni.cs b/JISP/Forms/FrmZaposleni.cs index 393c2dd..26da08e 100644 --- a/JISP/Forms/FrmZaposleni.cs +++ b/JISP/Forms/FrmZaposleni.cs @@ -276,6 +276,11 @@ private void BtnResenja_Click(object sender, EventArgs e) new FrmResenja().ShowDialog(); } + private void BtnObrazovanje_Click(object sender, EventArgs e) + { + new FrmObrazovanje().ShowDialog(); + } + private void BtnSistematizacija_Click(object sender, EventArgs e) { new FrmSistematizacija().Show(); diff --git a/JISP/Forms/FrmZaposlenja.cs b/JISP/Forms/FrmZaposlenja.cs index fb3087d..084265f 100644 --- a/JISP/Forms/FrmZaposlenja.cs +++ b/JISP/Forms/FrmZaposlenja.cs @@ -159,7 +159,7 @@ await DataGetter.GetResenjaAsync(dgvZaposlenjaSve.SelectedDataRows= 0 && e.ColumnIndex == dgvcResDokument.Index) - await Utils.PreuzmiDokumentResenja(dgvResenja, e); + await Utils.PreuzmiDokument(dgvResenja, e); } } } diff --git a/JISP/JISP.csproj b/JISP/JISP.csproj index 782af47..338c301 100644 --- a/JISP/JISP.csproj +++ b/JISP/JISP.csproj @@ -28,7 +28,7 @@ BV false 0 - 0.5.12.0 + 0.5.13.0 true true true @@ -156,6 +156,12 @@ FrmMain.cs + + Form + + + FrmObrazovanje.cs + Form @@ -246,6 +252,9 @@ FrmMain.cs + + FrmObrazovanje.cs + FrmPoruke.cs