Zbiór zmian 829 dla trunk

Data:

2009-09-11 11:19:31 (17 years ago)

Autor:

marek

Opis:

re #212 - dodano formatke interfej do tworzenia ogloszen

Lokalizacja:

trunk/BazaReklam

Pliki:

• Baza Reklam.csproj (zmodyfikowane) (3 diffs)
• Classes/Helpers/AdHelper.cs (zmodyfikowane) (3 diffs)
• Classes/Helpers/ReklamaHelper.cs (usunięte)
• ClientsForm.cs (zmodyfikowane) (3 diffs)
• OgloszenieForm.Designer.cs (dodane)
• OgloszenieForm.cs (dodane)
• OgloszenieForm.resx (dodane)
• OrderDetails.cs (zmodyfikowane) (2 diffs)
• OrdersForm.cs (zmodyfikowane) (2 diffs)
• ProjectForm.cs (zmodyfikowane) (4 diffs)

trunk/BazaReklam/Baza Reklam.csproj

@@ -152 +152 @@
     <Compile Include="Classes\PrintDGV.cs" />
     <Compile Include="Classes\Produkcja.cs" />
-    <Compile Include="Classes\Helpers\ReklamaHelper.cs" />
     <Compile Include="Classes\Repositories\AdLocationRepository.cs" />
     <Compile Include="Classes\Repositories\AgentRepository.cs" />
@@ -199 +198 @@
       <DependentUpon>KorektyForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="OgloszenieForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OgloszenieForm.Designer.cs">
+      <DependentUpon>OgloszenieForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="PaymentForm2.cs">
       <SubType>Form</SubType>
@@ -596 +601 @@
       <DependentUpon>KorektyForm.cs</DependentUpon>
       <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="OgloszenieForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>OgloszenieForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="PaymentForm2.resx">

trunk/BazaReklam/Classes/Helpers/AdHelper.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
 using Baza_Reklam.Classes.Model;
 
@@ -17 +20 @@
             AdSize adSize = new AdSize();
 
+            if (module == null)
+            {
+                adSize.Width = 0;
+                adSize.Height = 0;
+                return adSize;
+            }
+
             if (!module.MultiModule)
             {
@@ -31 +41 @@
             return adSize;
         }
+
+        public static bool IsReklamaNew(REKLAMADataSet.ReklamyZestawienieRow reklama)
+        {
+            if (!reklama.IsidZamowieniaNull()) return true;
+
+            return reklama.DATA_ZAMÓWIENIA.Year >= 2009;
+        }
+
+        public static bool IsReklamaNew(REKLAMADataSet.REKLAMARow reklama)
+        {
+            if (!reklama.IsidZamowieniaNull()) return true;
+
+            return reklama.DATA_ZAMÓWIENIA.Year >= 2009;
+        }
+
+        public static bool IsReklamaOldExpo(REKLAMADataSet.REKLAMARow reklama)
+        {
+            return (reklama.IsidZamowieniaNull() && reklama.TYTU£.ToUpper() == "EXPO");
+        }
+
+        public static Dictionary<int, DateTime> GetDatyEmisji(int reklamaId)
+        {
+            Dictionary<int, DateTime> datyEmisji = new Dictionary<int, DateTime>();
+
+            const string query = "sp_GetDatyEmisjiByReklama";
+
+            SqlConnection conn = null;
+            SqlCommand cmd = null;
+            SqlDataReader reader = null;
+            try
+            {
+                conn = new SqlConnection(ConnString.getConnString().Value);
+                conn.Open();
+                cmd = new SqlCommand(query, conn);
+                cmd.CommandType = CommandType.StoredProcedure;
+                cmd.Parameters.AddWithValue("@reklama", reklamaId);
+                reader = cmd.ExecuteReader();
+                if (reader != null)
+                {
+                    while (reader.Read())
+                        datyEmisji.Add(reader.GetInt32(0), reader.GetDateTime(1));
+                }
+            }
+            finally
+            {
+                if (reader != null)
+                {
+                    reader.Close();
+                    reader.Dispose();
+                }
+                if (cmd != null) cmd.Dispose();
+                if (conn != null)
+                {
+                    conn.Close();
+                    conn.Dispose();
+                }
+
+            }
+            return datyEmisji;
+
+        }
+
+        public static void AddUpdateIssueChange(double issueId, int currentIssueNumer, int newIssueNumber)
+        {
+            SqlConnection conn = null;
+            SqlCommand cmd = null;
+
+            try
+            {
+                conn = new SqlConnection(ConnString.getConnString().Value);
+                conn.Open();
+                cmd = new SqlCommand("sp_AddUpdateIssueChange", conn);
+                cmd.CommandType = CommandType.StoredProcedure;
+                cmd.Parameters.AddWithValue("@issueId", issueId);
+                cmd.Parameters.AddWithValue("@currentIssueNumer", currentIssueNumer);
+                cmd.Parameters.AddWithValue("@newIssueNumber", newIssueNumber);
+                cmd.ExecuteNonQuery();
+            }
+            finally
+            {
+                if (cmd != null)
+                    cmd.Dispose();
+
+                if (conn != null && conn.State == ConnectionState.Open)
+                {
+                    conn.Close();
+                    conn.Dispose();
+                }
+            }
+        }
+
+        public static bool IsOgloszenie(REKLAMADataSet.REKLAMARow reklama)
+        {
+            if (reklama == null) return false;
+
+            return GetProjectType(reklama.TYTU£, reklama.MOD_TYP) == 2;
+        }
+
+        //TODO: find better method to find out if this is ogloszenie or reklama
+        public static int GetProjectType(string title, string moduleName)
+        {
+            if (!title.StartsWith("AS-")) return 1;
+
+            switch (moduleName.ToLower())
+            {
+                case "standard":
+                case "billboard":
+                case "space":
+                    return 2;
+                default:
+                    return 1;
+            }
+        }
     }
 }

