diff --git a/JISP/Data/DataGetter.cs b/JISP/Data/DataGetter.cs
index 9013d71..4e84c7c 100644
--- a/JISP/Data/DataGetter.cs
+++ b/JISP/Data/DataGetter.cs
@@ -199,7 +199,10 @@ public static async Task GetSistematizacijaAsync()
sis.JezikNastaveId = item.jezikNastaveId != null ? (int)item.jezikNastaveId : 0;
sis.UkupnaNormaPoSistematizaciji = item.ukupnaNormaPoSistematizaciji;
sis.UkupnaNormaPoRMOsimZamena = item.ukupnaNormaPoRMOsimZamena;
+ sis.GreskaUPlaniranojNormi = item.greskaUPlaniranojNormi;
+ sis.GreskaUUgovornomAngazovanju = item.greskaUUgovornomAngazovanju;
AppData.Ds.Sistematizacija.AddSistematizacijaRow(sis);
+
}
if (AppData.Ds.Sistematizacija.Count > 0)
Poruke.SistematizacijaId = AppData.Ds.Sistematizacija.First().RegUstSisId;
diff --git a/JISP/Data/Ds.Designer.cs b/JISP/Data/Ds.Designer.cs
index b89328e..e1314d7 100644
--- a/JISP/Data/Ds.Designer.cs
+++ b/JISP/Data/Ds.Designer.cs
@@ -4224,6 +4224,10 @@ public partial class SistematizacijaDataTable : global::System.Data.TypedTableBa
private global::System.Data.DataColumn columnUkupnaNormaRazlika;
+ private global::System.Data.DataColumn columnGreskaUPlaniranojNormi;
+
+ private global::System.Data.DataColumn columnGreskaUUgovornomAngazovanju;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public SistematizacijaDataTable() :
@@ -4378,6 +4382,22 @@ protected SistematizacijaDataTable(global::System.Runtime.Serialization.Serializ
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ public global::System.Data.DataColumn GreskaUPlaniranojNormiColumn {
+ get {
+ return this.columnGreskaUPlaniranojNormi;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ public global::System.Data.DataColumn GreskaUUgovornomAngazovanjuColumn {
+ get {
+ return this.columnGreskaUUgovornomAngazovanju;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -4415,7 +4435,23 @@ public void AddSistematizacijaRow(SistematizacijaRow row) {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
- public SistematizacijaRow AddSistematizacijaRow(int IdSistematizacije, int SkolskaGodinaId, int RegUstSisId, string IzvorFinansiranja, bool RucniUnos, int RadnoMestoId, string RadnoMesto, int PredmetId, string Predmet, int PodnivoPredmetaId, int JezikNastaveId, double UkupnaNormaPoSistematizaciji, double UkupnaNormaPoRMOsimZamena, double UkupnaNormaRazlika) {
+ public SistematizacijaRow AddSistematizacijaRow(
+ int IdSistematizacije,
+ int SkolskaGodinaId,
+ int RegUstSisId,
+ string IzvorFinansiranja,
+ bool RucniUnos,
+ int RadnoMestoId,
+ string RadnoMesto,
+ int PredmetId,
+ string Predmet,
+ int PodnivoPredmetaId,
+ int JezikNastaveId,
+ double UkupnaNormaPoSistematizaciji,
+ double UkupnaNormaPoRMOsimZamena,
+ double UkupnaNormaRazlika,
+ string GreskaUPlaniranojNormi,
+ string GreskaUUgovornomAngazovanju) {
SistematizacijaRow rowSistematizacijaRow = ((SistematizacijaRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
IdSistematizacije,
@@ -4431,7 +4467,9 @@ public SistematizacijaRow AddSistematizacijaRow(int IdSistematizacije, int Skols
JezikNastaveId,
UkupnaNormaPoSistematizaciji,
UkupnaNormaPoRMOsimZamena,
- UkupnaNormaRazlika};
+ UkupnaNormaRazlika,
+ GreskaUPlaniranojNormi,
+ GreskaUUgovornomAngazovanju};
rowSistematizacijaRow.ItemArray = columnValuesArray;
this.Rows.Add(rowSistematizacijaRow);
return rowSistematizacijaRow;
@@ -4439,7 +4477,7 @@ public SistematizacijaRow AddSistematizacijaRow(int IdSistematizacije, int Skols
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
- public SistematizacijaRow AddSistematizacijaRow(int IdSistematizacije, int SkolskaGodinaId, int RegUstSisId, string IzvorFinansiranja, bool RucniUnos, int RadnoMestoId, string RadnoMesto, int PredmetId, string Predmet, int PodnivoPredmetaId, int JezikNastaveId, double UkupnaNormaPoSistematizaciji, double UkupnaNormaPoRMOsimZamena) {
+ public SistematizacijaRow AddSistematizacijaRow(int IdSistematizacije, int SkolskaGodinaId, int RegUstSisId, string IzvorFinansiranja, bool RucniUnos, int RadnoMestoId, string RadnoMesto, int PredmetId, string Predmet, int PodnivoPredmetaId, int JezikNastaveId, double UkupnaNormaPoSistematizaciji, double UkupnaNormaPoRMOsimZamena, string GreskaUPlaniranojNormi, string GreskaUUgovornomAngazovanju) {
SistematizacijaRow rowSistematizacijaRow = ((SistematizacijaRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
IdSistematizacije,
@@ -4455,7 +4493,9 @@ public SistematizacijaRow AddSistematizacijaRow(int IdSistematizacije, int Skols
JezikNastaveId,
UkupnaNormaPoSistematizaciji,
UkupnaNormaPoRMOsimZamena,
- null};
+ null,
+ GreskaUPlaniranojNormi,
+ GreskaUUgovornomAngazovanju};
rowSistematizacijaRow.ItemArray = columnValuesArray;
this.Rows.Add(rowSistematizacijaRow);
return rowSistematizacijaRow;
@@ -4499,6 +4539,8 @@ internal void InitVars() {
this.columnUkupnaNormaPoSistematizaciji = base.Columns["UkupnaNormaPoSistematizaciji"];
this.columnUkupnaNormaPoRMOsimZamena = base.Columns["UkupnaNormaPoRMOsimZamena"];
this.columnUkupnaNormaRazlika = base.Columns["UkupnaNormaRazlika"];
+ this.columnGreskaUPlaniranojNormi = base.Columns["GreskaUPlaniranojNormi"];
+ this.columnGreskaUUgovornomAngazovanju = base.Columns["GreskaUUgovornomAngazovanju"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4532,6 +4574,10 @@ private void InitClass() {
base.Columns.Add(this.columnUkupnaNormaPoRMOsimZamena);
this.columnUkupnaNormaRazlika = new global::System.Data.DataColumn("UkupnaNormaRazlika", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUkupnaNormaRazlika);
+ this.columnGreskaUPlaniranojNormi = new global::System.Data.DataColumn("GreskaUPlaniranojNormi", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnGreskaUPlaniranojNormi);
+ this.columnGreskaUUgovornomAngazovanju = new global::System.Data.DataColumn("GreskaUUgovornomAngazovanju", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnGreskaUUgovornomAngazovanju);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnIdSistematizacije}, true));
this.columnIdSistematizacije.AllowDBNull = false;
@@ -11388,6 +11434,40 @@ public double UkupnaNormaRazlika {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ public string GreskaUPlaniranojNormi {
+ get {
+ try {
+ return ((string)(this[this.tableSistematizacija.GreskaUPlaniranojNormiColumn]));
+ }
+ catch (global::System.InvalidCastException e) {
+ throw new global::System.Data.StrongTypingException("The value for column \'GreskaUPlaniranojNormi\' in table \'Sistematizacija\' is DBNul" +
+ "l.", e);
+ }
+ }
+ set {
+ this[this.tableSistematizacija.GreskaUPlaniranojNormiColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ public string GreskaUUgovornomAngazovanju {
+ get {
+ try {
+ return ((string)(this[this.tableSistematizacija.GreskaUUgovornomAngazovanjuColumn]));
+ }
+ catch (global::System.InvalidCastException e) {
+ throw new global::System.Data.StrongTypingException("The value for column \'GreskaUUgovornomAngazovanju\' in table \'Sistematizacija\' is " +
+ "DBNull.", e);
+ }
+ }
+ set {
+ this[this.tableSistematizacija.GreskaUUgovornomAngazovanjuColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsPredmetNull() {
@@ -11412,6 +11492,30 @@ public void SetUkupnaNormaRazlikaNull() {
this[this.tableSistematizacija.UkupnaNormaRazlikaColumn] = global::System.Convert.DBNull;
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ public bool IsGreskaUPlaniranojNormiNull() {
+ return this.IsNull(this.tableSistematizacija.GreskaUPlaniranojNormiColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ public void SetGreskaUPlaniranojNormiNull() {
+ this[this.tableSistematizacija.GreskaUPlaniranojNormiColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ public bool IsGreskaUUgovornomAngazovanjuNull() {
+ return this.IsNull(this.tableSistematizacija.GreskaUUgovornomAngazovanjuColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ public void SetGreskaUUgovornomAngazovanjuNull() {
+ this[this.tableSistematizacija.GreskaUUgovornomAngazovanjuColumn] = global::System.Convert.DBNull;
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public SistematizacijaDetaljiRow[] GetSistematizacijaDetaljiRows() {
diff --git a/JISP/Data/Ds.xsd b/JISP/Data/Ds.xsd
index 8865026..270d1a0 100644
--- a/JISP/Data/Ds.xsd
+++ b/JISP/Data/Ds.xsd
@@ -104,7 +104,7 @@
-
+
@@ -162,7 +162,7 @@
-
+
@@ -188,6 +188,8 @@
+
+
diff --git a/JISP/Data/Ds.xss b/JISP/Data/Ds.xss
index 17c569a..2c9e62a 100644
--- a/JISP/Data/Ds.xss
+++ b/JISP/Data/Ds.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
@@ -13,7 +13,7 @@
-
+
@@ -78,7 +78,7 @@
- 674
+ 691
946
diff --git a/JISP/Forms/FrmSistematizacija.Designer.cs b/JISP/Forms/FrmSistematizacija.Designer.cs
index 40f2d84..353ea71 100644
--- a/JISP/Forms/FrmSistematizacija.Designer.cs
+++ b/JISP/Forms/FrmSistematizacija.Designer.cs
@@ -42,6 +42,8 @@ private void InitializeComponent()
this.ukupnaNormaPoSistematizacijiDgvc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ukupnaNormaPoRMOsimZamenaDgvc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dgvcRazlika = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dgvcGreskaUPlaniranojNormi = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dgvcGreskaUUgovornomAngazovanju = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.lblRedovi = new System.Windows.Forms.Label();
this.bsSistematizacija = new System.Windows.Forms.BindingSource(this.components);
this.ds = new JISP.Data.Ds();
@@ -49,12 +51,12 @@ private void InitializeComponent()
this.txtFilter = new JISP.Controls.UcFilterTextBox();
this.btnOsveziPodatke = new JISP.Controls.UcButton();
this.dgvDetalji = new JISP.Controls.UcDGV();
- this.lblBrojRedova = new System.Windows.Forms.Label();
- this.bsDetalji = new System.Windows.Forms.BindingSource(this.components);
- this.pnlLeft = new JISP.Controls.UcLeftPanel();
this.zaposleniDgvc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tipUgovoraDgvc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.procenatAngazovanjaDgvc = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.lblBrojRedova = new System.Windows.Forms.Label();
+ this.bsDetalji = new System.Windows.Forms.BindingSource(this.components);
+ this.pnlLeft = new JISP.Controls.UcLeftPanel();
lblFilterCaption = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
this.scMain.Panel1.SuspendLayout();
@@ -123,7 +125,9 @@ private void InitializeComponent()
this.predmetDgvc,
this.ukupnaNormaPoSistematizacijiDgvc,
this.ukupnaNormaPoRMOsimZamenaDgvc,
- this.dgvcRazlika});
+ this.dgvcRazlika,
+ this.dgvcGreskaUPlaniranojNormi,
+ this.dgvcGreskaUUgovornomAngazovanju});
this.dgvSistematizacija.ColumnsForCopyOnClick = null;
this.dgvSistematizacija.CopyOnCellClick = false;
this.dgvSistematizacija.CtrlDisplayPositionRowCount = this.lblRedovi;
@@ -195,6 +199,20 @@ private void InitializeComponent()
this.dgvcRazlika.Name = "dgvcRazlika";
this.dgvcRazlika.ReadOnly = true;
//
+ // dgvcGreskaUPlaniranojNormi
+ //
+ this.dgvcGreskaUPlaniranojNormi.DataPropertyName = "GreskaUPlaniranojNormi";
+ this.dgvcGreskaUPlaniranojNormi.HeaderText = "Greška Plan";
+ this.dgvcGreskaUPlaniranojNormi.Name = "dgvcGreskaUPlaniranojNormi";
+ this.dgvcGreskaUPlaniranojNormi.ReadOnly = true;
+ //
+ // dgvcGreskaUUgovornomAngazovanju
+ //
+ this.dgvcGreskaUUgovornomAngazovanju.DataPropertyName = "GreskaUUgovornomAngazovanju";
+ this.dgvcGreskaUUgovornomAngazovanju.HeaderText = "Greška Ang";
+ this.dgvcGreskaUUgovornomAngazovanju.Name = "dgvcGreskaUUgovornomAngazovanju";
+ this.dgvcGreskaUUgovornomAngazovanju.ReadOnly = true;
+ //
// lblRedovi
//
this.lblRedovi.AutoSize = true;
@@ -208,7 +226,8 @@ private void InitializeComponent()
//
this.bsSistematizacija.DataMember = "Sistematizacija";
this.bsSistematizacija.DataSource = this.ds;
- this.bsSistematizacija.Sort = "UkupnaNormaRazlika DESC";
+ this.bsSistematizacija.Sort = "UkupnaNormaRazlika DESC, GreskaUPlaniranojNormi DESC, GreskaUUgovornomAngazovanju" +
+ " DESC";
//
// ds
//
@@ -232,6 +251,7 @@ private void InitializeComponent()
this.txtFilter.BindingSource = null;
this.txtFilter.Location = new System.Drawing.Point(374, 7);
this.txtFilter.Name = "txtFilter";
+ this.txtFilter.ShouldBeCyrillic = false;
this.txtFilter.Size = new System.Drawing.Size(209, 23);
this.txtFilter.TabIndex = 1;
this.txtFilter.TextChanged += new System.EventHandler(this.TxtFilter_TextChanged);
@@ -283,33 +303,6 @@ private void InitializeComponent()
this.dgvDetalji.StandardSort = null;
this.dgvDetalji.TabIndex = 0;
//
- // lblBrojRedova
- //
- this.lblBrojRedova.AutoSize = true;
- this.lblBrojRedova.Location = new System.Drawing.Point(12, 9);
- this.lblBrojRedova.Name = "lblBrojRedova";
- this.lblBrojRedova.Size = new System.Drawing.Size(57, 17);
- this.lblBrojRedova.TabIndex = 1;
- this.lblBrojRedova.Text = "Redova";
- //
- // bsDetalji
- //
- this.bsDetalji.AllowNew = false;
- this.bsDetalji.DataMember = "FK_Sistematizacija_SistematizacijaDetalji";
- this.bsDetalji.DataSource = this.bsSistematizacija;
- this.bsDetalji.Sort = "";
- //
- // pnlLeft
- //
- this.pnlLeft.Controls.Add(this.lblBrojRedova);
- this.pnlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.pnlLeft.Location = new System.Drawing.Point(0, 0);
- this.pnlLeft.Name = "pnlLeft";
- this.pnlLeft.PanelWidthState = JISP.Controls.PanelWidthState.Expanded;
- this.pnlLeft.RightWingWidth = 6;
- this.pnlLeft.Size = new System.Drawing.Size(146, 168);
- this.pnlLeft.TabIndex = 1;
- //
// zaposleniDgvc
//
this.zaposleniDgvc.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
@@ -339,6 +332,33 @@ private void InitializeComponent()
this.procenatAngazovanjaDgvc.ReadOnly = true;
this.procenatAngazovanjaDgvc.Width = 176;
//
+ // lblBrojRedova
+ //
+ this.lblBrojRedova.AutoSize = true;
+ this.lblBrojRedova.Location = new System.Drawing.Point(12, 9);
+ this.lblBrojRedova.Name = "lblBrojRedova";
+ this.lblBrojRedova.Size = new System.Drawing.Size(57, 17);
+ this.lblBrojRedova.TabIndex = 1;
+ this.lblBrojRedova.Text = "Redova";
+ //
+ // bsDetalji
+ //
+ this.bsDetalji.AllowNew = false;
+ this.bsDetalji.DataMember = "FK_Sistematizacija_SistematizacijaDetalji";
+ this.bsDetalji.DataSource = this.bsSistematizacija;
+ this.bsDetalji.Sort = "";
+ //
+ // pnlLeft
+ //
+ this.pnlLeft.Controls.Add(this.lblBrojRedova);
+ this.pnlLeft.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pnlLeft.Location = new System.Drawing.Point(0, 0);
+ this.pnlLeft.Name = "pnlLeft";
+ this.pnlLeft.PanelWidthState = JISP.Controls.PanelWidthState.Expanded;
+ this.pnlLeft.RightWingWidth = 6;
+ this.pnlLeft.Size = new System.Drawing.Size(146, 168);
+ this.pnlLeft.TabIndex = 1;
+ //
// FrmSistematizacija
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
@@ -388,5 +408,7 @@ private void InitializeComponent()
private System.Windows.Forms.DataGridViewTextBoxColumn zaposleniDgvc;
private System.Windows.Forms.DataGridViewTextBoxColumn tipUgovoraDgvc;
private System.Windows.Forms.DataGridViewTextBoxColumn procenatAngazovanjaDgvc;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dgvcGreskaUPlaniranojNormi;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dgvcGreskaUUgovornomAngazovanju;
}
}
\ No newline at end of file
diff --git a/JISP/Forms/FrmSistematizacija.cs b/JISP/Forms/FrmSistematizacija.cs
index 0ae6fae..0504df1 100644
--- a/JISP/Forms/FrmSistematizacija.cs
+++ b/JISP/Forms/FrmSistematizacija.cs
@@ -54,12 +54,19 @@ private void DgvSistematizacija_DataBindingComplete(object sender, DataGridViewB
// bojenje redova kod kojih se razlikuju ukupne norme
var idxSistemat = ukupnaNormaPoSistematizacijiDgvc.Index;
var idxPoRM = ukupnaNormaPoRMOsimZamenaDgvc.Index;
+ var idxGreskaPlan = dgvcGreskaUPlaniranojNormi.Index;
foreach (DataGridViewRow row in dgvSistematizacija.Rows)
{
if ((double)row.Cells[idxSistemat].Value != (double)row.Cells[idxPoRM].Value)
- row.DefaultCellStyle.ForeColor = Color.Red;
+ row.DefaultCellStyle.ForeColor = Color.Blue;
else
- row.DefaultCellStyle.ForeColor = Color.Black;
+ {
+ // if (string.IsNullOrEmpty((string)row.Cells[idxGreskaPlan].Value))
+ if (row.Cells[idxGreskaPlan].Value != DBNull.Value)
+ row.DefaultCellStyle.ForeColor = Color.Red;
+ else
+ row.DefaultCellStyle.ForeColor = Color.Black;
+ }
}
}
diff --git a/JISP/Forms/FrmSistematizacija.resx b/JISP/Forms/FrmSistematizacija.resx
index e295eeb..d8e40d4 100644
--- a/JISP/Forms/FrmSistematizacija.resx
+++ b/JISP/Forms/FrmSistematizacija.resx
@@ -123,6 +123,12 @@
True
+
+ True
+
+
+ True
+
89, 17
@@ -130,9 +136,9 @@
17, 17
- 260, 17
+ 232, 17
- 62
+ 57
\ No newline at end of file
diff --git a/JISP/Forms/FrmZaposleni.Designer.cs b/JISP/Forms/FrmZaposleni.Designer.cs
index d500435..27e58ba 100644
--- a/JISP/Forms/FrmZaposleni.Designer.cs
+++ b/JISP/Forms/FrmZaposleni.Designer.cs
@@ -77,7 +77,6 @@ private void InitializeComponent()
this.pnlLeft = new JISP.Controls.UcLeftPanel();
this.cmbIzracunajStatuse = new System.Windows.Forms.ComboBox();
this.btnIzracunajStatuse = new JISP.Controls.UcButton();
- this.btnStaz = new JISP.Controls.UcButton();
this.gbIzvestaji = new System.Windows.Forms.GroupBox();
this.btnSistematizacija = new JISP.Controls.UcButton();
this.btnKvalifStruktura = new JISP.Controls.UcButton();
@@ -142,8 +141,8 @@ private void InitializeComponent()
// splitContainer.Panel2
//
this.splitContainer.Panel2.Controls.Add(this.dgvZaposlenja);
- this.splitContainer.Size = new System.Drawing.Size(840, 615);
- this.splitContainer.SplitterDistance = 494;
+ this.splitContainer.Size = new System.Drawing.Size(838, 605);
+ this.splitContainer.SplitterDistance = 484;
this.splitContainer.TabIndex = 0;
//
// dgvZaposleni
@@ -192,9 +191,9 @@ private void InitializeComponent()
this.dgvZaposleni.RowHeadersWidth = 30;
this.dgvZaposleni.RowTemplate.Height = 24;
this.dgvZaposleni.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.dgvZaposleni.Size = new System.Drawing.Size(840, 464);
+ this.dgvZaposleni.Size = new System.Drawing.Size(838, 454);
this.dgvZaposleni.StandardSort = null;
- this.dgvZaposleni.TabIndex = 0;
+ this.dgvZaposleni.TabIndex = 1;
this.dgvZaposleni.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DgvZaposleni_CellClick);
this.dgvZaposleni.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DgvZaposleni_CellDoubleClick);
this.dgvZaposleni.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.DgvZaposleni_RowsAdded);
@@ -383,8 +382,8 @@ private void InitializeComponent()
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;
+ this.pnlZaposleniTop.Size = new System.Drawing.Size(838, 30);
+ this.pnlZaposleniTop.TabIndex = 0;
//
// chkAktivniZap
//
@@ -444,7 +443,7 @@ private void InitializeComponent()
this.dgvZaposlenja.Location = new System.Drawing.Point(0, 0);
this.dgvZaposlenja.Name = "dgvZaposlenja";
this.dgvZaposlenja.RowHeadersWidth = 51;
- this.dgvZaposlenja.Size = new System.Drawing.Size(840, 117);
+ this.dgvZaposlenja.Size = new System.Drawing.Size(838, 117);
this.dgvZaposlenja.StandardSort = null;
this.dgvZaposlenja.TabIndex = 0;
//
@@ -515,7 +514,6 @@ private void InitializeComponent()
//
this.pnlLeft.Controls.Add(this.cmbIzracunajStatuse);
this.pnlLeft.Controls.Add(this.btnIzracunajStatuse);
- this.pnlLeft.Controls.Add(this.btnStaz);
this.pnlLeft.Controls.Add(this.gbIzvestaji);
this.pnlLeft.Controls.Add(this.cmbPodaciZaDohvatanje);
this.pnlLeft.Controls.Add(this.btnDohvatiPodatke);
@@ -529,8 +527,8 @@ private void InitializeComponent()
this.pnlLeft.Name = "pnlLeft";
this.pnlLeft.PanelWidthState = JISP.Controls.PanelWidthState.Expanded;
this.pnlLeft.RightWingWidth = 6;
- this.pnlLeft.Size = new System.Drawing.Size(146, 615);
- this.pnlLeft.TabIndex = 0;
+ this.pnlLeft.Size = new System.Drawing.Size(146, 605);
+ this.pnlLeft.TabIndex = 1;
//
// cmbIzracunajStatuse
//
@@ -540,30 +538,19 @@ private void InitializeComponent()
this.cmbIzracunajStatuse.Location = new System.Drawing.Point(9, 211);
this.cmbIzracunajStatuse.Name = "cmbIzracunajStatuse";
this.cmbIzracunajStatuse.Size = new System.Drawing.Size(126, 26);
- this.cmbIzracunajStatuse.TabIndex = 16;
+ this.cmbIzracunajStatuse.TabIndex = 5;
//
// btnIzracunajStatuse
//
this.btnIzracunajStatuse.Location = new System.Drawing.Point(8, 238);
this.btnIzracunajStatuse.Name = "btnIzracunajStatuse";
this.btnIzracunajStatuse.Size = new System.Drawing.Size(128, 40);
- this.btnIzracunajStatuse.TabIndex = 15;
+ this.btnIzracunajStatuse.TabIndex = 6;
this.btnIzracunajStatuse.Text = "Izračunaj statuse";
this.btnIzracunajStatuse.ToolTipText = null;
this.btnIzracunajStatuse.UseVisualStyleBackColor = true;
this.btnIzracunajStatuse.Click += new System.EventHandler(this.BtnIzracunajStatuse_Click);
//
- // btnStaz
- //
- this.btnStaz.Location = new System.Drawing.Point(8, 498);
- this.btnStaz.Name = "btnStaz";
- this.btnStaz.Size = new System.Drawing.Size(127, 40);
- this.btnStaz.TabIndex = 10;
- this.btnStaz.Text = "Staž";
- this.btnStaz.ToolTipText = "Sistematizacija radnih mesta";
- this.btnStaz.UseVisualStyleBackColor = true;
- this.btnStaz.Click += new System.EventHandler(this.BtnStaz_Click);
- //
// gbIzvestaji
//
this.gbIzvestaji.Controls.Add(this.btnSistematizacija);
@@ -572,16 +559,16 @@ private void InitializeComponent()
this.gbIzvestaji.Location = new System.Drawing.Point(3, 342);
this.gbIzvestaji.Name = "gbIzvestaji";
this.gbIzvestaji.Size = new System.Drawing.Size(136, 150);
- this.gbIzvestaji.TabIndex = 15;
+ this.gbIzvestaji.TabIndex = 8;
this.gbIzvestaji.TabStop = false;
this.gbIzvestaji.Text = "Izveštaji";
//
// btnSistematizacija
//
- this.btnSistematizacija.Location = new System.Drawing.Point(6, 103);
+ this.btnSistematizacija.Location = new System.Drawing.Point(6, 23);
this.btnSistematizacija.Name = "btnSistematizacija";
this.btnSistematizacija.Size = new System.Drawing.Size(127, 40);
- this.btnSistematizacija.TabIndex = 9;
+ this.btnSistematizacija.TabIndex = 0;
this.btnSistematizacija.Text = "Sistemat. RM";
this.btnSistematizacija.ToolTipText = "Sistematizacija radnih mesta";
this.btnSistematizacija.UseVisualStyleBackColor = true;
@@ -592,7 +579,7 @@ private void InitializeComponent()
this.btnKvalifStruktura.Location = new System.Drawing.Point(6, 63);
this.btnKvalifStruktura.Name = "btnKvalifStruktura";
this.btnKvalifStruktura.Size = new System.Drawing.Size(128, 40);
- this.btnKvalifStruktura.TabIndex = 5;
+ this.btnKvalifStruktura.TabIndex = 1;
this.btnKvalifStruktura.Text = "Kvalif. struktura";
this.btnKvalifStruktura.ToolTipText = "Kreiranje izveštaja Kvalifikaciona Struktura";
this.btnKvalifStruktura.UseVisualStyleBackColor = true;
@@ -600,10 +587,10 @@ private void InitializeComponent()
//
// BtnCsvZaposlenja
//
- this.BtnCsvZaposlenja.Location = new System.Drawing.Point(6, 23);
+ this.BtnCsvZaposlenja.Location = new System.Drawing.Point(6, 103);
this.BtnCsvZaposlenja.Name = "BtnCsvZaposlenja";
this.BtnCsvZaposlenja.Size = new System.Drawing.Size(128, 40);
- this.BtnCsvZaposlenja.TabIndex = 8;
+ this.BtnCsvZaposlenja.TabIndex = 2;
this.BtnCsvZaposlenja.Text = "CSV zaposlenja";
this.BtnCsvZaposlenja.ToolTipText = "Stavljanje u klipbord podatаkа u CSV formatu o svim zaposlenima radi provere Kval" +
"ifikacione strukture";
@@ -618,14 +605,14 @@ private void InitializeComponent()
this.cmbPodaciZaDohvatanje.Location = new System.Drawing.Point(9, 138);
this.cmbPodaciZaDohvatanje.Name = "cmbPodaciZaDohvatanje";
this.cmbPodaciZaDohvatanje.Size = new System.Drawing.Size(126, 26);
- this.cmbPodaciZaDohvatanje.TabIndex = 14;
+ this.cmbPodaciZaDohvatanje.TabIndex = 3;
//
// btnDohvatiPodatke
//
this.btnDohvatiPodatke.Location = new System.Drawing.Point(8, 165);
this.btnDohvatiPodatke.Name = "btnDohvatiPodatke";
this.btnDohvatiPodatke.Size = new System.Drawing.Size(128, 40);
- this.btnDohvatiPodatke.TabIndex = 13;
+ this.btnDohvatiPodatke.TabIndex = 4;
this.btnDohvatiPodatke.Text = "Dohvati podatke";
this.btnDohvatiPodatke.ToolTipText = null;
this.btnDohvatiPodatke.UseVisualStyleBackColor = true;
@@ -636,7 +623,7 @@ private void InitializeComponent()
this.btnResenja.Location = new System.Drawing.Point(7, 284);
this.btnResenja.Name = "btnResenja";
this.btnResenja.Size = new System.Drawing.Size(128, 40);
- this.btnResenja.TabIndex = 10;
+ this.btnResenja.TabIndex = 7;
this.btnResenja.Text = "Rešenja";
this.btnResenja.ToolTipText = "Rešenja svih zaposlenih";
this.btnResenja.UseVisualStyleBackColor = true;
@@ -646,7 +633,7 @@ private void InitializeComponent()
//
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(5, 588);
+ this.lblStatus.Location = new System.Drawing.Point(5, 578);
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(0, 18);
this.lblStatus.TabIndex = 7;
@@ -689,7 +676,7 @@ private void InitializeComponent()
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(986, 615);
+ this.ClientSize = new System.Drawing.Size(984, 605);
this.Controls.Add(this.splitContainer);
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)(0)));
@@ -741,7 +728,6 @@ private void InitializeComponent()
private Controls.UcButton btnDohvatiPodatke;
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;
diff --git a/JISP/Forms/FrmZaposleni.cs b/JISP/Forms/FrmZaposleni.cs
index 4ea92c1..7455c75 100644
--- a/JISP/Forms/FrmZaposleni.cs
+++ b/JISP/Forms/FrmZaposleni.cs
@@ -399,26 +399,6 @@ private async void BtnDohvatiPodatke_Click(object sender, EventArgs e)
}
}
- private void BtnStaz_Click(object sender, EventArgs e)
- {
- try
- {
- var frm = new FrmStaz();
- if (frm.ShowDialog() != DialogResult.OK)
- return;
-
- AppData.SaveSett(AppData.DatumIzvestajaTrezora, frm.DatumIzvestajaTrezora.ToShortDateString());
- var krajSkGod = new DateTime(AppData.SkolskaGodina.Kraj, 8, 31);
- var meseciOdIzvestaja = Utils.DiffMonths(frm.DatumIzvestajaTrezora, krajSkGod);
- foreach (var zap in AppData.Ds.Zaposleni.Where(it => !it.IsStazGodineNull()))
- {
- var stazMeseci = zap.StazGodine * 12 + zap.StazMeseci + meseciOdIzvestaja;
- zap.StatusAktivnosti1 = (stazMeseci / 12) + " / " + (stazMeseci % 12);
- }
- }
- catch (Exception ex) { Utils.ShowMbox(ex, btnStaz.Text); }
- }
-
private void FrmZaposleni_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.F && e.Control)
diff --git a/JISP/JISP.csproj b/JISP/JISP.csproj
index d34c95f..274e34a 100644
--- a/JISP/JISP.csproj
+++ b/JISP/JISP.csproj
@@ -27,8 +27,8 @@
Naš JISP
BV
false
- 3
- 0.5.9.3
+ 0
+ 0.5.10.0
true
true
true