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

pridanie poznamky2 do nacenovania

Browse Source 
odblokovanie nacenovania pre filipa baloga
This commit is contained in:
Culak-HP\Culak
2020-11-11 23:35:14 +01:00
parent 211842b182
commit 4a384ba963
7 changed files with 1372 additions and 88 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.

27
Mip/SQLscripts/Poznamka2Dotab-pohladNacenovanie.sql Normal file
View File

@@ -0,0 +1,27 @@
ALTER ALGORITHM = MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `pohladnacenovanie` AS SELECT
`tab-nacenovanie`.`IDNacenovanie`,
`NazovVyrobku` as `Názov výrobku`,
`Zakaznik` as `Zákazník`,
`SpojeneRozmery` as `Spojené rozmery`,
`tab-nacenovanie`.`Status`,
`DatumPrijatia` as `Dátum prijatia`,
`Material1` as `Materiál č.1`,
`Material2` as `Materiál č.2`,
`Material3` as `Materiál č.3`,
`Material4` as `Materiál č.4`,
`PocetNacenovanychKusov` as `Počet naceňovaných kusov`,
`Poznamka` as `Poznámka1`,
`Poznamka2` as `Poznámka2`,
CONCAT (`tabusers`.Titul, ' ', `tabusers`.Priezvisko, ' ', `tabusers`.Meno) AS Meno,
`IDVyrobokNac`,
`InyNazov` as `Iný názov`,
`RozlisZnakKonecnaOp` as `Rozlišovací znak`,
`Alias`,
`PocetSegmentov` as `Počet segmentov`,
concat(round(`myNuD71`,2),' €/Ks (', `PocetNacenovanychKusov`, 'Ks)') as `Nacenená cena`
FROM `tab-nacenovanie`
INNER JOIN `tabusers` on (`tab-nacenovanie`.IDUser = `tabusers`.IDUsers)
INNER JOIN `tabvyrobok` on (`tab-nacenovanie`.IDVyrobokNac = `tabvyrobok`.IDVyrobok)
LEFT JOIN `tab-nacenovanie-nacenovanie` on (`tab-nacenovanie`.IDNacenovanie = `tab-nacenovanie-nacenovanie`.IDNacenovanie) ;

2
Mip/SQLscripts/Poznamka2Dotab-tabNacenovanie.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `tab-nacenovanie`
ADD COLUMN `Poznamka2` CHAR(200) NULL DEFAULT NULL COLLATE 'utf8_general_ci' AFTER `Poznamka`;

241
Mip/frmMain.Designer.cs generated
View File

