Zbiór zmian 778 dla branches/Emisje

Data:

2009-07-24 16:34:06 (17 years ago)

Autor:

marek

Opis:

re #195 - poprawiono liste promocji

Lokalizacja:

branches/Emisje/BazaReklam

Pliki:

• Baza Reklam.csproj (zmodyfikowane) (2 diffs)
• Classes/Model/Bargain.cs (dodane)
• Classes/Repositories/BargainRepository.cs (dodane)
• OrderDetails.Designer.cs (zmodyfikowane) (1 diff)
• OrderDetails.cs (zmodyfikowane) (9 diffs)

branches/Emisje/BazaReklam/Baza Reklam.csproj

@@ -134 +134 @@
     <Compile Include="Classes\Model\AdLocation.cs" />
     <Compile Include="Classes\Model\Agent.cs" />
+    <Compile Include="Classes\Model\Bargain.cs" />
     <Compile Include="Classes\Model\Country.cs" />
     <Compile Include="Classes\Model\Dzial.cs" />
@@ -153 +154 @@
     <Compile Include="Classes\Repositories\AdLocationRepository.cs" />
     <Compile Include="Classes\Repositories\AgentRepository.cs" />
+    <Compile Include="Classes\Repositories\BargainRepository.cs" />
     <Compile Include="Classes\Repositories\CountryRepository.cs" />
     <Compile Include="Classes\Repositories\IRepository.cs" />

branches/Emisje/BazaReklam/OrderDetails.Designer.cs

@@ -1238 +1238 @@
             // promocjaComboBox
             // 
-            this.promocjaComboBox.DataSource = this.pROMOCJEBindingSource;
-            this.promocjaComboBox.DisplayMember = "Nazwa";
             this.promocjaComboBox.Location = new System.Drawing.Point(286, 185);
             this.promocjaComboBox.Name = "promocjaComboBox";
             this.promocjaComboBox.Size = new System.Drawing.Size(124, 21);
             this.promocjaComboBox.TabIndex = 14;
-            this.promocjaComboBox.ValueMember = "id";
             // 
             // button3

branches/Emisje/BazaReklam/OrderDetails.cs

@@ -96 +96 @@
         }
 
+        private Bargain SelectedBargain
+        {
+            get
+            {
+                if (promocjaComboBox.SelectedItem == null) return null;
+                return (Bargain)promocjaComboBox.SelectedItem;
+            }
+        }
+
         protected REKLAMADataSet.REKLAMARow Reklama
         {
@@ -127 +136 @@
             cbLocation.ValueMember = "Id";
             cbLocation.SelectedIndex = 0;
+
+            BargainRepository bargainRepository = new BargainRepository(ConnString.getConnString().Value);
+            ComboBoxHelper.Bind(bargainRepository.FindAllActive(), promocjaComboBox);
+            promocjaComboBox.DisplayMember = "Name";
+            promocjaComboBox.ValueMember = "Id";
+            promocjaComboBox.SelectedIndex = -1;
 
             ComboBoxHelper.Bind(_titles, tYTULComboBox);
@@ -345 +360 @@
             }
 
-            if (string.IsNullOrEmpty(promocjaComboBox.Text))
+            if (SelectedBargain == null)
             {
                 DataRowView row = (DataRowView)rEKLAMABindingSource.Current;
@@ -351 +366 @@
             }
             else
-                Reklama.PROMOCJA = Convert.ToInt32(((DataRowView)promocjaComboBox.SelectedItem).Row[0]);
+                Reklama.PROMOCJA = SelectedBargain.Id;
 
             if (nowyRekord)
@@ -638 +653 @@
             }
 
-            ////lokalizacja
-            //if (sTRONATextBox.Text == "")
-            //{
-            //    MessageBox.Show("Podaj lokalizacjê.");
-            //    zATWIERDZONO_DO_DRUKUCheckBox.CheckState = CheckState.Unchecked;
-            //    return;
-            //}
-
             if (rEKLAMAUKAZESIEWNRBindingSource.List.Count != 0) return;
 
@@ -836 +843 @@
             bylyZmiany = false;
 
+            promocjaComboBox.SelectedIndex = -1;
+
             numeryReklam.Clear();
 
@@ -954 +963 @@
             {
                 index++;
-                if (item is DataRowView && Convert.ToInt32(((DataRowView)item).Row[0]) == value)
+                if (item is Bargain && Convert.ToInt32(((Bargain)item).Id) == value)
                     return index;                
             }
@@ -1724 +1733 @@
 
             if (Validate())
-            {
                 RecalculateAdSize();
-
-                //txtTotalModuleAmount.Text =
-                //    ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString();
-
-                //int horizontal, vertical;
-                //if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical))
-                //{
-                //    AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule);
-
-                //    sZERTextBox.Text = adSize.Width.ToString();
-                //    wYSTextBox.Text = adSize.Height.ToString();
-                //}
-            }
         }
 
@@ -1746 +1741 @@
 
             if (Validate())
-            {
-
                 RecalculateAdSize();
-                
-                //txtTotalModuleAmount.Text =
-                //    ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString();
-
-                //int horizontal, vertical;
-                //if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical))
-                //{
-                //    AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule);
-
-                //    sZERTextBox.Text = adSize.Width.ToString();
-                //    wYSTextBox.Text = adSize.Height.ToString();
-                //}
-            }
         }