Index: branches/Abonament/BazaReklam/Baza Reklam.csproj
===================================================================
--- branches/Abonament/BazaReklam/Baza Reklam.csproj (revision 795)
+++ branches/Abonament/BazaReklam/Baza Reklam.csproj (revision 800)
@@ -33,5 +33,5 @@
index.htm
false
-
1.1.24.0
+
1.1.25.0
false
@@ -129,6 +129,8 @@
+
+
@@ -175,4 +177,5 @@
+
Index: branches/Abonament/BazaReklam/ProvisionForm.Designer.cs
===================================================================
--- branches/Abonament/BazaReklam/ProvisionForm.Designer.cs (revision 677)
+++ branches/Abonament/BazaReklam/ProvisionForm.Designer.cs (revision 800)
@@ -241,4 +241,5 @@
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;
Index: branches/Abonament/BazaReklam/ProvisionForm.cs
===================================================================
--- branches/Abonament/BazaReklam/ProvisionForm.cs (revision 677)
+++ branches/Abonament/BazaReklam/ProvisionForm.cs (revision 800)
@@ -5,5 +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,4 +112,6 @@
try
{
+ SaveResult();
+
conn = new SqlConnection(ConnString.getConnString().Value);
conn.Open();
@@ -188,4 +190,6 @@
try
{
+ SaveResult();
+
command.ExecuteNonQuery();
transaction.Commit();
@@ -229,10 +233,16 @@
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,6 +334,6 @@
- btnBlockProvision.Visible = User.Instance().IsKsiegowosc;
- if (!User.Instance().IsKsiegowosc) return;
+ btnBlockProvision.Visible = User.Instance().IsKierownik;
+ if (!User.Instance().IsKierownik) return;
_isProvisionBlocked =
@@ -367,14 +377,28 @@
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,16 +418,10 @@
}
+ 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,5 +480,5 @@
private void btnBlockProvision_Click(object sender, EventArgs e)
{
- if (!User.Instance().IsKsiegowosc) return;
+ if (!User.Instance().IsKierownik) return;
if (!_isProvisionBlocked.HasValue) return;
@@ -480,4 +498,7 @@
aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, agencja);
pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
+
+ if (_isProvisionBlocked.Value)
+ SendEmailNotification();
}
@@ -487,4 +508,16 @@
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();
+ }
}
}
Index: branches/Abonament/BazaReklam/Classes/SmtpConfiguration.cs
===================================================================
--- branches/Abonament/BazaReklam/Classes/SmtpConfiguration.cs (revision 800)
+++ branches/Abonament/BazaReklam/Classes/SmtpConfiguration.cs (revision 800)
@@ -0,0 +1,33 @@
+using System;
+using System.Configuration;
+using Baza_Reklam.Classes.Interfaces;
+
+namespace Baza_Reklam.Classes
+{
+ public class SmtpConfiguration : ISmtpConfiguration
+ {
+ private string _server;
+ public SmtpConfiguration()
+ {
+ _server = ConfigurationManager.AppSettings["Application.Email.Smtp"];
+ }
+
+ public string Server
+ {
+ get { return _server; }
+ set { _server = value; }
+ }
+
+ public string User
+ {
+ get { throw new NotImplementedException(); }
+ set { throw new NotImplementedException(); }
+ }
+
+ public string Password
+ {
+ get { throw new NotImplementedException(); }
+ set { throw new NotImplementedException(); }
+ }
+ }
+}
Index: branches/Abonament/BazaReklam/Classes/Interfaces/IEmailSender.cs
===================================================================
--- branches/Abonament/BazaReklam/Classes/Interfaces/IEmailSender.cs (revision 800)
+++ branches/Abonament/BazaReklam/Classes/Interfaces/IEmailSender.cs (revision 800)
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Baza_Reklam.Classes.Interfaces
+{
+ public interface IEmailSender
+ {
+ string From { get; set;}
+ List
To { get; set;}
+ List Cc { get; set;}
+ List Bcc { get; set;}
+ string Subject { get; set;}
+ string Body { get; set;}
+ void Send();
+ }
+}
Index: branches/Abonament/BazaReklam/Classes/Interfaces/ISmtpConfiguration.cs
===================================================================
--- branches/Abonament/BazaReklam/Classes/Interfaces/ISmtpConfiguration.cs (revision 800)
+++ branches/Abonament/BazaReklam/Classes/Interfaces/ISmtpConfiguration.cs (revision 800)
@@ -0,0 +1,9 @@
+namespace Baza_Reklam.Classes.Interfaces
+{
+ public interface ISmtpConfiguration
+ {
+ string Server { get; set; }
+ string User { get; set; }
+ string Password { get; set; }
+ }
+}
Index: branches/Abonament/BazaReklam/Classes/Logger.cs
===================================================================
--- branches/Abonament/BazaReklam/Classes/Logger.cs (revision 626)
+++ branches/Abonament/BazaReklam/Classes/Logger.cs (revision 800)
@@ -30,5 +30,5 @@
catch (Exception ex)
{
- EmailSender.SendNotification(ex, errorMessage, errorDetails, userName, dateTime);
+ EmailSender.SendExceptonNotification(ex, errorMessage, errorDetails, userName, dateTime);
}
finally
Index: branches/Abonament/BazaReklam/Classes/EmailSender.cs
===================================================================
--- branches/Abonament/BazaReklam/Classes/EmailSender.cs (revision 626)
+++ branches/Abonament/BazaReklam/Classes/EmailSender.cs (revision 800)
@@ -1,12 +1,33 @@
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 _to = new List();
+ 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,4 +57,67 @@
}
+
+ public string From
+ {
+ get { return _from; }
+ set { _from = value; }
+ }
+
+ public List To
+ {
+ get { return _to; }
+ set { _to = value; }
+ }
+
+ public List Cc
+ {
+ get { throw new NotImplementedException(); }
+ set { throw new NotImplementedException(); }
+ }
+
+ public List 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...
+ }
+ }
}
}
Index: branches/Abonament/BazaReklam/app.config
===================================================================
--- branches/Abonament/BazaReklam/app.config (revision 703)
+++ branches/Abonament/BazaReklam/app.config (revision 800)
@@ -27,6 +27,9 @@
-
+
+
+
+
Index: branches/Abonament/BazaReklam/Properties/AssemblyInfo.cs
===================================================================
--- branches/Abonament/BazaReklam/Properties/AssemblyInfo.cs (revision 795)
+++ branches/Abonament/BazaReklam/Properties/AssemblyInfo.cs (revision 800)
@@ -30,3 +30,3 @@
//
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.24")]
+[assembly: AssemblyFileVersion("1.1.25")]