Zbiór zmian 602 dla trunk

Data:

2009-04-23 12:38:47 (17 years ago)

Autor:

marek

Opis:

re #166

Lokalizacja:

trunk/BazaReklam

Pliki:

• AddZamowienieForm.cs (zmodyfikowane) (1 diff)
• Baza Reklam.csproj (zmodyfikowane) (2 diffs)
• Classes/DbUtils.cs (zmodyfikowane) (3 diffs)
• Classes/Helpers/ExcelHelper.cs (przeniesione) (przeniesione from trunk/BazaReklam/Classes/ExcelHelper.cs) (1 diff)
• Classes/Helpers/FakturaHelper.cs (przeniesione) (przeniesione from trunk/BazaReklam/Classes/FakturaHelper.cs) (8 diffs)
• Classes/Helpers/ReklamaHelper.cs (przeniesione) (przeniesione from trunk/BazaReklam/Classes/ReklamaHelper.cs) (1 diff)
• Classes/Helpers/VatHelper.cs (przeniesione) (przeniesione from trunk/BazaReklam/Classes/VatHelper.cs) (1 diff)
• Classes/Helpers/WordHelper.cs (przeniesione) (przeniesione from trunk/BazaReklam/Classes/WordHandler.cs) (3 diffs)
• Classes/Helpers/ZamowienieHelper.cs (przeniesione) (przeniesione from trunk/BazaReklam/Classes/ZamowienieHelper.cs) (1 diff)
• Facturer.cs (zmodyfikowane) (2 diffs)
• FacturesForm.cs (zmodyfikowane) (1 diff)
• FacturesFormNEW.cs (zmodyfikowane) (1 diff)
• FakturowaniePoznanKatowice.cs (zmodyfikowane) (3 diffs)
• InfoForm.cs (zmodyfikowane) (1 diff)
• KorektyForm.cs (zmodyfikowane) (1 diff)
• OferForm.cs (zmodyfikowane) (2 diffs)
• OrderDetails.cs (zmodyfikowane) (1 diff)
• ZamowieniaForm.cs (zmodyfikowane) (1 diff)
• ZestawienieZamowienForm.cs (zmodyfikowane) (1 diff)
• app.config (zmodyfikowane) (1 diff)

trunk/BazaReklam/AddZamowienieForm.cs

@@ -38 +38 @@
                 row = (REKLAMADataSet.zamowieniaRow)r.Row;
 
-                row.nrZamowienia =  DbUtils.numerNowegoZamowienia(idKlienta, DateTime.Today.Year, User.Instance().Kod_agenta);
-                row.rokZamowienia = DateTime.Today.Year;
+                row.nrZamowienia =  DbUtils.numerNowegoZamowienia(idKlienta, DateTime.Now.Year, User.Instance().Kod_agenta);
+                row.rokZamowienia = DateTime.Now.Year;
                 row.kodAgenta = User.Instance().Kod_agenta;
                 row.idKlienta = idKlienta;

trunk/BazaReklam/Baza Reklam.csproj

@@ -108 +108 @@
     <Compile Include="Classes\DBBindings.cs" />
     <Compile Include="Classes\EmailSender.cs" />
-    <Compile Include="Classes\ExcelHelper.cs" />
-    <Compile Include="Classes\FakturaHelper.cs" />
+    <Compile Include="Classes\Helpers\ExcelHelper.cs" />
+    <Compile Include="Classes\Helpers\FakturaHelper.cs" />
     <Compile Include="Classes\Helpers\ConfigurationHelper.cs" />
     <Compile Include="Classes\Helpers\PdfHelper.cs" />
@@ -124 +124 @@
     <Compile Include="Classes\PrintDGV.cs" />
     <Compile Include="Classes\Produkcja.cs" />
-    <Compile Include="Classes\ReklamaHelper.cs" />
+    <Compile Include="Classes\Helpers\ReklamaHelper.cs" />
     <Compile Include="Classes\Repositories\UserAgencyRepository.cs" />
     <Compile Include="Classes\User.cs" />
     <Compile Include="Classes\DbUtils.cs" />
     <Compile Include="Classes\Helpers\ValidationHelper.cs" />
