Zbiór zmian 800 dla branches

Data:

2009-08-03 13:56:21 (17 years ago)

Autor:

marek

Opis:

re #184 - merged with latest trunk

Lokalizacja:

branches/Abonament

Pliki:

• . (zmodyfikowane) (1 prop)
• BazaReklam.Updater/ICSharpCode.SharpZipLib/BZip2 (zmodyfikowane) (1 prop)
• BazaReklam.Updater/ICSharpCode.SharpZipLib/Checksums (zmodyfikowane) (1 prop)
• BazaReklam.Updater/ICSharpCode.SharpZipLib/Core (zmodyfikowane) (1 prop)
• BazaReklam.Updater/ICSharpCode.SharpZipLib/Encryption (zmodyfikowane) (1 prop)
• BazaReklam.Updater/ICSharpCode.SharpZipLib/Tar (zmodyfikowane) (1 prop)
• BazaReklam.Updater/ICSharpCode.SharpZipLib/Zip (zmodyfikowane) (1 prop)
• BazaReklam/Baza Reklam.csproj (zmodyfikowane) (3 diffs)
• BazaReklam/Classes/EmailSender.cs (zmodyfikowane) (2 diffs)
• BazaReklam/Classes/Interfaces/IEmailSender.cs (skopiowane) (skopiowane from trunk/BazaReklam/Classes/Interfaces/IEmailSender.cs)
• BazaReklam/Classes/Interfaces/ISmtpConfiguration.cs (skopiowane) (skopiowane from trunk/BazaReklam/Classes/Interfaces/ISmtpConfiguration.cs)
• BazaReklam/Classes/Logger.cs (zmodyfikowane) (1 diff)
• BazaReklam/Classes/SmtpConfiguration.cs (skopiowane) (skopiowane from trunk/BazaReklam/Classes/SmtpConfiguration.cs)
• BazaReklam/Docs/versioninfo.html (zmodyfikowane) (1 diff)
• BazaReklam/OrderDetails.cs (zmodyfikowane) (2 diffs)
• BazaReklam/Properties/AssemblyInfo.cs (zmodyfikowane) (1 diff)
• BazaReklam/ProvisionForm.Designer.cs (zmodyfikowane) (1 diff)
• BazaReklam/ProvisionForm.cs (zmodyfikowane) (10 diffs)
• BazaReklam/ProvisionForm.resx (zmodyfikowane) (2 diffs)
• BazaReklam/app.config (zmodyfikowane) (1 diff)
• BazaReklamSetup/BazaReklamSetup.vdproj (zmodyfikowane) (2 diffs)
• BazaZamowien/Classes/Premie (zmodyfikowane) (1 prop)
• BazaZamowien/Classes/Zamowienia (zmodyfikowane) (1 prop)
• BazaZamowien/Properties (zmodyfikowane) (1 prop)
• BazaZamowien/Raporty (zmodyfikowane) (1 prop)
• BazaZamowien_Updater/Properties (zmodyfikowane) (1 prop)

branches/Abonament

@@ -1 +1 @@
 /branches/ReklamaReorganizacja:568-731
-/trunk:708-758,760-794
+/trunk:708-758,760-799

@@ -1 +1 @@
 /branches/ReklamaReorganizacja:568-731
-/trunk:708-758,760-794
+/trunk:708-758,760-799

branches/Abonament/BazaReklam/Baza Reklam.csproj

@@ -33 +33 @@
     <WebPage>index.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationVersion>1.1.24.0</ApplicationVersion>
+    <ApplicationVersion>1.1.25.0</ApplicationVersion>
     <BootstrapperEnabled>false</BootstrapperEnabled>
   </PropertyGroup>
@@ -129 +129 @@
     <Compile Include="Classes\Helpers\StringHelper.cs" />
     <Compile Include="Classes\Helpers\WebRequestHelper.cs" />
+    <Compile Include="Classes\Interfaces\IEmailSender.cs" />
     <Compile Include="Classes\Interfaces\IInvoiceProvider.cs" />
     <Compile Include="Classes\Interfaces\IForm.cs" />
+    <Compile Include="Classes\Interfaces\ISmtpConfiguration.cs" />
     <Compile Include="Classes\Interfaces\IProduct.cs" />
     <Compile Include="Classes\Interfaces\IProductDetail.cs" />
@@ -175 +177 @@
     <Compile Include="Classes\Repositories\TitleRepository.cs" />
     <Compile Include="Classes\Repositories\UserAgencyRepository.cs" />
