Index: branches/TruckExpo/BrMerger/Form1.cs
===================================================================
--- branches/TruckExpo/BrMerger/Form1.cs (revision 446)
+++ branches/TruckExpo/BrMerger/Form1.cs (revision 447)
@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Configuration;
 using System.Data;
-using System.Configuration;
+using System.Data.SqlClient;
+using System.Diagnostics;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using System.Data.SqlClient;
 
 namespace BrMerger
@@ -32,20 +33,20 @@
             SqlTransaction tr1 = null;
 
+            SqlConnection conn1 = null;
+            SqlConnection conn2 = null;
+            SqlConnection conn3 = null;
+
             try
             {
-                // zamowienia
-                // mapowanie kont, id_konta
-                // ustawienie idFaktiry w [UKAZE SIE ...]
-
-                string connectionString = ConfigurationManager.AppSettings["BazaReklam.ConnectionString"]; 
-                //"Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM;Persist Security Info=True;User ID=wwwadmin;Password=adm1648";
-                //string dbName = "BAZA_REKLAM";
-                
-
-                SqlConnection conn1 = new SqlConnection(connectionString);
+                //TODO: dla kazdej reklamy stworzyc zamowienie dla danego klienta
+                //TODO: dla kazdej zafakturowanej emisji [uka¿e siê w nr] dodac id faktury oraz jesli sie da cene emisji (cene jednostkowa?)
+
+                string connectionString = ConfigurationManager.AppSettings["BazaReklam.ConnectionString"];
+
+                conn1 = new SqlConnection(connectionString);
                 conn1.Open();
-                SqlConnection conn2 = new SqlConnection(connectionString);
+                conn2 = new SqlConnection(connectionString);
                 conn2.Open();
-                SqlConnection conn3 = new SqlConnection(connectionString);
+                conn3 = new SqlConnection(connectionString);
                 conn3.Open();
 
@@ -59,5 +60,4 @@
                 SqlCommand cmd3 = conn3.CreateCommand();
 
-                //string dbName = "BAZA_REKLAM";
                 string bazaReklamDbName = ConfigurationManager.AppSettings["BazaReklam.DbName"];
                 string truckExpoDbName = ConfigurationManager.AppSettings["TruckExpo.DbName"];
@@ -65,28 +65,34 @@
                 m_waitProgressMax = 0;
 
+                //cmd1.CommandText = "SELECT COUNT(*) " +
+                //       "FROM " + truckExpoDbName + ".dbo.Klienci " +
+                //       "WHERE CustomerID > 56710 ";
+
                 cmd1.CommandText = "SELECT COUNT(*) " +
-                       "FROM " + truckExpoDbName + ".dbo.Klienci " +
-                       "WHERE CustomerID > 56710 ";
+                        "FROM " + truckExpoDbName + ".dbo.Klienci " +
+                        "WHERE CustomerID IN (56922, 56971, 56773) ";
                 m_waitProgressMax = (int)cmd1.ExecuteScalar();
 
 
+                //cmd1.CommandText = "SELECT CustomerID, FirstName, LastName, OrganizationName, Address, City, State, PostalCode, Country, Nip, ContactName, PhoneNumber, FaxNumber, " +
+                //       "Note, data, osw_nr, osw_wazne_do, Adres_Fkatura, Old_ID, Adres_Kor, Platnik_VAT, Aktywny, Email, UserName, Last_Modify, Modify_User, http, VIES, regon, krs, nipKraj " +
+                //       "FROM " + truckExpoDbName + ".dbo.Klienci " +
+                //       "WHERE CustomerID > 56710 " +
+                //       "ORDER BY CustomerID";
+
+
                 cmd1.CommandText = "SELECT CustomerID, FirstName, LastName, OrganizationName, Address, City, State, PostalCode, Country, Nip, ContactName, PhoneNumber, FaxNumber, " +
-                       "Note, data, osw_nr, osw_wazne_do, Adres_Fkatura, Old_ID, Adres_Kor, Platnik_VAT, Aktywny, Email, UserName, Last_Modify, Modify_User, http, VIES, regon, krs, nipKraj " +
-                       "FROM " + truckExpoDbName + ".dbo.Klienci " +
-                       "WHERE CustomerID > 56710 " +
-                       "ORDER BY CustomerID";
-
+                           "Note, data, osw_nr, osw_wazne_do, Adres_Fkatura, Old_ID, Adres_Kor, Platnik_VAT, Aktywny, Email, UserName, Last_Modify, Modify_User, http, VIES, regon, krs, nipKraj " +
+                           "FROM " + truckExpoDbName + ".dbo.Klienci " +
+                           "WHERE CustomerID IN (56922, 56971, 56773) " +
+                           "ORDER BY CustomerID";
 
                 SqlDataReader rdrCustomer, rdrReklama, rdrKontakt;
 
-                bool bInsert = false;
-                int idCustomer, idReklama, idKontaSanPress, idFaktura, idKontakt, n;
+                int idCustomer, idReklama, idFaktura, idKontakt, n;
                 int nKlienci, nKlienci_Osoby_Do_Kontaktu, nFAKTURY, nReklama, nFAKTURA_DETAILS, nPlatnosciEcard, nUKAzeSie, nProdukcja, nReklama_Info_Dod,
                     nKontakty, nKONTAKTY_Log, nKLIENCI_Log, nKlienci_Tytul, nOferty_Main, nSheduler, nKl_Klienci;
                 nKlienci = nKlienci_Osoby_Do_Kontaktu = nFAKTURY = nReklama = nFAKTURA_DETAILS = nPlatnosciEcard = nUKAzeSie = nProdukcja = nReklama_Info_Dod
                         = nKontakty = nKONTAKTY_Log = nKLIENCI_Log = nKlienci_Tytul = nOferty_Main = nSheduler = nKl_Klienci = 0;
-
-                //ustawiæ static
-                idKontaSanPress = 0;
 
                 tr1 = conn3.BeginTransaction();
@@ -105,16 +111,10 @@
                     ++nRead;
 
-                    //szukanie w tabeli [Customer_TE_BR]
-                    //je¿eli nie znaleziono - dodanie nowego
-                    ;
-                    ;
-                    ;
-
-                    bInsert = true;
-
-                    if (bInsert)
+                    SqlCommand cmd = new SqlCommand("SELECT COUNT(*) FROM dbo.CustomerMap WHERE TruckExpoId=" + rdrCustomer["CustomerID"], conn2);
+
+                    if ((int)cmd.ExecuteScalar() == 0)
                     {
                         //insert customer
-                        cmd3.CommandText = "INSERT INTO " + bazaReklamDbName + ".dbo.Klienci "+
+                        cmd3.CommandText = "INSERT INTO " + bazaReklamDbName + ".dbo.Klienci " +
                             "(FirstName, LastName, OrganizationName, Address, City, State, PostalCode, Country, Nip, ContactName, PhoneNumber, FaxNumber, Note, data, osw_nr, " +
                             "osw_wazne_do, Adres_Fkatura, Old_ID, Adres_Kor, Platnik_VAT, Aktywny, Email, UserName, Last_Modify, Modify_User, http, VIES, regon, krs, nipKraj) " +
@@ -129,9 +129,11 @@
                         idCustomer = Convert.ToInt32(obj1);
 
+                        Debug.WriteLine("Nowy klient: " + idCustomer);
+
                         cmd3.CommandText = "INSERT INTO " + bazaReklamDbName + ".dbo.Klienci_Osoby_Do_Kontaktu " +
                             "(customerid, Imie_Nazwisko, stanowisko, Tel, email, opis) " +
                             "SELECT " + idCustomer + ", Imie_Nazwisko, stanowisko, Tel, email, opis " +
-                            "FROM " + truckExpoDbName + ".dbo.Klienci_Osoby_Do_Kontaktu " + 
-                            "WHERE CustomerID="+ rdrCustomer["CustomerID"];
+                            "FROM " + truckExpoDbName + ".dbo.Klienci_Osoby_Do_Kontaktu " +
+                            "WHERE CustomerID=" + rdrCustomer["CustomerID"];
                         n = cmd3.ExecuteNonQuery();
                         nKlienci_Osoby_Do_Kontaktu += n;
@@ -139,5 +141,49 @@
                     else
                     {
-                        idCustomer = 0;// (int)cmd3.ExecuteScalar("SELECT idBR FROM Customer_TE_BR WHERE idTE=" + rdrCustomer["CustomerID"])");
+                        cmd3.CommandText = "SELECT BazaReklamId FROM CustomerMap WHERE TruckExpoId=" + rdrCustomer["CustomerID"];
+                        idCustomer = (int)cmd3.ExecuteScalar();
+                        cmd3.CommandText = "SELECT Akcja FROM CustomerMap WHERE TruckExpoId=" + rdrCustomer["CustomerID"];
+                        int akcja = (int)cmd3.ExecuteScalar();
+
+                        //jesli akcja>0 to trzeba uaktualnic wszystkie dane klienta z Bazy Reklam (CustomerID=idCustomer) danymi z bazy Truck_Expo
+                        if (akcja > 0)
+                        {
+                            cmd3.CommandText = "UPDATE " + bazaReklamDbName + ".dbo.Klienci SET "
+                                + bazaReklamDbName + ".dbo.Klienci.FirstName=E.FirstName,"
+                                + bazaReklamDbName + ".dbo.Klienci.LastName=E.LastName,"
+                                + bazaReklamDbName + ".dbo.Klienci.OrganizationName=E.OrganizationName,"
+                                + bazaReklamDbName + ".dbo.Klienci.Address=E.Address,"
+                                + bazaReklamDbName + ".dbo.Klienci.City=E.City,"
+                                + bazaReklamDbName + ".dbo.Klienci.State=E.State,"
+                                + bazaReklamDbName + ".dbo.Klienci.PostalCode=E.PostalCode,"
+                                + bazaReklamDbName + ".dbo.Klienci.Country=E.Country,"
+                                + bazaReklamDbName + ".dbo.Klienci.Nip=E.Nip,"
+                                + bazaReklamDbName + ".dbo.Klienci.ContactName=E.ContactName,"
+                                + bazaReklamDbName + ".dbo.Klienci.PhoneNumber=E.PhoneNumber,"
+                                + bazaReklamDbName + ".dbo.Klienci.FaxNumber=E.FaxNumber,"
+                                + bazaReklamDbName + ".dbo.Klienci.Note=E.Note,"
+                                + bazaReklamDbName + ".dbo.Klienci.data=E.data,"
+                                + bazaReklamDbName + ".dbo.Klienci.osw_nr=E.osw_nr,"
+                                + bazaReklamDbName + ".dbo.Klienci.osw_wazne_do=E.osw_wazne_do,"
+                                + bazaReklamDbName + ".dbo.Klienci.Adres_Fkatura=E.Adres_Fkatura,"
+                                + bazaReklamDbName + ".dbo.Klienci.Old_ID=E.Old_ID,"
+                                + bazaReklamDbName + ".dbo.Klienci.Adres_Kor=E.Adres_Kor,"
+                                + bazaReklamDbName + ".dbo.Klienci.Platnik_VAT=E.Platnik_VAT,"
+                                + bazaReklamDbName + ".dbo.Klienci.Aktywny=E.Aktywny,"
+                                + bazaReklamDbName + ".dbo.Klienci.Email=E.Email,"
+                                + bazaReklamDbName + ".dbo.Klienci.UserName=E.UserName,"
+                                + bazaReklamDbName + ".dbo.Klienci.Last_Modify=E.Last_Modify,"
+                                + bazaReklamDbName + ".dbo.Klienci.Modify_User=E.Modify_User,"
+                                + bazaReklamDbName + ".dbo.Klienci.http=E.http,"
+                                + bazaReklamDbName + ".dbo.Klienci.VIES=E.VIES,"
+                                + bazaReklamDbName + ".dbo.Klienci.regon=E.regon,"
+                                + bazaReklamDbName + ".dbo.Klienci.krs=E.krs,"
+                                + bazaReklamDbName + ".dbo.Klienci.nipKraj=E.nipKraj"
+                                + " FROM "
+                                + " (SELECT * FROM " + truckExpoDbName + ".dbo.Klienci "
+                                + " WHERE CustomerID=" + rdrCustomer["CustomerID"] + ") E "
+                                + " WHERE " + bazaReklamDbName + ".dbo.Klienci.CustomerID=" + idCustomer;
+                            cmd3.ExecuteNonQuery();
+                        }
                     }
 
@@ -172,5 +218,5 @@
                                     "SELECT NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC_WYSTAWIENIA, ID_SPRZEDAWCY, " + idCustomer + ", DATA_SPRZEDAZY, " +
                                     "PODPIS_WYSTAWIL, PODPIS_ODEBRAL, opis, SPOSOB_ZAPLATY, TERMIN_ZAPLATY, ZAPLACONO, BYL_WYDRUK, NABYWCA_ADRES, SPRZEDAWCA_ADRES, " +
-                                    "SPRZEDAWCA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, " + idKontaSanPress + ", EKSPORT, EXPORTED, ID_TYTUL, EXPORTED_DATA, suma_zaplat, ID_FK_KOR, " +
+                                    "SPRZEDAWCA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, ID_KONTA, EKSPORT, EXPORTED, ID_TYTUL, EXPORTED_DATA, suma_zaplat, ID_FK_KOR, " +
                                     "KOREKTA, zaplata_data, zaplata_opis, Zaliczka_Brutto, Zaliczka_Data, waluta_brutto, waluta_miano, waluta_kurs, waluta_przelicznik, waluta_kurs_z_dnia, " +
                                     "waluta_tabela_nr " +
@@ -274,8 +320,14 @@
 
 
-                        cmd3.CommandText = "INSERT INTO " + bazaReklamDbName + ".dbo.[UKA¯E SIÊ W NR] (ReklamaId, [Nr Wydania]) " +
-                                "SELECT " + idReklama + ", [Nr Wydania] " +
-                                "FROM " + truckExpoDbName + ".dbo.[UKA¯E SIÊ W NR] " +
-                                "WHERE ReklamaId=" + rdrReklama["ReklamaID"];
+                        //: wstaw IdFaktury oraz cene netto emisji, jesli zafakturowana reklama
+                        int idFaktury = rdrReklama["ID_Faktury"] is DBNull ? 0 : (int)rdrReklama["ID_Faktury"];
+                        decimal netto = decimal.MinValue;
+                        if (idFaktury > 0)
+                            netto = Convert.ToDecimal(rdrReklama["Netto"]) / Convert.ToInt32(rdrReklama["Krotnoæ"]);
+
+                        cmd3.CommandText = "INSERT INTO " + bazaReklamDbName + ".dbo.[UKA¯E SIÊ W NR] (ReklamaId, [Nr Wydania], status, zafakturowana, idFaktury, dataDodania, dataAnulowania, netto) " +
+                            "SELECT " + idReklama + ", [Nr Wydania], 0, " + (idFaktury > 0 ? 1 : 0).ToString() + ", " + (idFaktury > 0 ? idFaktury.ToString() : "NULL").ToString() + ", NULL, NULL, " + (idFaktury > 0 ? Math.Round(netto, 2).ToString() : "NULL").ToString().Replace(",", ".") + " " +
+                            "FROM " + truckExpoDbName + ".dbo.[UKA¯E SIÊ W NR] " +
+                            "WHERE ReklamaId=" + rdrReklama["ReklamaID"];
                         n = cmd3.ExecuteNonQuery();
                         nUKAzeSie += n;
@@ -324,6 +376,6 @@
 
                         cmd3.CommandText = "INSERT INTO " + bazaReklamDbName + ".dbo.Kontakty " +
-                            "(customerId, symbol_agenta, data, rodzaj, opis) " +
-                            "SELECT " + idCustomer + ", symbol_agenta, data, rodzaj, opis " +
+                            "(customerId, symbol_agenta, data, rodzaj, opis, KontaktTypId) " +
+                            "SELECT " + idCustomer + ", symbol_agenta, data, rodzaj, opis, 2 " +
                             "FROM " + truckExpoDbName + ".dbo.Kontakty " +
                             "WHERE Id_kontaktu=" + rdrKontakt["Id_kontaktu"];
@@ -331,5 +383,5 @@
                         nKontakty += n;
 
-                        if(n > 0)
+                        if (n > 0)
                         {
                             cmd3.CommandText = "SELECT SCOPE_IDENTITY()";
@@ -369,6 +421,6 @@
                         "(TYTUL, Customerid, username, data) " +
                         "SELECT TYTUL, " + idCustomer + ", username, data " +
-                        "FROM " + truckExpoDbName + ".dbo.Klienci_Tytul " + 
-                        "WHERE CustomerID="+ rdrCustomer["CustomerID"];
+                        "FROM " + truckExpoDbName + ".dbo.Klienci_Tytul " +
+                        "WHERE CustomerID=" + rdrCustomer["CustomerID"];
                     n = cmd3.ExecuteNonQuery();
                     if (n > 0)
@@ -383,8 +435,8 @@
                         "(Stan_Oferty, Id_Wersje_Oferty, CUSTOMER_ID, id_klienci_os_kontakt, id_tytul, AGENT, JEZYK, Data_Oferty, " +
                         "Opis_Dol, Data_Wyslania, Data_Modyfikacji, Zmodyfikowal_User, zapisana, ReklamaID, ProjektID) " +
-                        "SELECT Stan_Oferty, Id_Wersje_Oferty, " + idCustomer + ", id_klienci_os_kontakt, id_tytul, AGENT, JEZYK, Data_Oferty, "+
+                        "SELECT Stan_Oferty, Id_Wersje_Oferty, " + idCustomer + ", id_klienci_os_kontakt, id_tytul, AGENT, JEZYK, Data_Oferty, " +
                         "Opis_Dol, Data_Wyslania, Data_Modyfikacji, Zmodyfikowal_User, zapisana, ReklamaID, ProjektID " +
-                        "FROM " + truckExpoDbName + ".dbo.Oferty_Main " + 
-                        "WHERE Customer_ID="+ rdrCustomer["CustomerID"];
+                        "FROM " + truckExpoDbName + ".dbo.Oferty_Main " +
+                        "WHERE Customer_ID=" + rdrCustomer["CustomerID"];
                     n = cmd3.ExecuteNonQuery();
                     nOferty_Main += n;
@@ -394,6 +446,6 @@
                         "(CustomerId, CustomerName, Akwizytor, DataWprowadzenia, DataPrzypomnienia, Opis, zalatwione) " +
                         "SELECT " + idCustomer + ", CustomerName, Akwizytor, DataWprowadzenia, DataPrzypomnienia, Opis, zalatwione " +
-                        "FROM " + truckExpoDbName + ".dbo.Sheduler " + 
-                        "WHERE CustomerID="+ rdrCustomer["CustomerID"];
+                        "FROM " + truckExpoDbName + ".dbo.Sheduler " +
+                        "WHERE CustomerID=" + rdrCustomer["CustomerID"];
                     n = cmd3.ExecuteNonQuery();
                     nSheduler += n;
@@ -411,9 +463,15 @@
 
                     // dla testów
-                    if(nRead > 100)
+                    if (nRead > 100)
                         break;
                 }
                 rdrCustomer.Close();
                 rdrCustomer = null;
+
+                tr1.Commit();
+
+                Debug.WriteLine("Uff...");
+                return;
+
 
 
@@ -462,5 +520,5 @@
                                 "SELECT NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC_WYSTAWIENIA, " + "ID_SPRZEDAWCY" + ", ID_NABYWCY, DATA_SPRZEDAZY, " +
                                 "PODPIS_WYSTAWIL, PODPIS_ODEBRAL, opis, SPOSOB_ZAPLATY, TERMIN_ZAPLATY, ZAPLACONO, BYL_WYDRUK, NABYWCA_ADRES, SPRZEDAWCA_ADRES, " +
-                                "SPRZEDAWCA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, " + idKontaSanPress + ", EKSPORT, EXPORTED, ID_TYTUL, EXPORTED_DATA, suma_zaplat, ID_FK_KOR, " +
+                                "SPRZEDAWCA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, ID_KONTA, EKSPORT, EXPORTED, ID_TYTUL, EXPORTED_DATA, suma_zaplat, ID_FK_KOR, " +
                                 "KOREKTA, zaplata_data, zaplata_opis, Zaliczka_Brutto, Zaliczka_Data, waluta_brutto, waluta_miano, waluta_kurs, waluta_przelicznik, waluta_kurs_z_dnia, " +
                                 "waluta_tabela_nr " +
@@ -727,5 +785,5 @@
             catch (Exception ex)
             {
-                if(tr1 != null)
+                if (tr1 != null)
                 {
                     tr1.Rollback();
@@ -734,4 +792,10 @@
 
                 MessageBox.Show(ex.ToString());
+            }
+            finally
+            {
+                if (conn1 != null && conn1.State == ConnectionState.Open) conn1.Close();
+                if (conn2 != null && conn2.State == ConnectionState.Open) conn2.Close();
+                if (conn3 != null && conn3.State == ConnectionState.Open) conn3.Close();
             }
         }
Index: branches/TruckExpo/BazaReklam/app.config
===================================================================
--- branches/TruckExpo/BazaReklam/app.config (revision 392)
+++ branches/TruckExpo/BazaReklam/app.config (revision 447)
@@ -9,6 +9,9 @@
     <clear />
     <add name="BAZA_REKLAM_LOCAL"
-         connectionString="Data Source=10.0.0.21;Initial Catalog=BAZA_REKLAM;Persist Security Info=True"
+         connectionString="Data Source=.\sql2k;Initial Catalog=BAZA_REKLAM;Persist Security Info=True"
          providerName="System.Data.SqlClient" />
+    <!--<add name="BAZA_REKLAM_LOCAL"
+     connectionString="Data Source=10.0.0.21;Initial Catalog=BAZA_REKLAM;Persist Security Info=True"
+     providerName="System.Data.SqlClient" />-->
     <add name="BAZA_REKLAM" 
          connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM;Persist Security Info=True"
