Zbiór zmian 470 dla trunk

Data:

2009-03-19 14:57:39 (17 years ago)

Autor:

marek

Opis:

re #128

Lokalizacja:

trunk

Pliki:

• BazaReklam/ClientsForm.cs (zmodyfikowane) (4 diffs)
• BazaReklam/Properties/AssemblyInfo.cs (zmodyfikowane) (1 diff)
• BazaReklam/Raporty/ReportsTree.xml (zmodyfikowane) (1 diff)
• BazaReklam/app.config (zmodyfikowane) (1 diff)
• BazaReklamSetup/BazaReklamSetup.vdproj (zmodyfikowane) (2 diffs)

trunk/BazaReklam/ClientsForm.cs

@@ -2494 +2494 @@
 
                     DataRowView r = datatable.AddNew();
-                    AddUpdateKontakt(r, custId);
+                    AddUpdateKontakt(r, custId, DateTime.Now.AddMonths(-1));
                     
-                    //r["customerId"] = custId;
-                    //r["data"] = DateTime.Now.AddMonths(-1);
-                    //r["symbol_agenta"] = User.getUser().Login;
-                    //if (cbTypKontaktu.Enabled)
-                    //    r["KontaktTypId"] = (byte) cbTypKontaktu.SelectedValue;
-
                     kONTAKTYBindingSource.MoveLast();
                     kONTAKTYBindingSource.EndEdit();
@@ -2613 +2607 @@
         {
             r["customerId"] = customerId;
-            r["data"] = DateTime.Now.AddMonths(-1);
+            r["data"] = DateTime.Now;
             r["symbol_agenta"] = User.getUser().Login;
             if (cbTypKontaktu.Enabled && cbTypKontaktu.SelectedValue != null)
@@ -2619 +2613 @@
             else
                 r["KontaktTypId"] = 1;
+
+            AddUpdateKontakt(r, customerId, DateTime.Now);
+        }
+
+        private void AddUpdateKontakt(DataRowView r, int customerId, DateTime dateTime)
+        {
+            r["customerId"] = customerId;
+            r["data"] = dateTime;
+            r["symbol_agenta"] = User.getUser().Login;
+            if (cbTypKontaktu.Enabled && cbTypKontaktu.SelectedValue != null)
+                r["KontaktTypId"] = (byte)cbTypKontaktu.SelectedValue;
+            else
+                r["KontaktTypId"] = 1;
         }
 
@@ -2626 +2633 @@
             if (kLIENCIBindingSource.Current == null || kONTAKTYBindingSource.Current == null) return;
             DataRowView row = (DataRowView)kLIENCIBindingSource.Current;
-            AddUpdateKontakt((DataRowView)kONTAKTYBindingSource.Current, Int32.Parse(row["CustomerId"].ToString()));
+            AddUpdateKontakt((DataRowView)kONTAKTYBindingSource.Current, Int32.Parse(row["CustomerId"].ToString()), DateTime.Now);
         }
         

trunk/BazaReklam/Properties/AssemblyInfo.cs

@@ -30 +30 @@
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.85")]
+[assembly: AssemblyFileVersion("1.0.0.87")]

trunk/BazaReklam/Raporty/ReportsTree.xml

@@ -66 +66 @@
       <Report text="Raport testowy 2" path="testowyAll2" rights="" />
     </Report>
-    <!--<Report text="Raporty_CT_EXPO">
-      <Report text="Zestawienie Kontaktow CT_EXPO" path="ZestawienieKontaktowCT_EXPO" rights="k" />
-      <Report text="Sprzedaz Reklam CT_EXPO" path="SprzedazReklamCT_EXPO" rights="k" />
-      <Report text="Rozliczenie Wplywow Wg Daty Wplaty CT_EXPO" path="RozliczenieWplywowWgDatyWplatyCT_EXPO" rights="k" />
-    </Report>-->
     <Report text="Koszty biur">
       <Report text="Koszty biur" path="KosztyBiur" rights="k" />

trunk/BazaReklam/app.config

@@ -12 +12 @@
     <add name="BAZA_REKLAM" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM;Persist Security Info=True"
       providerName="System.Data.SqlClient" />
-    <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_TEST" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True"
+      providerName="System.Data.SqlClient" />-->
   </connectionStrings>
   <applicationSettings>

trunk/BazaReklamSetup/BazaReklamSetup.vdproj

@@ -762 +762 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Baza Reklam"
-        "ProductCode" = "8:{1F493BF2-537C-4B2C-B8DC-FE3DD5A38CC1}"
-        "PackageCode" = "8:{CFB556B3-88B7-4358-B831-23BAB85F7B37}"
+        "ProductCode" = "8:{2AE634B7-64F7-4180-AA7B-15DBF14D3DCD}"
+        "PackageCode" = "8:{4D99F805-4DDF-4E72-9D58-A036B32F9C8B}"
         "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}"
         "RestartWWWService" = "11:FALSE"
@@ -769 +769 @@
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.85"
+        "ProductVersion" = "8:1.0.87"
         "Manufacturer" = "8:AACT"
         "ARPHELPTELEPHONE" = "8:"