Zbiór zmian 674 dla trunk

Data:

2009-06-02 15:43:32 (17 years ago)

Autor:

marek

Opis:

re #178

Lokalizacja:

trunk

Pliki:

• BazaReklam/ProvisionForm.Designer.cs (zmodyfikowane) (20 diffs)
• BazaReklam/ProvisionForm.cs (zmodyfikowane) (10 diffs)
• BazaReklam/ProvisionForm.resx (zmodyfikowane) (5 diffs)
• BazaReklam/app.config (zmodyfikowane) (1 diff)
• SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_PROWIZJE.txt (zmodyfikowane) (2 diffs)

trunk/BazaReklam/ProvisionForm.Designer.cs

@@ -30 +30 @@
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            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();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProvisionForm));
             this.aGENCIBindingSource = new System.Windows.Forms.BindingSource(this.components);
@@ -92 +92 @@
             this.zapiszDaneToolStripButton = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.pobierzDaneToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.stareProwizjeToolStripButton = new System.Windows.Forms.ToolStripButton();
             this.zapiszToolStripButton = new System.Windows.Forms.ToolStripButton();
             this.naniesNaReklamyToolStripButton = new System.Windows.Forms.ToolStripButton();
@@ -229 +227 @@
             this.wREKLAMYDataGridViewTextBoxColumn});
             this.prowizjeDataGridView.DataSource = this.pLANBindingSource;
-            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.prowizjeDataGridView.DefaultCellStyle = dataGridViewCellStyle26;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.prowizjeDataGridView.DefaultCellStyle = dataGridViewCellStyle13;
             this.prowizjeDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.prowizjeDataGridView.Location = new System.Drawing.Point(0, 31);
@@ -247 +245 @@
             this.prowizjeDataGridView.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.prowizjeDataGridView_CellLeave);
             this.prowizjeDataGridView.Leave += new System.EventHandler(this.prowizjeDataGridView_Leave);
-            this.prowizjeDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.prowizjeDataGridView_DataError_1);
+            this.prowizjeDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.prowizjeDataGridView_DataError);
             // 
             // sYMBOLDataGridViewTextBoxColumn
@@ -284 +282 @@
             this.bUDZETDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.bUDZETDataGridViewTextBoxColumn.DataPropertyName = "BUDZET";
-            dataGridViewCellStyle14.Format = "N0";
-            dataGridViewCellStyle14.NullValue = null;
-            this.bUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle1.Format = "N0";
+            dataGridViewCellStyle1.NullValue = null;
+            this.bUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
             this.bUDZETDataGridViewTextBoxColumn.HeaderText = "Plan sprzeda¿y";
             this.bUDZETDataGridViewTextBoxColumn.Name = "bUDZETDataGridViewTextBoxColumn";
@@ -345 +343 @@
             this.oCENADataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.oCENADataGridViewTextBoxColumn.DataPropertyName = "OCENA";
-            dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.oCENADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.oCENADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
             this.oCENADataGridViewTextBoxColumn.HeaderText = "Ocena";
             this.oCENADataGridViewTextBoxColumn.Name = "oCENADataGridViewTextBoxColumn";
@@ -365 +363 @@
             this.PR_PROWIZJI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.PR_PROWIZJI.DataPropertyName = "PR_PROWIZJI";
-            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            dataGridViewCellStyle16.Format = "P";
-            dataGridViewCellStyle16.NullValue = null;
-            this.PR_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            dataGridViewCellStyle3.Format = "P";
+            dataGridViewCellStyle3.NullValue = null;
+            this.PR_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle3;
             this.PR_PROWIZJI.HeaderText = "Prowizja";
             this.PR_PROWIZJI.Name = "PR_PROWIZJI";
@@ -378 +376 @@
             this.wBUDZETDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.wBUDZETDataGridViewTextBoxColumn.DataPropertyName = "W_BUDZET";
-            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle17.Format = "N0";
-            this.wBUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle4.Format = "N0";
+            this.wBUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
             this.wBUDZETDataGridViewTextBoxColumn.HeaderText = "Sprzeda¿ rzeczywista";
             this.wBUDZETDataGridViewTextBoxColumn.Name = "wBUDZETDataGridViewTextBoxColumn";
@@ -388 +386 @@
             // 
             this.wSPOTKANIADataGridViewTextBoxColumn.DataPropertyName = "W_SPOTKANIA";
-            dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wSPOTKANIADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wSPOTKANIADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
             this.wSPOTKANIADataGridViewTextBoxColumn.FillWeight = 91.90488F;
             this.wSPOTKANIADataGridViewTextBoxColumn.HeaderText = "SP";
@@ -400 +398 @@
             // 
             this.wTELDataGridViewTextBoxColumn.DataPropertyName = "W_TEL";
-            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wTELDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wTELDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
             this.wTELDataGridViewTextBoxColumn.FillWeight = 91.90488F;
             this.wTELDataGridViewTextBoxColumn.HeaderText = "TE";