+    <Compile Include="Classes\SmtpConfiguration.cs" />
     <Compile Include="Classes\User.cs" />
     <Compile Include="Classes\DbUtils.cs" />

branches/Abonament/BazaReklam/Classes/EmailSender.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 using System.Net.Mail;
 using System.Text;
 using Baza_Reklam.Classes.Helpers;
+using Baza_Reklam.Classes.Interfaces;
 
 namespace Baza_Reklam.Classes
 {
-    public class EmailSender
+    public class EmailSender : IEmailSender
     {
-        public static void SendNotification(Exception loggingException, string exceptionMessage, string exceptionDetails, string userName, DateTime dateTime)
+        private readonly ISmtpConfiguration _smtpConfiguration;
+        private string _from;
+        private List<string> _to = new List<string>();
+        private string _subject;
+        private string _body;
+
+        public EmailSender(ISmtpConfiguration smtpConfiguration)
+        {
+            _smtpConfiguration = smtpConfiguration;
+        }
+
+        public EmailSender(string to, string subject, string body)
+        {
+            _from = ConfigurationHelper.GetSettingByKey("Application.Email.From");
+            _to.Add(to);
+            _subject = subject;
+            _body = body;
+        }
+
+        public static void SendExceptonNotification(Exception loggingException, string exceptionMessage, string exceptionDetails, string userName, DateTime dateTime)
         {
             try
@@ -36 +57 @@
 
         }
+
+        public string From
+        {
+            get { return _from; }
+            set { _from = value; }
+        }
+
+        public List<string> To
+        {
+            get { return _to; }
+            set { _to = value; }
+        }
+
+        public List<string> Cc
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public List<string> Bcc
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string Subject
+        {
+            get { return _subject; }
+            set { _subject = value; }
+        }
+
+        public string Body
+        {
+            get { return _body; }
+            set { _body = value; }
+        }
+
+        public ISmtpConfiguration SmtpConfiguration
+        {
+            get { return _smtpConfiguration; }
+        }
+
+        public void Send()
+        {
+            try
+            {
+                MailMessage message = new MailMessage();
+                message.From = new MailAddress(From);
+                foreach (string to in To)
+                {
+                    message.To.Add(new MailAddress(to));
+                }
+                
+                message.Subject = Subject;
+                message.Body = Body;
+                SmtpClient client = new SmtpClient(SmtpConfiguration.Server);
+                client.SendAsync(message, null);
+            }
+            catch
+            {
+                //TODO: nothing what we can do now...
+            }
+        }
     }
 }

branches/Abonament/BazaReklam/Classes/Logger.cs

@@ -30 +30 @@
             catch (Exception ex)
             {
-                EmailSender.SendNotification(ex, errorMessage, errorDetails, userName, dateTime);
+                EmailSender.SendExceptonNotification(ex, errorMessage, errorDetails, userName, dateTime);
             }
             finally

branches/Abonament/BazaReklam/Docs/versioninfo.html

@@ -6 +6 @@
 <body>
    <h1>Baza reklam - Informacje o wersji</h1>
+   <div>
+        <a id="1.1.25" />
+        <h2>Wersja 1.1.25 (2009-08-03)</h2>
+        <p>Opis zmian wprowadzonych do wersji 1.1.25</p>
+        <ul>
+            <li>Zgłoszenie #182: poprawiono błąd występujący przy edycji procentu prowizji dla handlowaca oraz dodano funkcję wysyłania maila do księgowości gdy dyrektor zakończy ustalanie prowizji.</li>
+        </ul>
+   </div>
    <div>
         <a id="1.1.24" />

branches/Abonament/BazaReklam/OrderDetails.cs

