Zbiór zmian 307

Data:

2009-02-06 12:12:37 (17 years ago)

Autor:

marek

Opis:

re #78 - poprawiono punkt 1 oraz 2 z opisu zgloszenia

Lokalizacja:

trunk/BazaReklam

Pliki:

• KalendarzEmisji.Designer.cs (zmodyfikowane) (8 diffs)
• KalendarzEmisji.cs (zmodyfikowane) (8 diffs)
• KalendarzEmisji.resx (zmodyfikowane) (1 diff)
• ZamowieniaForm.cs (zmodyfikowane) (3 diffs)

trunk/BazaReklam/KalendarzEmisji.Designer.cs

@@ -30 +30 @@
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = 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 dataGridViewCellStyle6 = 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();
             this.sLOWNIKDataSet = new Baza_Reklam.SLOWNIKDataSet();
             this.nRBindingSource = new System.Windows.Forms.BindingSource(this.components);
@@ -45 +45 @@
             this.label2 = new System.Windows.Forms.Label();
             this.button1 = new System.Windows.Forms.Button();
+            this.rEKLAMADataSet = new Baza_Reklam.REKLAMADataSet();
+            this.zamowieniaBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.zamowieniaTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.zamowieniaTableAdapter();
             ((System.ComponentModel.ISupportInitialize)(this.sLOWNIKDataSet)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nRBindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nRDataGridView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rEKLAMADataSet)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.zamowieniaBindingSource)).BeginInit();
             this.SuspendLayout();
             // 
@@ -77 +82 @@
             this.Column1});
             this.nRDataGridView.DataSource = this.nRBindingSource;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.nRDataGridView.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.nRDataGridView.DefaultCellStyle = dataGridViewCellStyle6;
             this.nRDataGridView.Location = new System.Drawing.Point(12, 36);
             this.nRDataGridView.Name = "nRDataGridView";
@@ -96 +101 @@
             this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.dataGridViewTextBoxColumn3.DataPropertyName = "NRW";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle4;
             this.dataGridViewTextBoxColumn3.HeaderText = "Nr wyd.";
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
@@ -107 +112 @@
             this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.dataGridViewTextBoxColumn4.DataPropertyName = "DATA_W";
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle5;
             this.dataGridViewTextBoxColumn4.HeaderText = "Data wyd.";
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
@@ -164 +169 @@
             this.button1.Text = "Anuluj";
             this.button1.UseVisualStyleBackColor = true;
+            // 
+            // rEKLAMADataSet
+            // 
+            this.rEKLAMADataSet.DataSetName = "REKLAMADataSet";
+            this.rEKLAMADataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // zamowieniaBindingSource
+            // 
+            this.zamowieniaBindingSource.DataMember = "zamowienia";
+            this.zamowieniaBindingSource.DataSource = this.rEKLAMADataSet;
+            // 
+            // zamowieniaTableAdapter
+            // 
+            this.zamowieniaTableAdapter.ClearBeforeFill = true;
             // 
             // KalendarzEmisji
@@ -182 +201 @@
             ((System.ComponentModel.ISupportInitialize)(this.nRBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.nRDataGridView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rEKLAMADataSet)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.zamowieniaBindingSource)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -201 +222 @@
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column1;
         private System.Windows.Forms.Button button1;
+        private REKLAMADataSet rEKLAMADataSet;
+        private System.Windows.Forms.BindingSource zamowieniaBindingSource;
+        private Baza_Reklam.REKLAMADataSetTableAdapters.zamowieniaTableAdapter zamowieniaTableAdapter;
     }
 }

trunk/BazaReklam/KalendarzEmisji.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
@@ -28 +26 @@
         string tytul;
 
-        REKLAMADataSet.REKLAMARow reklama;
+        readonly REKLAMADataSet.REKLAMARow reklama;
 
         REKLAMADataSet.UKAZE_SIE_W_NRDataTable emisje;
@@ -38 +36 @@
         }
 
-        short emisjaDoZmiany;
+        readonly short emisjaDoZmiany;
         short nowaEmisja;
 