@@ -412 +410 @@
             // 
             this.wEMAILDataGridViewTextBoxColumn.DataPropertyName = "W_EMAIL";
-            dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wEMAILDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle20;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wEMAILDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7;
             this.wEMAILDataGridViewTextBoxColumn.FillWeight = 91.90488F;
             this.wEMAILDataGridViewTextBoxColumn.HeaderText = "EM";
@@ -424 +422 @@
             // 
             this.wLISTDataGridViewTextBoxColumn.DataPropertyName = "W_LIST";
-            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wLISTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle21;
+            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wLISTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8;
             this.wLISTDataGridViewTextBoxColumn.FillWeight = 91.90488F;
             this.wLISTDataGridViewTextBoxColumn.HeaderText = "LIST";
@@ -436 +434 @@
             // 
             this.wFAXDataGridViewTextBoxColumn.DataPropertyName = "W_FAX";
-            dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wFAXDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wFAXDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9;
             this.wFAXDataGridViewTextBoxColumn.FillWeight = 91.90488F;
             this.wFAXDataGridViewTextBoxColumn.HeaderText = "FAX";
@@ -448 +446 @@
             // 
             this.wNKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_N_KLIENCI";
-            dataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wNKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle23;
+            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wNKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle10;
             this.wNKLIENCIDataGridViewTextBoxColumn.FillWeight = 91.90488F;
             this.wNKLIENCIDataGridViewTextBoxColumn.HeaderText = "NKL";
@@ -460 +458 @@
             // 
             this.wKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_KLIENCI";
-            dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11;
             this.wKLIENCIDataGridViewTextBoxColumn.FillWeight = 91.90488F;
             this.wKLIENCIDataGridViewTextBoxColumn.HeaderText = "KL";
@@ -472 +470 @@
             // 
             this.wREKLAMYDataGridViewTextBoxColumn.DataPropertyName = "W_REKLAMY";
-            dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle25;
+            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle12;
             this.wREKLAMYDataGridViewTextBoxColumn.FillWeight = 91.90488F;
             this.wREKLAMYDataGridViewTextBoxColumn.HeaderText = "RE";
@@ -503 +501 @@
             this.zapiszDaneToolStripButton,
             this.toolStripSeparator2,
-            this.pobierzDaneToolStripButton,
-            this.stareProwizjeToolStripButton,
             this.zapiszToolStripButton,
             this.naniesNaReklamyToolStripButton,
@@ -638 +634 @@
             this.toolStripSeparator2.Name = "toolStripSeparator2";
             this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
-            // 
-            // pobierzDaneToolStripButton
-            // 
-            this.pobierzDaneToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.pobierzDaneToolStripButton.Enabled = false;
-            this.pobierzDaneToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("pobierzDaneToolStripButton.Image")));
-            this.pobierzDaneToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.pobierzDaneToolStripButton.Name = "pobierzDaneToolStripButton";
-            this.pobierzDaneToolStripButton.Size = new System.Drawing.Size(28, 28);
-            this.pobierzDaneToolStripButton.Text = "Pobierz dane";
-            this.pobierzDaneToolStripButton.Click += new System.EventHandler(this.pobierzDaneToolStripButton_Click);
-            // 
-            // stareProwizjeToolStripButton
-            // 
-            this.stareProwizjeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.stareProwizjeToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("stareProwizjeToolStripButton.Image")));
-            this.stareProwizjeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.stareProwizjeToolStripButton.Name = "stareProwizjeToolStripButton";
-            this.stareProwizjeToolStripButton.Size = new System.Drawing.Size(23, 28);
-            this.stareProwizjeToolStripButton.Text = "SP";
-            this.stareProwizjeToolStripButton.Click += new System.EventHandler(this.stareProwizjeToolStripButton_Click);
             // 
             // zapiszToolStripButton
@@ -831 +806 @@
         private System.Windows.Forms.ToolStripButton zapiszDaneToolStripButton;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.Windows.Forms.ToolStripButton pobierzDaneToolStripButton;
         private System.Windows.Forms.ToolStripButton zapiszToolStripButton;
         private System.Windows.Forms.ToolStripButton naniesNaReklamyToolStripButton;
@@ -847 +821 @@
         private System.Windows.Forms.Label ukrytyLabel;
         private System.Windows.Forms.ToolStripButton printToolStripButton;
-        private System.Windows.Forms.ToolStripButton stareProwizjeToolStripButton;
         private System.Windows.Forms.DataGridViewComboBoxColumn sYMBOLDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn rOKDataGridViewTextBoxColumn;

trunk/BazaReklam/ProvisionForm.cs

@@ -97 +97 @@
         /// <summary>
         ///     Krok 1
