Index: trunk/BazaReklam/FakturowaniePoznanKatowice.Designer.cs =================================================================== --- trunk/BazaReklam/FakturowaniePoznanKatowice.Designer.cs (revision 270) +++ trunk/BazaReklam/FakturowaniePoznanKatowice.Designer.cs (revision 301) @@ -50,9 +50,14 @@ this.kontaTableAdapter = new Baza_Reklam.SLOWNIKDataSetTableAdapters.KONTATableAdapter(); this.wplatyTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.WplatyTableAdapter(); + this.btnSearch = new System.Windows.Forms.Button(); + this.txtMonth = new System.Windows.Forms.TextBox(); + this.txtYear = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.NrTygodnia = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.dataGridViewTextBoxColumn29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -113,5 +118,5 @@ this.groupBox3.Location = new System.Drawing.Point(117, 12); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(479, 338); + this.groupBox3.Size = new System.Drawing.Size(518, 338); this.groupBox3.TabIndex = 15; this.groupBox3.TabStop = false; @@ -167,7 +172,6 @@ this.dataGridViewTextBoxColumn2, this.NrTygodnia, + this.dataGridViewTextBoxColumn8, this.dataGridViewTextBoxColumn6, - this.dataGridViewTextBoxColumn7, - this.dataGridViewTextBoxColumn8, this.dataGridViewCheckBoxColumn2, this.dataGridViewTextBoxColumn29, @@ -183,5 +187,5 @@ this.fAKTURYDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.fAKTURYDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.fAKTURYDataGridView.Size = new System.Drawing.Size(451, 266); + this.fAKTURYDataGridView.Size = new System.Drawing.Size(492, 266); this.fAKTURYDataGridView.TabIndex = 8; // @@ -202,9 +206,8 @@ "POZ", "KAT"}); - this.agencjaListBox.Location = new System.Drawing.Point(23, 22); + this.agencjaListBox.Location = new System.Drawing.Point(63, 64); this.agencjaListBox.Name = "agencjaListBox"; - this.agencjaListBox.Size = new System.Drawing.Size(64, 95); + this.agencjaListBox.Size = new System.Drawing.Size(48, 43); this.agencjaListBox.TabIndex = 16; - this.agencjaListBox.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged); // // klienciTableAdapter @@ -227,4 +230,55 @@ // this.wplatyTableAdapter.ClearBeforeFill = true; + // + // btnSearch + // + this.btnSearch.Location = new System.Drawing.Point(36, 113); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(75, 23); + this.btnSearch.TabIndex = 17; + this.btnSearch.Text = "Szukaj"; + this.btnSearch.UseVisualStyleBackColor = true; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // + // txtMonth + // + this.txtMonth.Location = new System.Drawing.Point(63, 38); + this.txtMonth.Name = "txtMonth"; + this.txtMonth.Size = new System.Drawing.Size(48, 20); + this.txtMonth.TabIndex = 18; + // + // txtYear + // + this.txtYear.Location = new System.Drawing.Point(63, 12); + this.txtYear.Name = "txtYear"; + this.txtYear.Size = new System.Drawing.Size(48, 20); + this.txtYear.TabIndex = 19; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(30, 13); + this.label1.TabIndex = 20; + this.label1.Text = "Rok:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 38); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(46, 13); + this.label2.TabIndex = 21; + this.label2.Text = "Miesiac:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(12, 64); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(49, 13); + this.label3.TabIndex = 22; + this.label3.Text = "Agencja:"; // // dataGridViewTextBoxColumn2 @@ -247,4 +301,13 @@ this.NrTygodnia.Width = 35; // + // dataGridViewTextBoxColumn8 + // + this.dataGridViewTextBoxColumn8.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.dataGridViewTextBoxColumn8.DataPropertyName = "DATA_WYSTAWIENIA"; + this.dataGridViewTextBoxColumn8.HeaderText = "Data wystawienia"; + this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.ReadOnly = true; + this.dataGridViewTextBoxColumn8.Width = 110; + // // dataGridViewTextBoxColumn6 // @@ -256,20 +319,4 @@ this.dataGridViewTextBoxColumn6.Width = 65; // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.dataGridViewTextBoxColumn7.DataPropertyName = "NUMER_ROK"; - this.dataGridViewTextBoxColumn7.HeaderText = "Rok"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.ReadOnly = true; - this.dataGridViewTextBoxColumn7.Width = 65; - // - // dataGridViewTextBoxColumn8 - // - this.dataGridViewTextBoxColumn8.DataPropertyName = "DATA_WYSTAWIENIA"; - this.dataGridViewTextBoxColumn8.HeaderText = "Data wystawienia"; - this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; - this.dataGridViewTextBoxColumn8.ReadOnly = true; - // // dataGridViewCheckBoxColumn2 // @@ -279,12 +326,14 @@ this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2"; this.dataGridViewCheckBoxColumn2.ReadOnly = true; - this.dataGridViewCheckBoxColumn2.Width = 30; + this.dataGridViewCheckBoxColumn2.Width = 25; // // dataGridViewTextBoxColumn29 // + this.dataGridViewTextBoxColumn29.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn29.DataPropertyName = "suma_zaplat"; this.dataGridViewTextBoxColumn29.HeaderText = "Suma zap³at"; this.dataGridViewTextBoxColumn29.Name = "dataGridViewTextBoxColumn29"; this.dataGridViewTextBoxColumn29.ReadOnly = true; + this.dataGridViewTextBoxColumn29.Width = 90; // // dataGridViewTextBoxColumn31 @@ -301,8 +350,10 @@ // dataGridViewTextBoxColumn37 // + this.dataGridViewTextBoxColumn37.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn37.DataPropertyName = "waluta_miano"; this.dataGridViewTextBoxColumn37.HeaderText = "Waluta"; this.dataGridViewTextBoxColumn37.Name = "dataGridViewTextBoxColumn37"; this.dataGridViewTextBoxColumn37.ReadOnly = true; + this.dataGridViewTextBoxColumn37.Width = 50; // // EKSPORT @@ -321,5 +372,11 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(611, 358); + this.ClientSize = new System.Drawing.Size(647, 358); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.txtYear); + this.Controls.Add(this.txtMonth); + this.Controls.Add(this.btnSearch); this.Controls.Add(this.agencjaListBox); this.Controls.Add(this.groupBox3); @@ -334,4 +391,5 @@ ((System.ComponentModel.ISupportInitialize)(this.fAKTURYDataGridView)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -357,9 +415,14 @@ private System.Windows.Forms.DateTimePicker dtpZmianaDaty; private Baza_Reklam.REKLAMADataSetTableAdapters.WplatyTableAdapter wplatyTableAdapter; + private System.Windows.Forms.Button btnSearch; + private System.Windows.Forms.TextBox txtMonth; + private System.Windows.Forms.TextBox txtYear; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn NrTygodnia; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn29; Index: trunk/BazaReklam/REKLAMADataSet.xsd =================================================================== --- trunk/BazaReklam/REKLAMADataSet.xsd (revision 300) +++ trunk/BazaReklam/REKLAMADataSet.xsd (revision 301) @@ -1663,20 +1663,4 @@ - - - - SELECT DISTINCT - F.NUMER, F.NUMER_ROZ, F.NUMER_ROK, F.DATA_WYSTAWIENIA, F.ZAPLACONO, F.suma_zaplat, F.KOREKTA, F.waluta_miano, F.EKSPORT, - FPK.NrTygodnia, F.ID_FAKTURY -FROM FAKTURY AS F LEFT OUTER JOIN - FakturyPoznanKatowice AS FPK ON FPK.ID = F.ID_FAKTURY -WHERE (F.NUMER_ROZ = @param) - - - - - - - @@ -1739,4 +1723,24 @@ + + + + + + + + + SELECT DISTINCT + F.NUMER, F.NUMER_ROZ, F.NUMER_ROK, F.DATA_WYSTAWIENIA, F.ZAPLACONO, F.suma_zaplat, F.KOREKTA, F.waluta_miano, F.EKSPORT, + FPK.NrTygodnia, F.ID_FAKTURY +FROM FAKTURY AS F LEFT OUTER JOIN + FakturyPoznanKatowice AS FPK ON FPK.ID = F.ID_FAKTURY +WHERE F.NUMER_ROZ = @agency AND DATEPART(year,F.DATA_WYSTAWIENIA)=@year AND DATEPART(month,F.DATA_WYSTAWIENIA)=@month + + + + + + @@ -4630,14 +4634,14 @@ - - - - - - - - - - + + + + + + + + + + @@ -4646,5 +4650,5 @@ - + @@ -4653,5 +4657,5 @@ - + @@ -4660,15 +4664,15 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -4677,5 +4681,5 @@ - + @@ -4684,9 +4688,9 @@ - - - - - + + + + + @@ -4695,11 +4699,11 @@ - - - - - - - + + + + + + + @@ -4708,19 +4712,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -4729,33 +4733,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4764,6 +4768,6 @@ - - + + @@ -4772,10 +4776,10 @@ - - - - - - + + + + + + @@ -4784,6 +4788,6 @@ - - + + @@ -4792,9 +4796,9 @@ - - - - - + + + + + @@ -4803,8 +4807,8 @@ - - - - + + + + @@ -4813,13 +4817,13 @@ - - - - - - - - - + + + + + + + + + @@ -4828,13 +4832,13 @@ - - - - - - - - - + + + + + + + + + @@ -4843,33 +4847,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4878,33 +4882,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4913,5 +4917,5 @@ - + @@ -4920,5 +4924,5 @@ - + @@ -4927,6 +4931,6 @@ - - + + @@ -4935,5 +4939,5 @@ - + @@ -4942,14 +4946,14 @@ - - - - - - - - - - + + + + + + + + + + @@ -4958,5 +4962,5 @@ - + @@ -4965,20 +4969,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -4987,14 +4991,14 @@ - - - - - - - - - - + + + + + + + + + + @@ -5003,5 +5007,5 @@ - + @@ -5016,9 +5020,9 @@ - - - - - + + + + + @@ -5027,35 +5031,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5070,21 +5074,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -5093,55 +5097,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5150,5 +5154,5 @@ - + @@ -5157,5 +5161,5 @@ - + @@ -5164,12 +5168,12 @@ - - - - - - - - + + + + + + + + @@ -5178,14 +5182,14 @@ - - - - - - - - - - + + + + + + + + + + @@ -5194,19 +5198,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -5221,7 +5225,7 @@ - - - + + + @@ -5230,7 +5234,7 @@ - - - + + + @@ -5239,8 +5243,8 @@ - - - - + + + + @@ -5249,5 +5253,5 @@ - + @@ -5256,5 +5260,5 @@ - + @@ -5263,5 +5267,5 @@ - + @@ -5270,8 +5274,8 @@ - - - - + + + + @@ -5280,5 +5284,5 @@ - + @@ -5287,39 +5291,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5328,8 +5332,8 @@ - - - - + + + + @@ -5338,8 +5342,8 @@ - - - - + + + + @@ -5349,9 +5353,9 @@ - - - - - + + + + + @@ -5360,5 +5364,5 @@ - + @@ -5367,5 +5371,5 @@ - + @@ -5374,18 +5378,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -5394,10 +5398,10 @@ - - - - - - + + + + + + @@ -5406,5 +5410,5 @@ - + @@ -5413,7 +5417,7 @@ - - - + + + @@ -5422,5 +5426,5 @@ - + @@ -5429,5 +5433,5 @@ - + @@ -5436,5 +5440,5 @@ - + @@ -5443,15 +5447,15 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -5460,5 +5464,5 @@ - + @@ -5467,9 +5471,9 @@ - - - - - + + + + + @@ -5478,11 +5482,11 @@ - - - - - - - + + + + + + + @@ -5491,19 +5495,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -5512,33 +5516,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5547,6 +5551,6 @@ - - + + @@ -5555,10 +5559,10 @@ - - - - - - + + + + + + @@ -5567,6 +5571,6 @@ - - + + @@ -5575,9 +5579,9 @@ - - - - - + + + + + @@ -5586,8 +5590,8 @@ - - - - + + + + @@ -5596,28 +5600,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -5626,6 +5630,6 @@ - - + + @@ -5634,5 +5638,5 @@ - + @@ -5641,21 +5645,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -5664,20 +5668,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -5686,15 +5690,15 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -5703,5 +5707,5 @@ - + @@ -5716,7 +5720,7 @@ - - - + + + @@ -5725,8 +5729,8 @@ - - - - + + + + @@ -5735,5 +5739,5 @@ - + @@ -5742,10 +5746,10 @@ - - - - - - + + + + + + @@ -5754,39 +5758,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5795,6 +5799,6 @@ - - + + @@ -5803,47 +5807,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5852,15 +5856,15 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -5869,6 +5873,6 @@ - - + + @@ -5877,5 +5881,5 @@ - + @@ -5884,23 +5888,23 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -5909,5 +5913,5 @@ - + @@ -5916,26 +5920,26 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -5944,16 +5948,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -5968,15 +5972,15 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -5991,20 +5995,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -6013,5 +6017,5 @@ - + @@ -6020,6 +6024,6 @@ - - + + @@ -6034,25 +6038,66 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + @@ -6071,50 +6116,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -6123,5 +6127,5 @@ - + @@ -6130,7 +6134,7 @@ - - - + + + @@ -6139,12 +6143,12 @@ - - - - - - - - + + + + + + + + @@ -6153,6 +6157,6 @@ - - + + @@ -6161,16 +6165,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -6179,17 +6183,17 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -6198,9 +6202,9 @@ - - - - - + + + + + @@ -6209,5 +6213,5 @@ - + @@ -6216,5 +6220,5 @@ - + @@ -6223,5 +6227,5 @@ - + @@ -6230,8 +6234,8 @@ - - - - + + + + @@ -6246,6 +6250,6 @@ - - + + @@ -6254,6 +6258,6 @@ - - + + @@ -6262,5 +6266,5 @@ - + @@ -6269,21 +6273,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -6292,9 +6296,9 @@ - - - - - + + + + + @@ -6303,10 +6307,10 @@ - - - - - - + + + + + + @@ -6315,14 +6319,14 @@ - - - - - - - - - - + + + + + + + + + + @@ -6331,6 +6335,6 @@ - - + + @@ -6339,5 +6343,5 @@ - + @@ -6346,7 +6350,7 @@ - - - + + + @@ -6355,8 +6359,8 @@ - - - - + + + + @@ -6365,22 +6369,22 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -6389,10 +6393,10 @@ - - - - - - + + + + + + @@ -6401,5 +6405,5 @@ - + @@ -6414,9 +6418,9 @@ - - - - - + + + + + @@ -6425,5 +6429,5 @@ - + @@ -6432,7 +6436,7 @@ - - - + + + @@ -6447,6 +6451,6 @@ - - + + @@ -6455,5 +6459,5 @@ - + @@ -6462,7 +6466,7 @@ - - - + + + @@ -6471,6 +6475,6 @@ - - + + @@ -6479,7 +6483,7 @@ - - - + + + @@ -6488,8 +6492,8 @@ - - - - + + + + @@ -6498,6 +6502,6 @@ - - + + @@ -6506,24 +6510,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -6532,6 +6536,6 @@ - - + + @@ -6540,11 +6544,11 @@ - - - - - - - + + + + + + + @@ -6553,23 +6557,23 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -6578,10 +6582,10 @@ - - - - - - + + + + + + @@ -6590,5 +6594,5 @@ - + @@ -6597,10 +6601,10 @@ - - - - - - + + + + + + @@ -6609,5 +6613,5 @@ - + @@ -6616,40 +6620,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6658,12 +6662,12 @@ - - - - - - - - + + + + + + + + Index: trunk/BazaReklam/FakturowaniePoznanKatowice.cs =================================================================== --- trunk/BazaReklam/FakturowaniePoznanKatowice.cs (revision 300) +++ trunk/BazaReklam/FakturowaniePoznanKatowice.cs (revision 301) @@ -1,4 +1,5 @@ using System; using System.Data; +using System.Text; using System.Windows.Forms; using System.Globalization; @@ -16,4 +17,7 @@ InitializeComponent(); + txtYear.Text = DateTime.Now.Year.ToString(); + txtMonth.Text = DateTime.Now.Month.ToString(); + fAKTURYTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; fakturA_DETAILSTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; @@ -40,15 +44,4 @@ konto = kontaTableAdapter.GetDataById((int)FakturaHelper.BankAccount.CentralaPLN)[0]; - } - - private void listBox1_SelectedIndexChanged(object sender, EventArgs e) - { - if (agencjaListBox.SelectedItem == null) return; - - Cursor = Cursors.WaitCursor; - - fAKTURYTableAdapter.FillByKodAgenta(rEKLAMADataSet.FAKTURY, agencjaListBox.SelectedItem.ToString()); - - Cursor = Cursors.Default; } @@ -77,4 +70,43 @@ return null; } + } + + private string ValidateSearch() + { + int year; + int month; + + StringBuilder errorMsg = new StringBuilder(); + + if (string.IsNullOrEmpty(txtYear.Text) || !Int32.TryParse(txtYear.Text, out year)) + errorMsg.Append("- Proszê podaæ poprawny rok \n"); + if (string.IsNullOrEmpty(txtMonth.Text) || !Int32.TryParse(txtMonth.Text, out month)) + errorMsg.Append("- Proszê podaæ poprawny miesi¹c \n"); + if (agencjaListBox.SelectedItem == null) + errorMsg.Append("- Proszê wybraæ agencjê"); + + if (!string.IsNullOrEmpty(errorMsg.ToString())) + errorMsg.Insert(0, "Proszê poprawiæ:\n"); + + return errorMsg.ToString(); + } + + private void btnSearch_Click(object sender, EventArgs e) + { + string errorMsg = ValidateSearch(); + if (!string.IsNullOrEmpty(errorMsg)) + { + MessageBox.Show(errorMsg, "Wyszukiwanie"); + return; + } + + Cursor = Cursors.WaitCursor; + + fAKTURYTableAdapter.FillInvoicesByAgencyYearMonth(rEKLAMADataSet.FAKTURY, + agencjaListBox.SelectedItem.ToString(), + decimal.Parse(txtYear.Text), + decimal.Parse(txtMonth.Text)); + + Cursor = Cursors.Default; } @@ -139,5 +171,8 @@ fAKTURYBindingSource.ResetBindings(false); fAKTURYBindingSource.Sort = "NUMER"; - fAKTURYTableAdapter.FillByKodAgenta(rEKLAMADataSet.FAKTURY, agencjaListBox.SelectedItem.ToString()); + fAKTURYTableAdapter.FillInvoicesByAgencyYearMonth(rEKLAMADataSet.FAKTURY, + agencjaListBox.SelectedItem.ToString(), + decimal.Parse(txtYear.Text), + decimal.Parse(txtMonth.Text)); fAKTURYDataGridView.Refresh(); @@ -211,5 +246,8 @@ fAKTURYBindingSource.ResetBindings(false); fAKTURYBindingSource.Sort = "NUMER"; - fAKTURYTableAdapter.FillByKodAgenta(rEKLAMADataSet.FAKTURY, agencjaListBox.SelectedItem.ToString()); + fAKTURYTableAdapter.FillInvoicesByAgencyYearMonth(rEKLAMADataSet.FAKTURY, + agencjaListBox.SelectedItem.ToString(), + decimal.Parse(txtYear.Text), + decimal.Parse(txtMonth.Text)); fAKTURYDataGridView.Refresh(); @@ -327,5 +365,8 @@ } - fAKTURYTableAdapter.FillByKodAgenta(rEKLAMADataSet.FAKTURY, kod); + fAKTURYTableAdapter.FillInvoicesByAgencyYearMonth(rEKLAMADataSet.FAKTURY, + agencjaListBox.SelectedItem.ToString(), + decimal.Parse(txtYear.Text), + decimal.Parse(txtMonth.Text)); fAKTURYDataGridView.Refresh(); Index: trunk/BazaReklam/REKLAMADataSet.xss =================================================================== --- trunk/BazaReklam/REKLAMADataSet.xss (revision 300) +++ trunk/BazaReklam/REKLAMADataSet.xss (revision 301) @@ -5,5 +5,5 @@ the code is regenerated. --> - + Index: trunk/BazaReklam/REKLAMADataSet.Designer.cs =================================================================== --- trunk/BazaReklam/REKLAMADataSet.Designer.cs (revision 300) +++ trunk/BazaReklam/REKLAMADataSet.Designer.cs (revision 301) @@ -40648,15 +40648,5 @@ this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = @"SELECT DISTINCT - F.NUMER, F.NUMER_ROZ, F.NUMER_ROK, F.DATA_WYSTAWIENIA, F.ZAPLACONO, F.suma_zaplat, F.KOREKTA, F.waluta_miano, F.EKSPORT, - FPK.NrTygodnia, F.ID_FAKTURY -FROM FAKTURY AS F LEFT OUTER JOIN - FakturyPoznanKatowice AS FPK ON FPK.ID = F.ID_FAKTURY -WHERE (F.NUMER_ROZ = @param)"; - this._commandCollection[6].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@param", global::System.Data.SqlDbType.NVarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, "NUMER_ROZ", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = @"SELECT ID_FAKTURY, NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC_WYSTAWIENIA, ID_SPRZEDAWCY, ID_NABYWCY, + this._commandCollection[6].CommandText = @"SELECT ID_FAKTURY, NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC_WYSTAWIENIA, ID_SPRZEDAWCY, ID_NABYWCY, DATA_SPRZEDAZY, PODPIS_WYSTAWIL, PODPIS_ODEBRAL, opis, SPOSOB_ZAPLATY, TERMIN_ZAPLATY, ZAPLACONO, BYL_WYDRUK, NABYWCA_ADRES, SPRZEDAWCA_ADRES, SPRZEDAWCA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, ID_KONTA, EKSPORT, @@ -40667,12 +40657,12 @@ (ID_SPRZEDAWCY = @agencja) AND (NUMER_ROZ <> 'POZ') AND (NUMER_ROZ <> 'KAT') AND (MONTH(DATA_WYSTAWIENIA) = @ms) AND (SPOSOB_ZAPLATY <> 'Barter')"; - this._commandCollection[7].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rok", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nrTygodnia", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agencja", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ID_SPRZEDAWCY", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ms", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "SELECT ID_FAKTURY, NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC" + + this._commandCollection[6].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rok", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nrTygodnia", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agencja", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ID_SPRZEDAWCY", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ms", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[7].Connection = this.Connection; + this._commandCollection[7].CommandText = "SELECT ID_FAKTURY, NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC" + "_WYSTAWIENIA, ID_SPRZEDAWCY, ID_NABYWCY, \r\n DATA_SPRZEDAZY," + " PODPIS_WYSTAWIL, PODPIS_ODEBRAL, opis, SPOSOB_ZAPLATY, TERMIN_ZAPLATY, ZAPLACON" + @@ -40709,9 +40699,21 @@ "<> \'POZ\') AND (FAKTURY_1.NUMER_ROZ <> \'KAT\') AND (MONTH(FAKTURY_1.DATA_WYSTAWIEN" + "IA) = @ms)"; + this._commandCollection[7].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ms", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rok", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nrTygodnia", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agencja", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ID_SPRZEDAWCY", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[8].Connection = this.Connection; + this._commandCollection[8].CommandText = @"SELECT DISTINCT + F.NUMER, F.NUMER_ROZ, F.NUMER_ROK, F.DATA_WYSTAWIENIA, F.ZAPLACONO, F.suma_zaplat, F.KOREKTA, F.waluta_miano, F.EKSPORT, + FPK.NrTygodnia, F.ID_FAKTURY +FROM FAKTURY AS F LEFT OUTER JOIN + FakturyPoznanKatowice AS FPK ON FPK.ID = F.ID_FAKTURY +WHERE F.NUMER_ROZ = @agency AND DATEPART(year,F.DATA_WYSTAWIENIA)=@year AND DATEPART(month,F.DATA_WYSTAWIENIA)=@month"; this._commandCollection[8].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ms", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rok", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nrTygodnia", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agencja", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ID_SPRZEDAWCY", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agency", global::System.Data.SqlDbType.NVarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, "NUMER_ROZ", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@year", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@month", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -40907,40 +40909,6 @@ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillByKodAgenta(REKLAMADataSet.FAKTURYDataTable dataTable, string param) { + public virtual int FillByNrTygodniaWRoku(REKLAMADataSet.FAKTURYDataTable dataTable, decimal rok, decimal nrTygodnia, global::System.Nullable agencja, decimal ms) { this.Adapter.SelectCommand = this.CommandCollection[6]; - if ((param == null)) { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; - } - else { - this.Adapter.SelectCommand.Parameters[0].Value = ((string)(param)); - } - if ((this.ClearBeforeFill == true)) { - dataTable.Clear(); - } - int returnValue = this.Adapter.Fill(dataTable); - return returnValue; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual REKLAMADataSet.FAKTURYDataTable GetDataByKodAgenta(string param) { - this.Adapter.SelectCommand = this.CommandCollection[6]; - if ((param == null)) { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; - } - else { - this.Adapter.SelectCommand.Parameters[0].Value = ((string)(param)); - } - REKLAMADataSet.FAKTURYDataTable dataTable = new REKLAMADataSet.FAKTURYDataTable(); - this.Adapter.Fill(dataTable); - return dataTable; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillByNrTygodniaWRoku(REKLAMADataSet.FAKTURYDataTable dataTable, decimal rok, decimal nrTygodnia, global::System.Nullable agencja, decimal ms) { - this.Adapter.SelectCommand = this.CommandCollection[7]; this.Adapter.SelectCommand.Parameters[0].Value = ((decimal)(rok)); this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(nrTygodnia)); @@ -40963,5 +40931,5 @@ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual REKLAMADataSet.FAKTURYDataTable GetDataByNrTygodniaWRoku(decimal rok, decimal nrTygodnia, global::System.Nullable agencja, decimal ms) { - this.Adapter.SelectCommand = this.CommandCollection[7]; + this.Adapter.SelectCommand = this.CommandCollection[6]; this.Adapter.SelectCommand.Parameters[0].Value = ((decimal)(rok)); this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(nrTygodnia)); @@ -40982,5 +40950,5 @@ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] public virtual int FillByNrTygodniaWRokuZKorekta(REKLAMADataSet.FAKTURYDataTable dataTable, decimal ms, decimal rok, decimal nrTygodnia, global::System.Nullable agencja) { - this.Adapter.SelectCommand = this.CommandCollection[8]; + this.Adapter.SelectCommand = this.CommandCollection[7]; this.Adapter.SelectCommand.Parameters[0].Value = ((decimal)(ms)); this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(rok)); @@ -41003,5 +40971,5 @@ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual REKLAMADataSet.FAKTURYDataTable GetDataByNrTygodniaWRokuZKorekta(decimal ms, decimal rok, decimal nrTygodnia, global::System.Nullable agencja) { - this.Adapter.SelectCommand = this.CommandCollection[8]; + this.Adapter.SelectCommand = this.CommandCollection[7]; this.Adapter.SelectCommand.Parameters[0].Value = ((decimal)(ms)); this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(rok)); @@ -41013,4 +40981,42 @@ this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + REKLAMADataSet.FAKTURYDataTable dataTable = new REKLAMADataSet.FAKTURYDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillInvoicesByAgencyYearMonth(REKLAMADataSet.FAKTURYDataTable dataTable, string agency, decimal year, decimal month) { + this.Adapter.SelectCommand = this.CommandCollection[8]; + if ((agency == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(agency)); + } + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(year)); + this.Adapter.SelectCommand.Parameters[2].Value = ((decimal)(month)); + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual REKLAMADataSet.FAKTURYDataTable GetInvoicesByAgencyYearMonth(string agency, decimal year, decimal month) { + this.Adapter.SelectCommand = this.CommandCollection[8]; + if ((agency == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(agency)); + } + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(year)); + this.Adapter.SelectCommand.Parameters[2].Value = ((decimal)(month)); REKLAMADataSet.FAKTURYDataTable dataTable = new REKLAMADataSet.FAKTURYDataTable(); this.Adapter.Fill(dataTable);