diff --git a/JISP.sln b/JISP.sln index 8bd880f..d8be9dc 100644 --- a/JISP.sln +++ b/JISP.sln @@ -13,6 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScreenShots", "ScreenShots", "{2C8CDB9D-1259-459B-9E27-F03BB9DB7C10}" ProjectSection(SolutionItems) = preProject + ScreenShots\pocetna.png = ScreenShots\pocetna.png + ScreenShots\prostorije.png = ScreenShots\prostorije.png + ScreenShots\sistematizacija.png = ScreenShots\sistematizacija.png ScreenShots\ucenici.png = ScreenShots\ucenici.png ScreenShots\zaposleni.png = ScreenShots\zaposleni.png ScreenShots\zaposlenja.png = ScreenShots\zaposlenja.png diff --git a/JISP/Data/DataGetter.cs b/JISP/Data/DataGetter.cs index 1639fbf..470af54 100644 --- a/JISP/Data/DataGetter.cs +++ b/JISP/Data/DataGetter.cs @@ -104,6 +104,7 @@ public static async Task GetZaposlenjaAsync(Ds.ZaposleniRow zaposleni) if (obj.noksNivo != null) z.NoksNivoNaziv = obj.noksNivo.naziv; z.Aktivan = obj.statusUgovora != null && obj.statusUgovora == 19292; + z.ImaDokument = obj.ugovorORaduDokumentNaziv != null && obj.ugovorORaduDokumentNaziv != ""; if (isNew) zaposlenja.AddZaposlenjaRow(z); } diff --git a/JISP/Data/Ds.Designer.cs b/JISP/Data/Ds.Designer.cs index c7e782b..d6364fd 100644 --- a/JISP/Data/Ds.Designer.cs +++ b/JISP/Data/Ds.Designer.cs @@ -2165,6 +2165,8 @@ public partial class ZaposlenjaDataTable : global::System.Data.TypedTableBase + @@ -292,7 +293,7 @@ - + @@ -423,24 +424,24 @@ - + - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/JISP/Data/Ds.xss b/JISP/Data/Ds.xss index 0fe0f5b..2bb5939 100644 --- a/JISP/Data/Ds.xss +++ b/JISP/Data/Ds.xss @@ -4,11 +4,11 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + @@ -54,7 +54,7 @@ - 930 + 913 739 @@ -66,7 +66,7 @@ - 930 + 913 501 diff --git a/JISP/Forms/FrmProstorije.cs b/JISP/Forms/FrmProstorije.cs index 86fdd66..2980e53 100644 --- a/JISP/Forms/FrmProstorije.cs +++ b/JISP/Forms/FrmProstorije.cs @@ -23,8 +23,6 @@ private void FrmProstorije_Load(object sender, EventArgs e) bsGrejanja.DataSource = AppData.Ds.SifGrejanja; bsHladjenja.DataSource = AppData.Ds.SifHladjenja; bsLokacije.DataSource = AppData.Ds.Lokacije; - bsObjekti.DataSource = AppData.Ds.Objekti; - bsProstorije.DataSource = AppData.Ds.Prostorije; dgvLokacije.TsmiSelekcija(false); dgvObjekti.TsmiSelekcija(false); diff --git a/JISP/Forms/FrmZaposleni.Designer.cs b/JISP/Forms/FrmZaposleni.Designer.cs index 51db590..2e3679a 100644 --- a/JISP/Forms/FrmZaposleni.Designer.cs +++ b/JISP/Forms/FrmZaposleni.Designer.cs @@ -33,37 +33,21 @@ private void InitializeComponent() System.Windows.Forms.Label lblFilterCaption; System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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(); 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(); - this.dgvZaposleni = new JISP.Controls.UcDGV(); - this.dgvcIme = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcPrezime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcJMBG = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcGodine = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcDanaDoRodj = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcPol = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcDevojackoPrezime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcEmail = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcTelefon = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcPrebivaliste = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcAngazovanja = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcImaSliku = new System.Windows.Forms.DataGridViewImageColumn(); - this.dgvcZapId = new System.Windows.Forms.DataGridViewButtonColumn(); - this.dgvcStatusAktivnosti = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcStatusAktivnosti2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcStazGodine = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcStazMeseci = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvcNapomene = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pnlZaposleniTop = new System.Windows.Forms.Panel(); this.chkAktivniZap = new System.Windows.Forms.CheckBox(); + this.bsZaposlenja = new System.Windows.Forms.BindingSource(this.components); + this.ofdZapSlika = new System.Windows.Forms.OpenFileDialog(); + this.dgvZaposleni = new JISP.Controls.UcDGV(); this.txtFilter = new JISP.Controls.UcFilterTextBox(); this.dgvZaposlenja = new JISP.Controls.UcDGV(); this.dgvcNjaAktivan = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -72,11 +56,10 @@ private void InitializeComponent() this.dgvcNjaRMNaziv = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dgvcNjaNoksNivo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dgvcNjaVrstaAng = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bsZaposlenja = new System.Windows.Forms.BindingSource(this.components); - this.ofdZapSlika = new System.Windows.Forms.OpenFileDialog(); this.pnlLeft = new JISP.Controls.UcLeftPanel(); this.btnStaz = new JISP.Controls.UcButton(); this.gbIzvestaji = new System.Windows.Forms.GroupBox(); + this.btnSumaAngazovanja = new JISP.Controls.UcButton(); this.btnSistematizacija = new JISP.Controls.UcButton(); this.btnKvalifStruktura = new JISP.Controls.UcButton(); this.BtnCsvZaposlenja = new JISP.Controls.UcButton(); @@ -87,17 +70,34 @@ private void InitializeComponent() this.chkCopyOnClick = new System.Windows.Forms.CheckBox(); this.btnSaveData = new JISP.Controls.UcButton(); this.btnExit = new JISP.Controls.UcExitAppButton(); - this.btnSumaAngazovanja = new JISP.Controls.UcButton(); + this.dgvcIme = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcPrezime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcJMBG = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcGodine = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcDanaDoRodj = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcPol = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcDevojackoPrezime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcEmail = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcTelefon = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcPrebivaliste = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcAngazovanja = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcImaSliku = new System.Windows.Forms.DataGridViewImageColumn(); + this.dgvcZapId = new System.Windows.Forms.DataGridViewButtonColumn(); + this.dgvcStatusAktivnosti = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcStatusAktivnosti2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcStazGodine = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcStazMeseci = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcNapomene = new System.Windows.Forms.DataGridViewTextBoxColumn(); lblFilterCaption = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bsZaposleni)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); this.splitContainer.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvZaposleni)).BeginInit(); this.pnlZaposleniTop.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvZaposlenja)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsZaposlenja)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvZaposleni)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvZaposlenja)).BeginInit(); this.pnlLeft.SuspendLayout(); this.gbIzvestaji.SuspendLayout(); this.SuspendLayout(); @@ -145,6 +145,43 @@ private void InitializeComponent() this.splitContainer.SplitterDistance = 454; this.splitContainer.TabIndex = 0; // + // pnlZaposleniTop + // + this.pnlZaposleniTop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlZaposleniTop.Controls.Add(lblFilterCaption); + this.pnlZaposleniTop.Controls.Add(this.chkAktivniZap); + this.pnlZaposleniTop.Controls.Add(this.txtFilter); + this.pnlZaposleniTop.Controls.Add(this.lblRowCount); + this.pnlZaposleniTop.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlZaposleniTop.Location = new System.Drawing.Point(0, 0); + this.pnlZaposleniTop.Name = "pnlZaposleniTop"; + this.pnlZaposleniTop.Size = new System.Drawing.Size(840, 30); + this.pnlZaposleniTop.TabIndex = 1; + // + // chkAktivniZap + // + this.chkAktivniZap.AutoSize = true; + this.chkAktivniZap.Checked = true; + this.chkAktivniZap.CheckState = System.Windows.Forms.CheckState.Indeterminate; + this.chkAktivniZap.Location = new System.Drawing.Point(509, 4); + this.chkAktivniZap.Name = "chkAktivniZap"; + this.chkAktivniZap.Size = new System.Drawing.Size(69, 22); + this.chkAktivniZap.TabIndex = 1; + this.chkAktivniZap.Text = "Aktivni"; + this.chkAktivniZap.ThreeState = true; + this.chkAktivniZap.UseVisualStyleBackColor = true; + this.chkAktivniZap.CheckStateChanged += new System.EventHandler(this.FilterChanged); + // + // bsZaposlenja + // + this.bsZaposlenja.DataSource = this.bsZaposleni; + this.bsZaposlenja.Sort = ""; + // + // ofdZapSlika + // + this.ofdZapSlika.Filter = "Image files (*.jpg, *.jpeg, *.png)|*.jpg;*.jpeg;*.png|All files (*.*)|*.*"; + this.ofdZapSlika.Title = "Odabir slike za zaposlenog"; + // // dgvZaposleni // this.dgvZaposleni.AllowUserToAddRows = false; @@ -199,206 +236,6 @@ private void InitializeComponent() this.dgvZaposleni.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.DgvZaposleni_RowsAdded); this.dgvZaposleni.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DgvZaposleni_KeyDown); // - // dgvcIme - // - this.dgvcIme.DataPropertyName = "Ime"; - this.dgvcIme.HeaderText = "Ime"; - this.dgvcIme.MinimumWidth = 6; - this.dgvcIme.Name = "dgvcIme"; - this.dgvcIme.ReadOnly = true; - this.dgvcIme.Width = 115; - // - // dgvcPrezime - // - this.dgvcPrezime.DataPropertyName = "Prezime"; - this.dgvcPrezime.HeaderText = "Prezime"; - this.dgvcPrezime.MinimumWidth = 6; - this.dgvcPrezime.Name = "dgvcPrezime"; - this.dgvcPrezime.ReadOnly = true; - this.dgvcPrezime.Width = 150; - // - // dgvcJMBG - // - this.dgvcJMBG.DataPropertyName = "JMBG"; - this.dgvcJMBG.HeaderText = "JMBG"; - this.dgvcJMBG.MinimumWidth = 6; - this.dgvcJMBG.Name = "dgvcJMBG"; - this.dgvcJMBG.ReadOnly = true; - this.dgvcJMBG.Width = 125; - // - // dgvcGodine - // - this.dgvcGodine.DataPropertyName = "Godine"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle3.Format = "N1"; - dataGridViewCellStyle3.NullValue = null; - this.dgvcGodine.DefaultCellStyle = dataGridViewCellStyle3; - this.dgvcGodine.HeaderText = "Godine"; - this.dgvcGodine.MinimumWidth = 6; - this.dgvcGodine.Name = "dgvcGodine"; - this.dgvcGodine.ReadOnly = true; - this.dgvcGodine.Width = 85; - // - // dgvcDanaDoRodj - // - this.dgvcDanaDoRodj.DataPropertyName = "DanaDoRodj"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.dgvcDanaDoRodj.DefaultCellStyle = dataGridViewCellStyle4; - this.dgvcDanaDoRodj.HeaderText = "Do Rođ."; - this.dgvcDanaDoRodj.MinimumWidth = 6; - this.dgvcDanaDoRodj.Name = "dgvcDanaDoRodj"; - this.dgvcDanaDoRodj.ReadOnly = true; - this.dgvcDanaDoRodj.Width = 90; - // - // dgvcPol - // - this.dgvcPol.DataPropertyName = "Pol"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dgvcPol.DefaultCellStyle = dataGridViewCellStyle5; - this.dgvcPol.HeaderText = "Pol"; - this.dgvcPol.MinimumWidth = 6; - this.dgvcPol.Name = "dgvcPol"; - this.dgvcPol.Width = 50; - // - // dgvcDevojackoPrezime - // - this.dgvcDevojackoPrezime.DataPropertyName = "DevojackoPrezime"; - this.dgvcDevojackoPrezime.HeaderText = "Dev prezime"; - this.dgvcDevojackoPrezime.MinimumWidth = 6; - this.dgvcDevojackoPrezime.Name = "dgvcDevojackoPrezime"; - this.dgvcDevojackoPrezime.ReadOnly = true; - this.dgvcDevojackoPrezime.Width = 125; - // - // dgvcEmail - // - this.dgvcEmail.DataPropertyName = "Email"; - this.dgvcEmail.HeaderText = "Email"; - this.dgvcEmail.MinimumWidth = 6; - this.dgvcEmail.Name = "dgvcEmail"; - this.dgvcEmail.ReadOnly = true; - this.dgvcEmail.Width = 125; - // - // dgvcTelefon - // - this.dgvcTelefon.DataPropertyName = "Telefon"; - this.dgvcTelefon.HeaderText = "Telefon"; - this.dgvcTelefon.MinimumWidth = 6; - this.dgvcTelefon.Name = "dgvcTelefon"; - this.dgvcTelefon.ReadOnly = true; - this.dgvcTelefon.Width = 125; - // - // dgvcPrebivaliste - // - this.dgvcPrebivaliste.DataPropertyName = "Prebivaliste"; - this.dgvcPrebivaliste.HeaderText = "Prebivaliste"; - this.dgvcPrebivaliste.MinimumWidth = 6; - this.dgvcPrebivaliste.Name = "dgvcPrebivaliste"; - this.dgvcPrebivaliste.ReadOnly = true; - this.dgvcPrebivaliste.Width = 125; - // - // dgvcAngazovanja - // - this.dgvcAngazovanja.DataPropertyName = "Angazovanja"; - this.dgvcAngazovanja.HeaderText = "Angazovanja"; - this.dgvcAngazovanja.MinimumWidth = 6; - this.dgvcAngazovanja.Name = "dgvcAngazovanja"; - this.dgvcAngazovanja.ReadOnly = true; - this.dgvcAngazovanja.Width = 190; - // - // dgvcImaSliku - // - this.dgvcImaSliku.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.dgvcImaSliku.HeaderText = ""; - this.dgvcImaSliku.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.dgvcImaSliku.MinimumWidth = 25; - this.dgvcImaSliku.Name = "dgvcImaSliku"; - this.dgvcImaSliku.ReadOnly = true; - this.dgvcImaSliku.Width = 25; - // - // dgvcZapId - // - this.dgvcZapId.DataPropertyName = "IdZaposlenog"; - this.dgvcZapId.HeaderText = "Id"; - this.dgvcZapId.MinimumWidth = 6; - this.dgvcZapId.Name = "dgvcZapId"; - this.dgvcZapId.ReadOnly = true; - this.dgvcZapId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dgvcZapId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dgvcZapId.Width = 80; - // - // dgvcStatusAktivnosti - // - this.dgvcStatusAktivnosti.DataPropertyName = "StatusAktivnosti1"; - this.dgvcStatusAktivnosti.HeaderText = "Status 1"; - this.dgvcStatusAktivnosti.MinimumWidth = 20; - this.dgvcStatusAktivnosti.Name = "dgvcStatusAktivnosti"; - this.dgvcStatusAktivnosti.Width = 125; - // - // dgvcStatusAktivnosti2 - // - this.dgvcStatusAktivnosti2.DataPropertyName = "StatusAktivnosti2"; - this.dgvcStatusAktivnosti2.HeaderText = "Status 2"; - this.dgvcStatusAktivnosti2.MinimumWidth = 20; - this.dgvcStatusAktivnosti2.Name = "dgvcStatusAktivnosti2"; - this.dgvcStatusAktivnosti2.Width = 125; - // - // dgvcStazGodine - // - this.dgvcStazGodine.DataPropertyName = "StazGodine"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.dgvcStazGodine.DefaultCellStyle = dataGridViewCellStyle6; - this.dgvcStazGodine.HeaderText = "god"; - this.dgvcStazGodine.MinimumWidth = 6; - this.dgvcStazGodine.Name = "dgvcStazGodine"; - this.dgvcStazGodine.ToolTipText = "Godine staža"; - this.dgvcStazGodine.Width = 50; - // - // dgvcStazMeseci - // - this.dgvcStazMeseci.DataPropertyName = "StazMeseci"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.dgvcStazMeseci.DefaultCellStyle = dataGridViewCellStyle7; - this.dgvcStazMeseci.HeaderText = "mes"; - this.dgvcStazMeseci.MinimumWidth = 6; - this.dgvcStazMeseci.Name = "dgvcStazMeseci"; - this.dgvcStazMeseci.ToolTipText = "Meseci staža"; - this.dgvcStazMeseci.Width = 50; - // - // dgvcNapomene - // - this.dgvcNapomene.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.dgvcNapomene.DataPropertyName = "Napomene"; - this.dgvcNapomene.HeaderText = "Napomene"; - this.dgvcNapomene.MinimumWidth = 88; - this.dgvcNapomene.Name = "dgvcNapomene"; - // - // pnlZaposleniTop - // - this.pnlZaposleniTop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlZaposleniTop.Controls.Add(lblFilterCaption); - this.pnlZaposleniTop.Controls.Add(this.chkAktivniZap); - this.pnlZaposleniTop.Controls.Add(this.txtFilter); - this.pnlZaposleniTop.Controls.Add(this.lblRowCount); - this.pnlZaposleniTop.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlZaposleniTop.Location = new System.Drawing.Point(0, 0); - this.pnlZaposleniTop.Name = "pnlZaposleniTop"; - this.pnlZaposleniTop.Size = new System.Drawing.Size(840, 30); - this.pnlZaposleniTop.TabIndex = 1; - // - // chkAktivniZap - // - this.chkAktivniZap.AutoSize = true; - this.chkAktivniZap.Checked = true; - this.chkAktivniZap.CheckState = System.Windows.Forms.CheckState.Indeterminate; - this.chkAktivniZap.Location = new System.Drawing.Point(509, 4); - this.chkAktivniZap.Name = "chkAktivniZap"; - this.chkAktivniZap.Size = new System.Drawing.Size(69, 22); - this.chkAktivniZap.TabIndex = 1; - this.chkAktivniZap.Text = "Aktivni"; - this.chkAktivniZap.ThreeState = true; - this.chkAktivniZap.UseVisualStyleBackColor = true; - this.chkAktivniZap.CheckStateChanged += new System.EventHandler(this.FilterChanged); - // // txtFilter // this.txtFilter.BindingSource = null; @@ -500,16 +337,6 @@ private void InitializeComponent() this.dgvcNjaVrstaAng.Name = "dgvcNjaVrstaAng"; this.dgvcNjaVrstaAng.ReadOnly = true; // - // bsZaposlenja - // - this.bsZaposlenja.DataSource = this.bsZaposleni; - this.bsZaposlenja.Sort = ""; - // - // ofdZapSlika - // - this.ofdZapSlika.Filter = "Image files (*.jpg, *.jpeg, *.png)|*.jpg;*.jpeg;*.png|All files (*.*)|*.*"; - this.ofdZapSlika.Title = "Odabir slike za zaposlenog"; - // // pnlLeft // this.pnlLeft.Controls.Add(this.btnStaz); @@ -553,6 +380,17 @@ private void InitializeComponent() this.gbIzvestaji.TabStop = false; this.gbIzvestaji.Text = "Izveštaji"; // + // btnSumaAngazovanja + // + this.btnSumaAngazovanja.Location = new System.Drawing.Point(6, 143); + this.btnSumaAngazovanja.Name = "btnSumaAngazovanja"; + this.btnSumaAngazovanja.Size = new System.Drawing.Size(127, 40); + this.btnSumaAngazovanja.TabIndex = 10; + this.btnSumaAngazovanja.Text = "∑ angažovanja"; + this.btnSumaAngazovanja.ToolTipText = "Suma angažovanja za sve zaposlene"; + this.btnSumaAngazovanja.UseVisualStyleBackColor = true; + this.btnSumaAngazovanja.Click += new System.EventHandler(this.BtnSumaAngazovanja_Click); + // // btnSistematizacija // this.btnSistematizacija.Location = new System.Drawing.Point(6, 103); @@ -662,16 +500,178 @@ private void InitializeComponent() this.btnExit.ToolTipText = "Izlaz iz aplikacije"; this.btnExit.UseVisualStyleBackColor = false; // - // btnSumaAngazovanja + // dgvcIme // - this.btnSumaAngazovanja.Location = new System.Drawing.Point(6, 143); - this.btnSumaAngazovanja.Name = "btnSumaAngazovanja"; - this.btnSumaAngazovanja.Size = new System.Drawing.Size(127, 40); - this.btnSumaAngazovanja.TabIndex = 10; - this.btnSumaAngazovanja.Text = "∑ angažovanja"; - this.btnSumaAngazovanja.ToolTipText = "Suma angažovanja za sve zaposlene"; - this.btnSumaAngazovanja.UseVisualStyleBackColor = true; - this.btnSumaAngazovanja.Click += new System.EventHandler(this.BtnSumaAngazovanja_Click); + this.dgvcIme.DataPropertyName = "Ime"; + this.dgvcIme.HeaderText = "Ime"; + this.dgvcIme.MinimumWidth = 6; + this.dgvcIme.Name = "dgvcIme"; + this.dgvcIme.ReadOnly = true; + this.dgvcIme.Width = 115; + // + // dgvcPrezime + // + this.dgvcPrezime.DataPropertyName = "Prezime"; + this.dgvcPrezime.HeaderText = "Prezime"; + this.dgvcPrezime.MinimumWidth = 6; + this.dgvcPrezime.Name = "dgvcPrezime"; + this.dgvcPrezime.ReadOnly = true; + this.dgvcPrezime.Width = 150; + // + // dgvcJMBG + // + this.dgvcJMBG.DataPropertyName = "JMBG"; + this.dgvcJMBG.HeaderText = "JMBG"; + this.dgvcJMBG.MinimumWidth = 6; + this.dgvcJMBG.Name = "dgvcJMBG"; + this.dgvcJMBG.ReadOnly = true; + this.dgvcJMBG.Width = 125; + // + // dgvcGodine + // + this.dgvcGodine.DataPropertyName = "Godine"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle3.Format = "N1"; + dataGridViewCellStyle3.NullValue = null; + this.dgvcGodine.DefaultCellStyle = dataGridViewCellStyle3; + this.dgvcGodine.HeaderText = "Godine"; + this.dgvcGodine.MinimumWidth = 6; + this.dgvcGodine.Name = "dgvcGodine"; + this.dgvcGodine.ReadOnly = true; + this.dgvcGodine.Width = 85; + // + // dgvcDanaDoRodj + // + this.dgvcDanaDoRodj.DataPropertyName = "DanaDoRodj"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.dgvcDanaDoRodj.DefaultCellStyle = dataGridViewCellStyle4; + this.dgvcDanaDoRodj.HeaderText = "Do Rođ."; + this.dgvcDanaDoRodj.MinimumWidth = 6; + this.dgvcDanaDoRodj.Name = "dgvcDanaDoRodj"; + this.dgvcDanaDoRodj.ReadOnly = true; + this.dgvcDanaDoRodj.Width = 90; + // + // dgvcPol + // + this.dgvcPol.DataPropertyName = "Pol"; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dgvcPol.DefaultCellStyle = dataGridViewCellStyle5; + this.dgvcPol.HeaderText = "Pol"; + this.dgvcPol.MinimumWidth = 6; + this.dgvcPol.Name = "dgvcPol"; + this.dgvcPol.Width = 50; + // + // dgvcDevojackoPrezime + // + this.dgvcDevojackoPrezime.DataPropertyName = "DevojackoPrezime"; + this.dgvcDevojackoPrezime.HeaderText = "Dev prezime"; + this.dgvcDevojackoPrezime.MinimumWidth = 6; + this.dgvcDevojackoPrezime.Name = "dgvcDevojackoPrezime"; + this.dgvcDevojackoPrezime.ReadOnly = true; + this.dgvcDevojackoPrezime.Width = 125; + // + // dgvcEmail + // + this.dgvcEmail.DataPropertyName = "Email"; + this.dgvcEmail.HeaderText = "Email"; + this.dgvcEmail.MinimumWidth = 6; + this.dgvcEmail.Name = "dgvcEmail"; + this.dgvcEmail.ReadOnly = true; + this.dgvcEmail.Width = 125; + // + // dgvcTelefon + // + this.dgvcTelefon.DataPropertyName = "Telefon"; + this.dgvcTelefon.HeaderText = "Telefon"; + this.dgvcTelefon.MinimumWidth = 6; + this.dgvcTelefon.Name = "dgvcTelefon"; + this.dgvcTelefon.ReadOnly = true; + this.dgvcTelefon.Width = 125; + // + // dgvcPrebivaliste + // + this.dgvcPrebivaliste.DataPropertyName = "Prebivaliste"; + this.dgvcPrebivaliste.HeaderText = "Prebivaliste"; + this.dgvcPrebivaliste.MinimumWidth = 6; + this.dgvcPrebivaliste.Name = "dgvcPrebivaliste"; + this.dgvcPrebivaliste.ReadOnly = true; + this.dgvcPrebivaliste.Width = 125; + // + // dgvcAngazovanja + // + this.dgvcAngazovanja.DataPropertyName = "Angazovanja"; + this.dgvcAngazovanja.HeaderText = "Angazovanja"; + this.dgvcAngazovanja.MinimumWidth = 6; + this.dgvcAngazovanja.Name = "dgvcAngazovanja"; + this.dgvcAngazovanja.ReadOnly = true; + this.dgvcAngazovanja.Width = 190; + // + // dgvcImaSliku + // + this.dgvcImaSliku.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; + this.dgvcImaSliku.HeaderText = ""; + this.dgvcImaSliku.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.dgvcImaSliku.MinimumWidth = 25; + this.dgvcImaSliku.Name = "dgvcImaSliku"; + this.dgvcImaSliku.ReadOnly = true; + this.dgvcImaSliku.Width = 25; + // + // dgvcZapId + // + this.dgvcZapId.DataPropertyName = "IdZaposlenog"; + this.dgvcZapId.HeaderText = "Id"; + this.dgvcZapId.MinimumWidth = 6; + this.dgvcZapId.Name = "dgvcZapId"; + this.dgvcZapId.ReadOnly = true; + this.dgvcZapId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dgvcZapId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dgvcZapId.Width = 80; + // + // dgvcStatusAktivnosti + // + this.dgvcStatusAktivnosti.DataPropertyName = "StatusAktivnosti1"; + this.dgvcStatusAktivnosti.HeaderText = "Status 1"; + this.dgvcStatusAktivnosti.MinimumWidth = 20; + this.dgvcStatusAktivnosti.Name = "dgvcStatusAktivnosti"; + this.dgvcStatusAktivnosti.Width = 125; + // + // dgvcStatusAktivnosti2 + // + this.dgvcStatusAktivnosti2.DataPropertyName = "StatusAktivnosti2"; + this.dgvcStatusAktivnosti2.HeaderText = "Status 2"; + this.dgvcStatusAktivnosti2.MinimumWidth = 20; + this.dgvcStatusAktivnosti2.Name = "dgvcStatusAktivnosti2"; + this.dgvcStatusAktivnosti2.Width = 125; + // + // dgvcStazGodine + // + this.dgvcStazGodine.DataPropertyName = "StazGodine"; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.dgvcStazGodine.DefaultCellStyle = dataGridViewCellStyle6; + this.dgvcStazGodine.HeaderText = "god"; + this.dgvcStazGodine.MinimumWidth = 6; + this.dgvcStazGodine.Name = "dgvcStazGodine"; + this.dgvcStazGodine.ToolTipText = "Godine staža"; + this.dgvcStazGodine.Width = 50; + // + // dgvcStazMeseci + // + this.dgvcStazMeseci.DataPropertyName = "StazMeseci"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.dgvcStazMeseci.DefaultCellStyle = dataGridViewCellStyle7; + this.dgvcStazMeseci.HeaderText = "mes"; + this.dgvcStazMeseci.MinimumWidth = 6; + this.dgvcStazMeseci.Name = "dgvcStazMeseci"; + this.dgvcStazMeseci.ToolTipText = "Meseci staža"; + this.dgvcStazMeseci.Width = 50; + // + // dgvcNapomene + // + this.dgvcNapomene.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dgvcNapomene.DataPropertyName = "Napomene"; + this.dgvcNapomene.HeaderText = "Napomene"; + this.dgvcNapomene.MinimumWidth = 88; + this.dgvcNapomene.Name = "dgvcNapomene"; // // FrmZaposleni // @@ -693,11 +693,11 @@ private void InitializeComponent() this.splitContainer.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); this.splitContainer.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dgvZaposleni)).EndInit(); this.pnlZaposleniTop.ResumeLayout(false); this.pnlZaposleniTop.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvZaposlenja)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsZaposlenja)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvZaposleni)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvZaposlenja)).EndInit(); this.pnlLeft.ResumeLayout(false); this.pnlLeft.PerformLayout(); this.gbIzvestaji.ResumeLayout(false); @@ -730,6 +730,13 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox cmbPodaciZaDohvatanje; private System.Windows.Forms.GroupBox gbIzvestaji; private Controls.UcButton btnStaz; + private System.Windows.Forms.DataGridViewCheckBoxColumn dgvcNjaAktivan; + private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaProcenat; + private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaZaposlenOd; + private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaRMNaziv; + private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaNoksNivo; + private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaVrstaAng; + private Controls.UcButton btnSumaAngazovanja; private System.Windows.Forms.DataGridViewTextBoxColumn dgvcIme; private System.Windows.Forms.DataGridViewTextBoxColumn dgvcPrezime; private System.Windows.Forms.DataGridViewTextBoxColumn dgvcJMBG; @@ -748,12 +755,5 @@ private void InitializeComponent() private System.Windows.Forms.DataGridViewTextBoxColumn dgvcStazGodine; private System.Windows.Forms.DataGridViewTextBoxColumn dgvcStazMeseci; private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNapomene; - private System.Windows.Forms.DataGridViewCheckBoxColumn dgvcNjaAktivan; - private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaProcenat; - private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaZaposlenOd; - private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaRMNaziv; - private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaNoksNivo; - private System.Windows.Forms.DataGridViewTextBoxColumn dgvcNjaVrstaAng; - private Controls.UcButton btnSumaAngazovanja; } } \ No newline at end of file diff --git a/JISP/Forms/FrmZaposleni.cs b/JISP/Forms/FrmZaposleni.cs index e20214e..40cfc02 100644 --- a/JISP/Forms/FrmZaposleni.cs +++ b/JISP/Forms/FrmZaposleni.cs @@ -377,7 +377,8 @@ private async void BtnDohvatiPodatke_Click(object sender, EventArgs e) //var ozs = Classes.ObracunZarada.ObracunZarada.PoslednjiObracuni // (zap.GetObracunZaradaRows(), zap.GetZaposlenjaRows().Where(it => it.Aktivan) // .Select(it => it.IdZaposlenja)); - foreach (var oz in zap.GetObracunZaradaRows().Where(it => it.Godina == AppData.SkolskaGodina.Start)) + foreach (var oz in zap.GetObracunZaradaRows() + .Where(it => it.Godina == AppData.SkolskaGodina.Start || it.Godina == AppData.SkolskaGodina.Kraj)) await DataGetter.GetOzDodatnoAsync(oz); zap.CalcAngazovanja(); }); @@ -419,7 +420,7 @@ private void TxtFilter_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) { - DgvZaposleni_CellDoubleClick(this, + DgvZaposleni_CellDoubleClick(this, new DataGridViewCellEventArgs(dgvcIme.Index, dgvZaposleni.CurrentRow.Index)); e.SuppressKeyPress = true; // protiv "kling" zvuka } diff --git a/JISP/Forms/FrmZaposlenja.Designer.cs b/JISP/Forms/FrmZaposlenja.Designer.cs index fea25eb..c6752ef 100644 --- a/JISP/Forms/FrmZaposlenja.Designer.cs +++ b/JISP/Forms/FrmZaposlenja.Designer.cs @@ -48,14 +48,6 @@ private void InitializeComponent() this.chkAktivno = new System.Windows.Forms.CheckBox(); this.lblBrojRedovaZaposlenja = new System.Windows.Forms.Label(); this.dgvZaposlenjaSve = new JISP.Controls.UcDGV(); - this.aktivanDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.brojUgovoraORaduDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.radnoMestoNazivDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.procenatRadnogVremenaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.datumZaposlenOdDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.datumZaposlenDoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.noksNivoNazivDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.vrstaAngazovanjaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bsZaposlenja = new System.Windows.Forms.BindingSource(this.components); this.ds = new JISP.Data.Ds(); this.scMain = new System.Windows.Forms.SplitContainer(); @@ -97,6 +89,15 @@ private void InitializeComponent() this.bsResenja = new System.Windows.Forms.BindingSource(this.components); this.pnlBottomLeftRes = new JISP.Controls.UcLeftPanel(); this.btnUcitajResenja = new JISP.Controls.UcButton(); + this.aktivanDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.brojUgovoraORaduDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.radnoMestoNazivDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.procenatRadnogVremenaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.datumZaposlenOdDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.datumZaposlenDoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.noksNivoNazivDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.vrstaAngazovanjaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvcZapImaDokument = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.pnlLeft.SuspendLayout(); this.pnlZaposleniTop.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvZaposlenjaSve)).BeginInit(); @@ -240,7 +241,8 @@ private void InitializeComponent() this.datumZaposlenOdDataGridViewTextBoxColumn, this.datumZaposlenDoDataGridViewTextBoxColumn, this.noksNivoNazivDataGridViewTextBoxColumn, - this.vrstaAngazovanjaDataGridViewTextBoxColumn}); + this.vrstaAngazovanjaDataGridViewTextBoxColumn, + this.dgvcZapImaDokument}); this.dgvZaposlenjaSve.ColumnsForCopyOnClick = null; this.dgvZaposlenjaSve.CopyOnCellClick = false; this.dgvZaposlenjaSve.CtrlDisplayPositionRowCount = this.lblBrojRedovaZaposlenja; @@ -263,68 +265,6 @@ private void InitializeComponent() this.dgvZaposlenjaSve.TabIndex = 4; this.dgvZaposlenjaSve.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DgvZaposlenjaSve_CellClick); // - // aktivanDataGridViewCheckBoxColumn - // - this.aktivanDataGridViewCheckBoxColumn.DataPropertyName = "Aktivan"; - this.aktivanDataGridViewCheckBoxColumn.HeaderText = "Aktivan"; - this.aktivanDataGridViewCheckBoxColumn.Name = "aktivanDataGridViewCheckBoxColumn"; - this.aktivanDataGridViewCheckBoxColumn.ReadOnly = true; - this.aktivanDataGridViewCheckBoxColumn.Width = 65; - // - // brojUgovoraORaduDataGridViewTextBoxColumn - // - this.brojUgovoraORaduDataGridViewTextBoxColumn.DataPropertyName = "BrojUgovoraORadu"; - this.brojUgovoraORaduDataGridViewTextBoxColumn.HeaderText = "Broj ugovora"; - this.brojUgovoraORaduDataGridViewTextBoxColumn.Name = "brojUgovoraORaduDataGridViewTextBoxColumn"; - this.brojUgovoraORaduDataGridViewTextBoxColumn.ReadOnly = true; - // - // radnoMestoNazivDataGridViewTextBoxColumn - // - this.radnoMestoNazivDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.radnoMestoNazivDataGridViewTextBoxColumn.DataPropertyName = "RadnoMestoNaziv"; - this.radnoMestoNazivDataGridViewTextBoxColumn.FillWeight = 200F; - this.radnoMestoNazivDataGridViewTextBoxColumn.HeaderText = "Radno mesto"; - this.radnoMestoNazivDataGridViewTextBoxColumn.Name = "radnoMestoNazivDataGridViewTextBoxColumn"; - this.radnoMestoNazivDataGridViewTextBoxColumn.ReadOnly = true; - // - // procenatRadnogVremenaDataGridViewTextBoxColumn - // - this.procenatRadnogVremenaDataGridViewTextBoxColumn.DataPropertyName = "ProcenatRadnogVremena"; - this.procenatRadnogVremenaDataGridViewTextBoxColumn.HeaderText = "Procenat"; - this.procenatRadnogVremenaDataGridViewTextBoxColumn.Name = "procenatRadnogVremenaDataGridViewTextBoxColumn"; - this.procenatRadnogVremenaDataGridViewTextBoxColumn.ReadOnly = true; - this.procenatRadnogVremenaDataGridViewTextBoxColumn.Width = 80; - // - // datumZaposlenOdDataGridViewTextBoxColumn - // - this.datumZaposlenOdDataGridViewTextBoxColumn.DataPropertyName = "DatumZaposlenOd"; - this.datumZaposlenOdDataGridViewTextBoxColumn.HeaderText = "Zaposlen od"; - this.datumZaposlenOdDataGridViewTextBoxColumn.Name = "datumZaposlenOdDataGridViewTextBoxColumn"; - this.datumZaposlenOdDataGridViewTextBoxColumn.ReadOnly = true; - // - // datumZaposlenDoDataGridViewTextBoxColumn - // - this.datumZaposlenDoDataGridViewTextBoxColumn.DataPropertyName = "DatumZaposlenDo"; - this.datumZaposlenDoDataGridViewTextBoxColumn.HeaderText = "Zaposlen do"; - this.datumZaposlenDoDataGridViewTextBoxColumn.Name = "datumZaposlenDoDataGridViewTextBoxColumn"; - this.datumZaposlenDoDataGridViewTextBoxColumn.ReadOnly = true; - // - // noksNivoNazivDataGridViewTextBoxColumn - // - this.noksNivoNazivDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.noksNivoNazivDataGridViewTextBoxColumn.DataPropertyName = "NoksNivoNaziv"; - this.noksNivoNazivDataGridViewTextBoxColumn.HeaderText = "NOKS"; - this.noksNivoNazivDataGridViewTextBoxColumn.Name = "noksNivoNazivDataGridViewTextBoxColumn"; - this.noksNivoNazivDataGridViewTextBoxColumn.ReadOnly = true; - // - // vrstaAngazovanjaDataGridViewTextBoxColumn - // - this.vrstaAngazovanjaDataGridViewTextBoxColumn.DataPropertyName = "VrstaAngazovanja"; - this.vrstaAngazovanjaDataGridViewTextBoxColumn.HeaderText = "Vrsta angažovanja"; - this.vrstaAngazovanjaDataGridViewTextBoxColumn.Name = "vrstaAngazovanjaDataGridViewTextBoxColumn"; - this.vrstaAngazovanjaDataGridViewTextBoxColumn.ReadOnly = true; - this.vrstaAngazovanjaDataGridViewTextBoxColumn.Width = 135; - // // bsZaposlenja // this.bsZaposlenja.DataMember = "Zaposlenja"; @@ -788,6 +728,78 @@ private void InitializeComponent() this.btnUcitajResenja.UseVisualStyleBackColor = true; this.btnUcitajResenja.Click += new System.EventHandler(this.BtnUcitajResenja_Click); // + // aktivanDataGridViewCheckBoxColumn + // + this.aktivanDataGridViewCheckBoxColumn.DataPropertyName = "Aktivan"; + this.aktivanDataGridViewCheckBoxColumn.HeaderText = "Aktivan"; + this.aktivanDataGridViewCheckBoxColumn.Name = "aktivanDataGridViewCheckBoxColumn"; + this.aktivanDataGridViewCheckBoxColumn.ReadOnly = true; + this.aktivanDataGridViewCheckBoxColumn.Width = 65; + // + // brojUgovoraORaduDataGridViewTextBoxColumn + // + this.brojUgovoraORaduDataGridViewTextBoxColumn.DataPropertyName = "BrojUgovoraORadu"; + this.brojUgovoraORaduDataGridViewTextBoxColumn.HeaderText = "Broj ugovora"; + this.brojUgovoraORaduDataGridViewTextBoxColumn.Name = "brojUgovoraORaduDataGridViewTextBoxColumn"; + this.brojUgovoraORaduDataGridViewTextBoxColumn.ReadOnly = true; + // + // radnoMestoNazivDataGridViewTextBoxColumn + // + this.radnoMestoNazivDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.radnoMestoNazivDataGridViewTextBoxColumn.DataPropertyName = "RadnoMestoNaziv"; + this.radnoMestoNazivDataGridViewTextBoxColumn.FillWeight = 200F; + this.radnoMestoNazivDataGridViewTextBoxColumn.HeaderText = "Radno mesto"; + this.radnoMestoNazivDataGridViewTextBoxColumn.Name = "radnoMestoNazivDataGridViewTextBoxColumn"; + this.radnoMestoNazivDataGridViewTextBoxColumn.ReadOnly = true; + // + // procenatRadnogVremenaDataGridViewTextBoxColumn + // + this.procenatRadnogVremenaDataGridViewTextBoxColumn.DataPropertyName = "ProcenatRadnogVremena"; + this.procenatRadnogVremenaDataGridViewTextBoxColumn.HeaderText = "Procenat"; + this.procenatRadnogVremenaDataGridViewTextBoxColumn.Name = "procenatRadnogVremenaDataGridViewTextBoxColumn"; + this.procenatRadnogVremenaDataGridViewTextBoxColumn.ReadOnly = true; + this.procenatRadnogVremenaDataGridViewTextBoxColumn.Width = 80; + // + // datumZaposlenOdDataGridViewTextBoxColumn + // + this.datumZaposlenOdDataGridViewTextBoxColumn.DataPropertyName = "DatumZaposlenOd"; + this.datumZaposlenOdDataGridViewTextBoxColumn.HeaderText = "Zaposlen od"; + this.datumZaposlenOdDataGridViewTextBoxColumn.Name = "datumZaposlenOdDataGridViewTextBoxColumn"; + this.datumZaposlenOdDataGridViewTextBoxColumn.ReadOnly = true; + // + // datumZaposlenDoDataGridViewTextBoxColumn + // + this.datumZaposlenDoDataGridViewTextBoxColumn.DataPropertyName = "DatumZaposlenDo"; + this.datumZaposlenDoDataGridViewTextBoxColumn.HeaderText = "Zaposlen do"; + this.datumZaposlenDoDataGridViewTextBoxColumn.Name = "datumZaposlenDoDataGridViewTextBoxColumn"; + this.datumZaposlenDoDataGridViewTextBoxColumn.ReadOnly = true; + // + // noksNivoNazivDataGridViewTextBoxColumn + // + this.noksNivoNazivDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.noksNivoNazivDataGridViewTextBoxColumn.DataPropertyName = "NoksNivoNaziv"; + this.noksNivoNazivDataGridViewTextBoxColumn.HeaderText = "NOKS"; + this.noksNivoNazivDataGridViewTextBoxColumn.Name = "noksNivoNazivDataGridViewTextBoxColumn"; + this.noksNivoNazivDataGridViewTextBoxColumn.ReadOnly = true; + // + // vrstaAngazovanjaDataGridViewTextBoxColumn + // + this.vrstaAngazovanjaDataGridViewTextBoxColumn.DataPropertyName = "VrstaAngazovanja"; + this.vrstaAngazovanjaDataGridViewTextBoxColumn.HeaderText = "Vrsta angažovanja"; + this.vrstaAngazovanjaDataGridViewTextBoxColumn.Name = "vrstaAngazovanjaDataGridViewTextBoxColumn"; + this.vrstaAngazovanjaDataGridViewTextBoxColumn.ReadOnly = true; + this.vrstaAngazovanjaDataGridViewTextBoxColumn.Width = 135; + // + // dgvcZapImaDokument + // + this.dgvcZapImaDokument.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; + this.dgvcZapImaDokument.DataPropertyName = "ImaDokument"; + this.dgvcZapImaDokument.HeaderText = "Dok"; + this.dgvcZapImaDokument.Name = "dgvcZapImaDokument"; + this.dgvcZapImaDokument.ReadOnly = true; + this.dgvcZapImaDokument.ToolTipText = "Da li je unet PDF dokument za dato zaposlenje"; + this.dgvcZapImaDokument.Width = 42; + // // FrmZaposlenja // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); @@ -890,5 +902,6 @@ private void InitializeComponent() private System.Windows.Forms.DataGridViewTextBoxColumn datumZaposlenDoDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn noksNivoNazivDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn vrstaAngazovanjaDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewCheckBoxColumn dgvcZapImaDokument; } } \ No newline at end of file diff --git a/JISP/Forms/FrmZaposlenja.resx b/JISP/Forms/FrmZaposlenja.resx index 6faaa58..b7ac7fb 100644 --- a/JISP/Forms/FrmZaposlenja.resx +++ b/JISP/Forms/FrmZaposlenja.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + 81, 17 diff --git a/JISP/JISP.csproj b/JISP/JISP.csproj index e484e89..659a66a 100644 --- a/JISP/JISP.csproj +++ b/JISP/JISP.csproj @@ -27,8 +27,8 @@ Naš JISP BV false - 0 - 0.5.9.0 + 1 + 0.5.9.1 true true true diff --git a/README.md b/README.md index 56047eb..42e1ecb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # Pomoćna windows aplikacija za JISP -Aplikacija koja olakšava pregled podataka unetih u JISP za neku školu. +Aplikacija koja olakšava pregled i izmenu podataka unetih u JISP za neku školu. + +## Početna +![Početna](https://github.com/bvujovic/JISP/blob/master/ScreenShots/pocetna.png) ## Zaposleni ![Zaposleni](https://github.com/bvujovic/JISP/blob/master/ScreenShots/zaposleni.png) @@ -8,5 +11,11 @@ Aplikacija koja olakšava pregled podataka unetih u JISP za neku školu. ## Zaposlenja ![Zaposlenja](https://github.com/bvujovic/JISP/blob/master/ScreenShots/zaposlenja.png) +## Sistematizacija +![Sistematizacija](https://github.com/bvujovic/JISP/blob/master/ScreenShots/sistematizacija.png) + ## Učenici ![Učenici](https://github.com/bvujovic/JISP/blob/master/ScreenShots/ucenici.png) + +## Prostorije +![Prostorije](https://github.com/bvujovic/JISP/blob/master/ScreenShots/prostorije.png) diff --git a/ScreenShots/pocetna.png b/ScreenShots/pocetna.png new file mode 100644 index 0000000..56f36ac Binary files /dev/null and b/ScreenShots/pocetna.png differ diff --git a/ScreenShots/prostorije.png b/ScreenShots/prostorije.png new file mode 100644 index 0000000..0b59fe3 Binary files /dev/null and b/ScreenShots/prostorije.png differ diff --git a/ScreenShots/sistematizacija.png b/ScreenShots/sistematizacija.png new file mode 100644 index 0000000..37e8806 Binary files /dev/null and b/ScreenShots/sistematizacija.png differ