roman/MIP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oprava nacenovania - oprava citania vykresu z DB

Browse Source
This commit is contained in:
roman6791
2021-08-16 11:20:56 +02:00
parent af17e590be
commit 6ea3678213
9 changed files with 326 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Mip/Properties/AssemblyInfo.cs
View File

@@ -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.4.0")]
[assembly: AssemblyFileVersion("1.1.4.0")]
[assembly: AssemblyVersion("1.1.6.0")]
[assembly: AssemblyFileVersion("1.1.6.0")]

7
Mip/classSQL.cs
View File

@@ -374,8 +374,11 @@ namespace Mip
string cmd = Command.ToString();
if (cmd.Substring(0, 6).ToUpper() == "SELECT")
{
if (cmd.EndsWith(";")) cmd = cmd.Remove(cmd.Length - 1, 1) + " LIMIT " + classUser.LimitSqlPrikazu.ToString() + ";";
else cmd = cmd + " LIMIT " + classUser.LimitSqlPrikazu.ToString() + ";";
if (!cmd.Contains("LIMIT"))
{
if (cmd.EndsWith(";")) cmd = cmd.Remove(cmd.Length - 1, 1) + " LIMIT " + classUser.LimitSqlPrikazu.ToString() + ";";
else cmd = cmd + " LIMIT " + classUser.LimitSqlPrikazu.ToString() + ";";
}
}
Command = cmd;

142
Mip/frmMain.Designer.cs generated
View File

@@ -29,19 +29,19 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea7 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend7 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series11 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea8 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend8 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series12 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint13 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(1D, 9.5D);
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint14 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(2D, 9.25D);
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint15 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(3D, 8.84D);
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint16 = 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();
@@ -548,6 +548,7 @@
this.button98 = new System.Windows.Forms.Button();
this.dataGridView7 = new System.Windows.Forms.DataGridView();
this.tabPage13 = new System.Windows.Forms.TabPage();
this.button205 = new System.Windows.Forms.Button();
this.button181 = new System.Windows.Forms.Button();
this.dataGridViewVyhodnocovanie = new System.Windows.Forms.DataGridView();
this.tabPage14 = new System.Windows.Forms.TabPage();
@@ -906,7 +907,6 @@
this.pictureBox4 = new System.Windows.Forms.PictureBox();
this.label175 = new System.Windows.Forms.Label();
this.label182 = new System.Windows.Forms.Label();
this.button205 = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
@@ -1889,12 +1889,12 @@
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.AliceBlue;
dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.Green;
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Yellow;
this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle7;
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;
@@ -2471,14 +2471,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)));
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dGVVydajMat.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
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;
@@ -4963,27 +4963,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)));
chartArea7.Area3DStyle.IsRightAngleAxes = false;
chartArea7.Area3DStyle.Perspective = 25;
chartArea7.Name = "ChartArea1";
this.chart1.ChartAreas.Add(chartArea7);
legend7.DockedToChartArea = "ChartArea1";
legend7.Name = "Legend1";
this.chart1.Legends.Add(legend7);
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";
series10.ChartArea = "ChartArea1";
series10.Enabled = false;
series10.IsValueShownAsLabel = true;
series10.Legend = "Legend1";
series10.Name = "Priemerná zmätkovitosť";
series11.ChartArea = "ChartArea1";
series11.Enabled = false;
series11.IsValueShownAsLabel = true;
series11.Legend = "Legend1";
series11.Name = "Priemer zmätkovitostí";
this.chart1.Series.Add(series10);
this.chart1.Series.Add(series11);
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";
@@ -7536,6 +7536,16 @@
this.tabPage13.UseVisualStyleBackColor = true;
this.tabPage13.Enter += new System.EventHandler(this.tabPage13_Enter);
//
// button205
//
this.button205.Location = new System.Drawing.Point(88, 0);
this.button205.Name = "button205";
this.button205.Size = new System.Drawing.Size(89, 43);
this.button205.TabIndex = 8;
this.button205.Text = "Editovať vyhodnotenie";
this.button205.UseVisualStyleBackColor = true;
this.button205.Click += new System.EventHandler(this.button205_Click);
//
// button181
//
this.button181.Location = new System.Drawing.Point(0, 0);
@@ -8737,22 +8747,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;
chartArea8.Name = "ChartArea1";
this.chart2.ChartAreas.Add(chartArea8);
chartArea2.Name = "ChartArea1";
this.chart2.ChartAreas.Add(chartArea2);
this.chart2.Dock = System.Windows.Forms.DockStyle.Bottom;
legend8.Name = "Legend1";
this.chart2.Legends.Add(legend8);
legend2.Name = "Legend1";
this.chart2.Legends.Add(legend2);
this.chart2.Location = new System.Drawing.Point(0, 287);
this.chart2.Name = "chart2";
series12.ChartArea = "ChartArea1";
series12.IsValueShownAsLabel = true;
series12.Legend = "Legend1";
series12.Name = "Rozmer";
series12.Points.Add(dataPoint13);
series12.Points.Add(dataPoint14);
series12.Points.Add(dataPoint15);
series12.Points.Add(dataPoint16);
this.chart2.Series.Add(series12);
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";
@@ -11900,7 +11910,7 @@
this.lblVerzia.Name = "lblVerzia";
this.lblVerzia.Size = new System.Drawing.Size(34, 13);
this.lblVerzia.TabIndex = 13;
this.lblVerzia.Text = "1,005";
this.lblVerzia.Text = "1,006";
this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label50
@@ -12207,16 +12217,6 @@
this.label182.Text = "↗";
this.label182.Click += new System.EventHandler(this.label182_Click);
//
// button205
//
this.button205.Location = new System.Drawing.Point(88, 0);
this.button205.Name = "button205";
this.button205.Size = new System.Drawing.Size(89, 43);
this.button205.TabIndex = 8;
this.button205.Text = "Editovať vyhodnotenie";
this.button205.UseVisualStyleBackColor = true;
this.button205.Click += new System.EventHandler(this.button205_Click);
//
// frmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

3
Mip/frmNacenovanie.cs
View File

@@ -139,7 +139,8 @@ namespace Mip
objObjectPocty.SetDataToForm(this);
string strIDVykres = "";
classSQL.SQL("SELECT `IDVykres` FROM `mip`.`tabvykres` WHERE IDVyrobok = " + IDV.ToString() + " AND IndexVykresu = 1", out strIDVykres);
var commandSQL = $@"SELECT `IDVykres` FROM `mip`.`tabvykres` WHERE IDVyrobok = {IDV.ToString()} order by IndexVykresu asc LIMIT 1;";
classSQL.SQL(commandSQL, out strIDVykres);
IDVykres = Convert.ToInt32(strIDVykres);
Image setImage = classSQL.VykresZSQLDoPictureBox(IDVykres);

BIN
Mip/obj/Debug/Mip.csproj.ResolveComReference.cache
View File

Binary file not shown.