Zbiór zmian 784 dla branches

Data:

2009-07-28 13:02:14 (17 years ago)

Autor:

marek

Opis:

re #195 - edycja emisji zakonczona...

Lokalizacja:

branches/Emisje/BazaReklam

Pliki:

• Baza Reklam.csproj (zmodyfikowane) (1 diff)
• Classes/Helpers/ComboBoxHelper.cs (zmodyfikowane) (2 diffs)
• Classes/Interfaces/IEntity.cs (dodane)
• Classes/Model/AdIssue.cs (zmodyfikowane) (1 diff)
• Classes/Model/AdLocation.cs (zmodyfikowane) (1 diff)
• Classes/Model/Bargain.cs (zmodyfikowane) (1 diff)
• Classes/Model/Dzial.cs (zmodyfikowane) (1 diff)
• Classes/Model/Invoice.cs (zmodyfikowane) (1 diff)
• Classes/Model/Module.cs (zmodyfikowane) (1 diff)
• Classes/Model/Rozdzial.cs (zmodyfikowane) (1 diff)
• Classes/Model/Section.cs (zmodyfikowane) (1 diff)
• Classes/Model/Title.cs (zmodyfikowane) (1 diff)
• Classes/Repositories/NavigationColumnRepository.cs (zmodyfikowane) (1 diff)
• Classes/Repositories/NavigationSubColumnRepository.cs (zmodyfikowane) (2 diffs)
• EditAdIssue.Designer.cs (zmodyfikowane) (6 diffs)
• EditAdIssue.cs (zmodyfikowane) (5 diffs)
• OrderDetails.Designer.cs (zmodyfikowane) (5 diffs)
• OrderDetails.cs (zmodyfikowane) (9 diffs)

branches/Emisje/BazaReklam/Baza Reklam.csproj

@@ -131 +131 @@
     <Compile Include="Classes\Interfaces\IInvoiceProvider.cs" />
     <Compile Include="Classes\Interfaces\IForm.cs" />
+    <Compile Include="Classes\Interfaces\IEntity.cs" />
     <Compile Include="Classes\Model\AdIssue.cs" />
     <Compile Include="Classes\Model\AdLocation.cs" />

branches/Emisje/BazaReklam/Classes/Helpers/ComboBoxHelper.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
+using Baza_Reklam.Classes.Interfaces;
 
 namespace Baza_Reklam.Classes.Helpers
@@ -22 +23 @@
         }
 
-        //public static int GetItemIndex<T>(T type, int value, ComboBox comboBox)
-        //{
-        //    foreach (object item in comboBox.Items)
-        //    {
-        //        if(((T)item))
-        //        {
-                    
-        //        }
-        //    }
-        //}
+        public static int GetItemIndex(int value, ComboBox comboBox)
+        {
+            foreach (object item in comboBox.Items)
+                if (item is IEntity && ((IEntity)item).Id == value)
+                    return comboBox.Items.IndexOf(item);
+
+            return -1;
+        }
     }
 }

branches/Emisje/BazaReklam/Classes/Model/AdIssue.cs

@@ -1 +1 @@
 using System;
