diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index ac9738b..8e6c7c1 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/frmNovaPoziadavka.cs b/Mip/frmNovaPoziadavka.cs index 1a8aa44..e2523b0 100644 --- a/Mip/frmNovaPoziadavka.cs +++ b/Mip/frmNovaPoziadavka.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Data; using System.Drawing; using System.IO; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace Mip @@ -41,7 +37,7 @@ namespace Mip tabNoveZiadanky.Columns.Add("Množstvo", typeof(System.Decimal)); tabNoveZiadanky.Columns.Add("Jednotka", typeof(System.String)); tabNoveZiadanky.Columns.Add("Cena", typeof(System.Decimal)); - + //cmd = "select `Hodnota` from `tabpomocnychudajov` where `Kategoria` = 'Pridať jednotku';"; //classSQL.SQL(cmd, out tabJednotka); @@ -54,7 +50,7 @@ namespace Mip acscNazov.Add(dr["Názov"].ToString()); acscTypy.Add(dr["Typ"].ToString()); acscPoznamky.Add(dr["Poznámka"].ToString()); - + } cmd = "select `IDFirma`, `FirmaMeno`, concat(`FirmaMeno`,' (',`IDFirma`, ')') as FirmaMenoID from `tabfirmy`"; @@ -214,7 +210,7 @@ namespace Mip // nudPocet // nudPocet.Location = new System.Drawing.Point(371, 43); - nudPocet.Maximum = new decimal(new int[] { 99999, 0, 0, 0}); + nudPocet.Maximum = new decimal(new int[] { 99999, 0, 0, 0 }); nudPocet.Name = "nudPocet"; nudPocet.Value = 0; nudPocet.Size = new System.Drawing.Size(146, 20); @@ -441,13 +437,13 @@ namespace Mip classGlobal.FillCB(cb, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať jednotku"); cb.Text = classGlobal.strNovyPomocnyUdaj; } - + } void controlEnter(object sender, EventArgs e) { Control ctrl = sender as Control; - + switch (ctrl.Name) { case "tbTyp": @@ -515,17 +511,17 @@ namespace Mip ComboBox cb = sender as ComboBox; tabNoveZiadanky.Rows[Convert.ToInt32(cb.Parent.Name.ToString()) - 1].SetField("Jednotka", cb.Text); } - + void nudMnozstvoChanged(object sender, EventArgs e) { NumericUpDown nud = sender as NumericUpDown; tabNoveZiadanky.Rows[Convert.ToInt32(nud.Parent.Name.ToString()) - 1].SetField("Množstvo", nud.Value); } - void nudPocetChanged(object sender, EventArgs e) + void nudPocetChanged(object sender, EventArgs e) { NumericUpDown nud = sender as NumericUpDown; - tabNoveZiadanky.Rows[Convert.ToInt32(nud.Parent.Name.ToString())-1].SetField("Počet kusov", nud.Value); + tabNoveZiadanky.Rows[Convert.ToInt32(nud.Parent.Name.ToString()) - 1].SetField("Počet kusov", nud.Value); } void nudCenaChanged(object sender, EventArgs e) { @@ -551,10 +547,10 @@ namespace Mip TextBox tb = sender as TextBox; DataView dv = new DataView(); dv = tabZoznamZiadanky.DefaultView; - dv.RowFilter = "Názov LIKE '%" + tb.Text + "%'"; + dv.RowFilter = "Názov LIKE '%" + tb.Text.Replace("%", "[%]") + "%'"; if (dv.Count > 0 && tb.Text != "") { - tb.Parent.Controls.Find("tbFirma",true)[0].Text = dv.ToTable().Rows[0].ItemArray[dv.ToTable().Columns["FirmaMenoID"].Ordinal].ToString(); + tb.Parent.Controls.Find("tbFirma", true)[0].Text = dv.ToTable().Rows[0].ItemArray[dv.ToTable().Columns["FirmaMenoID"].Ordinal].ToString(); tb.Parent.Controls.Find("tbTyp", true)[0].Text = dv.ToTable().Rows[0].ItemArray[dv.ToTable().Columns["Typ"].Ordinal].ToString(); tb.Parent.Controls.Find("tbPoznamka", true)[0].Text = dv.ToTable().Rows[0].ItemArray[dv.ToTable().Columns["Poznámka"].Ordinal].ToString(); } @@ -587,13 +583,13 @@ namespace Mip string status = "False"; if (tabNoveZiadanky.Rows[Convert.ToInt32(pnl.Name.ToString()) - 1].ItemArray[tabNoveZiadanky.Columns["Status"].Ordinal].ToString() == null) status = "False"; else status = tabNoveZiadanky.Rows[Convert.ToInt32(pnl.Name.ToString()) - 1].ItemArray[tabNoveZiadanky.Columns["Status"].Ordinal].ToString(); - - if(status == "True") pnl.BackColor = Color.Empty; + + if (status == "True") pnl.BackColor = Color.Empty; } void btnOKCancelClick(object sender, EventArgs e) { Button btn = sender as Button; - + if (btn.Name == "btnCancel") { foreach (Control cntrl in btn.Parent.Controls) if (!(cntrl is Button)) cntrl.Enabled = false; @@ -602,15 +598,15 @@ namespace Mip btn.Parent.BackColor = Color.LightCoral; tabNoveZiadanky.Rows[Convert.ToInt32(btn.Parent.Name.ToString()) - 1].SetField("Status", false); } - else + else { foreach (Control cntrl in btn.Parent.Controls) if (!(cntrl is Button)) cntrl.Enabled = true; btn.Parent.Controls.Find("btnAddPicture", true)[0].Enabled = true; - if(tabNoveZiadanky.Rows[Convert.ToInt32(btn.Parent.Name.ToString()) - 1].ItemArray[tabNoveZiadanky.Columns["Súborove Dáta"].Ordinal].ToString() != "") btn.Parent.Controls.Find("btnDeletePicture", true)[0].Enabled = true; + if (tabNoveZiadanky.Rows[Convert.ToInt32(btn.Parent.Name.ToString()) - 1].ItemArray[tabNoveZiadanky.Columns["Súborove Dáta"].Ordinal].ToString() != "") btn.Parent.Controls.Find("btnDeletePicture", true)[0].Enabled = true; btn.Parent.BackColor = Color.Empty; tabNoveZiadanky.Rows[Convert.ToInt32(btn.Parent.Name.ToString()) - 1].SetField("Status", true); } - + } void btnAddPictureClick(object sender, EventArgs e) @@ -621,8 +617,8 @@ namespace Mip FileStream fs; Button ctrl = sender as Button; - if(tabNoveZiadanky.Rows[Convert.ToInt32(ctrl.Parent.Name.ToString()) - 1].ItemArray[tabNoveZiadanky.Columns["Súborove Dáta"].Ordinal].ToString() == "") - { + if (tabNoveZiadanky.Rows[Convert.ToInt32(ctrl.Parent.Name.ToString()) - 1].ItemArray[tabNoveZiadanky.Columns["Súborove Dáta"].Ordinal].ToString() == "") + { if (ofd.ShowDialog() == DialogResult.OK) { fs = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read); @@ -631,12 +627,12 @@ namespace Mip FileData = new byte[FileSize]; fs.Read(FileData, 0, FileSize); fs.Close(); - + tabNoveZiadanky.Rows[Convert.ToInt32(ctrl.Parent.Name.ToString()) - 1].SetField("Súborove Dáta", FileData); ctrl.Parent.Controls.Find("btnDeletePicture", true)[0].Enabled = true; ctrl.Image = global::Mip.Properties.Resources.image_icon; } - else MessageBox.Show("Obrázok nebol vybraný!"); + else MessageBox.Show("Obrázok nebol vybraný!"); } else { @@ -663,7 +659,7 @@ namespace Mip void lblVykresHover(object sender, EventArgs e) { - + } void lblVykresLeave(object sender, EventArgs e) { @@ -677,22 +673,22 @@ namespace Mip private void button6_Click(object sender, EventArgs e) { - foreach(DataRow rw in tabNoveZiadanky.Rows) + foreach (DataRow rw in tabNoveZiadanky.Rows) { - if(rw.ItemArray[rw.Table.Columns["Názov"].Ordinal].ToString() != "") + if (rw.ItemArray[rw.Table.Columns["Názov"].Ordinal].ToString() != "") { int pocetKusov = 0; - if(rw.ItemArray[rw.Table.Columns["Počet kusov"].Ordinal].ToString() != "") pocetKusov = Convert.ToInt32(rw.ItemArray[rw.Table.Columns["Počet kusov"].Ordinal]); + if (rw.ItemArray[rw.Table.Columns["Počet kusov"].Ordinal].ToString() != "") pocetKusov = Convert.ToInt32(rw.ItemArray[rw.Table.Columns["Počet kusov"].Ordinal]); decimal mnozstvo = 0; - if(rw.ItemArray[rw.Table.Columns["Množstvo"].Ordinal].ToString() != "") mnozstvo = Convert.ToDecimal(rw.ItemArray[rw.Table.Columns["Množstvo"].Ordinal]); + if (rw.ItemArray[rw.Table.Columns["Množstvo"].Ordinal].ToString() != "") mnozstvo = Convert.ToDecimal(rw.ItemArray[rw.Table.Columns["Množstvo"].Ordinal]); decimal cena = 0; if (rw.ItemArray[rw.Table.Columns["Cena"].Ordinal].ToString() != "") cena = Convert.ToDecimal(rw.ItemArray[rw.Table.Columns["Cena"].Ordinal]); - + string IDFirma = ""; string filter = ""; - + filter = rw.ItemArray[rw.Table.Columns["Firma"].Ordinal].ToString(); - if(filter != "") + if (filter != "") { IDFirma = filter.Substring(filter.IndexOf("(") + 1, filter.Length - filter.IndexOf("(") - 2); Int32 n; @@ -708,7 +704,7 @@ namespace Mip MessageBox.Show("Nová firma s názvom '" + filter + "' bola pridaná! \nPre doplnenie údajov o firme treba editovať firmu na karte 'Zoznam firiem'."); } } - + int lastIndex = 0; string cmd = ""; cmd = @"INSERT INTO `mip`.`tabziadanka` (`Dátum zadania`, `Status žiadanky`, `Status`, `Názov`, `Typ`, `Firma`, `Poznámka`, `Termín`, `Počet kusov`, `IDUser`, `Množstvo`, `Jednotka`, Cena) VALUES (" @@ -726,16 +722,16 @@ namespace Mip + "'" + rw.ItemArray[rw.Table.Columns["Jednotka"].Ordinal].ToString() + "', " + cena.ToString().Replace(",", ".") + " );"; - - if (cmd != "") classSQL.SQL(cmd,out lastIndex); + + if (cmd != "") classSQL.SQL(cmd, out lastIndex); - if (rw.ItemArray[rw.Table.Columns["Súborove Dáta"].Ordinal].ToString() != "") - classSQL.SaveNakresToSQL(lastIndex, (byte[])rw.ItemArray[rw.Table.Columns["Súborove Dáta"].Ordinal]); + if (rw.ItemArray[rw.Table.Columns["Súborove Dáta"].Ordinal].ToString() != "") + classSQL.SaveNakresToSQL(lastIndex, (byte[])rw.ItemArray[rw.Table.Columns["Súborove Dáta"].Ordinal]); } - + } MessageBox.Show("Žiadanky vložené do systému!"); this.Close(); @@ -744,7 +740,7 @@ namespace Mip private void button5_Click(object sender, EventArgs e) { Form frmPridatFirmu = new frmAddFirma(); - frmPridatFirmu.Location = new Point(this.Location.X + this.Size.Width-7, this.Location.Y); + frmPridatFirmu.Location = new Point(this.Location.X + this.Size.Width - 7, this.Location.Y); frmPridatFirmu.ShowDialog(); }