-    <Compile Include="Classes\VatHelper.cs" />
-    <Compile Include="Classes\WordHandler.cs" />
+    <Compile Include="Classes\Helpers\VatHelper.cs" />
+    <Compile Include="Classes\Helpers\WordHelper.cs" />
     <Compile Include="Classes\XTGFile.cs" />
-    <Compile Include="Classes\ZamowienieHelper.cs" />
+    <Compile Include="Classes\Helpers\ZamowienieHelper.cs" />
     <Compile Include="ClientsForm.cs">
       <SubType>Form</SubType>

trunk/BazaReklam/Classes/DbUtils.cs

@@ -195 +195 @@
         }
 
-        /// <summary>
-        /// Zwraca numer nastêpnej faktury danego agenta.
-        /// </summary>
-        public static int numerNowejFaktury(string tagAgenta, int year)
-        {
-            string query = "SELECT MAX(Numer) FROM Faktury WHERE Korekta=0 AND [Numer_Roz]='" + tagAgenta + "' AND [Numer_Rok]=" + year;
-
-            object nr = ExecuteQuery(query);
-            if (nr is DBNull) return 1;
-            return ((int)nr + 1);
-        }
+
 
 
@@ -273 +263 @@
 
         /// <summary>
-        /// Zwraca numer nowego zamówienia
-        /// </summary>
-        public static int numerNowegoZamowienia(int idKlienta, int year, string kodAgenta)
-        {
-            string query = "SELECT MAX(nrZamowienia) FROM Zamowienia WHERE idKlienta=" + idKlienta + " AND rokZamowienia=" + year + " AND kodAgenta='" + kodAgenta + "'";
+        /// Zwraca numer nastêpnej faktury danego agenta.
+        /// </summary>
+        public static int numerNowejFaktury(string tagAgenta, int year)
+        {
+            string query = "SELECT MAX(Numer) FROM Faktury WHERE Korekta=0 AND [Numer_Roz]='" + tagAgenta + "' AND [Numer_Rok]=" + year;
 
             object nr = ExecuteQuery(query);
@@ -284 +274 @@
         }
 
-        /// <summary>
-        /// Zwraca numer nastêpnej faktury korekty dla danego agenta.
-        /// </summary>
-        public static int numerNowejFakturyKorekty(int year)
-        {
-            string query = "SELECT MAX(Numer) FROM Faktury WHERE Korekta=1 AND [Numer_Rok]=" + year;
+
+        /// <summary>
+        /// Zwraca numer nowego zamówienia
+        /// </summary>
+        public static int numerNowegoZamowienia(int idKlienta, int year, string kodAgenta)
+        {
+            string query = "SELECT MAX(nrZamowienia) FROM Zamowienia WHERE idKlienta=" + idKlienta + " AND rokZamowienia=" + year + " AND kodAgenta='" + kodAgenta + "'";
 
             object nr = ExecuteQuery(query);

trunk/BazaReklam/Classes/Helpers/ExcelHelper.cs

@@ -1 +1 @@
 using System.Windows.Forms;
 
-namespace Baza_Reklam
+namespace Baza_Reklam.Classes.Helpers
 {
     public class ExcelHelper

trunk/BazaReklam/Classes/Helpers/FakturaHelper.cs

@@ -6 +6 @@
 using Baza_Reklam.REKLAMADataSetTableAdapters;
 
-namespace Baza_Reklam
+namespace Baza_Reklam.Classes.Helpers
 {
     public class FakturaHelper
@@ -39 +39 @@
         public enum BankAccount
         {
-            CentralaPLN = 43
+            CentralaPln = 43
         }
 
@@ -144 +144 @@
                                                            SLOWNIKDataSet.AGENCJERow redakcja,
                                                            SLOWNIKDataSet.KONTARow bankAccount,
-                                                           string numer_roz,
+                                                           string numerRoz,
                                                            PaymentType paymentType,
                                                            DateTime dateTime)
@@ -151 +151 @@
 
             naglowekFaktury.KOREKTA = false;
-            naglowekFaktury.NUMER_ROZ = numer_roz;
+            naglowekFaktury.NUMER_ROZ = numerRoz;
             naglowekFaktury.NUMER = DbUtils.numerNowejFaktury(naglowekFaktury.NUMER_ROZ, DateTime.Today.Year);
             naglowekFaktury.NUMER_ROK = DateTime.Today.Year;
@@ -220 +220 @@
             SqlDataReader reader = null;
 
-            string query =
-                "SELECT IDPozKat AS Id, NrFakturyPozKat AS Label, NettoPozKat AS Amount, DataWystawieniaPozKat AS Date FROM dbo.FakturyPoznanKatowice WHERE ID=@id";
+            const string query = "SELECT IDPozKat AS Id, NrFakturyPozKat AS Label, NettoPozKat AS Amount, DataWystawieniaPozKat AS Date FROM dbo.FakturyPoznanKatowice WHERE ID=@id";
 
             try
@@ -231 +230 @@
                 reader = cmd.ExecuteReader();
 
-                while (reader.Read())
-                {
-                    Invoice invoice = new Invoice();
-                    invoice.Id = Convert.ToInt32(reader["Id"]);
-                    invoice.Label = Convert.ToString(reader["Label"]);
-                    invoice.Amount = Convert.ToDecimal(reader["Amount"]);
-                    invoice.Date = Convert.ToDateTime(reader["Date"]);
-                    invoices.Add(invoice);
-                }
+                if (reader != null)
+                    while (reader.Read())
+                    {
+                        Invoice invoice = new Invoice();
+                        invoice.Id = Convert.ToInt32(reader["Id"]);
+                        invoice.Label = Convert.ToString(reader["Label"]);
+                        invoice.Amount = Convert.ToDecimal(reader["Amount"]);
+                        invoice.Date = Convert.ToDateTime(reader["Date"]);
+                        invoices.Add(invoice);
+                    }
             }
             finally
@@ -280 +280 @@
                 reader = cmd.ExecuteReader();
 
-                while (reader.Read())
-                {
-                    Invoice invoice = new Invoice();
-                    invoice.Id = Convert.ToInt32(reader["Id"]);
-                    invoice.Label = Convert.ToString(reader["Number"]) + "/" + Convert.ToString(reader["AgentShortCut"]) + "/" + Convert.ToString(reader["Year"]);
-                    invoice.Amount = Convert.ToDecimal(reader["Amount"]);
-                    invoice.Date = Convert.ToDateTime(reader["Date"]);
-                    invoice.PaidAmount = Convert.ToDecimal(reader["TotalPaid"]);
-                    invoice.IsCorrectionInvoice = Convert.ToBoolean(reader["Correction"]);
-                    invoice.Currency = Convert.ToString(reader["Currency"]);
-                    invoice.WeekNumber = Convert.ToInt32(reader["WeekNumber"]);
-                    invoices.Add(invoice);
-                }
+                if (reader != null)
+                    while (reader.Read())
+                    {
+                        Invoice invoice = new Invoice();
+                        invoice.Id = Convert.ToInt32(reader["Id"]);
+                        invoice.Label = Convert.ToString(reader["Number"]) + "/" + Convert.ToString(reader["AgentShortCut"]) + "/" + Convert.ToString(reader["Year"]);
+                        invoice.Amount = Convert.ToDecimal(reader["Amount"]);
+                        invoice.Date = Convert.ToDateTime(reader["Date"]);
+                        invoice.PaidAmount = Convert.ToDecimal(reader["TotalPaid"]);
+                        invoice.IsCorrectionInvoice = Convert.ToBoolean(reader["Correction"]);
+                        invoice.Currency = Convert.ToString(reader["Currency"]);
+                        invoice.WeekNumber = Convert.ToInt32(reader["WeekNumber"]);
+                        invoices.Add(invoice);
+                    }
             }
             finally
@@ -315 +316 @@
         }
 
+        /// <summary>
+        /// Zwraca numer nastêpnej faktury korekty dla danego agenta.
+        /// </summary>
+        public static int GetNewCorrectionInvoiceNumber(int year, int systemKsiegowy)
+        {
+            string query = "SELECT MAX(Numer) FROM Faktury WHERE Korekta=1 AND [Numer_Rok]=" + year + " AND SystemKsiegowyId=" + systemKsiegowy;
+
+            object nr = DbUtils.ExecuteQuery(query);
+            if (nr is DBNull) return 1;
+            return ((int)nr + 1);
+        }
+
     }
 }