+using Baza_Reklam.Classes.Interfaces;
 
 namespace Baza_Reklam.Classes.Model
 {
-    public class AdIssue
+    public class AdIssue : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Model/AdLocation.cs

@@ +1 @@
+using Baza_Reklam.Classes.Interfaces;
+
 namespace Baza_Reklam.Classes.Model
 {
-    public class AdLocation
+    public class AdLocation : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Model/Bargain.cs

@@ +1 @@
+using Baza_Reklam.Classes.Interfaces;
+
 namespace Baza_Reklam.Classes.Model
 {
-    public class Bargain
+    public class Bargain : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Model/Dzial.cs

@@ +1 @@
+using Baza_Reklam.Classes.Interfaces;
+
 namespace Baza_Reklam.Classes.Model
 {
-    public class NavigationColumn
+    public class NavigationColumn : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Model/Invoice.cs

@@ -1 +1 @@
 using System;
+using Baza_Reklam.Classes.Interfaces;
 
 namespace Baza_Reklam.Classes.Model
 {
-    public class Invoice
+    public class Invoice : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Model/Module.cs

@@ +1 @@
+using Baza_Reklam.Classes.Interfaces;
+
 namespace Baza_Reklam.Classes.Model
 {
-    public class Module
+    public class Module : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Model/Rozdzial.cs

@@ +1 @@
+using Baza_Reklam.Classes.Interfaces;
+
 namespace Baza_Reklam.Classes.Model
 {
-    public class NavigationSubColumn
+    public class NavigationSubColumn : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Model/Section.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using Baza_Reklam.Classes.Interfaces;
 using Baza_Reklam.Classes.Repositories;
 
 namespace Baza_Reklam.Classes.Model
 {
-    public class Section
+    public class Section : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Model/Title.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using Baza_Reklam.Classes.Interfaces;
 using Baza_Reklam.Classes.Repositories;
 
 namespace Baza_Reklam.Classes.Model
 {
-    public class Title
+    public class Title : IEntity
     {
         private int _id;

branches/Emisje/BazaReklam/Classes/Repositories/NavigationColumnRepository.cs

@@ -97 +97 @@
             return navigationSubColumnRepository.FindAllActiveByNavigationColumn(navigationColumn);
         }
+
+        public List<NavigationSubColumn> FindActiveNavigationSubColumnsByNavigationColumnId(int navigationColumnId)
+        {
+            NavigationSubColumnRepository navigationSubColumnRepository = new NavigationSubColumnRepository(_connectionString);
+            return navigationSubColumnRepository.FindAllActiveByNavigationColumnId(navigationColumnId, null);
+        }
     }
 }

branches/Emisje/BazaReklam/Classes/Repositories/NavigationSubColumnRepository.cs

@@ -58 +58 @@
         public List<NavigationSubColumn> FindAllActiveByNavigationColumn(NavigationColumn navigationColumn)
         {
+            return FindAllActiveByNavigationColumnId(navigationColumn.Id, navigationColumn);
+        }
+
+        public List<NavigationSubColumn> FindAllActiveByNavigationColumnId(int navigationColumnId, NavigationColumn navigationColumn)
+        {
             string query = "SELECT Id, Name FROM Rozdzial WHERE Active=1 AND DzialId={0} ORDER BY SortOrder";
-            query = string.Format(query, navigationColumn.Id);
+            query = string.Format(query, navigationColumnId);
 
             List<NavigationSubColumn> navigationSubColumns = new List<NavigationSubColumn>();
@@ -77 +82 @@
                     {
                         NavigationSubColumn navigationSubColumn = new NavigationSubColumn(reader.GetInt32(0), reader.GetString(1));
-                        navigationSubColumn.NavigationColumn = navigationColumn;
+                        if (navigationColumn != null)
+                            navigationSubColumn.NavigationColumn = navigationColumn;
 
                         navigationSubColumns.Add(navigationSubColumn);

branches/Emisje/BazaReklam/EditAdIssue.Designer.cs

@@ -33 +33 @@
             this.cbNavigationSubColumn = new System.Windows.Forms.ComboBox();
             this.cbAdLocation = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.btnCancel = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
@@ -38 +42 @@
             // 
             this.button1.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.button1.Location = new System.Drawing.Point(205, 238);
+            this.button1.Location = new System.Drawing.Point(159, 148);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
@@ -48 +52 @@
             // 
             this.cbNavigationColumn.FormattingEnabled = true;
-            this.cbNavigationColumn.Location = new System.Drawing.Point(79, 12);
+            this.cbNavigationColumn.Location = new System.Drawing.Point(92, 28);
             this.cbNavigationColumn.Name = "cbNavigationColumn";
             this.cbNavigationColumn.Size = new System.Drawing.Size(121, 21);
             this.cbNavigationColumn.TabIndex = 1;
+            this.cbNavigationColumn.SelectedIndexChanged += new System.EventHandler(this.cbNavigationColumn_SelectedIndexChanged);
             // 
             // cbNavigationSubColumn
             // 
             this.cbNavigationSubColumn.FormattingEnabled = true;
-            this.cbNavigationSubColumn.Location = new System.Drawing.Point(79, 54);
+            this.cbNavigationSubColumn.Location = new System.Drawing.Point(92, 64);
             this.cbNavigationSubColumn.Name = "cbNavigationSubColumn";
             this.cbNavigationSubColumn.Size = new System.Drawing.Size(121, 21);
@@ -64 +69 @@
             // 
             this.cbAdLocation.FormattingEnabled = true;
-            this.cbAdLocation.Location = new System.Drawing.Point(79, 101);
+            this.cbAdLocation.Location = new System.Drawing.Point(92, 100);
             this.cbAdLocation.Name = "cbAdLocation";
             this.cbAdLocation.Size = new System.Drawing.Size(121, 21);
             this.cbAdLocation.TabIndex = 3;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 32);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(35, 13);
+            this.label1.TabIndex = 4;
+            this.label1.Text = "Dzia³:";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 68);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(52, 13);
+            this.label2.TabIndex = 5;
+            this.label2.Text = "Rozdzia³:";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(12, 104);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(63, 13);
+            this.label3.TabIndex = 6;
+            this.label3.Text = "Lokalizacja:";
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(15, 148);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(75, 23);
+            this.btnCancel.TabIndex = 7;
+            this.btnCancel.Text = "Anuluj";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
             // EditAdIssue
@@ -73 +116 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(292, 273);
+            this.ClientSize = new System.Drawing.Size(249, 186);
+            this.ControlBox = false;
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
             this.Controls.Add(this.cbAdLocation);
             this.Controls.Add(this.cbNavigationSubColumn);
             this.Controls.Add(this.cbNavigationColumn);
             this.Controls.Add(this.button1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Name = "EditAdIssue";
-            this.Text = "EditAdIssue";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Edytuj emisjê";
             this.Load += new System.EventHandler(this.EditAdIssue_Load);
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
@@ -91 +142 @@
         private System.Windows.Forms.ComboBox cbNavigationSubColumn;
         private System.Windows.Forms.ComboBox cbAdLocation;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Button btnCancel;
     }
 }

branches/Emisje/BazaReklam/EditAdIssue.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;
 using Baza_Reklam.Classes.Helpers;
@@ -28 +23 @@
             get
             {
-                if (cbNavigationColumn.SelectedItem != null)
+                if (cbNavigationColumn.SelectedIndex > 0 && cbNavigationColumn.SelectedItem != null)
                     return (NavigationColumn)cbNavigationColumn.SelectedItem;
                 return null;
@@ -39 +34 @@
             get
             {
-                if (cbNavigationSubColumn.SelectedItem != null)
+                if (cbNavigationSubColumn.SelectedIndex > 0 && cbNavigationSubColumn.SelectedItem != null)
                     return (NavigationSubColumn)cbNavigationSubColumn.SelectedItem;
                 return null;
@@ -45 +40 @@
         }
 
-        public EditAdIssue()
+        public EditAdIssue(Title title, int? dzialId, int? rozdzialId, int lokalizacjaId)
         {
             InitializeComponent();
 
-            AdLocationRepository adPlacementRepository = new AdLocationRepository(ConnString.getConnString().Value);
-            ComboBoxHelper.Bind(adPlacementRepository.FindAll(), cbAdLocation);
+            AdLocationRepository adLocationRepository = new AdLocationRepository(ConnString.getConnString().Value);
+            ComboBoxHelper.Bind(adLocationRepository.FindAll(), cbAdLocation);
             cbAdLocation.DisplayMember = "Text";
             cbAdLocation.ValueMember = "Id";
-            cbAdLocation.SelectedIndex = 0;
+            cbAdLocation.SelectedIndex = ComboBoxHelper.GetItemIndex(lokalizacjaId, cbAdLocation);
 
-            NavigationColumnRepository navigationColumnRepository = new NavigationColumnRepository(ConnString.getConnString().Value);
-            ComboBoxHelper.Bind(navigationColumnRepository.FindAll(), cbNavigationColumn);
-            cbNavigationColumn.DisplayMember = "Name";
-            cbNavigationColumn.ValueMember = "Id";
-            cbNavigationColumn.SelectedIndex = 0;
+            if (dzialId.HasValue)
+            {
+                NavigationColumnRepository navigationColumnRepository =
+                    new NavigationColumnRepository(ConnString.getConnString().Value);
+                ComboBoxHelper.Bind(navigationColumnRepository.FindAllActiveByTitle(title), cbNavigationColumn);
+                cbNavigationColumn.Items.Insert(0, "-- proszê wybraæ --");
+                cbNavigationColumn.DisplayMember = "Name";
+                cbNavigationColumn.ValueMember = "Id";
+                cbNavigationColumn.SelectedIndex = 0;
 
+                cbNavigationColumn.SelectedIndex = ComboBoxHelper.GetItemIndex(dzialId.Value, cbNavigationColumn);
 
-            NavigationSubColumnRepository navigationSubColumnRepository = new NavigationSubColumnRepository(ConnString.getConnString().Value);
-            ComboBoxHelper.Bind(navigationSubColumnRepository.FindAll(), cbNavigationSubColumn);
-            cbNavigationSubColumn.DisplayMember = "Name";
-            cbNavigationSubColumn.ValueMember = "Id";
-            cbNavigationSubColumn.SelectedIndex = 0;
-
+                if (rozdzialId.HasValue)
+                    cbNavigationSubColumn.SelectedIndex = ComboBoxHelper.GetItemIndex(rozdzialId.Value,
+                                                                                      cbNavigationSubColumn);
+            }
         }
 
@@ -74 +72 @@
 
         }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        private void cbNavigationColumn_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(Dzial==null) return;
+
+            NavigationColumnRepository navigationColumnRepository = new NavigationColumnRepository(ConnString.getConnString().Value);
+            ComboBoxHelper.Bind(navigationColumnRepository.FindActiveNavigationSubColumnsByNavigationColumn(Dzial), cbNavigationSubColumn);
+            cbNavigationSubColumn.Items.Insert(0, "-- proszê wybraæ --");
+            cbNavigationSubColumn.DisplayMember = "Name";
+            cbNavigationSubColumn.ValueMember = "Id";
+            cbNavigationSubColumn.SelectedIndex = 0;
+        }
     }
 }

branches/Emisje/BazaReklam/OrderDetails.Designer.cs

@@ -189 +189 @@
             this.usunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.anulujToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.editMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.advertSiteContext = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.deleteItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -194 +195 @@
             this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
             this.btnSaveClose = new System.Windows.Forms.Button();
-            this.editMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             sYMBOL_AKWIZYTORALabel = new System.Windows.Forms.Label();
             tYTULLabel = new System.Windows.Forms.Label();
@@ -1802 +1802 @@
             // 
             this.emisjeContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.editMenuItem,
             this.zmienToolStripMenuItem,
-            this.usunToolStripMenuItem,
             this.anulujToolStripMenuItem,
-            this.editMenuItem});
+            this.usunToolStripMenuItem});
             this.emisjeContextMenuStrip.Name = "emisjeContextMenuStrip";
             this.emisjeContextMenuStrip.Size = new System.Drawing.Size(153, 114);