@@ -28,20 +28,20 @@
/// </summary>
private void InitializeComponent()
{
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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
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);
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea15 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend15 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series22 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series23 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea16 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend16 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series24 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint29 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(1D, 9.5D);
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint30 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(2D, 9.25D);
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint31 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(3D, 8.84D);
System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint32 = 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();
@@ -894,6 +894,11 @@
this.pictureBox4 = new System.Windows.Forms.PictureBox();
this.label175 = new System.Windows.Forms.Label();
this.label182 = new System.Windows.Forms.Label();
this.panel75 = new System.Windows.Forms.Panel();
this.button199 = new System.Windows.Forms.Button();
this.button200 = new System.Windows.Forms.Button();
this.textBox51 = new System.Windows.Forms.TextBox();
this.button201 = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
@@ -1092,6 +1097,7 @@
((System.ComponentModel.ISupportInitialize)(this.numericUpDown38)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown37)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
this.panel75.SuspendLayout();
this.SuspendLayout();
//
// checkBox65
@@ -1687,7 +1693,7 @@
//
// panel8
//
this.panel8.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel8.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel8.BackgroundImage")));
this.panel8.Location = new System.Drawing.Point(127, 330);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(64, 64);
@@ -1876,12 +1882,12 @@
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
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;
dataGridViewCellStyle15.BackColor = System.Drawing.Color.AliceBlue;
dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.Green;
dataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Yellow;
this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle15;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView1.Size = new System.Drawing.Size(1298, 215);
this.dataGridView1.TabIndex = 0;
@@ -2176,7 +2182,7 @@
// panel10
//
this.panel10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panel10.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel10.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel10.BackgroundImage")));
this.panel10.Location = new System.Drawing.Point(1120, -11);
this.panel10.Name = "panel10";
this.panel10.Size = new System.Drawing.Size(64, 64);
@@ -2397,7 +2403,7 @@
//
// panel20
//
this.panel20.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel20.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel20.BackgroundImage")));
this.panel20.Location = new System.Drawing.Point(121, 130);
this.panel20.Name = "panel20";
this.panel20.Size = new System.Drawing.Size(64, 64);
@@ -2458,14 +2464,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)));
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;
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dGVVydajMat.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
this.dGVVydajMat.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dGVVydajMat.Location = new System.Drawing.Point(1, 43);
this.dGVVydajMat.MultiSelect = false;
@@ -2672,7 +2678,7 @@
//
// panel47
//
this.panel47.BackgroundImage = global::Mip.Properties.Resources.checked__green;
this.panel47.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel47.BackgroundImage")));
this.panel47.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.panel47.Location = new System.Drawing.Point(127, 78);
this.panel47.Name = "panel47";
@@ -2717,7 +2723,7 @@
//
// panel18
//
this.panel18.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel18.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel18.BackgroundImage")));
this.panel18.Location = new System.Drawing.Point(127, 130);
this.panel18.Name = "panel18";
this.panel18.Size = new System.Drawing.Size(64, 64);
@@ -2956,7 +2962,7 @@
//
// panel12
//
this.panel12.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel12.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel12.BackgroundImage")));
this.panel12.Location = new System.Drawing.Point(117, 159);
this.panel12.Name = "panel12";
this.panel12.Size = new System.Drawing.Size(64, 64);
@@ -3232,7 +3238,7 @@
//
// panel14
//
this.panel14.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel14.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel14.BackgroundImage")));
this.panel14.Location = new System.Drawing.Point(117, 159);
this.panel14.Name = "panel14";
this.panel14.Size = new System.Drawing.Size(64, 64);
@@ -3602,7 +3608,7 @@
// panel16
//
this.panel16.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.panel16.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel16.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel16.BackgroundImage")));
this.panel16.Location = new System.Drawing.Point(124, 165);
this.panel16.Name = "panel16";
this.panel16.Size = new System.Drawing.Size(64, 64);
@@ -3843,7 +3849,7 @@
// panel24
//
this.panel24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panel24.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel24.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel24.BackgroundImage")));
this.panel24.Location = new System.Drawing.Point(1119, -11);
this.panel24.Name = "panel24";
this.panel24.Size = new System.Drawing.Size(64, 64);
@@ -4950,27 +4956,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)));
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);
chartArea15.Area3DStyle.IsRightAngleAxes = false;
chartArea15.Area3DStyle.Perspective = 25;
chartArea15.Name = "ChartArea1";
this.chart1.ChartAreas.Add(chartArea15);
legend15.DockedToChartArea = "ChartArea1";
legend15.Name = "Legend1";
this.chart1.Legends.Add(legend15);
this.chart1.Location = new System.Drawing.Point(4, 4);
this.chart1.Name = "chart1";
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);
series22.ChartArea = "ChartArea1";
series22.Enabled = false;
series22.IsValueShownAsLabel = true;
series22.Legend = "Legend1";
series22.Name = "Priemerná zmätkovitosť";
series23.ChartArea = "ChartArea1";
series23.Enabled = false;
series23.IsValueShownAsLabel = true;
series23.Legend = "Legend1";
series23.Name = "Priemer zmätkovitostí";
this.chart1.Series.Add(series22);
this.chart1.Series.Add(series23);
this.chart1.Size = new System.Drawing.Size(838, 491);
this.chart1.TabIndex = 0;
this.chart1.Text = "chart1";
@@ -5985,7 +5991,7 @@
//
// panel22
//
this.panel22.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel22.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel22.BackgroundImage")));
this.panel22.Location = new System.Drawing.Point(116, 122);
this.panel22.Name = "panel22";
this.panel22.Size = new System.Drawing.Size(64, 64);
@@ -7030,7 +7036,7 @@
//
// panel26
//
this.panel26.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel26.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel26.BackgroundImage")));
this.panel26.Location = new System.Drawing.Point(116, 122);
this.panel26.Name = "panel26";
this.panel26.Size = new System.Drawing.Size(64, 64);
@@ -7137,6 +7143,8 @@
//
this.tabPage12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tabPage12.Controls.Add(this.panel63);
this.tabPage12.Controls.Add(this.button201);
this.tabPage12.Controls.Add(this.panel75);
this.tabPage12.Controls.Add(this.button169);
this.tabPage12.Controls.Add(this.button168);
this.tabPage12.Controls.Add(this.button162);
@@ -7162,9 +7170,9 @@
// panel63
//
this.panel63.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel63.Controls.Add(this.comboBox16);
this.panel63.Controls.Add(this.button171);
this.panel63.Controls.Add(this.button170);
this.panel63.Controls.Add(this.comboBox16);
this.panel63.Location = new System.Drawing.Point(607, 43);
this.panel63.Name = "panel63";
this.panel63.Size = new System.Drawing.Size(273, 25);
@@ -7303,7 +7311,7 @@
//
// panel42
//
this.panel42.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel42.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel42.BackgroundImage")));
this.panel42.Location = new System.Drawing.Point(121, 21);
this.panel42.Name = "panel42";
this.panel42.Size = new System.Drawing.Size(64, 64);
@@ -7538,7 +7546,7 @@
// panel64
//
this.panel64.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panel64.BackgroundImage = global::Mip.Properties.Resources.delete2;
this.panel64.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel64.BackgroundImage")));
this.panel64.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel64.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel64.Location = new System.Drawing.Point(243, 112);
@@ -7550,7 +7558,7 @@
// panel41
//
this.panel41.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panel41.BackgroundImage = global::Mip.Properties.Resources.Edit;
this.panel41.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel41.BackgroundImage")));
this.panel41.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel41.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel41.Location = new System.Drawing.Point(243, 90);
@@ -7562,7 +7570,7 @@
// panel40
//
this.panel40.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panel40.BackgroundImage = global::Mip.Properties.Resources.info;
this.panel40.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel40.BackgroundImage")));
this.panel40.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel40.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel40.Location = new System.Drawing.Point(243, 68);
@@ -7573,7 +7581,7 @@
// panel39
//
this.panel39.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panel39.BackgroundImage = global::Mip.Properties.Resources.plus;
this.panel39.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel39.BackgroundImage")));
this.panel39.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel39.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel39.Location = new System.Drawing.Point(243, 46);
@@ -7691,7 +7699,7 @@
// panel35
//
this.panel35.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.panel35.BackgroundImage = global::Mip.Properties.Resources.down;
this.panel35.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel35.BackgroundImage")));
this.panel35.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel35.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel35.Location = new System.Drawing.Point(243, 1);
@@ -8646,22 +8654,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;
chartArea2.Name = "ChartArea1";
this.chart2.ChartAreas.Add(chartArea2);
chartArea16.Name = "ChartArea1";
this.chart2.ChartAreas.Add(chartArea16);
this.chart2.Dock = System.Windows.Forms.DockStyle.Bottom;
legend2.Name = "Legend1";
this.chart2.Legends.Add(legend2);
legend16.Name = "Legend1";
this.chart2.Legends.Add(legend16);
this.chart2.Location = new System.Drawing.Point(0, 287);
this.chart2.Name = "chart2";
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);
series24.ChartArea = "ChartArea1";
series24.IsValueShownAsLabel = true;
series24.Legend = "Legend1";
series24.Name = "Rozmer";
series24.Points.Add(dataPoint29);
series24.Points.Add(dataPoint30);
series24.Points.Add(dataPoint31);
series24.Points.Add(dataPoint32);
this.chart2.Series.Add(series24);
this.chart2.Size = new System.Drawing.Size(407, 203);
this.chart2.TabIndex = 2;
this.chart2.Text = "chart2";
@@ -9265,7 +9273,7 @@
//
// panel44
//
this.panel44.BackgroundImage = global::Mip.Properties.Resources.Restart;
this.panel44.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel44.BackgroundImage")));
this.panel44.Location = new System.Drawing.Point(121, 21);
this.panel44.Name = "panel44";
this.panel44.Size = new System.Drawing.Size(64, 64);
@@ -10659,7 +10667,7 @@
//
// pictureBox1
//
this.pictureBox1.Image = global::Mip.Properties.Resources.calculator;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(-3, 1);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(32, 32);
@@ -11215,7 +11223,7 @@
//
// pBMarkAsRead
//
this.pBMarkAsRead.Image = global::Mip.Properties.Resources.OK_3D;
this.pBMarkAsRead.Image = ((System.Drawing.Image)(resources.GetObject("pBMarkAsRead.Image")));
this.pBMarkAsRead.Location = new System.Drawing.Point(0, 122);
this.pBMarkAsRead.Name = "pBMarkAsRead";
this.pBMarkAsRead.Size = new System.Drawing.Size(32, 32);
@@ -11227,7 +11235,7 @@
//
// pBDelete
//
this.pBDelete.Image = global::Mip.Properties.Resources.erase_3D;
this.pBDelete.Image = ((System.Drawing.Image)(resources.GetObject("pBDelete.Image")));
this.pBDelete.Location = new System.Drawing.Point(0, 86);
this.pBDelete.Name = "pBDelete";
this.pBDelete.Size = new System.Drawing.Size(32, 32);
@@ -11483,7 +11491,7 @@
//
// pictureBox2
//
this.pictureBox2.Image = global::Mip.Properties.Resources.calendar;
this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
this.pictureBox2.Location = new System.Drawing.Point(1, 1);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(32, 32);
@@ -11538,7 +11546,7 @@
//
// pictureBox3
//
this.pictureBox3.Image = global::Mip.Properties.Resources.Chat;
this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
this.pictureBox3.Location = new System.Drawing.Point(0, 0);
this.pictureBox3.Name = "pictureBox3";
this.pictureBox3.Size = new System.Drawing.Size(32, 32);
@@ -11986,7 +11994,7 @@
// pictureBox4
//
this.pictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox4.Image = global::Mip.Properties.Resources.Superman_logo;
this.pictureBox4.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox4.Image")));
this.pictureBox4.Location = new System.Drawing.Point(-3, 1);
this.pictureBox4.Name = "pictureBox4";
this.pictureBox4.Size = new System.Drawing.Size(34, 34);
@@ -12017,6 +12025,64 @@
this.label182.Text = "↗";
this.label182.Click += new System.EventHandler(this.label182_Click);
//
// panel75
//
this.panel75.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel75.Controls.Add(this.textBox51);
this.panel75.Controls.Add(this.button199);
this.panel75.Controls.Add(this.button200);
this.panel75.Location = new System.Drawing.Point(631, 43);
this.panel75.Name = "panel75";
this.panel75.Size = new System.Drawing.Size(434, 25);
this.panel75.TabIndex = 42;
this.panel75.Visible = false;
//
// button199
//
this.button199.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.button199.Location = new System.Drawing.Point(357, 0);
this.button199.Name = "button199";
this.button199.Size = new System.Drawing.Size(75, 23);
this.button199.TabIndex = 2;
this.button199.Text = "Zavrieť";
this.button199.UseVisualStyleBackColor = true;
this.button199.Click += new System.EventHandler(this.button199_Click);
//
// button200
//
this.button200.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.button200.Location = new System.Drawing.Point(259, 0);
this.button200.Name = "button200";
this.button200.Size = new System.Drawing.Size(99, 23);
this.button200.TabIndex = 1;
this.button200.Text = "Uložiť poznámku";
this.button200.UseVisualStyleBackColor = true;
this.button200.Click += new System.EventHandler(this.button200_Click);
//
// textBox51
//
this.textBox51.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)));
this.textBox51.BackColor = System.Drawing.Color.Gainsboro;
this.textBox51.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.textBox51.Location = new System.Drawing.Point(1, 1);
this.textBox51.Name = "textBox51";
this.textBox51.Size = new System.Drawing.Size(258, 21);
this.textBox51.TabIndex = 3;
//
// button201
//
this.button201.Location = new System.Drawing.Point(692, 0);
this.button201.Name = "button201";
this.button201.Size = new System.Drawing.Size(104, 43);
this.button201.TabIndex = 43;
this.button201.Text = "Pridať (upraviť) poznámku výroby";
this.button201.UseVisualStyleBackColor = true;
this.button201.Click += new System.EventHandler(this.button201_Click);
//
// frmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -12303,6 +12369,8 @@
((System.ComponentModel.ISupportInitialize)(this.numericUpDown38)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown37)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
this.panel75.ResumeLayout(false);
this.panel75.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -13164,6 +13232,11 @@
private System.Windows.Forms.Button button196;
private System.Windows.Forms.Button button198;
private System.Windows.Forms.Button button197;
private System.Windows.Forms.Button button201;
private System.Windows.Forms.Panel panel75;
private System.Windows.Forms.TextBox textBox51;
private System.Windows.Forms.Button button199;
private System.Windows.Forms.Button button200;
}
}

