Index: /trunk/SQL/StoredProcedures/sp_GetReklamy.txt =================================================================== --- /trunk/SQL/StoredProcedures/sp_GetReklamy.txt (revision 313) +++ /trunk/SQL/StoredProcedures/sp_GetReklamy.txt (revision 339) @@ -6,7 +6,7 @@ -- ============================================= --- Author: marek --- Create date: 2009-02-08 --- Description: Wyszukuje reklamy odpowiedniodo podanych parametrow +-- Author: +-- Create date: +-- Description: -- ============================================= ALTER PROCEDURE [dbo].[sp_GetReklamy] @@ -18,4 +18,5 @@ @tytul nvarchar(100) = NULL, @typ nvarchar(100) = NULL, +@promocja int = NULL, @zd bit = NULL, @fw bit = NULL, @@ -80,4 +81,7 @@ SET @query = @query + ' AND R.[TYP]=''' + @typ + ''' ' +if NOT (@promocja IS NULL) +SET @query = @query + ' AND R.[Promocja]=' + CAST(@promocja as nvarchar) + ' ' + if (NOT (@fw IS NULL) AND NOT(@ms IS NULL) AND NOT(@rok IS NULL)) BEGIN Index: /trunk/BazaReklam/OrdersForm.cs =================================================================== --- /trunk/BazaReklam/OrdersForm.cs (revision 313) +++ /trunk/BazaReklam/OrdersForm.cs (revision 339) @@ -49,4 +49,5 @@ kONTATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; kLIENCITableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + pROMOCJETableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; SqlConnection conn = new SqlConnection(ConnString.getConnString().Value); @@ -69,11 +70,14 @@ private void OrdersForm_Load(object sender, EventArgs e) { - kONTATableAdapter.FillByIdAgencji(sLOWNIKDataSet.KONTA,User.getUser().IdAgencji); + pROMOCJETableAdapter.Fill(sLOWNIKDataSet.PROMOCJE); + kONTATableAdapter.FillByIdAgencji(sLOWNIKDataSet.KONTA, User.getUser().IdAgencji); WindowState = FormWindowState.Maximized; + DBBindings.bindujAgencje(agencjaToolStripComboBox); DBBindings.bindujAgentow(agentToolStripComboBox); DBBindings.bindujTytuly(tytToolStripComboBox); DBBindings.bindujTypyReklam(typToolStripComboBox); + DBBindings.BindujPromocje((ComboBox)cbPromocje.Control, sLOWNIKDataSet.PROMOCJE); } @@ -82,26 +86,26 @@ ToolStripLabel toolStripLabel = new ToolStripLabel("DR"); toolStripLabel.ToolTipText = "Zatwierdzone do druku"; - toolStrip.Items.Insert(13, toolStripLabel); - toolStrip.Items.Insert(14, new ToolStripControlHost(new CheckBox(), "DRCheckBox")); + toolStrip.Items.Insert(15, toolStripLabel); + toolStrip.Items.Insert(16, new ToolStripControlHost(new CheckBox(), "DRCheckBox")); toolStripLabel = new ToolStripLabel("FW"); toolStripLabel.ToolTipText = "Wystawiona faktura"; - toolStrip.Items.Insert(15, toolStripLabel); - toolStrip.Items.Insert(16, new ToolStripControlHost(new CheckBox(), "FWCheckBox")); + toolStrip.Items.Insert(17, toolStripLabel); + toolStrip.Items.Insert(18, new ToolStripControlHost(new CheckBox(), "FWCheckBox")); toolStripLabel = new ToolStripLabel("KZ"); toolStripLabel.ToolTipText = "Kierownik zatwierdzi³"; - toolStrip.Items.Insert(17, toolStripLabel); - toolStrip.Items.Insert(18, new ToolStripControlHost(new CheckBox(), "KZCheckBox")); + toolStrip.Items.Insert(19, toolStripLabel); + toolStrip.Items.Insert(20, new ToolStripControlHost(new CheckBox(), "KZCheckBox")); toolStripLabel = new ToolStripLabel("WYR"); toolStripLabel.ToolTipText = "Wyró¿nienie"; - toolStrip.Items.Insert(19, toolStripLabel); - toolStrip.Items.Insert(20, new ToolStripControlHost(new CheckBox(), "WyrCheckBox")); + toolStrip.Items.Insert(21, toolStripLabel); + toolStrip.Items.Insert(22, new ToolStripControlHost(new CheckBox(), "WyrCheckBox")); toolStripLabel = new ToolStripLabel("BZ"); toolStripLabel.ToolTipText = "Bez zamówienia"; - toolStrip.Items.Insert(21, toolStripLabel); - toolStrip.Items.Insert(22, new ToolStripControlHost(new CheckBox(), "BZCheckBox")); + toolStrip.Items.Insert(23, toolStripLabel); + toolStrip.Items.Insert(24, new ToolStripControlHost(new CheckBox(), "BZCheckBox")); ((CheckBox)((ToolStripControlHost)toolStrip.Items["DRCheckBox"]).Control).ThreeState = true; //Zatwierdzone do druku @@ -631,4 +635,9 @@ { command.Parameters.AddWithValue("@typ", typToolStripComboBox.Text.Trim()); + } + + if (!string.IsNullOrEmpty(cbPromocje.Text.Trim())) + { + command.Parameters.AddWithValue("@promocja", Convert.ToInt32(((DataRow)cbPromocje.SelectedItem)["Id"])); } Index: /trunk/BazaReklam/OrdersForm.resx =================================================================== --- /trunk/BazaReklam/OrdersForm.resx (revision 306) +++ /trunk/BazaReklam/OrdersForm.resx (revision 339) @@ -383,31 +383,31 @@ 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 - jvEPApigoZ/DeeQAAAAASUVORK5CYII= + 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 + /AP516CeZgQwTAAAAABJRU5ErkJggg== @@ -505,29 +505,29 @@ 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 @@ -660,6 +660,12 @@ 421, 95 + + 579, 95 + + + 757, 95 + - 185 + 198 Index: /trunk/BazaReklam/Classes/DBBindings.cs =================================================================== --- /trunk/BazaReklam/Classes/DBBindings.cs (revision 73) +++ /trunk/BazaReklam/Classes/DBBindings.cs (revision 339) @@ -1,5 +1,3 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Data; using System.Data.SqlClient; @@ -424,4 +422,22 @@ } + public static void BindujPromocje(ComboBox comboBox, DataTable dt) + { + comboBox.Items.Add(string.Empty); + comboBox.DisplayMember = "Nazwa"; + comboBox.ValueMember = "Id"; + + foreach(DataRow row in dt.Rows) + { + comboBox.Items.Add(row); + } + + //comboBox.DataSource = dt; + //comboBox.DisplayMember = "Nazwa"; + //comboBox.ValueMember = "Id"; + //comboBox.Items.Insert(0, string.Empty); + + } + } } Index: /trunk/BazaReklam/OrdersForm.Designer.cs =================================================================== --- /trunk/BazaReklam/OrdersForm.Designer.cs (revision 306) +++ /trunk/BazaReklam/OrdersForm.Designer.cs (revision 339) @@ -127,4 +127,8 @@ this.reklamaTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.REKLAMATableAdapter(); this.kLIENCITableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.KLIENCITableAdapter(); + this.pROMOCJEBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.pROMOCJETableAdapter = new Baza_Reklam.SLOWNIKDataSetTableAdapters.PROMOCJETableAdapter(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.cbPromocje = new System.Windows.Forms.ToolStripComboBox(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); @@ -141,4 +145,5 @@ ((System.ComponentModel.ISupportInitialize)(this.fAKTURYBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.kLIENCIBindingSource)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pROMOCJEBindingSource)).BeginInit(); this.SuspendLayout(); // @@ -425,4 +430,6 @@ this.toolStripLabel5, this.typToolStripComboBox, + this.toolStripLabel7, + this.cbPromocje, this.szukajToolStripButton, this.wyczyscPolaToolStripButton}); @@ -998,4 +1005,24 @@ this.kLIENCITableAdapter.ClearBeforeFill = true; // + // pROMOCJEBindingSource + // + this.pROMOCJEBindingSource.DataMember = "PROMOCJE"; + this.pROMOCJEBindingSource.DataSource = this.sLOWNIKDataSet; + // + // pROMOCJETableAdapter + // + this.pROMOCJETableAdapter.ClearBeforeFill = true; + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(55, 22); + this.toolStripLabel7.Text = "promocja:"; + // + // cbPromocje + // + this.cbPromocje.Name = "cbPromocje"; + this.cbPromocje.Size = new System.Drawing.Size(121, 25); + // // OrdersForm // @@ -1032,4 +1059,5 @@ ((System.ComponentModel.ISupportInitialize)(this.fAKTURYBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.kLIENCIBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pROMOCJEBindingSource)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1126,4 +1154,8 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripButton zamowieniaToolStripButton; + private System.Windows.Forms.BindingSource pROMOCJEBindingSource; + private Baza_Reklam.SLOWNIKDataSetTableAdapters.PROMOCJETableAdapter pROMOCJETableAdapter; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripComboBox cbPromocje; }