@@ -1826 +1826 @@
             this.anulujToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
             this.anulujToolStripMenuItem.Text = "Anuluj";
+            // 
+            // editMenuItem
+            // 
+            this.editMenuItem.Name = "editMenuItem";
+            this.editMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.editMenuItem.Text = "Edytuj";
             // 
             // advertSiteContext
@@ -1864 +1870 @@
             this.btnSaveClose.UseVisualStyleBackColor = true;
             this.btnSaveClose.Click += new System.EventHandler(this.btnSaveClose_Click);
-            // 
-            // editMenuItem
-            // 
-            this.editMenuItem.Name = "editMenuItem";
-            this.editMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.editMenuItem.Text = "Edytuj";
             // 
             // OrderDetails

branches/Emisje/BazaReklam/OrderDetails.cs

@@ -171 +171 @@
             rEKLAMADataSet.UKAZE_SIE_W_NR.TableNewRow += nowaEmisja;
 
-            //pROMOCJETableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-            //lISTA_TYPOW_REKLAMYTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-            //kursy_WalutTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-            //rEKLAMATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-            //uKAZE_SIE_W_NRTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-            //rEKLAMA_STRONATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-            //reklama_Info_DodTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-            //aGENCITableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-            //zmianyEmisjiTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
-
             pROMOCJETableAdapter.Fill(sLOWNIKDataSet.PROMOCJE);
 