-        ///     a) oblicza procent prowizji i wykonany budzet, generuje dane dla wybranego biura za wybrany miesiac
-        ///     b) nastepnie dyrektor ma prawo zmienic procent prowizji dla wybranoego handlowca, robi to recznie i zapisuje zmiany uzywajac przycisku zapiszDaneToolStripButton
-        /// </summary>
-        private void pobierzDaneToolStripButton_Click(object sender, EventArgs e)
+        ///     Wylicza i zapisuje prowizjê agenta do planu
+        /// </summary>
+        private void zapiszToolStripButton_Click(object sender, EventArgs e)
         {
             Cursor = Cursors.WaitCursor;
 
-            SqlCommand command = new SqlCommand();
-            command.Connection = new SqlConnection(ConnString.getConnString().Value);
-            command.CommandType = CommandType.StoredProcedure;
-
-            command.CommandText = "PROC_WYLICZ_I_ZAPISZ_DANE_O_KONTAKTACH_I_BUDZECIE";
-            command.Parameters.AddWithValue("@rok", rok);
-            command.Parameters.AddWithValue("@ms", miesiac);
-
-            command.Connection.Open();
-
-            SqlTransaction transaction = command.Connection.BeginTransaction();
-
-            command.Transaction = transaction;
+            SqlConnection conn = null;
+            SqlTransaction transaction = null;
 
             try
             {
+                conn = new SqlConnection(ConnString.getConnString().Value);
+                conn.Open();
+                transaction = conn.BeginTransaction();
+
+                SqlCommand command = new SqlCommand();
+                command.CommandType = CommandType.StoredProcedure;
+                command.Connection = conn;
+                command.Transaction = transaction;
+
+                //Krok 1
+                //oblicza procent prowizji i wykonany budzet, generuje dane dla wybranego biura za wybrany miesiac
+                command.CommandText = "PROC_WYLICZ_I_ZAPISZ_DANE_O_KONTAKTACH_I_BUDZECIE";
+                command.Parameters.AddWithValue("@rok", rok);
+                command.Parameters.AddWithValue("@ms", miesiac);
                 command.ExecuteNonQuery();
+
+                //TODO: Zastanowic sie, czy ten krok jest jeszcze w ogole potrzebny... 
+                //TODO: Nawet gdyby zaplacono za fakture z 2008 to i tak nie bedzie sie liczyc do prowizji
+                //Krok 2
+                //nalicza prowizje dla faktur wystawionych przed 2009
+                command.CommandText = "PROC_WYLICZ_I_ZAPISZ_PROWIZJE_DO_REKLAM";
+                command.ExecuteNonQuery();
+
+                //Krok 3
+                //Wylicza i zapisuje prowizjê agenta do planu
+                command.CommandText = "PROC_WYLICZ_I_ZAPISZ_PROWIZJE_AGENTA_DO_PLANU";
+                command.Parameters.AddWithValue("@id_Agencji", agencja);
+                command.ExecuteNonQuery();
+
                 transaction.Commit();
-                MessageBox.Show("Dane pobrano!");
+                MessageBox.Show("Dane pobrano i prowizja zosta³a zapisana.", "Baza Reklam - Prowizje");
             }
             catch
             {
-                transaction.Rollback();
+                if (transaction != null)
+                    transaction.Rollback();
                 throw;
             }
             finally
             {
-                command.Connection.Close();
+                if (conn != null) conn.Close();
+
                 rEKLAMADataSet.PLAN.Clear();
                 pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
+
                 Cursor = Cursors.Default;
             }
@@ -139 +158 @@
 
         /// <summary>
-        /// Wylicza i zapisuje prowizjê agenta do planu
-        /// </summary>
-        private void zapiszToolStripButton_Click(object sender, EventArgs e)
-        {
-            Cursor = Cursors.WaitCursor;
-
-            SqlCommand command = new SqlCommand();
-
-            command.Connection = new SqlConnection(ConnString.getConnString().Value);
-
-            command.CommandType = CommandType.StoredProcedure;
-
-            command.CommandText = "PROC_WYLICZ_I_ZAPISZ_PROWIZJE_AGENTA_DO_PLANU";
-            command.Parameters.AddWithValue("@rok", rok);
-            command.Parameters.AddWithValue("@ms", miesiac);
-            command.Parameters.AddWithValue("@id_Agencji", agencja);
-            command.Connection.Open();
-
-            SqlTransaction transaction = command.Connection.BeginTransaction();
-
-            command.Transaction = transaction;
-
-            try
-            {
-                command.ExecuteNonQuery();
-                transaction.Commit();
-                MessageBox.Show("Prowizja zosta³a zapisana!");
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-            finally
-            {
-                command.Connection.Close();
-
-                rEKLAMADataSet.PLAN.Clear();
-
-                pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
-
-                Cursor = Cursors.Default;
-            }
-        }
-
+        ///     Krok 2
+        ///     dyrektor ma prawo zmienic recznie procent prowizji, dodac ocene dla wybranego handlowca, nanosi poprawione dane
+        /// </summary>
         private void naniesNaReklamyToolStripButton_Click(object sender, EventArgs e)
         {
@@ -209 +186 @@
                 command.ExecuteNonQuery();
                 transaction.Commit();
-                MessageBox.Show("Prowizja zosta³a naniesiona na zlecenia");
+                MessageBox.Show("Prowizja zosta³a naniesiona na zlecenia", "Baza Reklam - Prowizje");
             }
             catch
@@ -256 +233 @@
         }
 
-        private void prowizjeDataGridView_Leave(object sender, EventArgs e)
-        {
-            prowizjeDataGridView.EndEdit();
-
-            REKLAMADataSet.PLANDataTable changes = rEKLAMADataSet.PLAN.GetChanges(DataRowState.Modified) as
-                REKLAMADataSet.PLANDataTable;
-
-            if (changes != null)
-            {
-                if (Validate())
-                {
-                    pLANBindingSource.EndEdit();
-                    pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
-                }
-            }
-        }
-
         /// <summary>
         /// Podsumowuje bud¿et do wykonania
@@ -299 +259 @@
         }
 