trunk/BazaReklam/Classes/Helpers/ReklamaHelper.cs

@@ -1 @@
-namespace Baza_Reklam
+namespace Baza_Reklam.Classes.Helpers
 {
     public class ReklamaHelper

trunk/BazaReklam/Classes/Helpers/VatHelper.cs

@@ -1 @@
-namespace Baza_Reklam
+namespace Baza_Reklam.Classes.Helpers
 {
     public class VatHelper

trunk/BazaReklam/Classes/Helpers/WordHelper.cs

@@ -3 +3 @@
 using Word;
 
-namespace Baza_Reklam
+namespace Baza_Reklam.Classes.Helpers
 {
-    internal class WordHandler
+    internal class WordHelper
     {
         private readonly Application oWord;
@@ -13 +13 @@
         private Document oWordDoc;
 
-        public WordHandler()
+        public WordHelper()
         {
             oWord = new Application();
         }
 
-        public void openFile(string filename)
+        public void OpenFile(string filename)
         {
             Object oPlik = filename;
@@ -26 +26 @@
         }
 
-        public void setWordVisible()
+        public void SetWordVisible()
         {
             if (!oWord.Visible) oWord.Visible = true;
         }
 
-        public void findAndReplace(string _strFind, string _strReplace)
+        public void FindAndReplace(string strFind, string strReplace)
         {
-            Object oFindText = _strFind;
-            Object oReplaceText = _strReplace;
+            Object oFindText = strFind;
+            Object oReplaceText = strReplace;
             Object oReplace = WdReplace.wdReplaceAll;
-            bool _boolToF = oWordDoc.Content.Find.Execute(ref oFindText, ref oFalse, ref oFalse, ref oFalse, ref oFalse,
-                                                          ref oFalse, ref oFalse, ref oMissing, ref oFalse,
-                                                          ref oReplaceText, ref oReplace, ref oFalse, ref oFalse,
-                                                          ref oFalse, ref oFalse);
+            oWordDoc.Content.Find.Execute(ref oFindText, ref oFalse, ref oFalse, ref oFalse, ref oFalse,
+                                          ref oFalse, ref oFalse, ref oMissing, ref oFalse,
+                                          ref oReplaceText, ref oReplace, ref oFalse, ref oFalse,
+                                          ref oFalse, ref oFalse);
         }
 
-        public void saveAs(string filename)
+        public void SaveAs(string filename)
         {
             Object oFileNameAs = filename;

trunk/BazaReklam/Classes/Helpers/ZamowienieHelper.cs

@@ -2 +2 @@
 using System.Data.SqlClient;
 
-namespace Baza_Reklam.Classes
+namespace Baza_Reklam.Classes.Helpers
 {
     public class ZamowienieHelper

trunk/BazaReklam/Facturer.cs

@@ -3 +3 @@
 using System.Data.SqlClient;
 using System.Windows.Forms;
+using Baza_Reklam.Classes.Helpers;
 
 namespace Baza_Reklam
@@ -764 +765 @@
 
             naglowekKorekty.NUMER_ROZ = faktura.NUMER_ROZ;
-            naglowekKorekty.NUMER = DbUtils.numerNowejFakturyKorekty(DateTime.Today.Year);
+            naglowekKorekty.NUMER = FakturaHelper.GetNewCorrectionInvoiceNumber(DateTime.Today.Year, faktura.SystemKsiegowyId);
             naglowekKorekty.NUMER_ROK = DateTime.Today.Year;
             naglowekKorekty.DATA_WYSTAWIENIA = DateTime.Today;

trunk/BazaReklam/FacturesForm.cs

@@ -4 +4 @@
 using System.Data.SqlClient;
 using System.Windows.Forms;
+using Baza_Reklam.Classes.Helpers;
 using Baza_Reklam.Classes.Interfaces;
 

trunk/BazaReklam/FacturesFormNEW.cs

@@ -5 +5 @@
 using System.Drawing;
 using System.Windows.Forms;
+using Baza_Reklam.Classes.Helpers;
 using Baza_Reklam.Classes.Interfaces;
 

trunk/BazaReklam/FakturowaniePoznanKatowice.cs

@@ -6 +6 @@
 using System.Globalization;
 using System.Data.SqlClient;
+using Baza_Reklam.Classes.Helpers;
 using Baza_Reklam.Classes.Model;
 
@@ -48 +49 @@
             _agencjaRedakcja = agencjeTableAdapter.GetDataByIdAgencji((int)FakturaHelper.OfficeId.Redakcja)[0];
 
-            _konto = kontaTableAdapter.GetDataById((int)FakturaHelper.BankAccount.CentralaPLN)[0];
+            _konto = kontaTableAdapter.GetDataById((int)FakturaHelper.BankAccount.CentralaPln)[0];
         }
 
@@ -542 +543 @@
 
             naglowekKorekty.NUMER_ROZ = faktura.NUMER_ROZ;
-            naglowekKorekty.NUMER = DbUtils.numerNowejFakturyKorekty(DateTime.Today.Year);
+            naglowekKorekty.NUMER = FakturaHelper.GetNewCorrectionInvoiceNumber(DateTime.Today.Year, faktura.SystemKsiegowyId);
             naglowekKorekty.NUMER_ROK = DateTime.Today.Year;
             naglowekKorekty.DATA_WYSTAWIENIA = DateTime.Today;

trunk/BazaReklam/InfoForm.cs

@@ -5 +5 @@
 using System.Windows.Forms;
 using System.Globalization;
+using Baza_Reklam.Classes.Helpers;
 using Baza_Reklam.Classes.Interfaces;
 

trunk/BazaReklam/KorektyForm.cs

@@ -7 +7 @@
 using System.Text;
 using System.Windows.Forms;
+using Baza_Reklam.Classes.Helpers;
 using Baza_Reklam.Classes.Interfaces;
 

trunk/BazaReklam/OferForm.cs

@@ -7 +7 @@
 using System.Windows.Forms;
 using System.IO;
+using Baza_Reklam.Classes.Helpers;
 
 
@@ -139 +140 @@
         private static void OpenOfer(string filename)
         {
-            WordHandler wh = new WordHandler();
-
-            wh.openFile(filename);
-            wh.setWordVisible();
+            WordHelper wh = new WordHelper();
+
+            wh.OpenFile(filename);
+            wh.SetWordVisible();
         }
 
         private void CreateNewOfer(string filename, string newFileName)
         {
-            WordHandler wh = new WordHandler();
-
-            wh.openFile(filename);
-
-            wh.findAndReplace("<<Oferta_Numer>>", id_ofertyTextBox.Text + "/" + User.Instance().Kod_agenta.ToUpper() + "/" + DateTime.Today.Year);
-            wh.findAndReplace("<<Osoba_Do_Kontaktu>>", id_klienci_os_kontaktComboBox.Text);
-            wh.findAndReplace("<<Nazwa_i_Adres_Klienta>>", adres_KorTextBox.Text);
-            wh.findAndReplace("<<Miasto>>", User.Instance().Miasto);
-            wh.findAndReplace("<<Data_Oferty>>", data_OfertyDateTimePicker.Value.ToShortDateString());
-            wh.findAndReplace("<<Podpis_Agenta>>", User.Instance().Imie + " " + User.Instance().Nazwisko);
-            wh.findAndReplace("<<Email_Agenta>>", User.Instance().Email);
-            wh.findAndReplace("<<tel_wew_Agenta>>", User.Instance().TelWewnetrzny);
-            wh.findAndReplace("<<tel_mobile_Agenta>>", User.Instance().KomSluzbowa);
-            wh.findAndReplace("<<Adres_Biura>>", User.Instance().AdresBiura);
-            wh.findAndReplace("<<Tel_Biura>>", User.Instance().TelSekretariat);
-            wh.findAndReplace("<<Fax_Biura>>", User.Instance().FaxSekretariat);
-            wh.findAndReplace("<<Oferta_Opis_Dod>>", opis_DolTextBox.Text);
-            wh.findAndReplace("<<Stanowisko_Agenta>>", User.Instance().Stanowisko);
-
-            wh.saveAs(newFileName);
-
-            wh.setWordVisible();
+            WordHelper wh = new WordHelper();
+
+            wh.OpenFile(filename);
+
+            wh.FindAndReplace("<<Oferta_Numer>>", id_ofertyTextBox.Text + "/" + User.Instance().Kod_agenta.ToUpper() + "/" + DateTime.Today.Year);
+            wh.FindAndReplace("<<Osoba_Do_Kontaktu>>", id_klienci_os_kontaktComboBox.Text);
+            wh.FindAndReplace("<<Nazwa_i_Adres_Klienta>>", adres_KorTextBox.Text);
+            wh.FindAndReplace("<<Miasto>>", User.Instance().Miasto);
+            wh.FindAndReplace("<<Data_Oferty>>", data_OfertyDateTimePicker.Value.ToShortDateString());
+            wh.FindAndReplace("<<Podpis_Agenta>>", User.Instance().Imie + " " + User.Instance().Nazwisko);
+            wh.FindAndReplace("<<Email_Agenta>>", User.Instance().Email);
+            wh.FindAndReplace("<<tel_wew_Agenta>>", User.Instance().TelWewnetrzny);
+            wh.FindAndReplace("<<tel_mobile_Agenta>>", User.Instance().KomSluzbowa);
+            wh.FindAndReplace("<<Adres_Biura>>", User.Instance().AdresBiura);
+            wh.FindAndReplace("<<Tel_Biura>>", User.Instance().TelSekretariat);
+            wh.FindAndReplace("<<Fax_Biura>>", User.Instance().FaxSekretariat);
+            wh.FindAndReplace("<<Oferta_Opis_Dod>>", opis_DolTextBox.Text);
+            wh.FindAndReplace("<<Stanowisko_Agenta>>", User.Instance().Stanowisko);
+
+            wh.SaveAs(newFileName);
+
+            wh.SetWordVisible();
         }
 

trunk/BazaReklam/OrderDetails.cs

@@ -7 +7 @@
 using System.Windows.Forms;
 using System.Text.RegularExpressions;
-using Baza_Reklam.Classes;
+using Baza_Reklam.Classes.Helpers;
 
 namespace Baza_Reklam

trunk/BazaReklam/ZamowieniaForm.cs

@@ -906 +906 @@
 
             naglowekKorekty.NUMER_ROZ = faktura.NUMER_ROZ;
-            naglowekKorekty.NUMER = DbUtils.numerNowejFakturyKorekty(DateTime.Today.Year);
+            naglowekKorekty.NUMER = FakturaHelper.GetNewCorrectionInvoiceNumber(DateTime.Today.Year, faktura.SystemKsiegowyId);
             naglowekKorekty.NUMER_ROK = DateTime.Today.Year;
             naglowekKorekty.DATA_WYSTAWIENIA = DateTime.Today;

trunk/BazaReklam/ZestawienieZamowienForm.cs

@@ -5 +5 @@
 using System.Drawing;
 using System.Windows.Forms;
+using Baza_Reklam.Classes.Helpers;
 using Baza_Reklam.Classes.Interfaces;
 

trunk/BazaReklam/app.config

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