Zbiór zmian 312 dla trunk

Data:

2009-02-06 16:54:38 (17 years ago)

Autor:

marek

Opis:

re #56 - dodano procedure do wyszukiwania reklam

Lokalizacja:

trunk

Pliki:

• BazaReklam/OrdersForm.cs (zmodyfikowane) (10 diffs)
• SQL/StoredProcedures/sp_GetReklamy.txt (dodane)

trunk/BazaReklam/OrdersForm.cs

@@ -576 +576 @@
         private void szukajToolStripButton_Click(object sender, EventArgs e)
         {
-            command.CommandText = query;
+            command.CommandText = "sp_GetReklamy";
+            command.CommandType = CommandType.StoredProcedure;
 
             rEKLAMADataSet.ReklamyZestawienie.Clear();
 
-            command.CommandText += " where 1=1 AND (r.SZER * r.WYS)<>0 ";
+            //command.CommandText += " where 1=1 AND (r.SZER * r.WYS)<>0 ";
 
             command.Parameters.Clear();
@@ -586 +587 @@
             if (!string.IsNullOrEmpty(agencjaToolStripComboBox.Text.Trim()))
             {
-                command.CommandText += " AND A.Symbol=@agencja ";
+                //command.CommandText += " AND A.Symbol=@agencja ";
                 command.Parameters.AddWithValue("@agencja", agencjaToolStripComboBox.Text.Trim());
             }
@@ -592 +593 @@
             if (!string.IsNullOrEmpty(agentToolStripComboBox.Text.Trim()))
             {
-                command.CommandText += "AND ([symbol akwizytora] like '%' + @agent + '%' )";
+                //command.CommandText += "AND ([symbol akwizytora] like '%' + @agent + '%' )";
                 command.Parameters.AddWithValue("@agent", agentToolStripComboBox.Text.Trim());
 
@@ -599 +600 @@
             if (!string.IsNullOrEmpty(symbolToolStripTextBox.Text.Trim()))
             {
-                command.CommandText += "AND r.[id reklamy] like '%' + @symbol + '%' ";
-                command.Parameters.AddWithValue("@symbol", symbolToolStripTextBox.Text.Trim());
+                //command.CommandText += "AND r.[id reklamy] like '%' + @symbol + '%' ";
+                command.Parameters.AddWithValue("@reklama", symbolToolStripTextBox.Text.Trim());
 
             }
@@ -613 +614 @@
                 }
 
-                command.CommandText += "AND DATEPART(yyyy,NR.DATA_W)=@rok ";
+                //command.CommandText += "AND DATEPART(yyyy,NR.DATA_W)=@rok ";
                 command.Parameters.AddWithValue("@rok", rokToolStripTextBox.Text.Trim());             
             }
@@ -627 +628 @@
                 }
 
-                command.CommandText += "AND DATEPART(month,NR.DATA_W)=@ms ";
+                //command.CommandText += "AND DATEPART(month,NR.DATA_W)=@ms ";
                 command.Parameters.AddWithValue("@ms", msToolStripTextBox.Text.Trim());
             }
@@ -634 +635 @@
             if (tytToolStripComboBox.SelectedIndex != -1)
             {
-                command.CommandText += "AND R.[tytu³]=@tytul ";
+                //command.CommandText += "AND R.[tytu³]=@tytul ";
                 command.Parameters.AddWithValue("@tytul",tytToolStripComboBox.Text.Trim());
             }
@@ -640 +641 @@
             if (!string.IsNullOrEmpty(typToolStripComboBox.Text.Trim()))
             {
-                command.CommandText += "AND R.[TYP]=@typ ";
+                //command.CommandText += "AND R.[TYP]=@typ ";
                 command.Parameters.AddWithValue("@typ", typToolStripComboBox.Text.Trim());
             }
 
             if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).CheckState == CheckState.Checked) {
-                command.CommandText += " AND R.[ZATWIERDZONO DO DRUKU]=1 ";
+                //command.CommandText += " AND R.[ZATWIERDZONO DO DRUKU]=1 ";
             }
             else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).CheckState == CheckState.Unchecked) {
-                command.CommandText += " AND R.[ZATWIERDZONO DO DRUKU]=0 ";
+                //command.CommandText += " AND R.[ZATWIERDZONO DO DRUKU]=0 ";
             }
 
             if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["FWCheckBox"]).Control).CheckState == CheckState.Checked)
             {
-                command.CommandText += "AND R.[FAKTURA WYSTAWIONO]=1 ";
+                //command.CommandText += "AND R.[FAKTURA WYSTAWIONO]=1 ";
             }
             else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["FWCheckBox"]).Control).CheckState == CheckState.Unchecked)
             {
-                command.CommandText += "AND R.[FAKTURA WYSTAWIONO]=0 ";
+                //command.CommandText += "AND R.[FAKTURA WYSTAWIONO]=0 ";
             }
             
             if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["KZCheckBox"]).Control).CheckState == CheckState.Checked)
             {
-                command.CommandText += " AND R.[kier_zatwierdzil]=1 ";
+                //command.CommandText += " AND R.[kier_zatwierdzil]=1 ";
             }
             else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["KZCheckBox"]).Control).CheckState == CheckState.Unchecked)
             {
-                command.CommandText += " AND R.[kier_zatwierdzil]=0 ";
+                //command.CommandText += " AND R.[kier_zatwierdzil]=0 ";
             }
 
             if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["WyrCheckBox"]).Control).CheckState == CheckState.Checked)
             {
-                command.CommandText += " AND R.[wyroznienie]=1 ";
+                //command.CommandText += " AND R.[wyroznienie]=1 ";
             } 
             else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["WyrCheckBox"]).Control).CheckState == CheckState.Unchecked)
             {
-                command.CommandText += " AND R.[wyroznienie]=0 ";
+                //command.CommandText += " AND R.[wyroznienie]=0 ";
             }
 
             if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["BZCheckBox"]).Control).CheckState == CheckState.Checked)
             {
-                command.CommandText += " AND Z.idZamowienia IS NULL ";
+                //ommand.CommandText += " AND Z.idZamowienia IS NULL ";
             }
             else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["BZCheckBox"]).Control).CheckState == CheckState.Unchecked)
             {
-                command.CommandText += " AND Z.idZamowienia IS NOT NULL ";
-            }
-
-
-            command.CommandText += " order by R.[DATA ZAMÓWIENIA] desc";
+                //command.CommandText += " AND Z.idZamowienia IS NOT NULL ";
+            }
+
+
+            //command.CommandText += " order by R.[DATA ZAMÓWIENIA] desc";
 
             sqlDataAdapter.SelectCommand = command;
@@ -1221 +1222 @@
                 if (File.Exists(sciezka))
                 {
-                    System.Diagnostics.Process.Start(sciezka);
+                    Process.Start(sciezka);
                 }
                 else
@@ -1253 +1254 @@
                 if (File.Exists(sciezka))
                 {
-                    System.Diagnostics.Process.Start(sciezka);
+                    Process.Start(sciezka);
                 }
                 else