From 975c2b3a31a67f198d7e48f851e1b7530a66b0a7 Mon Sep 17 00:00:00 2001 From: roman6791 Date: Thu, 11 Nov 2021 19:13:54 +0100 Subject: [PATCH] Oprava zobrazovania meskajucich ziadaniek --- .vs/Mip_v1/v16/.suo | Bin 224256 -> 209408 bytes Mip/Properties/AssemblyInfo.cs | 4 +- Mip/frmMain.Designer.cs | 122 +++++++++--------- Mip/frmMain.cs | 24 ++-- .../Mip.csproj.ResolveComReference.cache | Bin 810 -> 810 bytes 5 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index 1069a8256fd533405dfb4b6ebf266997fedfdd91..383ac6e4dc3d412099084d3cd1168a14b1b094c4 100644 GIT binary patch delta 8920 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 delta 6027 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 Fe*l{wsAvEH diff --git a/Mip/Properties/AssemblyInfo.cs b/Mip/Properties/AssemblyInfo.cs index cd9adad..506c8a7 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.13.0")] -[assembly: AssemblyFileVersion("1.1.13.0")] +[assembly: AssemblyVersion("1.1.14.0")] +[assembly: AssemblyFileVersion("1.1.14.0")] diff --git a/Mip/frmMain.Designer.cs b/Mip/frmMain.Designer.cs index 62a010e..22be316 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(); @@ -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"; @@ -8772,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"; @@ -11935,8 +11935,8 @@ this.lblVerzia.Name = "lblVerzia"; this.lblVerzia.Size = new System.Drawing.Size(37, 13); this.lblVerzia.TabIndex = 13; - this.lblVerzia.Tag = "1,113"; - this.lblVerzia.Text = "1.1.13"; + this.lblVerzia.Tag = "1,114"; + this.lblVerzia.Text = "1.1.14"; this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label50 diff --git a/Mip/frmMain.cs b/Mip/frmMain.cs index 4bc76c5..be77cc6 100644 --- a/Mip/frmMain.cs +++ b/Mip/frmMain.cs @@ -7090,11 +7090,9 @@ namespace Mip private void refreshNepotvrdeneNedoruceneZiadanky() { - string sqlCommandZiadanky; - sqlCommandZiadanky = @"SELECT * FROM `pohlad-ziadanka` - WHERE `Status` = 'True' - AND (`Status žiadanky` = '#&@' OR (`Status žiadanky` = 'Dopyt odoslaný' AND `Termín` <= NOW()) OR (`Status žiadanky` = 'Objednávka odoslaná' AND `Termín` <= NOW()) OR (`Status žiadanky` = 'Potvrdená' AND `Potvrdený dátum` <= NOW())) - ORDER BY `IDZiadanka` DESC;"; + var sqlCommandZiadanky = @"SELECT* FROM `pohlad-ziadanka` + WHERE `Status` = 'True' AND(`Potvrdený dátum` <= NOW() OR `Potvrdený dátum` != NULL) AND(`Status žiadanky` != 'Vybavená' AND `Status žiadanky` != 'Nevybavená' AND `Status žiadanky` != 'Zamietnutá') + ORDER BY `IDZiadanka` DESC;"; DataTable outdtbl = new DataTable(); @@ -7111,7 +7109,7 @@ namespace Mip if (dataGridView16.SelectedRows.Count > 0) selectedIndex = Convert.ToInt32(dataGridView16.SelectedRows[0].Index); - string strTextBoxCondition = $"{textBox52.Tag} {textBox38.Tag}"; + string strTextBoxCondition = $"{ textBox52.Tag} {textBox38.Tag}"; //if (ZiadankyColorIndex > 0) strTextBoxCondition = " AND INSTR(`" + dataGridView16.Columns[ZiadankyColorIndex].Name + "`, '" + textBox38.Text + "')>0 "; string sqlCommandZiadanky; @@ -8449,6 +8447,8 @@ namespace Mip dataGridView16.Columns["Dátum schválenia"].Width = 70; dataGridView16.Columns["Dátum odoslania"].Width = 70; dataGridView16.Columns["Potvrdený dátum"].Width = 70; + dataGridView16.Columns["Potvrdený dátum"].HeaderText = "Potvrdený termín"; + dataGridView16.Columns["Potvrdený dátum"].DisplayIndex = 6; dataGridView16.Columns["Dátum prijatia"].Width = 70; dataGridView16.Columns["Dátum vybavenia"].Width = 70; dataGridView16.Columns["Status žiadanky"].MinimumWidth = 85; @@ -8467,19 +8467,19 @@ namespace Mip dataGridView16.Columns["Firma"].DisplayIndex = 4; dataGridView16.Columns["Poznámka"].MinimumWidth = 100; dataGridView16.Columns["Poznámka"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader; - dataGridView16.Columns["Poznámka"].DisplayIndex = 11; + dataGridView16.Columns["Poznámka"].DisplayIndex = 12; dataGridView16.Columns["Termín"].Width = 70; dataGridView16.Columns["Termín"].DisplayIndex = 5; dataGridView16.Columns["Počet kusov"].Width = 60; - dataGridView16.Columns["Počet kusov"].DisplayIndex = 6; + dataGridView16.Columns["Počet kusov"].DisplayIndex = 7; dataGridView16.Columns["Množstvo"].Width = 60; - dataGridView16.Columns["Množstvo"].DisplayIndex = 7; + dataGridView16.Columns["Množstvo"].DisplayIndex = 8; dataGridView16.Columns["Jednotka"].Width = 60; - dataGridView16.Columns["Jednotka"].DisplayIndex = 8; + dataGridView16.Columns["Jednotka"].DisplayIndex = 9; dataGridView16.Columns["Faktúra"].Width = 80; dataGridView16.Columns["Cena"].Width = 60; - dataGridView16.Columns["Cena"].DisplayIndex = 9; - dataGridView16.Columns["Číslo objednávky"].DisplayIndex = 10; + dataGridView16.Columns["Cena"].DisplayIndex = 10; + dataGridView16.Columns["Číslo objednávky"].DisplayIndex = 11; dataGridView16.Columns["IDUser"].Visible = false; dataGridView16.Columns["Číslo dokumentu"].MinimumWidth = 95; dataGridView16.Columns["Číslo dokumentu"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader; diff --git a/Mip/obj/Release/Mip.csproj.ResolveComReference.cache b/Mip/obj/Release/Mip.csproj.ResolveComReference.cache index fc1efdfb038902edbe6fbc728ef3cfae7080ae0d..d5fe7e73387db18311e2342750912aea56386025 100644 GIT binary patch delta 38 wcmV+>0NMYl2C4?Ie*y;t0000A3I~&h0+JG-*3kRM$cP9Hcl5l0{d(7k3-odiZ2$lO delta 38 ucmZ3*wu)^-Jrg?<0|NsW7xUycrb$8;LiwMMpXlJ=E&sBo@o&}j4sHP0`VG