Index: BazaZamowien/Properties/AssemblyInfo.cs =================================================================== --- BazaZamowien/Properties/AssemblyInfo.cs (revision 714) +++ BazaZamowien/Properties/AssemblyInfo.cs (revision 715) @@ -31,3 +31,3 @@ // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.2")] +[assembly: AssemblyFileVersion("1.0.0.3")] Index: BazaZamowien/Classes/Zamowienia/ZamowieniaUtils.cs =================================================================== --- BazaZamowien/Classes/Zamowienia/ZamowieniaUtils.cs (revision 710) +++ BazaZamowien/Classes/Zamowienia/ZamowieniaUtils.cs (revision 715) @@ -39,5 +39,5 @@ } - public static int nrNowegoZamowienia(int IDEDzialu) + public static int nrNowegoZamowienia(int IDEDzialu, int year) { /* @@ -46,5 +46,5 @@ string query = "select top 1 Numer from dbo.Zamowienia where ZamowienieDzial=" + - + IDEDzialu + " and Numer_Rok=year(getdate()) order by numer desc"; + + IDEDzialu + " and Numer_Rok=" + year + " order by numer desc"; return (int)(ExecuteQuery(query) ?? 0) + 1; Index: BazaZamowien/Zamowienia/ZamowienieForm.Designer.cs =================================================================== --- BazaZamowien/Zamowienia/ZamowienieForm.Designer.cs (revision 710) +++ BazaZamowien/Zamowienia/ZamowienieForm.Designer.cs (revision 715) @@ -47,6 +47,6 @@ System.Windows.Forms.Label zamowienieKtoLabel; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ZamowienieForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.zamowieniaBindingSource = new System.Windows.Forms.BindingSource(this.components); this.zamowieniaDataSet = new BazaZamowien.zamowieniaDataSet(); @@ -147,7 +147,8 @@ // decyzja1KtoLabel.AutoSize = true; - decyzja1KtoLabel.Location = new System.Drawing.Point(37, 50); + decyzja1KtoLabel.Location = new System.Drawing.Point(49, 62); + decyzja1KtoLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja1KtoLabel.Name = "decyzja1KtoLabel"; - decyzja1KtoLabel.Size = new System.Drawing.Size(26, 13); + decyzja1KtoLabel.Size = new System.Drawing.Size(33, 17); decyzja1KtoLabel.TabIndex = 20; decyzja1KtoLabel.Text = "Kto:"; @@ -156,7 +157,8 @@ // decyzja1DataLabel.AutoSize = true; - decyzja1DataLabel.Location = new System.Drawing.Point(30, 80); + decyzja1DataLabel.Location = new System.Drawing.Point(40, 98); + decyzja1DataLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja1DataLabel.Name = "decyzja1DataLabel"; - decyzja1DataLabel.Size = new System.Drawing.Size(33, 13); + decyzja1DataLabel.Size = new System.Drawing.Size(42, 17); decyzja1DataLabel.TabIndex = 22; decyzja1DataLabel.Text = "Data:"; @@ -165,7 +167,8 @@ // decyzja2KtoLabel.AutoSize = true; - decyzja2KtoLabel.Location = new System.Drawing.Point(37, 50); + decyzja2KtoLabel.Location = new System.Drawing.Point(49, 62); + decyzja2KtoLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja2KtoLabel.Name = "decyzja2KtoLabel"; - decyzja2KtoLabel.Size = new System.Drawing.Size(26, 13); + decyzja2KtoLabel.Size = new System.Drawing.Size(33, 17); decyzja2KtoLabel.TabIndex = 26; decyzja2KtoLabel.Text = "Kto:"; @@ -174,7 +177,8 @@ // decyzja2DataLabel.AutoSize = true; - decyzja2DataLabel.Location = new System.Drawing.Point(30, 80); + decyzja2DataLabel.Location = new System.Drawing.Point(40, 98); + decyzja2DataLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja2DataLabel.Name = "decyzja2DataLabel"; - decyzja2DataLabel.Size = new System.Drawing.Size(33, 13); + decyzja2DataLabel.Size = new System.Drawing.Size(42, 17); decyzja2DataLabel.TabIndex = 28; decyzja2DataLabel.Text = "Data:"; @@ -183,7 +187,8 @@ // decyzja3KtoLabel.AutoSize = true; - decyzja3KtoLabel.Location = new System.Drawing.Point(40, 50); + decyzja3KtoLabel.Location = new System.Drawing.Point(53, 62); + decyzja3KtoLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja3KtoLabel.Name = "decyzja3KtoLabel"; - decyzja3KtoLabel.Size = new System.Drawing.Size(26, 13); + decyzja3KtoLabel.Size = new System.Drawing.Size(33, 17); decyzja3KtoLabel.TabIndex = 32; decyzja3KtoLabel.Text = "Kto:"; @@ -192,7 +197,8 @@ // decyzja3DataLabel.AutoSize = true; - decyzja3DataLabel.Location = new System.Drawing.Point(33, 77); + decyzja3DataLabel.Location = new System.Drawing.Point(44, 95); + decyzja3DataLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja3DataLabel.Name = "decyzja3DataLabel"; - decyzja3DataLabel.Size = new System.Drawing.Size(33, 13); + decyzja3DataLabel.Size = new System.Drawing.Size(42, 17); decyzja3DataLabel.TabIndex = 34; decyzja3DataLabel.Text = "Data:"; @@ -201,7 +207,8 @@ // decyzja3Label.AutoSize = true; - decyzja3Label.Location = new System.Drawing.Point(18, 26); + decyzja3Label.Location = new System.Drawing.Point(24, 32); + decyzja3Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja3Label.Name = "decyzja3Label"; - decyzja3Label.Size = new System.Drawing.Size(48, 13); + decyzja3Label.Size = new System.Drawing.Size(62, 17); decyzja3Label.TabIndex = 35; decyzja3Label.Text = "Decyzja:"; @@ -210,7 +217,8 @@ // decyzja2Label.AutoSize = true; - decyzja2Label.Location = new System.Drawing.Point(15, 26); + decyzja2Label.Location = new System.Drawing.Point(20, 32); + decyzja2Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja2Label.Name = "decyzja2Label"; - decyzja2Label.Size = new System.Drawing.Size(48, 13); + decyzja2Label.Size = new System.Drawing.Size(62, 17); decyzja2Label.TabIndex = 29; decyzja2Label.Text = "Decyzja:"; @@ -219,7 +227,8 @@ // decyzja1Label.AutoSize = true; - decyzja1Label.Location = new System.Drawing.Point(15, 22); + decyzja1Label.Location = new System.Drawing.Point(20, 27); + decyzja1Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); decyzja1Label.Name = "decyzja1Label"; - decyzja1Label.Size = new System.Drawing.Size(48, 13); + decyzja1Label.Size = new System.Drawing.Size(62, 17); decyzja1Label.TabIndex = 23; decyzja1Label.Text = "Decyzja:"; @@ -228,7 +237,8 @@ // numerLabel.AutoSize = true; - numerLabel.Location = new System.Drawing.Point(424, 20); + numerLabel.Location = new System.Drawing.Point(565, 25); + numerLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); numerLabel.Name = "numerLabel"; - numerLabel.Size = new System.Drawing.Size(41, 13); + numerLabel.Size = new System.Drawing.Size(54, 17); numerLabel.TabIndex = 6; numerLabel.Text = "Numer:"; @@ -237,7 +247,8 @@ // zamowienieTrescLabel.AutoSize = true; - zamowienieTrescLabel.Location = new System.Drawing.Point(23, 95); + zamowienieTrescLabel.Location = new System.Drawing.Point(31, 117); + zamowienieTrescLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); zamowienieTrescLabel.Name = "zamowienieTrescLabel"; - zamowienieTrescLabel.Size = new System.Drawing.Size(37, 13); + zamowienieTrescLabel.Size = new System.Drawing.Size(48, 17); zamowienieTrescLabel.TabIndex = 12; zamowienieTrescLabel.Text = "Treœæ:"; @@ -246,7 +257,8 @@ // zamowienieWartosc2Label.AutoSize = true; - zamowienieWartosc2Label.Location = new System.Drawing.Point(409, 56); + zamowienieWartosc2Label.Location = new System.Drawing.Point(545, 69); + zamowienieWartosc2Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); zamowienieWartosc2Label.Name = "zamowienieWartosc2Label"; - zamowienieWartosc2Label.Size = new System.Drawing.Size(59, 13); + zamowienieWartosc2Label.Size = new System.Drawing.Size(76, 17); zamowienieWartosc2Label.TabIndex = 16; zamowienieWartosc2Label.Text = "Wartoœæ 2:"; @@ -255,7 +267,8 @@ // zamowienieWartosc1Label.AutoSize = true; - zamowienieWartosc1Label.Location = new System.Drawing.Point(212, 56); + zamowienieWartosc1Label.Location = new System.Drawing.Point(283, 69); + zamowienieWartosc1Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); zamowienieWartosc1Label.Name = "zamowienieWartosc1Label"; - zamowienieWartosc1Label.Size = new System.Drawing.Size(59, 13); + zamowienieWartosc1Label.Size = new System.Drawing.Size(76, 17); zamowienieWartosc1Label.TabIndex = 14; zamowienieWartosc1Label.Text = "Wartoœæ 1:"; @@ -264,7 +277,8 @@ // zamowienieDataLabel.AutoSize = true; - zamowienieDataLabel.Location = new System.Drawing.Point(36, 56); + zamowienieDataLabel.Location = new System.Drawing.Point(48, 69); + zamowienieDataLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); zamowienieDataLabel.Name = "zamowienieDataLabel"; - zamowienieDataLabel.Size = new System.Drawing.Size(33, 13); + zamowienieDataLabel.Size = new System.Drawing.Size(42, 17); zamowienieDataLabel.TabIndex = 4; zamowienieDataLabel.Text = "Data:"; @@ -273,7 +287,8 @@ // zamowienieDzialLabel.AutoSize = true; - zamowienieDzialLabel.Location = new System.Drawing.Point(212, 21); + zamowienieDzialLabel.Location = new System.Drawing.Point(283, 26); + zamowienieDzialLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); zamowienieDzialLabel.Name = "zamowienieDzialLabel"; - zamowienieDzialLabel.Size = new System.Drawing.Size(35, 13); + zamowienieDzialLabel.Size = new System.Drawing.Size(43, 17); zamowienieDzialLabel.TabIndex = 2; zamowienieDzialLabel.Text = "Dzia³:"; @@ -282,7 +297,8 @@ // zamowienieKtoLabel.AutoSize = true; - zamowienieKtoLabel.Location = new System.Drawing.Point(43, 23); + zamowienieKtoLabel.Location = new System.Drawing.Point(57, 28); + zamowienieKtoLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); zamowienieKtoLabel.Name = "zamowienieKtoLabel"; - zamowienieKtoLabel.Size = new System.Drawing.Size(26, 13); + zamowienieKtoLabel.Size = new System.Drawing.Size(33, 17); zamowienieKtoLabel.TabIndex = 1; zamowienieKtoLabel.Text = "Kto:"; @@ -307,7 +323,9 @@ this.kierownikGroupBox.Controls.Add(decyzja1DataLabel); this.kierownikGroupBox.Controls.Add(this.KierownikPanel); - this.kierownikGroupBox.Location = new System.Drawing.Point(12, 426); + this.kierownikGroupBox.Location = new System.Drawing.Point(16, 524); + this.kierownikGroupBox.Margin = new System.Windows.Forms.Padding(4); this.kierownikGroupBox.Name = "kierownikGroupBox"; - this.kierownikGroupBox.Size = new System.Drawing.Size(213, 165); + this.kierownikGroupBox.Padding = new System.Windows.Forms.Padding(4); + this.kierownikGroupBox.Size = new System.Drawing.Size(284, 203); this.kierownikGroupBox.TabIndex = 37; this.kierownikGroupBox.TabStop = false; @@ -318,7 +336,8 @@ this.decyzja1DataLabel2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "Decyzja1Data", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "g")); this.decyzja1DataLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.decyzja1DataLabel2.Location = new System.Drawing.Point(90, 77); + this.decyzja1DataLabel2.Location = new System.Drawing.Point(120, 95); + this.decyzja1DataLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.decyzja1DataLabel2.Name = "decyzja1DataLabel2"; - this.decyzja1DataLabel2.Size = new System.Drawing.Size(100, 23); + this.decyzja1DataLabel2.Size = new System.Drawing.Size(133, 28); this.decyzja1DataLabel2.TabIndex = 48; // @@ -327,7 +346,8 @@ this.labelKto1.AutoSize = true; this.labelKto1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.labelKto1.Location = new System.Drawing.Point(83, 50); + this.labelKto1.Location = new System.Drawing.Point(111, 62); + this.labelKto1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelKto1.Name = "labelKto1"; - this.labelKto1.Size = new System.Drawing.Size(60, 13); + this.labelKto1.Size = new System.Drawing.Size(76, 17); this.labelKto1.TabIndex = 47; this.labelKto1.Text = "labelKto1"; @@ -337,7 +357,8 @@ this.labelDecyzja1.AutoSize = true; this.labelDecyzja1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.labelDecyzja1.Location = new System.Drawing.Point(83, 26); + this.labelDecyzja1.Location = new System.Drawing.Point(111, 32); + this.labelDecyzja1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDecyzja1.Name = "labelDecyzja1"; - this.labelDecyzja1.Size = new System.Drawing.Size(86, 13); + this.labelDecyzja1.Size = new System.Drawing.Size(109, 17); this.labelDecyzja1.TabIndex = 46; this.labelDecyzja1.Text = "labelDecyzja1"; @@ -349,7 +370,8 @@ this.KierownikPanel.Controls.Add(this.akc1Button); this.KierownikPanel.Enabled = false; - this.KierownikPanel.Location = new System.Drawing.Point(7, 103); + this.KierownikPanel.Location = new System.Drawing.Point(9, 127); + this.KierownikPanel.Margin = new System.Windows.Forms.Padding(4); this.KierownikPanel.Name = "KierownikPanel"; - this.KierownikPanel.Size = new System.Drawing.Size(200, 55); + this.KierownikPanel.Size = new System.Drawing.Size(267, 68); this.KierownikPanel.TabIndex = 49; // @@ -357,7 +379,8 @@ // this.wyczysc1Button.Image = ((System.Drawing.Image)(resources.GetObject("wyczysc1Button.Image"))); - this.wyczysc1Button.Location = new System.Drawing.Point(127, 7); + this.wyczysc1Button.Location = new System.Drawing.Point(169, 9); + this.wyczysc1Button.Margin = new System.Windows.Forms.Padding(4); this.wyczysc1Button.Name = "wyczysc1Button"; - this.wyczysc1Button.Size = new System.Drawing.Size(42, 40); + this.wyczysc1Button.Size = new System.Drawing.Size(56, 49); this.wyczysc1Button.TabIndex = 48; this.wyczysc1Button.UseVisualStyleBackColor = true; @@ -367,7 +390,8 @@ // this.nie1Button.Image = ((System.Drawing.Image)(resources.GetObject("nie1Button.Image"))); - this.nie1Button.Location = new System.Drawing.Point(79, 7); + this.nie1Button.Location = new System.Drawing.Point(105, 9); + this.nie1Button.Margin = new System.Windows.Forms.Padding(4); this.nie1Button.Name = "nie1Button"; - this.nie1Button.Size = new System.Drawing.Size(42, 40); + this.nie1Button.Size = new System.Drawing.Size(56, 49); this.nie1Button.TabIndex = 47; this.nie1Button.UseVisualStyleBackColor = true; @@ -377,7 +401,8 @@ // this.akc1Button.Image = ((System.Drawing.Image)(resources.GetObject("akc1Button.Image"))); - this.akc1Button.Location = new System.Drawing.Point(31, 7); + this.akc1Button.Location = new System.Drawing.Point(41, 9); + this.akc1Button.Margin = new System.Windows.Forms.Padding(4); this.akc1Button.Name = "akc1Button"; - this.akc1Button.Size = new System.Drawing.Size(42, 40); + this.akc1Button.Size = new System.Drawing.Size(56, 49); this.akc1Button.TabIndex = 46; this.akc1Button.UseVisualStyleBackColor = true; @@ -398,7 +423,9 @@ this.dyrFinanGroupBox.Controls.Add(decyzja2KtoLabel); this.dyrFinanGroupBox.Controls.Add(decyzja2DataLabel); - this.dyrFinanGroupBox.Location = new System.Drawing.Point(231, 426); + this.dyrFinanGroupBox.Location = new System.Drawing.Point(308, 524); + this.dyrFinanGroupBox.Margin = new System.Windows.Forms.Padding(4); this.dyrFinanGroupBox.Name = "dyrFinanGroupBox"; - this.dyrFinanGroupBox.Size = new System.Drawing.Size(211, 165); + this.dyrFinanGroupBox.Padding = new System.Windows.Forms.Padding(4); + this.dyrFinanGroupBox.Size = new System.Drawing.Size(281, 203); this.dyrFinanGroupBox.TabIndex = 38; this.dyrFinanGroupBox.TabStop = false; @@ -411,7 +438,8 @@ this.DyrFinansPanel.Controls.Add(this.wyczysc2Button); this.DyrFinansPanel.Enabled = false; - this.DyrFinansPanel.Location = new System.Drawing.Point(7, 103); + this.DyrFinansPanel.Location = new System.Drawing.Point(9, 127); + this.DyrFinansPanel.Margin = new System.Windows.Forms.Padding(4); this.DyrFinansPanel.Name = "DyrFinansPanel"; - this.DyrFinansPanel.Size = new System.Drawing.Size(200, 55); + this.DyrFinansPanel.Size = new System.Drawing.Size(267, 68); this.DyrFinansPanel.TabIndex = 50; // @@ -419,7 +447,8 @@ // this.akc2Button.Image = ((System.Drawing.Image)(resources.GetObject("akc2Button.Image"))); - this.akc2Button.Location = new System.Drawing.Point(28, 8); + this.akc2Button.Location = new System.Drawing.Point(37, 10); + this.akc2Button.Margin = new System.Windows.Forms.Padding(4); this.akc2Button.Name = "akc2Button"; - this.akc2Button.Size = new System.Drawing.Size(42, 40); + this.akc2Button.Size = new System.Drawing.Size(56, 49); this.akc2Button.TabIndex = 40; this.akc2Button.UseVisualStyleBackColor = true; @@ -429,7 +458,8 @@ // this.nie2Button.Image = ((System.Drawing.Image)(resources.GetObject("nie2Button.Image"))); - this.nie2Button.Location = new System.Drawing.Point(76, 8); + this.nie2Button.Location = new System.Drawing.Point(101, 10); + this.nie2Button.Margin = new System.Windows.Forms.Padding(4); this.nie2Button.Name = "nie2Button"; - this.nie2Button.Size = new System.Drawing.Size(42, 40); + this.nie2Button.Size = new System.Drawing.Size(56, 49); this.nie2Button.TabIndex = 41; this.nie2Button.UseVisualStyleBackColor = true; @@ -439,7 +469,8 @@ // this.wyczysc2Button.Image = ((System.Drawing.Image)(resources.GetObject("wyczysc2Button.Image"))); - this.wyczysc2Button.Location = new System.Drawing.Point(124, 8); + this.wyczysc2Button.Location = new System.Drawing.Point(165, 10); + this.wyczysc2Button.Margin = new System.Windows.Forms.Padding(4); this.wyczysc2Button.Name = "wyczysc2Button"; - this.wyczysc2Button.Size = new System.Drawing.Size(42, 40); + this.wyczysc2Button.Size = new System.Drawing.Size(56, 49); this.wyczysc2Button.TabIndex = 42; this.wyczysc2Button.UseVisualStyleBackColor = true; @@ -450,7 +481,8 @@ this.decyzja2DataLabel2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "Decyzja2Data", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "g")); this.decyzja2DataLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.decyzja2DataLabel2.Location = new System.Drawing.Point(80, 77); + this.decyzja2DataLabel2.Location = new System.Drawing.Point(107, 95); + this.decyzja2DataLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.decyzja2DataLabel2.Name = "decyzja2DataLabel2"; - this.decyzja2DataLabel2.Size = new System.Drawing.Size(100, 23); + this.decyzja2DataLabel2.Size = new System.Drawing.Size(133, 28); this.decyzja2DataLabel2.TabIndex = 49; // @@ -459,7 +491,8 @@ this.labelKto2.AutoSize = true; this.labelKto2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.labelKto2.Location = new System.Drawing.Point(80, 50); + this.labelKto2.Location = new System.Drawing.Point(107, 62); + this.labelKto2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelKto2.Name = "labelKto2"; - this.labelKto2.Size = new System.Drawing.Size(60, 13); + this.labelKto2.Size = new System.Drawing.Size(76, 17); this.labelKto2.TabIndex = 48; this.labelKto2.Text = "labelKto2"; @@ -469,7 +502,8 @@ this.labelDecyzja2.AutoSize = true; this.labelDecyzja2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.labelDecyzja2.Location = new System.Drawing.Point(80, 26); + this.labelDecyzja2.Location = new System.Drawing.Point(107, 32); + this.labelDecyzja2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDecyzja2.Name = "labelDecyzja2"; - this.labelDecyzja2.Size = new System.Drawing.Size(86, 13); + this.labelDecyzja2.Size = new System.Drawing.Size(109, 17); this.labelDecyzja2.TabIndex = 47; this.labelDecyzja2.Text = "labelDecyzja2"; @@ -484,7 +518,9 @@ this.dyrGeneralGroupBox.Controls.Add(decyzja3KtoLabel); this.dyrGeneralGroupBox.Controls.Add(decyzja3DataLabel); - this.dyrGeneralGroupBox.Location = new System.Drawing.Point(448, 426); + this.dyrGeneralGroupBox.Location = new System.Drawing.Point(597, 524); + this.dyrGeneralGroupBox.Margin = new System.Windows.Forms.Padding(4); this.dyrGeneralGroupBox.Name = "dyrGeneralGroupBox"; - this.dyrGeneralGroupBox.Size = new System.Drawing.Size(209, 165); + this.dyrGeneralGroupBox.Padding = new System.Windows.Forms.Padding(4); + this.dyrGeneralGroupBox.Size = new System.Drawing.Size(279, 203); this.dyrGeneralGroupBox.TabIndex = 39; this.dyrGeneralGroupBox.TabStop = false; @@ -497,7 +533,8 @@ this.DyrGeneralPanel.Controls.Add(this.wyczysc3Button); this.DyrGeneralPanel.Enabled = false; - this.DyrGeneralPanel.Location = new System.Drawing.Point(5, 103); + this.DyrGeneralPanel.Location = new System.Drawing.Point(7, 127); + this.DyrGeneralPanel.Margin = new System.Windows.Forms.Padding(4); this.DyrGeneralPanel.Name = "DyrGeneralPanel"; - this.DyrGeneralPanel.Size = new System.Drawing.Size(200, 55); + this.DyrGeneralPanel.Size = new System.Drawing.Size(267, 68); this.DyrGeneralPanel.TabIndex = 51; // @@ -505,7 +542,8 @@ // this.akc3Button.Image = ((System.Drawing.Image)(resources.GetObject("akc3Button.Image"))); - this.akc3Button.Location = new System.Drawing.Point(32, 8); + this.akc3Button.Location = new System.Drawing.Point(43, 10); + this.akc3Button.Margin = new System.Windows.Forms.Padding(4); this.akc3Button.Name = "akc3Button"; - this.akc3Button.Size = new System.Drawing.Size(42, 40); + this.akc3Button.Size = new System.Drawing.Size(56, 49); this.akc3Button.TabIndex = 37; this.akc3Button.UseVisualStyleBackColor = true; @@ -515,7 +553,8 @@ // this.nie3Button.Image = ((System.Drawing.Image)(resources.GetObject("nie3Button.Image"))); - this.nie3Button.Location = new System.Drawing.Point(80, 8); + this.nie3Button.Location = new System.Drawing.Point(107, 10); + this.nie3Button.Margin = new System.Windows.Forms.Padding(4); this.nie3Button.Name = "nie3Button"; - this.nie3Button.Size = new System.Drawing.Size(42, 40); + this.nie3Button.Size = new System.Drawing.Size(56, 49); this.nie3Button.TabIndex = 38; this.nie3Button.UseVisualStyleBackColor = true; @@ -525,7 +564,8 @@ // this.wyczysc3Button.Image = ((System.Drawing.Image)(resources.GetObject("wyczysc3Button.Image"))); - this.wyczysc3Button.Location = new System.Drawing.Point(128, 8); + this.wyczysc3Button.Location = new System.Drawing.Point(171, 10); + this.wyczysc3Button.Margin = new System.Windows.Forms.Padding(4); this.wyczysc3Button.Name = "wyczysc3Button"; - this.wyczysc3Button.Size = new System.Drawing.Size(42, 40); + this.wyczysc3Button.Size = new System.Drawing.Size(56, 49); this.wyczysc3Button.TabIndex = 39; this.wyczysc3Button.UseVisualStyleBackColor = true; @@ -536,7 +576,8 @@ this.decyzja3DataLabel2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "Decyzja3Data", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "g")); this.decyzja3DataLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.decyzja3DataLabel2.Location = new System.Drawing.Point(79, 77); + this.decyzja3DataLabel2.Location = new System.Drawing.Point(105, 95); + this.decyzja3DataLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.decyzja3DataLabel2.Name = "decyzja3DataLabel2"; - this.decyzja3DataLabel2.Size = new System.Drawing.Size(100, 23); + this.decyzja3DataLabel2.Size = new System.Drawing.Size(133, 28); this.decyzja3DataLabel2.TabIndex = 50; // @@ -545,7 +586,8 @@ this.labelKto3.AutoSize = true; this.labelKto3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.labelKto3.Location = new System.Drawing.Point(89, 50); + this.labelKto3.Location = new System.Drawing.Point(119, 62); + this.labelKto3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelKto3.Name = "labelKto3"; - this.labelKto3.Size = new System.Drawing.Size(60, 13); + this.labelKto3.Size = new System.Drawing.Size(76, 17); this.labelKto3.TabIndex = 49; this.labelKto3.Text = "labelKto3"; @@ -555,7 +597,8 @@ this.labelDecyzja3.AutoSize = true; this.labelDecyzja3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.labelDecyzja3.Location = new System.Drawing.Point(89, 26); + this.labelDecyzja3.Location = new System.Drawing.Point(119, 32); + this.labelDecyzja3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDecyzja3.Name = "labelDecyzja3"; - this.labelDecyzja3.Size = new System.Drawing.Size(86, 13); + this.labelDecyzja3.Size = new System.Drawing.Size(109, 17); this.labelDecyzja3.TabIndex = 48; this.labelDecyzja3.Text = "labelDecyzja3"; @@ -598,7 +641,8 @@ this.wiadoTabPage.Controls.Add(this.dodajButton); this.wiadoTabPage.Controls.Add(this.realizacjeDataGridView); - this.wiadoTabPage.Location = new System.Drawing.Point(4, 22); + this.wiadoTabPage.Location = new System.Drawing.Point(4, 25); + this.wiadoTabPage.Margin = new System.Windows.Forms.Padding(4); this.wiadoTabPage.Name = "wiadoTabPage"; - this.wiadoTabPage.Size = new System.Drawing.Size(637, 382); + this.wiadoTabPage.Size = new System.Drawing.Size(852, 473); this.wiadoTabPage.TabIndex = 2; this.wiadoTabPage.Text = "REALIZACJE"; @@ -607,7 +651,8 @@ // edytujButton // - this.edytujButton.Location = new System.Drawing.Point(272, 330); + this.edytujButton.Location = new System.Drawing.Point(363, 406); + this.edytujButton.Margin = new System.Windows.Forms.Padding(4); this.edytujButton.Name = "edytujButton"; - this.edytujButton.Size = new System.Drawing.Size(75, 23); + this.edytujButton.Size = new System.Drawing.Size(100, 28); this.edytujButton.TabIndex = 3; this.edytujButton.Text = "Edytuj"; @@ -617,7 +662,8 @@ // usunButton // - this.usunButton.Location = new System.Drawing.Point(169, 330); + this.usunButton.Location = new System.Drawing.Point(225, 406); + this.usunButton.Margin = new System.Windows.Forms.Padding(4); this.usunButton.Name = "usunButton"; - this.usunButton.Size = new System.Drawing.Size(75, 23); + this.usunButton.Size = new System.Drawing.Size(100, 28); this.usunButton.TabIndex = 2; this.usunButton.Text = "Usuñ"; @@ -627,7 +673,8 @@ // dodajButton // - this.dodajButton.Location = new System.Drawing.Point(373, 330); + this.dodajButton.Location = new System.Drawing.Point(497, 406); + this.dodajButton.Margin = new System.Windows.Forms.Padding(4); this.dodajButton.Name = "dodajButton"; - this.dodajButton.Size = new System.Drawing.Size(75, 23); + this.dodajButton.Size = new System.Drawing.Size(100, 28); this.dodajButton.TabIndex = 1; this.dodajButton.Text = "Dodaj"; @@ -649,10 +696,11 @@ this.realizacjeDataGridView.DataSource = this.realizacjeBindingSource; this.realizacjeDataGridView.GridColor = System.Drawing.Color.DimGray; - this.realizacjeDataGridView.Location = new System.Drawing.Point(14, 17); + this.realizacjeDataGridView.Location = new System.Drawing.Point(19, 21); + this.realizacjeDataGridView.Margin = new System.Windows.Forms.Padding(4); this.realizacjeDataGridView.Name = "realizacjeDataGridView"; this.realizacjeDataGridView.ReadOnly = true; this.realizacjeDataGridView.RowHeadersWidth = 10; this.realizacjeDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - this.realizacjeDataGridView.Size = new System.Drawing.Size(601, 296); + this.realizacjeDataGridView.Size = new System.Drawing.Size(801, 364); this.realizacjeDataGridView.TabIndex = 0; // @@ -661,6 +709,6 @@ this.dataGridViewTextBoxColumn8.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn8.DataPropertyName = "Data"; - dataGridViewCellStyle1.Format = "d"; - this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Format = "d"; + this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewTextBoxColumn8.HeaderText = "Data"; this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; @@ -689,6 +737,6 @@ this.dataGridViewTextBoxColumn11.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn11.DataPropertyName = "Wartosc"; - dataGridViewCellStyle2.Format = "c"; - this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Format = "c"; + this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle4; this.dataGridViewTextBoxColumn11.FillWeight = 131.3869F; this.dataGridViewTextBoxColumn11.HeaderText = "Wartosc"; @@ -721,8 +769,9 @@ this.zamTabPage.Controls.Add(numerLabel); this.zamTabPage.Controls.Add(this.groupBox1); - this.zamTabPage.Location = new System.Drawing.Point(4, 22); + this.zamTabPage.Location = new System.Drawing.Point(4, 25); + this.zamTabPage.Margin = new System.Windows.Forms.Padding(4); this.zamTabPage.Name = "zamTabPage"; - this.zamTabPage.Padding = new System.Windows.Forms.Padding(3); - this.zamTabPage.Size = new System.Drawing.Size(637, 382); + this.zamTabPage.Padding = new System.Windows.Forms.Padding(4); + this.zamTabPage.Size = new System.Drawing.Size(852, 473); this.zamTabPage.TabIndex = 0; this.zamTabPage.Text = "ZAMÓWIENIE"; @@ -732,7 +781,8 @@ // this.zamowienieKtoLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.zamowienieKtoLabel2.Location = new System.Drawing.Point(75, 18); + this.zamowienieKtoLabel2.Location = new System.Drawing.Point(100, 22); + this.zamowienieKtoLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.zamowienieKtoLabel2.Name = "zamowienieKtoLabel2"; - this.zamowienieKtoLabel2.Size = new System.Drawing.Size(123, 23); + this.zamowienieKtoLabel2.Size = new System.Drawing.Size(164, 28); this.zamowienieKtoLabel2.TabIndex = 47; // @@ -740,7 +790,8 @@ // this.iDETextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "IDE", true)); - this.iDETextBox.Location = new System.Drawing.Point(11, 142); + this.iDETextBox.Location = new System.Drawing.Point(15, 175); + this.iDETextBox.Margin = new System.Windows.Forms.Padding(4); this.iDETextBox.Name = "iDETextBox"; - this.iDETextBox.Size = new System.Drawing.Size(58, 20); + this.iDETextBox.Size = new System.Drawing.Size(76, 22); this.iDETextBox.TabIndex = 25; this.iDETextBox.Visible = false; @@ -749,8 +800,9 @@ // this.zamowienieTrescTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "ZamowienieTresc", true)); - this.zamowienieTrescTextBox.Location = new System.Drawing.Point(78, 92); + this.zamowienieTrescTextBox.Location = new System.Drawing.Point(104, 113); + this.zamowienieTrescTextBox.Margin = new System.Windows.Forms.Padding(4); this.zamowienieTrescTextBox.Multiline = true; this.zamowienieTrescTextBox.Name = "zamowienieTrescTextBox"; - this.zamowienieTrescTextBox.Size = new System.Drawing.Size(533, 211); + this.zamowienieTrescTextBox.Size = new System.Drawing.Size(709, 259); this.zamowienieTrescTextBox.TabIndex = 13; // @@ -758,7 +810,8 @@ // this.zamowienieWartosc1TextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "ZamowienieWartosc1", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.zamowienieWartosc1TextBox.Location = new System.Drawing.Point(274, 53); + this.zamowienieWartosc1TextBox.Location = new System.Drawing.Point(365, 65); + this.zamowienieWartosc1TextBox.Margin = new System.Windows.Forms.Padding(4); this.zamowienieWartosc1TextBox.Name = "zamowienieWartosc1TextBox"; - this.zamowienieWartosc1TextBox.Size = new System.Drawing.Size(121, 20); + this.zamowienieWartosc1TextBox.Size = new System.Drawing.Size(160, 22); this.zamowienieWartosc1TextBox.TabIndex = 15; // @@ -766,7 +819,8 @@ // this.numer_RokTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "Numer_Rok", true)); - this.numer_RokTextBox.Location = new System.Drawing.Point(11, 220); + this.numer_RokTextBox.Location = new System.Drawing.Point(15, 271); + this.numer_RokTextBox.Margin = new System.Windows.Forms.Padding(4); this.numer_RokTextBox.Name = "numer_RokTextBox"; - this.numer_RokTextBox.Size = new System.Drawing.Size(58, 20); + this.numer_RokTextBox.Size = new System.Drawing.Size(76, 22); this.numer_RokTextBox.TabIndex = 11; this.numer_RokTextBox.Visible = false; @@ -775,7 +829,8 @@ // this.zamowienieWartosc2TextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "ZamowienieWartosc2", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.zamowienieWartosc2TextBox.Location = new System.Drawing.Point(475, 53); + this.zamowienieWartosc2TextBox.Location = new System.Drawing.Point(633, 65); + this.zamowienieWartosc2TextBox.Margin = new System.Windows.Forms.Padding(4); this.zamowienieWartosc2TextBox.Name = "zamowienieWartosc2TextBox"; - this.zamowienieWartosc2TextBox.Size = new System.Drawing.Size(121, 20); + this.zamowienieWartosc2TextBox.Size = new System.Drawing.Size(160, 22); this.zamowienieWartosc2TextBox.TabIndex = 17; // @@ -783,7 +838,8 @@ // this.numerTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "Numer", true)); - this.numerTextBox.Location = new System.Drawing.Point(17, 168); + this.numerTextBox.Location = new System.Drawing.Point(23, 207); + this.numerTextBox.Margin = new System.Windows.Forms.Padding(4); this.numerTextBox.Name = "numerTextBox"; - this.numerTextBox.Size = new System.Drawing.Size(43, 20); + this.numerTextBox.Size = new System.Drawing.Size(56, 22); this.numerTextBox.TabIndex = 7; this.numerTextBox.Visible = false; @@ -792,7 +848,8 @@ // this.numer_RozTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.zamowieniaBindingSource, "Numer_Roz", true)); - this.numer_RozTextBox.Location = new System.Drawing.Point(9, 194); + this.numer_RozTextBox.Location = new System.Drawing.Point(12, 239); + this.numer_RozTextBox.Margin = new System.Windows.Forms.Padding(4); this.numer_RozTextBox.Name = "numer_RozTextBox"; - this.numer_RozTextBox.Size = new System.Drawing.Size(63, 20); + this.numer_RozTextBox.Size = new System.Drawing.Size(83, 22); this.numer_RozTextBox.TabIndex = 9; this.numer_RozTextBox.Visible = false; @@ -804,7 +861,8 @@ this.zamowienieDzialComboBox.DisplayMember = "Symbol"; this.zamowienieDzialComboBox.FormattingEnabled = true; - this.zamowienieDzialComboBox.Location = new System.Drawing.Point(274, 20); + this.zamowienieDzialComboBox.Location = new System.Drawing.Point(365, 25); + this.zamowienieDzialComboBox.Margin = new System.Windows.Forms.Padding(4); this.zamowienieDzialComboBox.Name = "zamowienieDzialComboBox"; - this.zamowienieDzialComboBox.Size = new System.Drawing.Size(121, 21); + this.zamowienieDzialComboBox.Size = new System.Drawing.Size(160, 24); this.zamowienieDzialComboBox.TabIndex = 24; this.zamowienieDzialComboBox.ValueMember = "IDE"; @@ -814,7 +872,8 @@ this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label1.Location = new System.Drawing.Point(471, 16); + this.label1.Location = new System.Drawing.Point(628, 20); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(57, 20); + this.label1.Size = new System.Drawing.Size(70, 25); this.label1.TabIndex = 22; this.label1.Text = "label1"; @@ -823,7 +882,8 @@ // this.zapiszButton.Image = ((System.Drawing.Image)(resources.GetObject("zapiszButton.Image"))); - this.zapiszButton.Location = new System.Drawing.Point(511, 333); + this.zapiszButton.Location = new System.Drawing.Point(681, 410); + this.zapiszButton.Margin = new System.Windows.Forms.Padding(4); this.zapiszButton.Name = "zapiszButton"; - this.zapiszButton.Size = new System.Drawing.Size(114, 35); + this.zapiszButton.Size = new System.Drawing.Size(152, 43); this.zapiszButton.TabIndex = 21; this.zapiszButton.Text = "ZAPISZ"; @@ -836,7 +896,8 @@ this.anulujButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.anulujButton.Image = ((System.Drawing.Image)(resources.GetObject("anulujButton.Image"))); - this.anulujButton.Location = new System.Drawing.Point(388, 333); + this.anulujButton.Location = new System.Drawing.Point(517, 410); + this.anulujButton.Margin = new System.Windows.Forms.Padding(4); this.anulujButton.Name = "anulujButton"; - this.anulujButton.Size = new System.Drawing.Size(110, 35); + this.anulujButton.Size = new System.Drawing.Size(147, 43); this.anulujButton.TabIndex = 20; this.anulujButton.Text = "ZAMKNIJ"; @@ -848,11 +909,15 @@ // this.zamowienieDataDateTimePicker.CalendarMonthBackground = System.Drawing.Color.White; + this.zamowienieDataDateTimePicker.CausesValidation = false; + this.zamowienieDataDateTimePicker.CustomFormat = "yyyy-MM-dd"; this.zamowienieDataDateTimePicker.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.zamowieniaBindingSource, "ZamowienieData", true)); - this.zamowienieDataDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.zamowienieDataDateTimePicker.Location = new System.Drawing.Point(77, 53); + this.zamowienieDataDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.zamowienieDataDateTimePicker.Location = new System.Drawing.Point(103, 65); + this.zamowienieDataDateTimePicker.Margin = new System.Windows.Forms.Padding(4); this.zamowienieDataDateTimePicker.Name = "zamowienieDataDateTimePicker"; - this.zamowienieDataDateTimePicker.Size = new System.Drawing.Size(121, 20); + this.zamowienieDataDateTimePicker.Size = new System.Drawing.Size(160, 22); this.zamowienieDataDateTimePicker.TabIndex = 5; - this.zamowienieDataDateTimePicker.ValueChanged += new System.EventHandler(this.zamowienieDataDateTimePicker_ValueChanged); + this.zamowienieDataDateTimePicker.Value = new System.DateTime(2009, 1, 14, 10, 47, 56, 0); + this.zamowienieDataDateTimePicker.CloseUp += new System.EventHandler(this.zamowienieDataDateTimePicker_CloseUp); // // groupBox1 @@ -860,7 +925,9 @@ this.groupBox1.Controls.Add(this.odtwierdzButton); this.groupBox1.Controls.Add(this.zatwierdzButton); - this.groupBox1.Location = new System.Drawing.Point(9, 309); + this.groupBox1.Location = new System.Drawing.Point(12, 380); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(118, 67); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(157, 82); this.groupBox1.TabIndex = 46; this.groupBox1.TabStop = false; @@ -870,7 +937,8 @@ // this.odtwierdzButton.Image = ((System.Drawing.Image)(resources.GetObject("odtwierdzButton.Image"))); - this.odtwierdzButton.Location = new System.Drawing.Point(62, 19); + this.odtwierdzButton.Location = new System.Drawing.Point(83, 23); + this.odtwierdzButton.Margin = new System.Windows.Forms.Padding(4); this.odtwierdzButton.Name = "odtwierdzButton"; - this.odtwierdzButton.Size = new System.Drawing.Size(42, 40); + this.odtwierdzButton.Size = new System.Drawing.Size(56, 49); this.odtwierdzButton.TabIndex = 45; this.odtwierdzButton.UseVisualStyleBackColor = true; @@ -880,7 +948,8 @@ // this.zatwierdzButton.Image = ((System.Drawing.Image)(resources.GetObject("zatwierdzButton.Image"))); - this.zatwierdzButton.Location = new System.Drawing.Point(14, 19); + this.zatwierdzButton.Location = new System.Drawing.Point(19, 23); + this.zatwierdzButton.Margin = new System.Windows.Forms.Padding(4); this.zatwierdzButton.Name = "zatwierdzButton"; - this.zatwierdzButton.Size = new System.Drawing.Size(42, 40); + this.zatwierdzButton.Size = new System.Drawing.Size(56, 49); this.zatwierdzButton.TabIndex = 44; this.zatwierdzButton.UseVisualStyleBackColor = true; @@ -891,19 +960,21 @@ this.tabControl1.Controls.Add(this.zamTabPage); this.tabControl1.Controls.Add(this.wiadoTabPage); - this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Location = new System.Drawing.Point(16, 15); + this.tabControl1.Margin = new System.Windows.Forms.Padding(4); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(645, 408); + this.tabControl1.Size = new System.Drawing.Size(860, 502); this.tabControl1.TabIndex = 40; // // ZamowienieForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(672, 600); + this.ClientSize = new System.Drawing.Size(896, 738); this.Controls.Add(this.tabControl1); this.Controls.Add(this.dyrGeneralGroupBox); this.Controls.Add(this.dyrFinanGroupBox); this.Controls.Add(this.kierownikGroupBox); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "ZamowienieForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; Index: BazaZamowien/Zamowienia/ZamowienieForm.cs =================================================================== --- BazaZamowien/Zamowienia/ZamowienieForm.cs (revision 712) +++ BazaZamowien/Zamowienia/ZamowienieForm.cs (revision 715) @@ -35,19 +35,21 @@ DataRowView row = datatable.AddNew(); - // row["IDE"] = Utils.IDENowegoZamowienia(); + // row["IDE"] = Utils.IDENowegoZamowienia(); row["ZamowienieKto"] = User.getUser().IDE; row["ZamowienieDzial"] = User.getUser().IDEDzialu; row["ZamowienieData"] = DateTime.Now; - row["Numer"] = ZamowieniaUtils.nrNowegoZamowienia(User.getUser().IDEDzialu); + row["Numer"] = ZamowieniaUtils.nrNowegoZamowienia(User.getUser().IDEDzialu, zamowienieDataDateTimePicker.Value.Year); row["Numer_Roz"] = User.getUser().Numer_Roz; - row["Numer_Rok"] = DateTime.Today.Year; - - label1.Text = row["Numer"].ToString() + "/" + row["Numer_Roz"].ToString() + "/" + row["Numer_Rok"].ToString(); - + row["Numer_Rok"] = zamowienieDataDateTimePicker.Value.Year; + + SetOrderNumberText(row["Numer"].ToString(), + row["Numer_Roz"].ToString(), + row["Numer_Rok"].ToString()); + Validate(); zamowieniaBindingSource.EndEdit(); zamowieniaBindingSource.MoveLast(); - + ustawLabele((DataRowView)zamowieniaBindingSource.Current); @@ -86,9 +88,9 @@ newRow["ZamowienieDzial"] = User.getUser().IDEDzialu; newRow["ZamowienieData"] = DateTime.Now; - newRow["Numer"] = ZamowieniaUtils.nrNowegoZamowienia(User.getUser().IDEDzialu); + newRow["Numer"] = ZamowieniaUtils.nrNowegoZamowienia(User.getUser().IDEDzialu, zamowienieDataDateTimePicker.Value.Year); newRow["Numer_Roz"] = User.getUser().Numer_Roz; - newRow["Numer_Rok"] = DateTime.Today.Year; - - label1.Text = newRow["Numer"].ToString() + "/" + newRow["Numer_Roz"].ToString() + "/" + newRow["Numer_Rok"].ToString(); + newRow["Numer_Rok"] = zamowienieDataDateTimePicker.Value.Year; + + SetOrderNumberText(newRow["Numer"].ToString(), newRow["Numer_Roz"].ToString(), newRow["Numer_Rok"].ToString()); Validate(); @@ -105,5 +107,6 @@ this.zamowieniaTableAdapter.FillByIDE(zamowieniaDataSet.Zamowienia, IDE); DataRowView row = (DataRowView)zamowieniaBindingSource.Current; - label1.Text = row["Numer"].ToString() + "/" + row["Numer_Roz"].ToString() + "/" + row["Numer_Rok"].ToString(); + + SetOrderNumberText(row["Numer"].ToString(), row["Numer_Roz"].ToString(), row["Numer_Rok"].ToString()); ustawLabele((DataRowView)zamowieniaBindingSource.Current); @@ -116,4 +119,9 @@ uprawnienia(); } + } + + private void SetOrderNumberText(string number, string numberExt, string year) + { + label1.Text = number + "/" + numberExt + "/" + year; } @@ -413,8 +421,11 @@ zamowieniaBindingSource.EndEdit(); - label1.Text = ZamowieniaUtils.nrNowegoZamowienia(Convert.ToInt32(dzialRow["IDE"])).ToString() + "/" + dzialRow["roz"].ToString() + "/" + DateTime.Today.Year; - - DataRowView row = (DataRowView)zamowieniaBindingSource.Current; - row["Numer"] = ZamowieniaUtils.nrNowegoZamowienia(Convert.ToInt32(dzialRow["IDE"])); + SetOrderNumberText(ZamowieniaUtils.nrNowegoZamowienia(Convert.ToInt32(dzialRow["IDE"]), zamowienieDataDateTimePicker.Value.Year).ToString(), + dzialRow["roz"].ToString(), + zamowienieDataDateTimePicker.Value.Year.ToString()); + + DataRowView row = (DataRowView)zamowieniaBindingSource.Current; + row["Numer"] = ZamowieniaUtils.nrNowegoZamowienia(Convert.ToInt32(dzialRow["IDE"]), + zamowienieDataDateTimePicker.Value.Year); row["Numer_Roz"] = dzialRow["roz"]; @@ -432,11 +443,38 @@ } - private void zamowienieDataDateTimePicker_ValueChanged(object sender, EventArgs e) + private void zamowienieDataDateTimePicker_CloseUp(object sender, EventArgs e) { DataRowView row = (DataRowView)zamowieniaBindingSource.Current; //row["ZamowienieData"] = row["ZamowienieData"]; row["ZamowienieData"] = zamowienieDataDateTimePicker.Value; + row["Numer_Rok"] = zamowienieDataDateTimePicker.Value.Year; + row["Numer"] = ZamowieniaUtils.nrNowegoZamowienia(Convert.ToInt32(zamowienieDzialComboBox.SelectedValue), + zamowienieDataDateTimePicker.Value.Year); + + + SetOrderNumberText(row["Numer"].ToString(), row["Numer_Roz"].ToString(), row["Numer_Rok"].ToString()); + zamowieniaBindingSource.EndEdit(); } + + //private void zamowienieDataDateTimePicker_ValueChanged(object sender, EventArgs e) + //{ + // return; + + // if (!(sender is DateTimePicker)) + // return; + + // DataRowView row = (DataRowView)zamowieniaBindingSource.Current; + // //row["ZamowienieData"] = row["ZamowienieData"]; + // row["ZamowienieData"] = zamowienieDataDateTimePicker.Value; + // row["Numer_Rok"] = zamowienieDataDateTimePicker.Value.Year; + // row["Numer"] = ZamowieniaUtils.nrNowegoZamowienia(Convert.ToInt32(zamowienieDzialComboBox.SelectedValue), + // zamowienieDataDateTimePicker.Value.Year); + + + // SetOrderNumberText(row["Numer"].ToString(), row["Numer_Roz"].ToString(), row["Numer_Rok"].ToString()); + + // zamowieniaBindingSource.EndEdit(); + //} private void anulujButton_Click(object sender, EventArgs e) @@ -595,5 +633,4 @@ } - } } Index: BazaZamowien/Zamowienia/ZamowienieForm.resx =================================================================== --- BazaZamowien/Zamowienia/ZamowienieForm.resx (revision 710) +++ BazaZamowien/Zamowienia/ZamowienieForm.resx (revision 715) @@ -172,4 +172,7 @@ 17, 17 + + 17, 17 +