trunk/BazaReklam/ClientsForm.cs

@@ -3 +3 @@
 using System.Data;
 using System.Data.SqlClient;
-using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
@@ -823 +822 @@
         {
             if (rEKLAMABindingSource.Current == null) return;
-            
+
             DataRowView row = (DataRowView) rEKLAMABindingSource.Current;
-            int idRek = Int32.Parse(row["reklamaId"].ToString());
-            ProjectForm pf = new ProjectForm(idRek);
-            pf.ShowDialog();
+            REKLAMADataSet.REKLAMARow reklama = (REKLAMADataSet.REKLAMARow) row.Row;
+
+            if (AdHelper.IsOgloszenie(reklama))
+            {
+                OgloszenieForm ogloszenieForm = new OgloszenieForm(reklama);
+                ogloszenieForm.ShowDialog();
+            }
+            else
+            {
+                ProjectForm pf = new ProjectForm(reklama.ReklamaID);
+                pf.ShowDialog();
+            }
         }
 
@@ -2321 +2329 @@
             REKLAMADataSet.REKLAMARow reklama = (REKLAMADataSet.REKLAMARow)((DataRowView)rEKLAMABindingSource.Current).Row;
 
-            pokazZamButton.Enabled = ReklamaHelper.IsReklamaOldExpo(reklama) || !ReklamaHelper.IsReklamaNew(reklama);
+            pokazZamButton.Enabled = AdHelper.IsReklamaOldExpo(reklama) || !AdHelper.IsReklamaNew(reklama);
             fakturaButton.Enabled = pokazZamButton.Enabled;
             pokFaktureButton.Enabled = pokazZamButton.Enabled;

trunk/BazaReklam/OrderDetails.cs

@@ -496 +496 @@
             Dictionary<int, DateTime> datyEmisji = null;
             if (ukazeSieDataGridView.Rows.Count > 0)
-                datyEmisji = ReklamaHelper.GetDatyEmisji(Convert.ToInt32(ukazeSieDataGridView.Rows[0].Cells["ReklamaId"].Value));
+                datyEmisji = AdHelper.GetDatyEmisji(Convert.ToInt32(ukazeSieDataGridView.Rows[0].Cells["ReklamaId"].Value));
 
             DateTime firstDayOfCurrentMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
@@ -1373 +1373 @@
 
                 if (emisja.zafakturowana && (staraEmisja != kalendarz.NowaEmisja))
-                    ReklamaHelper.AddUpdateIssueChange((double)emisja.ID, staraEmisja, kalendarz.NowaEmisja.Value);
+                    AdHelper.AddUpdateIssueChange((double)emisja.ID, staraEmisja, kalendarz.NowaEmisja.Value);
             }
         }

trunk/BazaReklam/OrdersForm.cs

@@ -1140 +1140 @@
             REKLAMADataSet.ReklamyZestawienieRow reklama = Reklama;
 
-            if (reklama == null || ReklamaHelper.IsReklamaNew(reklama)) return;
+            if (reklama == null || AdHelper.IsReklamaNew(reklama)) return;
 
             Facturer f = new Facturer(reklama.ReklamaID);
@@ -1205 +1205 @@
             REKLAMADataSet.ReklamyZestawienieRow reklama = Reklama;
 
-            if (reklama == null || ReklamaHelper.IsReklamaNew(reklama)) return;
+            if (reklama == null || AdHelper.IsReklamaNew(reklama)) return;
 
             Cursor = Cursors.WaitCursor;

trunk/BazaReklam/ProjectForm.cs

@@ -64 +64 @@
         }
 
-
-        private bool IsOgloszenie()
-        {
-            if (Reklama == null) return false;
-
-            return GetProjectType(Reklama.TYTU£, Reklama.MOD_TYP) == 2;
-        }
-
         private void InitReklama()
         {
@@ -86 +78 @@
             toolTip.SetToolTip(btnOpenFolder, "Otwórz folder z materia³ami");
 
-            EnableControls(!IsOgloszenie());
-            if (IsOgloszenie())
+            EnableControls(!AdHelper.IsOgloszenie(Reklama));
+            if (AdHelper.IsOgloszenie(Reklama))
             {
                 tYP_PROJEKTUComboBox.Items.Clear();
@@ -153 +145 @@
             row2["NAZWA_ZAMOWIENIA"] = row["Id reklamy"];
             row2["modu³"] = row["MOD_TYP"];
-            row2["Type"] = GetProjectType(row["TYTU£"].ToString(), row["MOD_TYP"].ToString());
+            row2["Type"] = AdHelper.GetProjectType(row["TYTU£"].ToString(), row["MOD_TYP"].ToString());
             row2["reklamaId"] = ReklamaId;
             row2["szer"] = row["SZER"];
@@ -182 +174 @@
 
         }
-
-        //TODO: find better method to find out if this is ogloszenie or reklama
-        private static int GetProjectType(string title, string moduleName)
-        {
-            if (!title.StartsWith("AS-")) return 1;
-
-            switch (moduleName.ToLower())
-            {
-                case "standard":
-                case "billboard":
-                case "space":
-                    return 2;
-                default:
-                    return 1;
-            }
-        }
-
 
         private void dodajButton_Click(object sender, EventArgs e)