diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index e384db0..7f7a27b 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/Properties/AssemblyInfo.cs b/Mip/Properties/AssemblyInfo.cs index 4674936..674421c 100644 --- a/Mip/Properties/AssemblyInfo.cs +++ b/Mip/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.8.0")] -[assembly: AssemblyFileVersion("1.1.8.0")] +[assembly: AssemblyVersion("1.1.9.0")] +[assembly: AssemblyFileVersion("1.1.9.0")] diff --git a/Mip/frmMain.Designer.cs b/Mip/frmMain.Designer.cs index 87afea2..3a3bf2f 100644 --- a/Mip/frmMain.Designer.cs +++ b/Mip/frmMain.Designer.cs @@ -29,19 +29,19 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend4 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint5 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(1D, 9.5D); - System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint6 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(2D, 9.25D); - System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint7 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(3D, 8.84D); - System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint8 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(4D, 8.67D); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint1 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(1D, 9.5D); + System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint2 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(2D, 9.25D); + System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint3 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(3D, 8.84D); + System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint4 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(4D, 8.67D); this.checkBox65 = new System.Windows.Forms.CheckBox(); this.checkBox66 = new System.Windows.Forms.CheckBox(); this.checkBox67 = new System.Windows.Forms.CheckBox(); @@ -518,6 +518,8 @@ this.button73 = new System.Windows.Forms.Button(); this.dataGridView8 = new System.Windows.Forms.DataGridView(); this.tabPage12 = new System.Windows.Forms.TabPage(); + this.button206 = new System.Windows.Forms.Button(); + this.button207 = new System.Windows.Forms.Button(); this.panel63 = new System.Windows.Forms.Panel(); this.comboBox16 = new System.Windows.Forms.ComboBox(); this.button171 = new System.Windows.Forms.Button(); @@ -907,8 +909,6 @@ this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.label175 = new System.Windows.Forms.Label(); this.label182 = new System.Windows.Forms.Label(); - this.button206 = new System.Windows.Forms.Button(); - this.button207 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -1891,12 +1891,12 @@ this.dataGridView1.ReadOnly = true; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.AliceBlue; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Green; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Yellow; - this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.AliceBlue; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.Green; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Yellow; + this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.Size = new System.Drawing.Size(1704, 215); this.dataGridView1.TabIndex = 0; @@ -2473,14 +2473,14 @@ this.dGVVydajMat.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dGVVydajMat.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.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.True; + this.dGVVydajMat.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dGVVydajMat.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dGVVydajMat.Location = new System.Drawing.Point(1, 43); this.dGVVydajMat.MultiSelect = false; @@ -4965,27 +4965,27 @@ this.chart1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - chartArea3.Area3DStyle.IsRightAngleAxes = false; - chartArea3.Area3DStyle.Perspective = 25; - chartArea3.Name = "ChartArea1"; - this.chart1.ChartAreas.Add(chartArea3); - legend3.DockedToChartArea = "ChartArea1"; - legend3.Name = "Legend1"; - this.chart1.Legends.Add(legend3); + chartArea1.Area3DStyle.IsRightAngleAxes = false; + chartArea1.Area3DStyle.Perspective = 25; + chartArea1.Name = "ChartArea1"; + this.chart1.ChartAreas.Add(chartArea1); + legend1.DockedToChartArea = "ChartArea1"; + legend1.Name = "Legend1"; + this.chart1.Legends.Add(legend1); this.chart1.Location = new System.Drawing.Point(4, 4); this.chart1.Name = "chart1"; - series4.ChartArea = "ChartArea1"; - series4.Enabled = false; - series4.IsValueShownAsLabel = true; - series4.Legend = "Legend1"; - series4.Name = "Priemerná zmätkovitosť"; - series5.ChartArea = "ChartArea1"; - series5.Enabled = false; - series5.IsValueShownAsLabel = true; - series5.Legend = "Legend1"; - series5.Name = "Priemer zmätkovitostí"; - this.chart1.Series.Add(series4); - this.chart1.Series.Add(series5); + series1.ChartArea = "ChartArea1"; + series1.Enabled = false; + series1.IsValueShownAsLabel = true; + series1.Legend = "Legend1"; + series1.Name = "Priemerná zmätkovitosť"; + series2.ChartArea = "ChartArea1"; + series2.Enabled = false; + series2.IsValueShownAsLabel = true; + series2.Legend = "Legend1"; + series2.Name = "Priemer zmätkovitostí"; + this.chart1.Series.Add(series1); + this.chart1.Series.Add(series2); this.chart1.Size = new System.Drawing.Size(971, 512); this.chart1.TabIndex = 0; this.chart1.Text = "chart1"; @@ -7192,6 +7192,27 @@ this.tabPage12.UseVisualStyleBackColor = true; this.tabPage12.Enter += new System.EventHandler(this.tabPage12_Enter); // + // button206 + // + this.button206.Enabled = false; + this.button206.Location = new System.Drawing.Point(827, 0); + this.button206.Name = "button206"; + this.button206.Size = new System.Drawing.Size(82, 43); + this.button206.TabIndex = 45; + this.button206.Text = "Zobraziť vyhodnotenie"; + this.button206.UseVisualStyleBackColor = true; + this.button206.Click += new System.EventHandler(this.button206_Click); + // + // button207 + // + this.button207.Location = new System.Drawing.Point(748, 0); + this.button207.Name = "button207"; + this.button207.Size = new System.Drawing.Size(80, 43); + this.button207.TabIndex = 44; + this.button207.Text = "Požiadať o vyhodnotenie"; + this.button207.UseVisualStyleBackColor = true; + this.button207.Click += new System.EventHandler(this.button207_Click); + // // panel63 // this.panel63.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -8751,22 +8772,22 @@ this.chart2.BackColor = System.Drawing.Color.DarkGray; this.chart2.BorderlineColor = System.Drawing.Color.Black; this.chart2.BorderlineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Solid; - chartArea4.Name = "ChartArea1"; - this.chart2.ChartAreas.Add(chartArea4); + chartArea2.Name = "ChartArea1"; + this.chart2.ChartAreas.Add(chartArea2); this.chart2.Dock = System.Windows.Forms.DockStyle.Bottom; - legend4.Name = "Legend1"; - this.chart2.Legends.Add(legend4); + legend2.Name = "Legend1"; + this.chart2.Legends.Add(legend2); this.chart2.Location = new System.Drawing.Point(0, 287); this.chart2.Name = "chart2"; - series6.ChartArea = "ChartArea1"; - series6.IsValueShownAsLabel = true; - series6.Legend = "Legend1"; - series6.Name = "Rozmer"; - series6.Points.Add(dataPoint5); - series6.Points.Add(dataPoint6); - series6.Points.Add(dataPoint7); - series6.Points.Add(dataPoint8); - this.chart2.Series.Add(series6); + series3.ChartArea = "ChartArea1"; + series3.IsValueShownAsLabel = true; + series3.Legend = "Legend1"; + series3.Name = "Rozmer"; + series3.Points.Add(dataPoint1); + series3.Points.Add(dataPoint2); + series3.Points.Add(dataPoint3); + series3.Points.Add(dataPoint4); + this.chart2.Series.Add(series3); this.chart2.Size = new System.Drawing.Size(407, 203); this.chart2.TabIndex = 2; this.chart2.Text = "chart2"; @@ -11914,7 +11935,7 @@ this.lblVerzia.Name = "lblVerzia"; this.lblVerzia.Size = new System.Drawing.Size(34, 13); this.lblVerzia.TabIndex = 13; - this.lblVerzia.Text = "1,008"; + this.lblVerzia.Text = "1,009"; this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label50 @@ -12221,25 +12242,6 @@ this.label182.Text = "↗"; this.label182.Click += new System.EventHandler(this.label182_Click); // - // button206 - // - this.button206.Enabled = false; - this.button206.Location = new System.Drawing.Point(822, 0); - this.button206.Name = "button206"; - this.button206.Size = new System.Drawing.Size(82, 43); - this.button206.TabIndex = 45; - this.button206.Text = "Zobraziť vyhodnotenie"; - this.button206.UseVisualStyleBackColor = true; - // - // button207 - // - this.button207.Location = new System.Drawing.Point(748, 0); - this.button207.Name = "button207"; - this.button207.Size = new System.Drawing.Size(75, 43); - this.button207.TabIndex = 44; - this.button207.Text = "Vyhodnotiť"; - this.button207.UseVisualStyleBackColor = true; - // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Mip/frmMain.cs b/Mip/frmMain.cs index fba146b..72c74ae 100644 --- a/Mip/frmMain.cs +++ b/Mip/frmMain.cs @@ -6890,6 +6890,10 @@ namespace Mip DataGridViewRow dtgvr = dataGridView7.SelectedRows[0]; if (dtgvr.Cells["Status"].Value.ToString() == "Prijatá") button57.Text = "Naceniť"; else button57.Text = "Editovať"; + if (dtgvr.Cells["Status vyhodnotenia"].Value.ToString() == "Vyhodnotená") button206.Enabled = true; + else button206.Enabled = false; + if (dtgvr.Cells["Status"].Value.ToString() == "Nacenená" && dtgvr.Cells["Status vyhodnotenia"].Value.ToString() == "") button207.Enabled = true; + else button207.Enabled = false; } } @@ -8150,6 +8154,8 @@ namespace Mip dataGridView7.Columns["Alias"].Width = 70; dataGridView7.Columns["Rozlišovací znak"].Width = 70; dataGridView7.Columns["Počet segmentov"].Width = 70; + dataGridView7.Columns["Status vyhodnotenia"].Width = 120; + dataGridView7.Columns["IdVyhodnotenie"].Visible = false; } private void button162_Click(object sender, EventArgs e) @@ -10710,5 +10716,42 @@ namespace Mip button205.Enabled = false; } } + + private void button206_Click(object sender, EventArgs e) + { + // + DataGridViewRow dtgvr = dataGridView7.SelectedRows[0]; + + var idNacenovanie = Convert.ToInt32(dtgvr.Cells["IDNacenovanie"].Value); + var idVyrobok = Convert.ToInt32(dtgvr.Cells["IDVyrobokNac"].Value); + var idVyhodnotenie = Convert.ToInt32(dtgvr.Cells["IdVyhodnotenie"].Value); + + Form frmNacenovanie2 = new frmNacenovanie(idNacenovanie, idVyrobok, true, true, false, false, false, false, idVyhodnotenie); + frmNacenovanie2.Text = "Vyhodnocovanie"; + frmNacenovanie2.ShowDialog(); + RefreshVyhodocovanie(); + } + + private void button207_Click(object sender, EventArgs e) + { + + DataGridViewRow dtgvr = dataGridView7.SelectedRows[0]; + + var idNacenovanie = Convert.ToInt32(dtgvr.Cells["IDNacenovanie"].Value); + var idVyrobok = Convert.ToInt32(dtgvr.Cells["IDVyrobokNac"].Value); + + var cmd = $@"INSERT INTO `mip`.`tab-nacenovanie-vyhodnocovanie` ( + `IDNacenovanie`, + `IdVyrobokVyhodnocovanie`, + `Status`) + VALUES ( + {idNacenovanie}, + {idVyrobok}, + 'Žiadosť o vyhodnotenie');"; + + if (cmd != "") classSQL.SQL(cmd); + + refreshNacenovanie(); + } } } diff --git a/Mip/frmNacenovanie.Designer.cs b/Mip/frmNacenovanie.Designer.cs index 0b592a1..abc5d61 100644 --- a/Mip/frmNacenovanie.Designer.cs +++ b/Mip/frmNacenovanie.Designer.cs @@ -799,8 +799,7 @@ this.label550 = new System.Windows.Forms.Label(); this.panel123 = new System.Windows.Forms.Panel(); this.panel124 = new System.Windows.Forms.Panel(); - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.VyhodnocovanieCenaZaKus = new System.Windows.Forms.Label(); + this.VyhodnocovanieCenaZaKus = new System.Windows.Forms.NumericUpDown(); this.label551 = new System.Windows.Forms.Label(); this.panel125 = new System.Windows.Forms.Panel(); this.label552 = new System.Windows.Forms.Label(); @@ -1048,6 +1047,7 @@ this.label355 = new System.Windows.Forms.Label(); this.label153 = new System.Windows.Forms.Label(); this.panel9 = new System.Windows.Forms.Panel(); + this.button22 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel19.SuspendLayout(); this.panel20.SuspendLayout(); @@ -1308,7 +1308,7 @@ this.panel122.SuspendLayout(); this.panel123.SuspendLayout(); this.panel124.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.VyhodnocovanieCenaZaKus)).BeginInit(); this.panel125.SuspendLayout(); this.panel126.SuspendLayout(); this.panel127.SuspendLayout(); @@ -1385,7 +1385,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Margin = new System.Windows.Forms.Padding(1); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(551, 130); + this.panel1.Size = new System.Drawing.Size(1551, 130); this.panel1.TabIndex = 20; // // panel19 @@ -1646,7 +1646,7 @@ this.Výkres.Controls.Add(this.panel15); this.Výkres.Controls.Add(this.panel105); this.Výkres.Dock = System.Windows.Forms.DockStyle.Right; - this.Výkres.Location = new System.Drawing.Point(551, 0); + this.Výkres.Location = new System.Drawing.Point(1551, 0); this.Výkres.MaximumSize = new System.Drawing.Size(1073, 916); this.Výkres.MinimumSize = new System.Drawing.Size(23, 916); this.Výkres.Name = "Výkres"; @@ -1736,7 +1736,7 @@ // button4 // this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button4.Location = new System.Drawing.Point(474, 31); + this.button4.Location = new System.Drawing.Point(1474, 31); this.button4.Margin = new System.Windows.Forms.Padding(1); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(75, 23); @@ -1793,7 +1793,7 @@ this.panel17.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel17.Location = new System.Drawing.Point(0, 860); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(551, 56); + this.panel17.Size = new System.Drawing.Size(1551, 56); this.panel17.TabIndex = 22; // // panel24 @@ -1804,7 +1804,7 @@ this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(549, 31); + this.panel24.Size = new System.Drawing.Size(1549, 31); this.panel24.TabIndex = 13; // // label14 @@ -1813,7 +1813,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.label14.Location = new System.Drawing.Point(94, 1); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(0, 29); + this.label14.Size = new System.Drawing.Size(1000, 29); this.label14.TabIndex = 1; this.label14.Text = "----"; // @@ -1844,7 +1844,7 @@ this.panel16.Location = new System.Drawing.Point(0, 130); this.panel16.MinimumSize = new System.Drawing.Size(551, 730); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(551, 730); + this.panel16.Size = new System.Drawing.Size(1551, 730); this.panel16.TabIndex = 21; // // Polotovar @@ -1856,7 +1856,7 @@ this.Polotovar.Controls.Add(this.label17); this.Polotovar.Controls.Add(this.panel10); this.Polotovar.Dock = System.Windows.Forms.DockStyle.Right; - this.Polotovar.Location = new System.Drawing.Point(411, 0); + this.Polotovar.Location = new System.Drawing.Point(1028, 0); this.Polotovar.Margin = new System.Windows.Forms.Padding(1); this.Polotovar.MaximumSize = new System.Drawing.Size(324, 728); this.Polotovar.MinimumSize = new System.Drawing.Size(23, 728); @@ -4114,7 +4114,7 @@ this.Materiál.Controls.Add(this.label15); this.Materiál.Controls.Add(this.panel11); this.Materiál.Dock = System.Windows.Forms.DockStyle.Right; - this.Materiál.Location = new System.Drawing.Point(434, 0); + this.Materiál.Location = new System.Drawing.Point(1051, 0); this.Materiál.Margin = new System.Windows.Forms.Padding(1); this.Materiál.MaximumSize = new System.Drawing.Size(457, 728); this.Materiál.MinimumSize = new System.Drawing.Size(23, 728); @@ -6370,7 +6370,7 @@ this.Naceňovanie.Controls.Add(this.panel77); this.Naceňovanie.Controls.Add(this.panel14); this.Naceňovanie.Dock = System.Windows.Forms.DockStyle.Right; - this.Naceňovanie.Location = new System.Drawing.Point(457, 0); + this.Naceňovanie.Location = new System.Drawing.Point(1074, 0); this.Naceňovanie.Margin = new System.Windows.Forms.Padding(1); this.Naceňovanie.MaximumSize = new System.Drawing.Size(406, 728); this.Naceňovanie.MinimumSize = new System.Drawing.Size(23, 728); @@ -8596,17 +8596,18 @@ this.Vyhodnocovanie.Controls.Add(this.panel112); this.Vyhodnocovanie.Controls.Add(this.panel12); this.Vyhodnocovanie.Dock = System.Windows.Forms.DockStyle.Right; - this.Vyhodnocovanie.Location = new System.Drawing.Point(480, 0); + this.Vyhodnocovanie.Location = new System.Drawing.Point(1097, 0); this.Vyhodnocovanie.Margin = new System.Windows.Forms.Padding(1); this.Vyhodnocovanie.MaximumSize = new System.Drawing.Size(406, 728); this.Vyhodnocovanie.MinimumSize = new System.Drawing.Size(23, 728); this.Vyhodnocovanie.Name = "Vyhodnocovanie"; - this.Vyhodnocovanie.Size = new System.Drawing.Size(23, 728); + this.Vyhodnocovanie.Size = new System.Drawing.Size(406, 728); this.Vyhodnocovanie.TabIndex = 4; // // panel112 // this.panel112.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel112.Controls.Add(this.button22); this.panel112.Controls.Add(this.panel113); this.panel112.Controls.Add(this.panel121); this.panel112.Controls.Add(this.panel123); @@ -10492,7 +10493,6 @@ // panel124 // this.panel124.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel124.Controls.Add(this.numericUpDown1); this.panel124.Controls.Add(this.VyhodnocovanieCenaZaKus); this.panel124.Controls.Add(this.label551); this.panel124.Controls.Add(this.panel125); @@ -10501,36 +10501,25 @@ this.panel124.Size = new System.Drawing.Size(188, 70); this.panel124.TabIndex = 2; // - // numericUpDown1 + // VyhodnocovanieCenaZaKus // - this.numericUpDown1.DecimalPlaces = 2; - this.numericUpDown1.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.numericUpDown1.Increment = new decimal(new int[] { + this.VyhodnocovanieCenaZaKus.DecimalPlaces = 2; + this.VyhodnocovanieCenaZaKus.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.VyhodnocovanieCenaZaKus.Increment = new decimal(new int[] { 1, 0, 0, 131072}); - this.numericUpDown1.Location = new System.Drawing.Point(2, 23); - this.numericUpDown1.Maximum = new decimal(new int[] { + this.VyhodnocovanieCenaZaKus.Location = new System.Drawing.Point(2, 23); + this.VyhodnocovanieCenaZaKus.Maximum = new decimal(new int[] { 99999, 0, 0, 0}); - this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(18, 44); - this.numericUpDown1.TabIndex = 3; - this.numericUpDown1.Visible = false; - this.numericUpDown1.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); - // - // VyhodnocovanieCenaZaKus - // - this.VyhodnocovanieCenaZaKus.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.VyhodnocovanieCenaZaKus.Location = new System.Drawing.Point(30, 25); this.VyhodnocovanieCenaZaKus.Name = "VyhodnocovanieCenaZaKus"; - this.VyhodnocovanieCenaZaKus.Size = new System.Drawing.Size(120, 39); - this.VyhodnocovanieCenaZaKus.TabIndex = 1; - this.VyhodnocovanieCenaZaKus.Text = "0"; - this.VyhodnocovanieCenaZaKus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.VyhodnocovanieCenaZaKus.Size = new System.Drawing.Size(146, 44); + this.VyhodnocovanieCenaZaKus.TabIndex = 3; + this.VyhodnocovanieCenaZaKus.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); // // label551 // @@ -10621,7 +10610,7 @@ this.Sadzby.Controls.Add(this.panel70); this.Sadzby.Controls.Add(this.panel13); this.Sadzby.Dock = System.Windows.Forms.DockStyle.Right; - this.Sadzby.Location = new System.Drawing.Point(503, 0); + this.Sadzby.Location = new System.Drawing.Point(1503, 0); this.Sadzby.Margin = new System.Windows.Forms.Padding(1); this.Sadzby.MaximumSize = new System.Drawing.Size(350, 728); this.Sadzby.MinimumSize = new System.Drawing.Size(23, 728); @@ -11458,7 +11447,7 @@ this.Počty.Controls.Add(this.panel98); this.Počty.Controls.Add(this.panel9); this.Počty.Dock = System.Windows.Forms.DockStyle.Right; - this.Počty.Location = new System.Drawing.Point(526, 0); + this.Počty.Location = new System.Drawing.Point(1526, 0); this.Počty.Margin = new System.Windows.Forms.Padding(1); this.Počty.MaximumSize = new System.Drawing.Size(403, 728); this.Počty.MinimumSize = new System.Drawing.Size(23, 728); @@ -13250,11 +13239,21 @@ this.panel9.Size = new System.Drawing.Size(19, 19); this.panel9.TabIndex = 0; // + // button22 + // + this.button22.Location = new System.Drawing.Point(236, 516); + this.button22.Name = "button22"; + this.button22.Size = new System.Drawing.Size(143, 22); + this.button22.TabIndex = 4; + this.button22.Text = "Vložiť údaje z naceňovania"; + this.button22.UseVisualStyleBackColor = true; + this.button22.Click += new System.EventHandler(this.button22_Click); + // // frmNacenovanie // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(574, 916); + this.ClientSize = new System.Drawing.Size(1574, 916); this.Controls.Add(this.panel16); this.Controls.Add(this.panel1); this.Controls.Add(this.panel17); @@ -13592,7 +13591,7 @@ this.panel123.ResumeLayout(false); this.panel124.ResumeLayout(false); this.panel124.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.VyhodnocovanieCenaZaKus)).EndInit(); this.panel125.ResumeLayout(false); this.panel125.PerformLayout(); this.panel126.ResumeLayout(false); @@ -14401,7 +14400,6 @@ private System.Windows.Forms.Panel panel125; private System.Windows.Forms.Label label552; private System.Windows.Forms.Panel panel126; - private System.Windows.Forms.Label VyhodnocovanieCenaZaKus; private System.Windows.Forms.Panel panel127; private System.Windows.Forms.Label label554; private System.Windows.Forms.TextBox textBox1; @@ -14679,6 +14677,7 @@ private MyTools.MyNumericUpDown VyhodnocovanieCenaImpregnaciaPraca; private MyTools.MyNumericUpDown VyhodnocovanieCenaImpregnaciaMaterial; private MyTools.MyNumericUpDown VyhodnocovanieCenaMaterial; - private System.Windows.Forms.NumericUpDown numericUpDown1; + private System.Windows.Forms.NumericUpDown VyhodnocovanieCenaZaKus; + private System.Windows.Forms.Button button22; } } \ No newline at end of file diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index a2cdd41..e7b9af2 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -163,10 +163,10 @@ namespace Mip pictureBox1.Size = new Size(Convert.ToInt32(sizeW * z), Convert.ToInt32(sizeH * z)); pictureBox1.Location = new Point(1, 1); - if (IDN == 0) - { - numericUpDown1.Visible = true; - } + //if (IDN == 0) + //{ + // VyhodnocovanieCenaZaKus.Visible = true; + //} if (FirstTimeLoad && !objObjectVyhodnocovanie.FormDataLoadedAndReady) { button8_Click(null, null); @@ -2462,7 +2462,7 @@ namespace Mip public decimal VyhodnocovanieCenaMaterial { get; private set; } public decimal VyhodnocovanieCenaImpregnaciaPraca { get; private set; } public decimal VyhodnocovanieCenaImpregnaciaMaterial { get; private set; } - public bool DataIsLoadedFromDB { get; private set; } = false; + public bool DataIsLoadedFromDB { get; set; } = false; public decimal VyhodnocovanieCenaZaKus { get; private set; } public decimal VyhodnocovanieCenaOstatneNaklady { get; private set; } public string NazovNovejPolozky { get; private set; } @@ -2518,6 +2518,7 @@ namespace Mip VyhodnocovanieVyrobaCNCsustruhSPU40 = Convert.ToDecimal(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["VyhodnocovanieVyrobaCNCsustruhSPU40"].ToString()); VyhodnocovanieVyroba3Dmeranie = Convert.ToDecimal(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["VyhodnocovanieVyroba3Dmeranie"].ToString()); VyhodnocovanieRezia = Convert.ToDecimal(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["VyhodnocovanieRezia"].ToString()); + VyhodnocovanieRezia = VyhodnocovanieRezia == 0 ? 1 : VyhodnocovanieRezia; VyhodnocovanieOstatneNakladyCena = Convert.ToDecimal(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["VyhodnocovanieOstatneNakladyCena"].ToString()); VyhodnocovanieOstatneNakladyPocet = Convert.ToDecimal(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["VyhodnocovanieOstatneNakladyPocet"].ToString()); VyhodnocovaniePocetKusovDoVyroby = Convert.ToDecimal(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["VyhodnocovaniePocetKusovDoVyroby"].ToString()); @@ -2534,7 +2535,8 @@ namespace Mip VyhodnocovanieCenaImpregnaciaMaterial = Convert.ToDecimal(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["VyhodnocovanieCenaImpregnaciaMaterial"].ToString()); VyhodnocovanieCenaZaKus = Convert.ToDecimal(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["VyhodnocovanieCenaZaKus"].ToString()); IdNacenovanieVyhodnocovanie = Convert.ToInt32(tblObjectVyhodnocovanie.Rows[intCisloRiadka]["IDNacenovanie"].ToString()); - VyhodnocovanieCenaOstatneNaklady = VyhodnocovanieOstatneNakladyCena * VyhodnocovanieOstatneNakladyPocet / VyhodnocovaniePocetKusovDoVyroby; + VyhodnocovanieCenaOstatneNaklady = VyhodnocovaniePocetKusovDoVyroby == 0 ? 0 : (VyhodnocovanieOstatneNakladyCena * VyhodnocovanieOstatneNakladyPocet / VyhodnocovaniePocetKusovDoVyroby); + DataIsLoadedFromDB = true; } RefreshForm(inputForm); @@ -2588,7 +2590,7 @@ namespace Mip VyhodnocovanieCenaImpregnaciaPraca = form.VyhodnocovanieCenaImpregnaciaPraca.Value; VyhodnocovanieCenaImpregnaciaMaterial = form.VyhodnocovanieCenaImpregnaciaMaterial.Value; - VyhodnocovanieCenaZaKus = Convert.ToDecimal(form.VyhodnocovanieCenaZaKus.Text); + VyhodnocovanieCenaZaKus = form.VyhodnocovanieCenaZaKus.Value; NazovNovejPolozky = form.label564.Text; } @@ -2719,7 +2721,7 @@ namespace Mip form.VyhodnocovanieCenaImpregnaciaPraca.Value = VyhodnocovanieCenaImpregnaciaPraca; form.VyhodnocovanieCenaImpregnaciaMaterial.Value = VyhodnocovanieCenaImpregnaciaMaterial; - form.VyhodnocovanieCenaZaKus.Text = string.Format("{0:F2}", VyhodnocovanieCenaZaKus); + form.VyhodnocovanieCenaZaKus.Value = VyhodnocovanieCenaZaKus; form.label549.Text = form.label206.Text; NacenenaCena = form.label206.Text; form.label546.Text = form.label212.Text; @@ -2800,7 +2802,7 @@ namespace Mip form.label548.Text = Convert.ToDecimal(form.label547.Text) == 0 ? string.Format("{0:F2}", 0) : - string.Format("{0:F2}", (Convert.ToDecimal(form.VyhodnocovanieCenaZaKus.Text) / Convert.ToDecimal(form.label547.Text) * 100) - 100); + string.Format("{0:F2}", (form.VyhodnocovanieCenaZaKus.Value / Convert.ToDecimal(form.label547.Text) * 100) - 100); VyhodnotenyZisk = form.label548.Text; form.VyhodnocovanieCenaMaterial.Value = Convert.ToDecimal(form.label182.Text); form.VyhodnocovanieCenaImpregnaciaPraca.Value = Convert.ToDecimal(form.label181.Text); @@ -2869,7 +2871,8 @@ namespace Mip `NacenenaCena` = '{NacenenaCena.Replace(",", ".")}', `NacenenyZisk` = '{NacenenyZisk.Replace(",", ".")}', `VyhodnotenaCena` = '{VyhodnotenaCena.Replace(",", ".")}', - `VyhodnotenyZisk` = '{VyhodnotenyZisk.Replace(",", ".")}' + `VyhodnotenyZisk` = '{VyhodnotenyZisk.Replace(",", ".")}', + `Status` = 'Vyhodnotená' WHERE `IdVyhodnotenie`= " + IdVyhodnotenie.ToString() + "; "; @@ -6216,8 +6219,17 @@ namespace Mip private void numericUpDown1_ValueChanged(object sender, EventArgs e) { - VyhodnocovanieCenaZaKus.Text = numericUpDown1.Value.ToString(); + //VyhodnocovanieCenaZaKus.Text = VyhodnocovanieCenaZaKus.Value.ToString(); RefreshVyhodnotenieAll(); } + + private void button22_Click(object sender, EventArgs e) + { + for (int i = 1; i < 101; i++) + { + objObjectVyhodnocovanie.DataIsLoadedFromDB = false; + objObjectVyhodnocovanie.SetDataToForm(this); + } + } } } diff --git a/MipInstaller/MipInstaller.vdproj b/MipInstaller/MipInstaller.vdproj index 26a2359..5daa176 100644 --- a/MipInstaller/MipInstaller.vdproj +++ b/MipInstaller/MipInstaller.vdproj @@ -630,15 +630,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Mip1.1" - "ProductCode" = "8:{89C91A43-2550-40FB-A31E-D44256A72D62}" - "PackageCode" = "8:{2D789EA9-AF33-4D74-90DC-6616EFEAAF3A}" + "ProductCode" = "8:{D97395FB-9568-4273-95B8-5CE34EA174CF}" + "PackageCode" = "8:{0BA4FB34-E859-4174-A50C-125BD81C3ADA}" "UpgradeCode" = "8:{96C5136E-DF0B-48C4-9031-F8CA75E3E3E6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.7" + "ProductVersion" = "8:1.1.8" "Manufacturer" = "8:Kompozitum" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/MipInstaller/Release/MipInstaller.msi b/MipInstaller/Release/MipInstaller.msi index 6653668..1322c10 100644 Binary files a/MipInstaller/Release/MipInstaller.msi and b/MipInstaller/Release/MipInstaller.msi differ