@@ -1270 +1270 @@
                 if (clickedRow.Selected)
                 {
+                    DataRowView emisja = (DataRowView)ukazeSieDataGridView.Rows[e.RowIndex].DataBoundItem;
+                    REKLAMADataSet.UKAZE_SIE_W_NRRow emisjaRow = (REKLAMADataSet.UKAZE_SIE_W_NRRow)emisja.Row;
+
                     if (clickedRow.DefaultCellStyle.BackColor == Color.MintCream)
                     {
                         zmienToolStripMenuItem.Visible = false;
-                        usunToolStripMenuItem.Visible = false;
+                        usunToolStripMenuItem.Visible = !emisjaRow.zafakturowana;
                         anulujToolStripMenuItem.Visible = false;
 
@@ -1279 +1282 @@
                         return;
                     }
-
-                    DataRowView emisja = (DataRowView)ukazeSieDataGridView.Rows[e.RowIndex].DataBoundItem;
-                    REKLAMADataSet.UKAZE_SIE_W_NRRow emisjaRow = (REKLAMADataSet.UKAZE_SIE_W_NRRow)emisja.Row;
 
                     if (emisjaRow.zafakturowana)

branches/Abonament/BazaReklam/Properties/AssemblyInfo.cs

@@ -30 +30 @@
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.24")]
+[assembly: AssemblyFileVersion("1.1.25")]

branches/Abonament/BazaReklam/ProvisionForm.Designer.cs

@@ -241 +241 @@
             this.prowizjeDataGridView.RowHeadersWidth = 10;
             this.prowizjeDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.prowizjeDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
             this.prowizjeDataGridView.Size = new System.Drawing.Size(984, 558);
             this.prowizjeDataGridView.TabIndex = 19;

branches/Abonament/BazaReklam/ProvisionForm.cs

@@ -5 +5 @@
 using System.Data.SqlClient;
 using System.Windows.Forms;
-
+using Baza_Reklam.Classes;
 using Baza_Reklam.Classes.Interfaces;
 using Baza_Reklam.Classes.Helpers;
@@ -112 +112 @@
             try
             {
+                SaveResult();
+
                 conn = new SqlConnection(ConnString.getConnString().Value);
                 conn.Open();
@@ -188 +190 @@
             try
             {
+                SaveResult();
+
                 command.ExecuteNonQuery();
                 transaction.Commit();
@@ -229 +233 @@
             if (Validate())
             {
-                pLANBindingSource.EndEdit();
-                pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
+                if (prowizjeDataGridView.SelectedCells.Count!=1)
+                {
+                    MessageBox.Show("Proszê zaznaczyæ tylko jedn¹ komórkê.");
+                    Cursor = Cursors.Default;
+                    return;
+                }
+                
+                SaveResult();
+
+                MessageBox.Show("Zmiany zapisane");
             }
             Cursor = Cursors.Default;
-
-            MessageBox.Show("Zmiany zapisane");
         }
 
@@ -324 +334 @@
 
 
-            btnBlockProvision.Visible = User.Instance().IsKsiegowosc;
-            if (!User.Instance().IsKsiegowosc) return;
+            btnBlockProvision.Visible = User.Instance().IsKierownik;
+            if (!User.Instance().IsKierownik) return;
 
             _isProvisionBlocked =
@@ -367 +377 @@
         private void prowizjeDataGridView_CellEndEdit(object sender, DataGridViewCellEventArgs e)
         {
-            if (Validate())
-            {
-                if (prowizjeDataGridView.Columns[e.ColumnIndex].Name == "PR_PROWIZJI")
+            if (prowizjeDataGridView.Columns[e.ColumnIndex].Name != "PR_PROWIZJI") return;
+
+            CorrectBonusPercentage(e.ColumnIndex, e.RowIndex);
+        }
+
+        private void CorrectBonusPercentage(int column, int row)
+        {
+            if (prowizjeDataGridView.Columns[column].Name != "PR_PROWIZJI") return;
+
+            if (prowizjeDataGridView.Columns[column].Name == "PR_PROWIZJI")
+            {
+                if (Convert.ToDecimal(prowizjeDataGridView[column, row].Value) >= 1)
                 {
-                    if (Convert.ToDecimal(prowizjeDataGridView[e.ColumnIndex, e.RowIndex].Value) >= 1)
-                    {
-                        prowizjeDataGridView[e.ColumnIndex, e.RowIndex].Value = Convert.ToDecimal(prowizjeDataGridView[e.ColumnIndex, e.RowIndex].Value) / 100;
-                    }
+                    prowizjeDataGridView[column, row].Value =
+                        Convert.ToDecimal(prowizjeDataGridView[column, row].Value) / 100;
                 }
-            }
+            } 
+        }
+
+        private void SaveResult()
+        {
+            CorrectBonusPercentage(prowizjeDataGridView.SelectedCells[0].ColumnIndex, prowizjeDataGridView.SelectedCells[0].RowIndex);
+            pLANBindingSource.EndEdit();
+            pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
         }
 
@@ -394 +418 @@
             }
 
+            CorrectBonusPercentage(e.ColumnIndex, e.RowIndex);
+
             ukrytyLabel.Select();
             prowizjeDataGridView.EndEdit();
             pLANBindingSource.EndEdit();
 
-            if (prowizjeDataGridView.Columns[e.ColumnIndex].Name == "PR_PROWIZJI")
-            {
-                if (Convert.ToDecimal(prowizjeDataGridView[e.ColumnIndex, e.RowIndex].Value) >= 1)
-                {
-                    prowizjeDataGridView[e.ColumnIndex, e.RowIndex].Value = Convert.ToDecimal(prowizjeDataGridView[e.ColumnIndex, e.RowIndex].Value) / 100;
-                }
-            }
-
             REKLAMADataSet.PLANDataTable changes = rEKLAMADataSet.PLAN.GetChanges(DataRowState.Modified) as
                  REKLAMADataSet.PLANDataTable;
@@ -462 +480 @@
         private void btnBlockProvision_Click(object sender, EventArgs e)
         {
-            if (!User.Instance().IsKsiegowosc) return;
+            if (!User.Instance().IsKierownik) return;
 
             if (!_isProvisionBlocked.HasValue) return;
@@ -480 +498 @@
             aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, agencja);
             pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
+
+            if (_isProvisionBlocked.Value)
+                SendEmailNotification();
         }
 