@@ -912 +902 @@
             obslugaZdarzen = true;
             tYTULComboBox.SelectedIndex = tYTULComboBox.FindString(Reklama.TYTU£);
-            cbLocation.SelectedIndex = GetAdLocationIndex(Reklama.AdLocationId);
-            grzbietComboBox.SelectedIndex = GetSectionIndex(Reklama.GRZBIET);
+            cbLocation.SelectedIndex = ComboBoxHelper.GetItemIndex(Reklama.AdLocationId, cbLocation);
+            grzbietComboBox.SelectedIndex = ComboBoxHelper.GetItemIndex(Reklama.GRZBIET, grzbietComboBox);
             mOD_TYPComboBox.SelectedIndex = mOD_TYPComboBox.FindString(Reklama.MOD_TYP);
 
@@ -919 +909 @@
                 promocjaComboBox.SelectedIndex = -1;
             else
-                promocjaComboBox.SelectedIndex = GetPromotionIndex(Reklama.PROMOCJA);
+                promocjaComboBox.SelectedIndex = ComboBoxHelper.GetItemIndex(Reklama.PROMOCJA, promocjaComboBox);
 
             obslugaZdarzen = false;
-        }
-
-        private int GetSectionIndex(int value)
-        {
-            foreach (object item in grzbietComboBox.Items)
-                if (item is Section && ((Section)item).Id == value)
-                    return grzbietComboBox.Items.IndexOf(item);
-
-            return -1;
-        }
-
-        private int GetAdLocationIndex(int value)
-        {
-            foreach (object item in cbLocation.Items)
-                if (item is AdLocation && ((AdLocation)item).Id == value)
-                    return cbLocation.Items.IndexOf(item);
-
-            return -1;
-        }
-
-        private int GetNavigationColumnIndex(int value)
-        {
-            foreach (object item in ogl_dzialComboBox.Items)
-                if (item is NavigationColumn && ((NavigationColumn)item).Id == value)
-                    return ogl_dzialComboBox.Items.IndexOf(item);
-
-            return -1;
-        }
-
-        private int GetNavigationSubColumnIndex(int value)
-        {
-            foreach (object item in ogl_rozdzialComboBox.Items)
-                if (item is NavigationSubColumn && ((NavigationSubColumn)item).Id == value)
-                    return ogl_rozdzialComboBox.Items.IndexOf(item);
-
-            return -1;
-        }
-
-        private int GetPromotionIndex(int value)
-        {
-            int index = -1;
-            foreach (object item in promocjaComboBox.Items)
-            {
-                index++;
-                if (item is Bargain && Convert.ToInt32(((Bargain)item).Id) == value)
-                    return index;                
-            }
-
-            return -1;
         }
 
