Index: branches/Abonament/BazaReklam/Baza Reklam.csproj
===================================================================
--- branches/Abonament/BazaReklam/Baza Reklam.csproj (revision 763)
+++ branches/Abonament/BazaReklam/Baza Reklam.csproj (revision 769)
@@ -33,5 +33,5 @@
index.htm
false
-
1.1.22.0
+
1.1.23.0
false
Index: branches/Abonament/BazaReklam/Classes/Helpers/ReklamaHelper.cs
===================================================================
--- branches/Abonament/BazaReklam/Classes/Helpers/ReklamaHelper.cs (revision 754)
+++ branches/Abonament/BazaReklam/Classes/Helpers/ReklamaHelper.cs (revision 769)
@@ -68,4 +68,34 @@
}
+
+ public static void AddUpdateIssueChange(double issueId, int currentIssueNumer, int newIssueNumber)
+ {
+ SqlConnection conn = null;
+ SqlCommand cmd = null;
+
+ try
+ {
+ conn = new SqlConnection(ConnString.getConnString().Value);
+ conn.Open();
+ cmd = new SqlCommand("sp_AddUpdateIssueChange", conn);
+ cmd.CommandType = CommandType.StoredProcedure;
+ cmd.Parameters.AddWithValue("@issueId", issueId);
+ cmd.Parameters.AddWithValue("@currentIssueNumer", currentIssueNumer);
+ cmd.Parameters.AddWithValue("@newIssueNumber", newIssueNumber);
+ cmd.ExecuteNonQuery();
+ }
+ finally
+ {
+ if (cmd != null)
+ cmd.Dispose();
+
+ if (conn != null && conn.State == ConnectionState.Open)
+ {
+ conn.Close();
+ conn.Dispose();
+ }
+ }
+
+ }
}
}
Index: branches/Abonament/BazaReklam/KalendarzEmisji.cs
===================================================================
--- branches/Abonament/BazaReklam/KalendarzEmisji.cs (revision 754)
+++ branches/Abonament/BazaReklam/KalendarzEmisji.cs (revision 769)
@@ -9,19 +9,4 @@
public partial class KalendarzEmisji : Form
{
- //emisja, która ukazala sie w gazecie
- public readonly string WYDANA = "wydana";
- //emisja, ktora sie dopiero ukaze
- public readonly string NIEWYDANA = "niewydana";
- //emisja zafakturowana
- public readonly string ZAFAKTUROWANA = "zafakturowana";
- //emisja zafakturowana i wydana
- public readonly string ZAFAKTUROWANA_WYDANA = "zafakturowana_wydana";
- //emisja siê nie ukazala, ale jest w miesiacu, ktory jest juz zafakturowany
- public readonly string MS_ZAFAKTUROWANY_NIEWYDANA = "zafakturowana_wydana";
- //emisja do zmiany
- public readonly string DO_ZMIANY = "do_zmiany";
- //emisja do zmiany
- public readonly string NOWA = "nowa";
-
string tytul;
@@ -37,5 +22,5 @@
readonly short emisjaDoZmiany;
- short nowaEmisja;
+ short? nowaEmisja;
int iloscEmisji;
@@ -47,5 +32,5 @@
#region properties
- public short NowaEmisja
+ public short? NowaEmisja
{
get { return nowaEmisja; }
@@ -117,6 +102,4 @@
nRDataGridView.CellValueChanged += nRDataGridView_CellValueChanged;
nRDataGridView.CellContentClick += nRDataGridView_CellContentClicked;
-
- // nRBindingSource.ResetBindings(false);
}
@@ -155,49 +138,66 @@
private void zmienButton_Click(object sender, EventArgs e)
{
- foreach (REKLAMADataSet.UKAZE_SIE_W_NRRow r in emisje)
- {
- if (r.RowState != DataRowState.Deleted)
- {
- if (r.Nr_Wydania == emisjaDoZmiany)
- {
- r.Nr_Wydania = nowaEmisja;
- r.EndEdit();
- break;
- }
- }
- }
+ //foreach (REKLAMADataSet.UKAZE_SIE_W_NRRow r in emisje)
+ //{
+ // if (r.RowState != DataRowState.Deleted)
+ // {
+ // if (r.Nr_Wydania == emisjaDoZmiany && nowaEmisja.HasValue)
+ // {
+ // r.Nr_Wydania = nowaEmisja.Value;
+ // r.EndEdit();
+ // break;
+ // }
+ // }
+ //}
+ nowaEmisja = GetNewIssueNumber();
+
+ }
+
+ private short? GetNewIssueNumber()
+ {
+ short? newIssueNumer = null;
+ bool? isIssueChecked;
+
+ foreach (DataGridViewRow row in nRDataGridView.Rows)
+ {
+ if (row.ReadOnly || (row.DefaultCellStyle.BackColor != Color.White && row.DefaultCellStyle.BackColor != Color.LightYellow)) continue;
+
+ isIssueChecked = (bool?)row.Cells[3].Value;
+ if (!isIssueChecked.HasValue || !isIssueChecked.Value) continue;
+
+ newIssueNumer = (short)row.Cells[0].Value;
+ break;
+ }
+
+ return newIssueNumer;
}
private void nRDataGridView_CellContentClicked(object sender, DataGridViewCellEventArgs e)
{
- if (e.RowIndex >= 0)
- {
- if (!nRDataGridView.Rows[e.RowIndex].ReadOnly)
- {
- if (e.ColumnIndex == 3)
- {
- if (nRDataGridView.Rows[e.RowIndex].DefaultCellStyle.BackColor == Color.White)
- {
- if (emisjaDoZmiany != 0 && index != -1)
- {
- nRDataGridView.Rows[index].Cells[3].Value = false;
- nRDataGridView.Rows[index].DefaultCellStyle.BackColor = Color.White;
- }
-
- nowaEmisja = (short)nRDataGridView.Rows[e.RowIndex].Cells[0].Value;
- index = e.RowIndex;
-
- nRDataGridView.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.LightYellow;
- }
- else
- {
- nowaEmisja = (short)nRDataGridView.Rows[e.RowIndex].Cells[0].Value;
- index = e.RowIndex;
-
- nRDataGridView.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.White;
- }
-
- }
- }
+ if (e.RowIndex < 0) return;
+
+ if (nRDataGridView.Rows[e.RowIndex].ReadOnly) return;
+
+ if (e.ColumnIndex != 3) return;
+
+ if (nRDataGridView.Rows[e.RowIndex].DefaultCellStyle.BackColor == Color.White)
+ {
+ if (emisjaDoZmiany != 0 && index != -1)
+ {
+ nRDataGridView.Rows[index].Cells[3].Value = false;
+ nRDataGridView.Rows[index].DefaultCellStyle.BackColor = Color.White;
+ }
+
+ nowaEmisja = (short) nRDataGridView.Rows[e.RowIndex].Cells[0].Value;
+ index = e.RowIndex;
+
+ nRDataGridView.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.LightYellow;
+ }
+ else
+ {
+ nowaEmisja = (short) nRDataGridView.Rows[e.RowIndex].Cells[0].Value;
+ index = e.RowIndex;
+
+ nRDataGridView.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.White;
}
nRDataGridView.EndEdit();
@@ -206,81 +206,74 @@
private void nRDataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
{
- if (e.ColumnIndex == 3)
- {
- if (((bool)nRDataGridView[e.ColumnIndex, e.RowIndex].Value))
- {
- iloscEmisji++;
- }
- else
- {
- iloscEmisji--;
- }
-
- label2.Text = iloscEmisji.ToString();
- }
+ if (e.ColumnIndex != 3) return;
+
+ if (((bool) nRDataGridView[e.ColumnIndex, e.RowIndex].Value))
+ iloscEmisji++;
+ else
+ iloscEmisji--;
+
+ label2.Text = iloscEmisji.ToString();
}
private void nRDataGridView_DataBindingComplete(object sender, DataGridViewBindingCompleteEventArgs e)
{
- if (e.ListChangedType == ListChangedType.Reset)
- {
- foreach (DataGridViewRow row in nRDataGridView.Rows)
- {
- row.DefaultCellStyle.BackColor = Color.White;
-
- row.Cells[2].Value = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.DayNames
- [(int)Convert.ToDateTime(row.Cells[1].Value).DayOfWeek];
-
- DataRow[] table = emisje.Select("[Nr Wydania]=" + row.Cells[0].Value);
-
- if (table != null && table.Length > 0)
+ if (e.ListChangedType != ListChangedType.Reset) return;
+
+ foreach (DataGridViewRow row in nRDataGridView.Rows)
+ {
+ row.DefaultCellStyle.BackColor = Color.White;
+
+ row.Cells[2].Value = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.DayNames
+ [(int) Convert.ToDateTime(row.Cells[1].Value).DayOfWeek];
+
+ DataRow[] table = emisje.Select("[Nr Wydania]=" + row.Cells[0].Value);
+
+ if (table != null && table.Length > 0)
+ {
+ row.ReadOnly = true;
+ row.Cells[3].Value = true;
+ row.DefaultCellStyle.BackColor = Color.WhiteSmoke;
+
+ REKLAMADataSet.UKAZE_SIE_W_NRRow em =
+ (REKLAMADataSet.UKAZE_SIE_W_NRRow) table[0];
+
+ if (Convert.ToDateTime(row.Cells[1].Value) < DateTime.Today)
+ {
+ row.DefaultCellStyle.BackColor = Color.MintCream;
+ }
+ else
+ {
+ if (em.zafakturowana)
+ {
+ row.DefaultCellStyle.BackColor = Color.LightGray;
+ }
+
+ //anulowana
+ if (em.status == 2)
+ {
+ row.DefaultCellStyle.ForeColor = Color.Red;
+ }
+
+ if (emisjaDoZmiany == (short) row.Cells[0].Value)
+ {
+ row.DefaultCellStyle.BackColor = Color.MistyRose;
+ }
+ }
+ }
+ else if (emisjaDoZmiany == 0)
+ {
+ //emisja nie zosta³a wczeniej wybrana, ale jej misi¹c ju¿
+ // jest zafakturowany
+ DateTime dataWydania = (DateTime) row.Cells[1].Value;
+ if (dataWydania.Year <= dataOstatatniejZafakturowanejEmisji.Year
+ &&
+ dataWydania.Month <= dataOstatatniejZafakturowanejEmisji.Month)
{
row.ReadOnly = true;
- row.Cells[3].Value = true;
- row.DefaultCellStyle.BackColor = Color.WhiteSmoke;
-
- REKLAMADataSet.UKAZE_SIE_W_NRRow em =
- (REKLAMADataSet.UKAZE_SIE_W_NRRow)table[0];
-
- if (Convert.ToDateTime(row.Cells[1].Value) < DateTime.Today)
- {
- row.DefaultCellStyle.BackColor = Color.MintCream;
- }
- else
- {
- if (em.zafakturowana)
- {
- row.DefaultCellStyle.BackColor = Color.LightGray;
- }
-
- //anulowana
- if (em.status == 2)
- {
- row.DefaultCellStyle.ForeColor = Color.Red;
- }
-
- if (emisjaDoZmiany == (short)row.Cells[0].Value)
- {
- row.DefaultCellStyle.BackColor = Color.MistyRose;
- }
- }
- }
- else if (emisjaDoZmiany == 0)
- {
- //emisja nie zosta³a wczeniej wybrana, ale jej misi¹c ju¿
- // jest zafakturowany
- DateTime dataWydania = (DateTime)row.Cells[1].Value;
- if (dataWydania.Year <= dataOstatatniejZafakturowanejEmisji.Year
- &&
- dataWydania.Month <= dataOstatatniejZafakturowanejEmisji.Month)
- {
- row.ReadOnly = true;
- row.DefaultCellStyle.BackColor = Color.LightGray;
- }
- }
- }
- }
- }
-
+ row.DefaultCellStyle.BackColor = Color.LightGray;
+ }
+ }
+ }
+ }
}
}
Index: branches/Abonament/BazaReklam/Properties/AssemblyInfo.cs
===================================================================
--- branches/Abonament/BazaReklam/Properties/AssemblyInfo.cs (revision 763)
+++ branches/Abonament/BazaReklam/Properties/AssemblyInfo.cs (revision 769)
@@ -30,3 +30,3 @@
//
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.22")]
+[assembly: AssemblyFileVersion("1.1.23")]