38
Mip/frmMain.cs
View File

@@ -6569,7 +6569,7 @@ namespace Mip
{
if (dataGridView7.SelectedRows.Count > 0)
{
if(classUser.ID == 1 || classUser.ID == 4)
if(classUser.ID == 1 || classUser.ID == 4 || classUser.ID == 26)
{
Form frmNacenovanie2 = new frmNacenovanie(Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDNacenovanie"].Value), Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDVyrobokNac"].Value), true, false, true, true, true, true);
frmNacenovanie2.Text = "Naceňovanie - vyhodnocovanie";
@@ -8024,7 +8024,8 @@ namespace Mip
dataGridView7.Columns["Materiál č.3"].Width = 70;
dataGridView7.Columns["Materiál č.4"].Width = 70;
dataGridView7.Columns["Počet naceňovaných kusov"].Width = 80;
dataGridView7.Columns["Poznámka"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
dataGridView7.Columns["Poznámka1"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
dataGridView7.Columns["Poznámka2"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView7.Columns["Meno"].Width = 120;
dataGridView7.Columns["Alias"].Width = 70;
dataGridView7.Columns["Rozlišovací znak"].Width = 70;
@@ -8189,7 +8190,6 @@ namespace Mip
classSQL.SQL(cmd);
MessageBox.Show("Iný názov opravený!");
refreshNacenovanie();
}
private void panel41_Click(object sender, EventArgs e)
@@ -10171,5 +10171,37 @@ string editDateRV;
}
}
private void button201_Click(object sender, EventArgs e)
{
if (dataGridView7.SelectedRows.Count != 0)
{
if (dataGridView7.SelectedRows[0].Cells["Status"].Value.ToString() != "Nacenená")
{
if (panel75.Visible == false)
{
textBox51.Text = dataGridView7.SelectedRows[0].Cells["Poznámka2"].Value.ToString();
panel75.Visible = true;
}
else panel75.Visible = false;
}
else MessageBox.Show("Záznam bol nacenený, nedá sa editovať!");
}
else MessageBox.Show("Žiadne nacenenie nebolo vybrané na editovanie!");
}
private void button200_Click(object sender, EventArgs e)
{
panel75.Visible = false;
string cmd = "UPDATE `mip`.`tab-nacenovanie` SET `Poznamka2`= '" + textBox51.Text + "' WHERE `IDNacenovanie`= " + dataGridView7.SelectedRows[0].Cells["IDNacenovanie"].Value.ToString() + "; ";
classSQL.SQL(cmd);
MessageBox.Show("Poznámka upravená!");
refreshNacenovanie();
}
private void button199_Click(object sender, EventArgs e)
{
panel75.Visible = false;
}
}
}

1150
Mip/frmMain.resx
View File

File diff suppressed because it is too large Load Diff

BIN
Mip/obj/Debug/Mip.frmMain.resources
View File

Binary file not shown.