+        private void pLANBindingSource_ListChanged(object sender, ListChangedEventArgs e)
+        {
+            UzupelnijBDsuma();
+            UzupelnijBudzetWykonanySuma();
+        }
+
+        private void szukajToolStripButton_Click(object sender, EventArgs e)
+        {
+            if (rokToolStripTextBox.Text != "")
+            {
+                short i;
+                if (!Int16.TryParse(rokToolStripTextBox.Text, out i))
+                {
+                    MessageBox.Show("Podaj prawid³owy rok.");
+                    Cursor = Cursors.Default;
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("Podaj prawid³owy rok.");
+                Cursor = Cursors.Default;
+                return;
+            }
+
+            if (msToolStripTextBox.Text != "")
+            {
+                short i;
+                if (!Int16.TryParse(msToolStripTextBox.Text, out i))
+                {
+                    MessageBox.Show("Podaj prawid³owy miesi¹c.");
+                    Cursor = Cursors.Default;
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("Podaj prawid³owy miesi¹c.");
+                Cursor = Cursors.Default;
+                return;
+            }
+
+            if (((ComboBox)agencjaToolStripComboBox.Control).SelectedValue == null)
+            {
+                MessageBox.Show("Wybierz agencjê");
+                return;
+            }
+
+            rok = Convert.ToInt16(rokToolStripTextBox.Text);
+            miesiac = Convert.ToInt16(msToolStripTextBox.Text);
+            agencja = Convert.ToInt32(((ComboBox)agencjaToolStripComboBox.Control).SelectedValue);
+
+            Uprawnienia();
+
+            sLOWNIKDataSet.AGENCI.Clear();
+            rEKLAMADataSet.PLAN.Clear();
+
+            aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, agencja);
+            pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
+        }
+
+        private void Uprawnienia()
+        {
+            if (User.Instance().St_kierownik)
+            {
+
+                if (!((rok > DateTime.Today.Year) |
+                    ((rok == DateTime.Today.Year) & (miesiac >= DateTime.Today.Month - 1)) |
+                    ((rok == DateTime.Today.Year - 1) & (miesiac == 12) & (DateTime.Today.Month == 1))))
+                {
+                    OCENAComboCoxColumn.Visible = false;
+                    oCENADataGridViewTextBoxColumn.Visible = true;
+
+                    prowizjeDataGridView.ReadOnly = true;
+                    usunToolStripButton.Enabled = false;
+                    naniesNaReklamyToolStripButton.Enabled = false;
+                    zapiszDaneToolStripButton.Enabled = false;
+                    zapiszToolStripButton.Enabled = false;
+
+                }
+                else
+                {
+                    OCENAComboCoxColumn.Visible = true;
+                    oCENADataGridViewTextBoxColumn.Visible = false;
+                    prowizjeDataGridView.ReadOnly = false;
+
+                    usunToolStripButton.Enabled = true;
+                    naniesNaReklamyToolStripButton.Enabled = true;
+                    zapiszDaneToolStripButton.Enabled = true;
+                    zapiszToolStripButton.Enabled = true;
+
+                }
+            }
+        }
+
         /// <summary>
         /// Zamienia wpisan¹ liczbê do decimal
@@ -304 +359 @@
         private void prowizjeDataGridView_CellLeave(object sender, DataGridViewCellEventArgs e)
         {
+            if (!Validate())
+            {
+                if (prowizjeDataGridView.Columns[e.ColumnIndex].Name == "PR_PROWIZJI")
+                    MessageBox.Show("Proszê wprowadziæ prowizjê bez znaku % - tylko wartoœæ liczbow¹");
+                else
+                    MessageBox.Show("Proszê wprowadziæ poprawne dane");
+
+                return;
+            }
+
             ukrytyLabel.Select();
             prowizjeDataGridView.EndEdit();
@@ -310 +375 @@
             if (prowizjeDataGridView.Columns[e.ColumnIndex].Name == "PR_PROWIZJI")
             {
-
                 if (Convert.ToDecimal(prowizjeDataGridView[e.ColumnIndex, e.RowIndex].Value) >= 1)
                 {
@@ -327 +391 @@
         }
 
-        private void pLANBindingSource_ListChanged(object sender, ListChangedEventArgs e)
-        {
-            UzupelnijBDsuma();
-            UzupelnijBudzetWykonanySuma();
-        }
-
-
-        private void szukajToolStripButton_Click(object sender, EventArgs e)
-        {
-            if (rokToolStripTextBox.Text != "")
-            {
-                short i;
-                if (!Int16.TryParse(rokToolStripTextBox.Text, out i))
-                {
-                    MessageBox.Show("Podaj prawid³owy rok.");
-                    Cursor = Cursors.Default;
-                    return;
-                }
-            }
-            else
-            {
-                MessageBox.Show("Podaj prawid³owy rok.");
-                Cursor = Cursors.Default;
-                return;
-            }
-
-            if (msToolStripTextBox.Text != "")
-            {
-                short i;
-                if (!Int16.TryParse(msToolStripTextBox.Text, out i))
-                {
-                    MessageBox.Show("Podaj prawid³owy miesi¹c.");
-                    Cursor = Cursors.Default;
-                    return;
-                }
-            }
-            else
-            {
-                MessageBox.Show("Podaj prawid³owy miesi¹c.");
-                Cursor = Cursors.Default;
-                return;
-            }
-
-            if (((ComboBox)agencjaToolStripComboBox.Control).SelectedValue == null)
-            {
-                MessageBox.Show("Wybierz agencjê");
-                return;
-            }
-
-            rok = Convert.ToInt16(rokToolStripTextBox.Text);
-            miesiac = Convert.ToInt16(msToolStripTextBox.Text);
-            agencja = Convert.ToInt32(((ComboBox)agencjaToolStripComboBox.Control).SelectedValue);
-
-            Uprawnienia();
-
-            sLOWNIKDataSet.AGENCI.Clear();
-            rEKLAMADataSet.PLAN.Clear();
-
-            aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, agencja);
-            pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
-        }
-
-        private void Uprawnienia()
-        {
-            if (User.Instance().St_kierownik)
-            {
-
-                if (!((rok > DateTime.Today.Year) |
-                    ((rok == DateTime.Today.Year) & (miesiac >= DateTime.Today.Month - 1)) |
-                    ((rok == DateTime.Today.Year - 1) & (miesiac == 12) & (DateTime.Today.Month == 1))))
-                {
-                    OCENAComboCoxColumn.Visible = false;
-                    oCENADataGridViewTextBoxColumn.Visible = true;
-
-                    prowizjeDataGridView.ReadOnly = true;
-                    usunToolStripButton.Enabled = false;
-                    pobierzDaneToolStripButton.Enabled = false;
-                    naniesNaReklamyToolStripButton.Enabled = false;
-                    zapiszDaneToolStripButton.Enabled = false;
-                    zapiszToolStripButton.Enabled = false;
-                    stareProwizjeToolStripButton.Enabled = false;
-
-                }
-                else
-                {
-                    OCENAComboCoxColumn.Visible = true;
-                    oCENADataGridViewTextBoxColumn.Visible = false;
-                    prowizjeDataGridView.ReadOnly = false;
-
-                    usunToolStripButton.Enabled = true;
-                    pobierzDaneToolStripButton.Enabled = true;
-                    naniesNaReklamyToolStripButton.Enabled = true;
-                    zapiszDaneToolStripButton.Enabled = true;
-                    zapiszToolStripButton.Enabled = true;
-
-                    stareProwizjeToolStripButton.Enabled = true;
-                }
-            }
-        }
-
-        private void prowizjeDataGridView_DataError_1(object sender, DataGridViewDataErrorEventArgs e)
-        {
-            MessageBox.Show("WprowadŸ poprawne dane");
+        private void prowizjeDataGridView_Leave(object sender, EventArgs e)
+        {
+            prowizjeDataGridView.EndEdit();
+
+            REKLAMADataSet.PLANDataTable changes = rEKLAMADataSet.PLAN.GetChanges(DataRowState.Modified) as
+                REKLAMADataSet.PLANDataTable;
+
+            if (changes != null && Validate())
+            {
+                pLANBindingSource.EndEdit();
+                pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
+            }
+        }
+
+        //TODO: Wprowadziæ sensowniejsz¹ walidacjê danych
+        private void prowizjeDataGridView_DataError(object sender, DataGridViewDataErrorEventArgs e)
+        {
+
         }
 
@@ -440 +419 @@
                 REKLAMADataSet.PLANDataTable;
 
-            if (changes != null)
-            {
-                if (Validate())
-                {
-                    pLANBindingSource.EndEdit();
-                    pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
-                }
+            if (changes != null && Validate())
+            {
+                pLANBindingSource.EndEdit();
+                pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
             }
         }
@@ -453 +429 @@
         {
             PrintDGV.Print_DataGridView(prowizjeDataGridView, 50);
-        }
-
-        /// <summary>
-        ///     Krok nr 2:
-        ///     nalicza prowizje dla faktur wystawionych przed 2009
-        /// </summary>
-        /// <remarks>
-        ///     Zastanowic sie, czy ten krok jest jeszcze w ogole potrzebny... 
-        ///     Nawet gdyby zaplacono za fakture z 2008 to i tak nie bedzie sie liczyc do prowizji
-        /// </remarks>
-        private void stareProwizjeToolStripButton_Click(object sender, EventArgs e)
-        {
-            Cursor = Cursors.WaitCursor;
-
-            SqlCommand command = new SqlCommand();
-
-            command.Connection = new SqlConnection(ConnString.getConnString().Value);
-
-            command.CommandType = CommandType.StoredProcedure;
-
-            command.CommandText = "PROC_WYLICZ_I_ZAPISZ_PROWIZJE_DO_REKLAM";
-            command.Parameters.AddWithValue("@rok", rok);
-            command.Parameters.AddWithValue("@ms", miesiac);
-
-            command.Connection.Open();
-
-            SqlTransaction transaction = command.Connection.BeginTransaction();
-
-            command.Transaction = transaction;
-
-            try
-            {
-                command.ExecuteNonQuery();
-                transaction.Commit();
-                MessageBox.Show("Prowizja zosta³a naniesiona na zlecenia");
-            }
-            catch (Exception)
-            {
-                transaction.Rollback();
-                throw;
-            }
-            finally
-            {
-                command.Connection.Close();
-                Cursor = Cursors.Default;
-            }
         }
 

trunk/BazaReklam/ProvisionForm.resx

@@ -124 +124 @@
     <value>793, 17</value>
   </metadata>
-  <metadata name="sLOWNIKDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>793, 17</value>
-  </metadata>
   <metadata name="pLANBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>478, 17</value>
-  </metadata>
-  <metadata name="rEKLAMADataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
   </metadata>
   <metadata name="rEKLAMADataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -225 +219 @@
         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
-        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
+        lWUUPU8eIdsDBVTwsSi4oEDihhK4oYLggixpmkumBa5jLo1kgmijjTM25tRMVlLZMi1my2QujbbMmKOM
+        TWmKy1hmqE0LLjg+evCfzveAAsTezJl/3uP+597v3Hvuhxfu8akE0qYBJWeB49WAW2EN7YUeACIKgYMT
+        gGD9/ZcqwKWndS9enAcKTwBntiTGWOdSenM7sFXBPQXvti/tBRyfAid+H9+TF/oFc5+X7cbbQEUJMFSx
+        voKt1TsiX7C5T6TFncvJHQvJZwr4pbfXrXhgngK7tHzhMGAX+d7q0bHk3AQyP4bMc/LSwGC+A9QodpDg
+        3yrBceCr+u1F5Lb5Ip9Ors/jn3kDuQ3Yp8CUpqo873wB7Dg3JJJ8fBBZEMeGyU7ezArnN3H+XKXEClki
+        dG+VYD+w5tfcFHLrbLK8gFyXK+SwLMJh5QLrFBwteB0FNm6K72pxyQPkQ33JqTF0ZXfnydQQvgFcvQ94
+        TXHm1F1bJSgH+h/vGlTPbXPJsjzyqUlkyQT+XZzGt4BL4UDuh8Da8h6hFpePImcl0iqMY/2UaF7N7MbS
+        ALs1ANgl0vXCQMGnbd98dLZDrtUiNgnW5JBPZpErM1g9JpavAmdLo0MsrhxDzhvgqd7Kj+WtnO48HBtg
+        pJEIeFHIETrd1WTzw05gflWKGrdhaiP5ExnkUlW7LJ0/j4wjV+n7fOk+sx85rTfrpkTy+9RQk/yypHld
+        HI8JUUbKttV7vo8EQj8BrvBpnWLVeBGLfGk6uXA4uSiVXDCEfFhTMyOeDXk9eTkznHs6etX3AiQ/SgWp
+        dLc0LZPZdYqNP43qQ64eRy4RebHIDfG8geTsRFUfL+17sWaik/si/DgT2C2C54VMIag9aVqdJk/G+tiG
+        Gq6Q1gubqjbkc5JUeT9aksY1OYrHEoO5CaiUmypEMFswY9m+NM0ZjIHeA8orgv3d7sWSp0hj20xudJ/e
+        xzM5bml/JMKXElx+80iTIKgN//P5GkjaAxw7M0xNLlGDjebzkhtlUeWGnAWxtHKjaU2WyaY4Wdrd1yqT
+        RLJs0j21P6XMmq/1hwI7umoflXmMNEbzuferof09DfUY6l9yJ62cCNZPCCezu7AyxpdbNN6JjbPfegfp
+        bB20ESvPDe+pqRFxsSQxxLPMpKjqGSKW5lZeD1UcRU5yskHk7gndWDc+jHVjw+jODOHZeH+zGKvygYlK
+        Etiy0bbD99lvcHka+YiIZ7ao2EgivV2Sw5jJ7JsGrQR3ViO5a2wo72R05u1RwXSNDuLVwf6ssNtuLQbk
+        OYQ2N9xmdLdke48MqtaQslB90I65MzGSp9PDWGqzWReTO9GaKPLM1uS1Ixy8lR7Am2kB/DHBhysbl+NY
+        wYHPgKLd3vbaumnS+UERi5RTo1VtJGtV9YlhIdxls91MBt7cDJy8mBzE+vGhdDVVbshr0wNZk+rP6qF+
+        /KBzBw77b2zD8C7wbX1BL5GrYo2eJY3d0vi6HHpEc/4K8Juz0aVbQoCFun1+OJcYQNeYTqwd6VDVgfxr
+        uD+vpfjxYLSda4Hv5IuXFJ/tMZ0204qqPg6RS9vscN7WTr+c0YWfO31pKnY07hctWmQIUX21TZ7VLXY6
+        3o+1IwJ5ReSnkny432k3pruocTXFLBfiBDuyAOf7Nly9PiaM18aF8WiCgxU+Xu45wEeypHGoaZhO7blz
+        jUv9Y4FUJTl2JMZbknhxA3C+GDggcm0Z6MbEkKZx9bjOexGQ/wJwYYfN9scyXVba+4b4OUF50M+Qthg7
+        c8/6aScMU5m7BwMvN0liTmkuGeOFgBbxnovZLKgRwgqhTCgS0oUIoT37m3eMofoLWl1GCE8h5gbr2JLc
+        cwR9OjRljdTT/AfRzVTZ9HtzTNunSWJurM6CMZa9PeJ/AOq40vknl93NAAAAAElFTkSuQmCC
 </value>
   </data>
@@ -285 +279 @@
 </value>
   </data>
-  <data name="pobierzDaneToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABDdJREFUSEvNlXtQ
-        VFUcx+8qo21WUgQNOIrRiI9SZERIURqwGAIcHJQGynEj4ikYIu8WLkhDkBEqBgLWkjyCQBAwyhCwJsUc
-        apSHK7uALA95rbC8jIfut99plsZeJgx/tDOfObt37vl+fufc37nLcf+bT4AihvOs96d6niK05rcuPyW/
-        iy9Sb0muuc/ZSaIpfNn8SXyUYhs+T/3TbaBEBqz/gCRWSYfnR+LTF7aNz1H/0AGclU4j9cokki/fg3FU
-        4z1uWwJPEoO5r+TdnpCX+dPqixReKp1CeMU4QitGiTHEVE3AUHRjmtsSH6WRLJzdM/HoOmTGS9TVt2hb
-        GicR8vUYQs6NILB0GP7FQ9hfrELQuTGsENVPcxaxYgrXJx5R4t550JQ/pf6OhTdN4VD5KILKhhFQooJv
-        0SA8C+7gnbwBiL5UwqtIBX3RL9OcGR/5aBJRR4AJn6H+tgUorJ+kikcQcFYFvzND8PqKgil0X04/3E73
-        wSWrB3skvXDLUULPt2yK2xQR/nCJu8LX5HDN/QvtQHXrFPjzo/ApGoJ34SA88pUQ5Q7gLQp+I6sXzp/3
-        YNdnfdiZ2Q+HzF7slAxA26NmkjMJDiXJc3/fLu9ObzNqv6NXAfGFCRyk/fYrHoZ7wSD20Xbsze6HKwXv
-        pmCnzG44UqgVXw1LcSUs42qx/aMGWH+qwFJ3kmwMDf6z5ED/qmf3N9Tq+lxq0nu7UqrnWn5T17W8Y234
-        dUjq7sIrvx97WMWnbsMxvQt2qZ2wPdkLS/4innYrg/A1SbvwdYlcaJ8tF9p9IVvskFvH6ax3IslSQsC6
-        ix375YQLEUawkxrz4vsNKLj+K3wL+mCf0Q37tC7YnuiAdYoCr6R0wSyyBjp7y0H3FhOfELFsnibDWdO+
-        C5iAWYSaCytpfJ4wMg67BsnVcbjn9uDVE53YcVwBq+R2bE1qg0VSBzaEVkHbrZQJ0gkbNkcDy2Bt+9jM
-        CphkRsRkv/NC0M84WTuKN7O6sZ2CLZNuweJIKzYltMA0QYE1wVV40qWECY4Ta2bmPTDO5P7jKDAMrEPy
-        90PYndmJzYltMEtswcZ4OV6Kk2FdXCuMAiuxxPnMjGD1X6t9aDq7Wd/vCuIr78AhtR0bPpTTS06GtbHN
-        MI6WYmW0HMv8KyF0Kpy7QNfrEsQVSuw41obVLJi/CSPxDSyPaIJ+ZDN0fM5jkWPB3AXPeP6IsLIBWCTK
-        YRQlhWFkEwzCmqAX2gSdECme8PwGWvb5cxfoel6GdVo3DGNaYMjLoC+WQTeiGdohjXj8vWtY5FEBgV0e
-        ExwjZv0MuAU2eSNatpl3F5pnTzAE5lkTAsuMccHmtFHONGWE23pUxZmnq7jFBskkWDfbh8yaYAVxgPiY
-        YAfpQZI014/QGKhZwaz/p9lBYSfcWBPAtoHBfjNWaWCFLJnLCtgq/jh4//H9X9v+N9pYRu0Ea6ZmAAAA
-        AElFTkSuQmCC
-</value>
-  </data>
-  <data name="stareProwizjeToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
-        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
-        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
-        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
-        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
-        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
-        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
-        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
-        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
-        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="zapiszToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -361 +315 @@
         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
-        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
+        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
 </value>
   </data>
@@ -396 +350 @@
     <value>
         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
-        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
+        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
 </value>
   </data>

trunk/BazaReklam/app.config

@@ -8 +8 @@
   <connectionStrings>
     <clear />
+    <add name="BAZA_REKLAM_TEST" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True"
+      providerName="System.Data.SqlClient" />
     <add name="BAZA_REKLAM" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM;Persist Security Info=True"
       providerName="System.Data.SqlClient" />

trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_PROWIZJE.txt

@@ -5 +5 @@
 GO
 
-ALTER Procedure [dbo].[PROC_WYLICZ_I_ZAPISZ_PROWIZJE]
-@ROK INTEGER = 2003,
-@MS INTEGER = 2,
-@idAgencji integer = 2
-As
-delete from PROWIZJE 
-where ROK =@ROK and MS =@MS and agencja = 
- (select symbol from agencje where id_Agencji = @idAgencji)
+ALTER PROCEDURE [dbo].[PROC_WYLICZ_I_ZAPISZ_PROWIZJE]
+                @ROK INTEGER = 2003,
+                @MS INTEGER = 2,
+                @idAgencji integer = 2
+AS
 
-insert into PROWIZJE 
-SELECT  a2.symbol,b_agent, B_ROK,b_ms,numer_faktury,NETTO,NrKorygowanejFaktury,
-case z.zp
-when 1 then z.procentProwizji
-else round(P.PR_PROWIZJI,2)
-end,
-z.zp,
-case z.zp
-when 1 then  round(z.procentProwizji * Netto,2)
-else round(round(P.PR_PROWIZJI,2) * Netto,2)
-end
-as kwotaProwizji, id_faktury
-FROM dbo.VIEW_POMOCNICZY_BUDZET VPB left join dbo.[PLAN] P on
-VPB.b_rok = P.rok and VPB.b_ms = P.ms and P.symbol = VPB.b_agent left join
-zamowienia Z on Z.idZamowienia = VPB.idZamowienia left join 
-agenci A1 on A1.symbol = VPB.B_agent  left join
-agencje A2 on A2.id_agencji = A1.id_agencji
-where B_ROK =@ROK and B_MS =@MS and A1.id_agencji = @idAgencji
+-- wyczysc wszystko dla danej agencji
+DELETE FROM Prowizje 
+WHERE Rok =@Rok 
+AND Ms=@Ms 
+AND Agencja = (SELECT symbol FROM Agencje where Id_Agencji = @idAgencji)
 
--- aktualizuj prowizjie dla faktur z poprzednich miesiecy
+-- 
+INSERT INTO Prowizje 
+SELECT  a2.symbol,b_agent, B_ROK, b_ms, numer_faktury, NETTO, NrKorygowanejFaktury,
+CASE Z.ZP
+        WHEN 1 THEN Z.procentProwizji
+        ELSE ROUND(P.PR_PROWIZJI,2)
+END,
+Z.ZP,
+CASE Z.ZP
+        WHEN 1 THEN ROUND(Z.procentProwizji * Netto, 2)
+        ELSE ROUND(ROUND(P.PR_PROWIZJI, 2) * Netto, 2)
+END AS kwotaProwizji, 
+id_faktury
+FROM dbo.VIEW_POMOCNICZY_BUDZET VPB 
+LEFT JOIN dbo.[PLAN] P ON VPB.b_rok = P.rok AND VPB.b_ms = P.ms AND P.symbol = VPB.b_agent 
+LEFT JOIN zamowienia Z ON Z.idZamowienia = VPB.idZamowienia 
+LEFT JOIN agenci A1 ON A1.symbol = VPB.B_agent  
+LEFT JOIN agencje A2 ON A2.id_agencji = A1.id_agencji
+WHERE B_ROK = @ROK 
+AND B_MS = @MS 
+AND A1.id_agencji = @idAgencji
 
+-- aktualizuj prowizje dla faktur z poprzednich miesiecy
 DECLARE @Prowizje TABLE
 (
@@ -75 +80 @@
 
 
-return
+RETURN
 GO