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

Oprava zobrazovania meskajucich ziadaniek

Browse Source
This commit is contained in:
roman6791
2021-11-11 19:13:54 +01:00
parent f721b16226
commit 975c2b3a31
5 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Mip_v1/v16/.suo
View File

Binary file not shown.

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 // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.13.0")] [assembly: AssemblyVersion("1.1.14.0")]
[assembly: AssemblyFileVersion("1.1.13.0")] [assembly: AssemblyFileVersion("1.1.14.0")]

122
Mip/frmMain.Designer.cs generated
View File

@@ -29,19 +29,19 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = 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.Legend legend1 = 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 series1 = 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.Series series2 = 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.ChartArea chartArea2 = 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.Legend legend2 = 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.Series series3 = 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 dataPoint1 = 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 dataPoint2 = 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 dataPoint3 = 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.DataVisualization.Charting.DataPoint dataPoint4 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(4D, 8.67D);
this.checkBox65 = new System.Windows.Forms.CheckBox(); this.checkBox65 = new System.Windows.Forms.CheckBox();
this.checkBox66 = new System.Windows.Forms.CheckBox(); this.checkBox66 = new System.Windows.Forms.CheckBox();
this.checkBox67 = new System.Windows.Forms.CheckBox(); this.checkBox67 = new System.Windows.Forms.CheckBox();
@@ -1891,12 +1891,12 @@
this.dataGridView1.ReadOnly = true; this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.AliceBlue; dataGridViewCellStyle1.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))); dataGridViewCellStyle1.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; dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Green; dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.Green;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Yellow; dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Yellow;
this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView1.Size = new System.Drawing.Size(1704, 215); this.dataGridView1.Size = new System.Drawing.Size(1704, 215);
this.dataGridView1.TabIndex = 0; 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) 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.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle2.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))); dataGridViewCellStyle2.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; dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dGVVydajMat.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dGVVydajMat.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dGVVydajMat.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dGVVydajMat.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dGVVydajMat.Location = new System.Drawing.Point(1, 43); this.dGVVydajMat.Location = new System.Drawing.Point(1, 43);
this.dGVVydajMat.MultiSelect = false; 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) 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.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
chartArea3.Area3DStyle.IsRightAngleAxes = false; chartArea1.Area3DStyle.IsRightAngleAxes = false;
chartArea3.Area3DStyle.Perspective = 25; chartArea1.Area3DStyle.Perspective = 25;
chartArea3.Name = "ChartArea1"; chartArea1.Name = "ChartArea1";
this.chart1.ChartAreas.Add(chartArea3); this.chart1.ChartAreas.Add(chartArea1);
legend3.DockedToChartArea = "ChartArea1"; legend1.DockedToChartArea = "ChartArea1";
legend3.Name = "Legend1"; legend1.Name = "Legend1";
this.chart1.Legends.Add(legend3); this.chart1.Legends.Add(legend1);
this.chart1.Location = new System.Drawing.Point(4, 4); this.chart1.Location = new System.Drawing.Point(4, 4);
this.chart1.Name = "chart1"; this.chart1.Name = "chart1";
series4.ChartArea = "ChartArea1"; series1.ChartArea = "ChartArea1";
series4.Enabled = false; series1.Enabled = false;
series4.IsValueShownAsLabel = true; series1.IsValueShownAsLabel = true;
series4.Legend = "Legend1"; series1.Legend = "Legend1";
series4.Name = "Priemerná zmätkovitosť"; series1.Name = "Priemerná zmätkovitosť";
series5.ChartArea = "ChartArea1"; series2.ChartArea = "ChartArea1";
series5.Enabled = false; series2.Enabled = false;
series5.IsValueShownAsLabel = true; series2.IsValueShownAsLabel = true;
series5.Legend = "Legend1"; series2.Legend = "Legend1";
series5.Name = "Priemer zmätkovitostí"; series2.Name = "Priemer zmätkovitostí";
this.chart1.Series.Add(series4); this.chart1.Series.Add(series1);
this.chart1.Series.Add(series5); this.chart1.Series.Add(series2);
this.chart1.Size = new System.Drawing.Size(971, 512); this.chart1.Size = new System.Drawing.Size(971, 512);
this.chart1.TabIndex = 0; this.chart1.TabIndex = 0;
this.chart1.Text = "chart1"; this.chart1.Text = "chart1";
@@ -8772,22 +8772,22 @@
this.chart2.BackColor = System.Drawing.Color.DarkGray; this.chart2.BackColor = System.Drawing.Color.DarkGray;
this.chart2.BorderlineColor = System.Drawing.Color.Black; this.chart2.BorderlineColor = System.Drawing.Color.Black;
this.chart2.BorderlineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Solid; this.chart2.BorderlineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Solid;
chartArea4.Name = "ChartArea1"; chartArea2.Name = "ChartArea1";
this.chart2.ChartAreas.Add(chartArea4); this.chart2.ChartAreas.Add(chartArea2);
this.chart2.Dock = System.Windows.Forms.DockStyle.Bottom; this.chart2.Dock = System.Windows.Forms.DockStyle.Bottom;
legend4.Name = "Legend1"; legend2.Name = "Legend1";
this.chart2.Legends.Add(legend4); this.chart2.Legends.Add(legend2);
this.chart2.Location = new System.Drawing.Point(0, 287); this.chart2.Location = new System.Drawing.Point(0, 287);
this.chart2.Name = "chart2"; this.chart2.Name = "chart2";
series6.ChartArea = "ChartArea1"; series3.ChartArea = "ChartArea1";
series6.IsValueShownAsLabel = true; series3.IsValueShownAsLabel = true;
series6.Legend = "Legend1"; series3.Legend = "Legend1";
series6.Name = "Rozmer"; series3.Name = "Rozmer";
series6.Points.Add(dataPoint5); series3.Points.Add(dataPoint1);
series6.Points.Add(dataPoint6); series3.Points.Add(dataPoint2);
series6.Points.Add(dataPoint7); series3.Points.Add(dataPoint3);
series6.Points.Add(dataPoint8); series3.Points.Add(dataPoint4);
this.chart2.Series.Add(series6); this.chart2.Series.Add(series3);
this.chart2.Size = new System.Drawing.Size(407, 203); this.chart2.Size = new System.Drawing.Size(407, 203);
this.chart2.TabIndex = 2; this.chart2.TabIndex = 2;
this.chart2.Text = "chart2"; this.chart2.Text = "chart2";
@@ -11935,8 +11935,8 @@
this.lblVerzia.Name = "lblVerzia"; this.lblVerzia.Name = "lblVerzia";
this.lblVerzia.Size = new System.Drawing.Size(37, 13); this.lblVerzia.Size = new System.Drawing.Size(37, 13);
this.lblVerzia.TabIndex = 13; this.lblVerzia.TabIndex = 13;
this.lblVerzia.Tag = "1,113"; this.lblVerzia.Tag = "1,114";
this.lblVerzia.Text = "1.1.13"; this.lblVerzia.Text = "1.1.14";
this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// label50 // label50