@@ -105 +103 @@
         {
             nRTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
+            zamowieniaTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
             DateTime startDay = DateTime.Today;
 
-            this.nRTableAdapter.FillByTytulData(this.sLOWNIKDataSet.NR, Tytul, startDay);
+            nRTableAdapter.FillByTytulData(sLOWNIKDataSet.NR, Tytul, startDay);
                        
             short nr = Emisje.MaxZafakturowanyNrWydania();
@@ -113 +112 @@
             if (nr != 0)
             {
-                dataOstatatniejZafakturowanejEmisji = this.sLOWNIKDataSet.NR.dataWydania(Tytul, nr);
+                dataOstatatniejZafakturowanejEmisji = sLOWNIKDataSet.NR.dataWydania(Tytul, nr);
             }
 
@@ -126 +125 @@
             foreach (DataGridViewRow row in nRDataGridView.Rows)
             {
-                if (row.Cells[3].Value != null && ((bool)row.Cells[3].Value) == true)
+                if (row.Cells[3].Value != null && ((bool)row.Cells[3].Value))
                 {
                     if (row.DefaultCellStyle.BackColor == Color.LightYellow)
@@ -138 +137 @@
 
                         emisje.AddUKAZE_SIE_W_NRRow(em);
+
+                        if(!reklama.IsidZamowieniaNull())
+                        {
+                            //ustaw pole zafakturowanowszystko na false
+                            REKLAMADataSet.zamowieniaDataTable zamowieniaDataTable = new REKLAMADataSet.zamowieniaDataTable();
+                            zamowieniaTableAdapter.FillByIdZamowienia(zamowieniaDataTable, reklama.idZamowienia);
+                            REKLAMADataSet.zamowieniaRow zamowieniaRow = (REKLAMADataSet.zamowieniaRow)zamowieniaDataTable.Rows[0];
+                            zamowieniaRow.zafakturowanoWszystko = false;
+                            zamowieniaRow.EndEdit();
+                            zamowieniaTableAdapter.Update(zamowieniaRow);
+                        }
                     }
                 }
@@ -198 +208 @@
             if (e.ColumnIndex == 3)
             {
-                if (((bool)nRDataGridView[e.ColumnIndex, e.RowIndex].Value) == true)
+                if (((bool)nRDataGridView[e.ColumnIndex, e.RowIndex].Value))
                 {
                     iloscEmisji++;

trunk/BazaReklam/KalendarzEmisji.resx

@@ -133 +133 @@
     <value>True</value>
   </metadata>
+  <metadata name="rEKLAMADataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>439, 17</value>
+  </metadata>
+  <metadata name="zamowieniaBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>575, 17</value>
+  </metadata>
+  <metadata name="zamowieniaTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>756, 17</value>
+  </metadata>
 </root>

trunk/BazaReklam/ZamowieniaForm.cs

@@ -294 +294 @@
                 Cursor = Cursors.WaitCursor;
 
-                DataRowView z = (DataRowView)zamowieniaBindingSource.Current;
-                REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow)z.Row;
-
-                REKLAMADataSet.KLIENCIRow _klient = (REKLAMADataSet.KLIENCIRow)klienciTableAdapter.GetDataByCustomerId(zamowienie.idKlienta).Rows[0];
+                DataRowView z = (DataRowView) zamowieniaBindingSource.Current;
+                REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow) z.Row;
+
+                REKLAMADataSet.KLIENCIRow _klient =
+                    (REKLAMADataSet.KLIENCIRow) klienciTableAdapter.GetDataByCustomerId(zamowienie.idKlienta).Rows[0];
                 string errorMessage = czyMoznaZafakturowac(zamowienie, _klient);
 
@@ -312 +313 @@
 
                 zamowieniaBindingSource.ResetBindings(false);
+
+                fAKTURYBindingSource.MoveLast();
 
                 Cursor = Cursors.Default;
@@ -1295 +1298 @@
                     reklama.EndEdit();
                 }
-
                 zamowienie.zafakturowano = false;
-                zamowienie.zafakturowanoWszystko = false;
-            }
-
+            }
+            //przy usuwaniu faktury zawsze ustaw to pole na false, poniewaz nie pozwala wystawic faktury
+            zamowienie.zafakturowanoWszystko = false;
             zamowienie.SetdataOstatniejZafakturowanejEmisjiNull();
             zamowienie.EndEdit();