@@ -487 +508 @@
             btnBlockProvision.Checked = isBlocked;
         }
+
+        private void SendEmailNotification()
+        {
+            string selectedAgencja = agencjaToolStripComboBox.Control.Text;
+            ISmtpConfiguration smtpConfig = new SmtpConfiguration();
+            IEmailSender emailSender = new EmailSender(smtpConfig);
+            emailSender.From = ConfigurationHelper.GetSettingByKey("Application.Email.From");
+            emailSender.To.AddRange(ConfigurationHelper.GetSettingByKey("Application.Email.Prowizje.To").Split(';'));
+            emailSender.Subject = string.Format(ConfigurationHelper.GetSettingByKey("Application.Email.Prowizje.Subject"), selectedAgencja);
+            emailSender.Body = string.Format(ConfigurationHelper.GetSettingByKey("Application.Email.Prowizje.Body"), selectedAgencja, User.Instance().Imie + " " + User.Instance().Nazwisko, "\n", DateTime.Now);
+            emailSender.Send();
+        }
     }
 }

branches/Abonament/BazaReklam/ProvisionForm.resx

@@ -321 +321 @@
         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
-        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
+        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
 </value>
   </data>
@@ -356 +356 @@
     <value>
         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
-        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
+        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
 </value>
   </data>

branches/Abonament/BazaReklam/app.config

@@ -27 +27 @@
     <add key="Application.Instruction.Url" value="http://www.infocity.pl/baza_reklam/instrukcja.htm" />
     <add key="Application.Email.Smtp" value="poczta.ct.com.pl" />
-    <add key="Application.Email.From" value="baza_reklam@ct.com.pl" />
+    <add key="Application.Email.From" value="BazaReklam@ct.com.pl" />
     <add key="Application.Email.To" value="marek.stachura@ct.com.pl" />
+    <add key="Application.Email.Prowizje.To" value="danuta@ct.com.pl;irena@ct.com.pl;marek.stachura@ct.com.pl"></add>
+    <add key="Application.Email.Prowizje.Subject" value="Prowizje dla biura: {0}" />
+    <add key="Application.Email.Prowizje.Body" value="Prowizje dla biura {0} zostały właśnie ustalone przez: {1}{2}{2}-- {2}Data: {3}" />
 
     <add key="Application.Pdf.File" value="http://truck.pl/ogloszenia/_getFile.asp?pdf,{0},," />

branches/Abonament/BazaReklamSetup/BazaReklamSetup.vdproj

@@ -656 +656 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Baza Reklam"
-        "ProductCode" = "8:{ED038D25-96BE-4894-83A5-B1E699B7B0A8}"
-        "PackageCode" = "8:{A623D699-24EA-4721-A69D-87D3F8DD32C0}"
+        "ProductCode" = "8:{BC2C991A-0AD3-4B26-8042-DF4B2473767A}"
+        "PackageCode" = "8:{3507D99F-F72D-4261-BCC7-4D3EE522CAC9}"
         "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}"
         "RestartWWWService" = "11:FALSE"
@@ -663 +663 @@
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.1.24"
+        "ProductVersion" = "8:1.1.25"
         "Manufacturer" = "8:AACT"
         "ARPHELPTELEPHONE" = "8:"

@@ -1 +1 @@
 /branches/ReklamaReorganizacja:568-731
-/trunk:708-758,760-794
+/trunk:708-758,760-799