24
Mip/frmMain.cs
View File

@@ -7090,11 +7090,9 @@ namespace Mip
private void refreshNepotvrdeneNedoruceneZiadanky() private void refreshNepotvrdeneNedoruceneZiadanky()
{ {
string sqlCommandZiadanky; var sqlCommandZiadanky = @"SELECT* FROM `pohlad-ziadanka`
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á')
WHERE `Status` = 'True' ORDER BY `IDZiadanka` DESC;";
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;";
DataTable outdtbl = new DataTable(); DataTable outdtbl = new DataTable();
@@ -7111,7 +7109,7 @@ namespace Mip
if (dataGridView16.SelectedRows.Count > 0) selectedIndex = Convert.ToInt32(dataGridView16.SelectedRows[0].Index); 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 "; //if (ZiadankyColorIndex > 0) strTextBoxCondition = " AND INSTR(`" + dataGridView16.Columns[ZiadankyColorIndex].Name + "`, '" + textBox38.Text + "')>0 ";
string sqlCommandZiadanky; string sqlCommandZiadanky;
@@ -8449,6 +8447,8 @@ namespace Mip
dataGridView16.Columns["Dátum schválenia"].Width = 70; dataGridView16.Columns["Dátum schválenia"].Width = 70;
dataGridView16.Columns["Dátum odoslania"].Width = 70; dataGridView16.Columns["Dátum odoslania"].Width = 70;
dataGridView16.Columns["Potvrdený dátum"].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 prijatia"].Width = 70;
dataGridView16.Columns["Dátum vybavenia"].Width = 70; dataGridView16.Columns["Dátum vybavenia"].Width = 70;
dataGridView16.Columns["Status žiadanky"].MinimumWidth = 85; dataGridView16.Columns["Status žiadanky"].MinimumWidth = 85;
@@ -8467,19 +8467,19 @@ namespace Mip
dataGridView16.Columns["Firma"].DisplayIndex = 4; dataGridView16.Columns["Firma"].DisplayIndex = 4;
dataGridView16.Columns["Poznámka"].MinimumWidth = 100; dataGridView16.Columns["Poznámka"].MinimumWidth = 100;
dataGridView16.Columns["Poznámka"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader; 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"].Width = 70;
dataGridView16.Columns["Termín"].DisplayIndex = 5; dataGridView16.Columns["Termín"].DisplayIndex = 5;
dataGridView16.Columns["Počet kusov"].Width = 60; 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"].Width = 60;
dataGridView16.Columns["Množstvo"].DisplayIndex = 7; dataGridView16.Columns["Množstvo"].DisplayIndex = 8;
dataGridView16.Columns["Jednotka"].Width = 60; dataGridView16.Columns["Jednotka"].Width = 60;
dataGridView16.Columns["Jednotka"].DisplayIndex = 8; dataGridView16.Columns["Jednotka"].DisplayIndex = 9;
dataGridView16.Columns["Faktúra"].Width = 80; dataGridView16.Columns["Faktúra"].Width = 80;
dataGridView16.Columns["Cena"].Width = 60; dataGridView16.Columns["Cena"].Width = 60;
dataGridView16.Columns["Cena"].DisplayIndex = 9; dataGridView16.Columns["Cena"].DisplayIndex = 10;
dataGridView16.Columns["Číslo objednávky"].DisplayIndex = 10; dataGridView16.Columns["Číslo objednávky"].DisplayIndex = 11;
dataGridView16.Columns["IDUser"].Visible = false; dataGridView16.Columns["IDUser"].Visible = false;
dataGridView16.Columns["Číslo dokumentu"].MinimumWidth = 95; dataGridView16.Columns["Číslo dokumentu"].MinimumWidth = 95;
dataGridView16.Columns["Číslo dokumentu"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader; dataGridView16.Columns["Číslo dokumentu"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;

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

Binary file not shown.