@@ -1051 +992 @@
             obslugaZdarzen = true;
             tYTULComboBox.SelectedIndex = tYTULComboBox.FindString(newRow["TYTU£"].ToString());
-            grzbietComboBox.SelectedIndex = GetSectionIndex(Convert.ToInt32(newRow["GRZBIET"]));
+            grzbietComboBox.SelectedIndex = ComboBoxHelper.GetItemIndex(Convert.ToInt32(newRow["GRZBIET"]), grzbietComboBox);
             mOD_TYPComboBox.SelectedIndex = mOD_TYPComboBox.FindString(newRow["MOD_TYP"].ToString());
-            cbLocation.SelectedIndex = GetAdLocationIndex(Convert.ToInt32(newRow["AdLocationId"]));
+            cbLocation.SelectedIndex = ComboBoxHelper.GetItemIndex(Convert.ToInt32(newRow["AdLocationId"]), cbLocation);
 
             if (SelectedModule != null)
@@ -1332 +1273 @@
         public void UsunEmisje(object sender, EventArgs e)
         {
+            DialogResult dialogResult = MessageBox.Show("Usun¹æ emisjê?", "Baza Reklam - usuñ emisjê",
+                                            MessageBoxButtons.YesNo);
+
+            if (dialogResult != DialogResult.Yes) return;
+
+
             foreach (DataGridViewRow r in ukazeSieDataGridView.SelectedRows)
             {
@@ -1353 +1300 @@
             if (ukazeSieDataGridView.CurrentCell == null) return;
 
+            DialogResult dialogResult = MessageBox.Show("Anulowaæ emisjê?", "Baza Reklam - anuluj emisjê",
+                                                        MessageBoxButtons.YesNo);
+            
+            if (dialogResult != DialogResult.Yes) return;
+
             DataGridViewRow r1 = ukazeSieDataGridView.CurrentCell.OwningRow;
 
-            REKLAMADataSet.UKAZE_SIE_W_NRRow row = (REKLAMADataSet.UKAZE_SIE_W_NRRow)(((DataRowView)r1.DataBoundItem).Row);
+            REKLAMADataSet.UKAZE_SIE_W_NRRow row =
+                (REKLAMADataSet.UKAZE_SIE_W_NRRow) (((DataRowView) r1.DataBoundItem).Row);
 
             row.status = 2;
@@ -1391 +1344 @@
         private void EdytujEmisje(object sender, EventArgs e)
         {
-            EditAdIssue editAdIssue = new EditAdIssue();
+            REKLAMADataSet.UKAZE_SIE_W_NRRow issue =
+                (REKLAMADataSet.UKAZE_SIE_W_NRRow) ((DataRowView) rEKLAMAUKAZESIEWNRBindingSource.Current).Row;
+
+            int? dzial = null;
+            if (!issue.IsDzialIdNull())
+                dzial = issue.DzialId;
+
+            int? rozdzial = null;
+            if (!issue.IsRozdzialIdNull())
+                rozdzial = issue.RozdzialId;
+
+            EditAdIssue editAdIssue = new EditAdIssue(SelectedTitle, dzial, rozdzial, issue.LokalizacjaId);
             DialogResult dialogResult = editAdIssue.ShowDialog();
-            if(dialogResult == DialogResult.OK)
-            {
-                REKLAMADataSet.UKAZE_SIE_W_NRRow issue = (REKLAMADataSet.UKAZE_SIE_W_NRRow)((DataRowView)rEKLAMAUKAZESIEWNRBindingSource.Current).Row;
-                
+            if (dialogResult == DialogResult.OK)
+            {
                 issue.Lokalizacja = editAdIssue.Lokalizacja.Text;
                 issue.LokalizacjaId = editAdIssue.Lokalizacja.Id;
-                if (editAdIssue.Dzial!=null)
+                if (editAdIssue.Dzial != null)
                 {
                     issue.DzialId = editAdIssue.Dzial.Id;
-                    issue.Dzial = editAdIssue.Dzial.Name;                    
+                    issue.Dzial = editAdIssue.Dzial.Name;
                 }
 
@@ -1408 +1370 @@
                 {
                     issue.RozdzialId = editAdIssue.Rozdzial.Id;
-                    issue.Rozdzial = editAdIssue.Rozdzial.Name;                    
-                }
-
-            }
-
+                    issue.Rozdzial = editAdIssue.Rozdzial.Name;
+                }
+            }
         }
 
@@ -1730 +1690 @@
                     }
 
-                    ogl_dzialComboBox.SelectedIndex = GetNavigationColumnIndex(Reklama.ogl_dzial);
+                    ogl_dzialComboBox.SelectedIndex = ComboBoxHelper.GetItemIndex(Reklama.ogl_dzial, ogl_dzialComboBox);
                     if (!Reklama.Isogl_rozdzialNull() && Reklama.ogl_rozdzial > 0)
-                        ogl_rozdzialComboBox.SelectedIndex = GetNavigationSubColumnIndex(Reklama.ogl_rozdzial);
+                        ogl_rozdzialComboBox.SelectedIndex = ComboBoxHelper.GetItemIndex(Reklama.ogl_rozdzial, ogl_rozdzialComboBox);
 
                     if (!isEventHandlingEnabled)