Index: /trunk/SQL/StoredProcedures/sp_DeleteReklamaStrona.txt =================================================================== --- /trunk/SQL/StoredProcedures/sp_DeleteReklamaStrona.txt (revision 745) +++ /trunk/SQL/StoredProcedures/sp_DeleteReklamaStrona.txt (revision 750) @@ -7,8 +7,8 @@ ALTER PROCEDURE [dbo].[sp_DeleteReklamaStrona] @tytul varchar(10), - @nrWydania int + @nrWyd int AS DELETE FROM dbo.REKLAMA_STRONA -WHERE Nr_Wydania=@nrWydania +WHERE Nr_Wydania=@nrWyd AND ReklamaId IN ( @@ -22,5 +22,5 @@ WHERE (R.[ZATWIERDZONO DO DRUKU] = 1) - AND (U.[Nr Wydania] = @nrWydania) + AND (U.[Nr Wydania] = @nrWyd) AND (U.status <> 2) AND (T.Symb = @tytul) Index: /trunk/SQL/StoredProcedures/sp_GetDatyEmisjiByReklama.txt =================================================================== --- /trunk/SQL/StoredProcedures/sp_GetDatyEmisjiByReklama.txt (revision 750) +++ /trunk/SQL/StoredProcedures/sp_GetDatyEmisjiByReklama.txt (revision 750) @@ -0,0 +1,33 @@ + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + +-- ============================================= +-- Author: marek +-- Create date: 16-07-2009 +-- Description: Zwraca daty emisji dla konkretnej reklamy +-- ============================================= +ALTER PROCEDURE [dbo].[sp_GetDatyEmisjiByReklama] + -- Add the parameters for the stored procedure here + @reklama INT +AS +BEGIN + -- SET NOCOUNT ON added to prevent extra result sets from + -- interfering with SELECT statements. + SET NOCOUNT ON; + + SELECT CAST(N.NRW AS INT) AS NumerWydania, N.Data_W AS DataWydania + FROM [UKA¯E SIÊ W NR] U + INNER JOIN Reklama R ON R.ReklamaId = U.ReklamaId + INNER JOIN Nr N ON R.[Tytu³] = N.Tyt AND N.NRW=U.[Nr Wydania] + WHERE (R.ReklamaId = @reklama) ORDER BY [Nr Wydania] +END +GO + +SET ANSI_NULLS OFF +GO +SET QUOTED_IDENTIFIER OFF +GO + Index: /trunk/BazaReklam/OrderDetails.cs =================================================================== --- /trunk/BazaReklam/OrderDetails.cs (revision 738) +++ /trunk/BazaReklam/OrderDetails.cs (revision 750) @@ -489,9 +489,26 @@ private void BlokowanieZrealizowanychEmisji() { + //TODO: Dodac kolumne DataEmisji do tabeli "Uka¿e siê w nr" + + Dictionary datyEmisji = null; + if (ukazeSieDataGridView.Rows.Count > 0) + datyEmisji = ReklamaHelper.GetDatyEmisji(Convert.ToInt32(ukazeSieDataGridView.Rows[0].Cells["ReklamaId"].Value)); + + DateTime firstDayOfCurrentMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + // ukazeSieDataGridView.Enabled = true; foreach (DataGridViewRow r in ukazeSieDataGridView.Rows) { REKLAMADataSet.UKAZE_SIE_W_NRRow em = - (REKLAMADataSet.UKAZE_SIE_W_NRRow)((DataRowView)r.DataBoundItem).Row; + (REKLAMADataSet.UKAZE_SIE_W_NRRow) ((DataRowView) r.DataBoundItem).Row; + + if (datyEmisji != null && datyEmisji.ContainsKey(em.Nr_Wydania)) + { + if (datyEmisji[em.Nr_Wydania] < firstDayOfCurrentMonth) + { + r.ReadOnly = true; + r.DefaultCellStyle.BackColor = Color.MintCream; + } + } //anulowana @@ -501,4 +518,6 @@ r.DefaultCellStyle.ForeColor = Color.Red; } + + if (r.ReadOnly && r.DefaultCellStyle.BackColor == Color.MintCream) continue; foreach (DataGridViewRow s in ukazaloSieDataGridView.Rows) @@ -513,5 +532,4 @@ } } - public void ZablokujGroupBoxa(GroupBox g) Index: /trunk/BazaReklam/Docs/versioninfo.html =================================================================== --- /trunk/BazaReklam/Docs/versioninfo.html (revision 742) +++ /trunk/BazaReklam/Docs/versioninfo.html (revision 750) @@ -6,4 +6,14 @@

Baza reklam - Informacje o wersji

+
+ +

Wersja 1.1.21 (2009-07-16)

+

Opis zmian wprowadzonych do wersji 1.1.21

+
    +
  • Poprawiono import numerów stron z XTG
    • +
  • Poprawiono błąd występujący po naciśnięciu przycisku "Pokaż szczegóły" - okno Klienci, zakładka Reklamy
    • +
  • Wprowadzono blokadę zmian dla emisji z poprzedniego miesiąca lub starszych
    • +
+
Index: /trunk/BazaReklam/Baza Reklam.csproj =================================================================== --- /trunk/BazaReklam/Baza Reklam.csproj (revision 742) +++ /trunk/BazaReklam/Baza Reklam.csproj (revision 750) @@ -33,5 +33,5 @@ index.htm false - 1.1.20.0 + 1.1.21.0 false Index: /trunk/BazaReklam/Classes/Helpers/ReklamaHelper.cs =================================================================== --- /trunk/BazaReklam/Classes/Helpers/ReklamaHelper.cs (revision 602) +++ /trunk/BazaReklam/Classes/Helpers/ReklamaHelper.cs (revision 750) @@ -1,2 +1,7 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; + namespace Baza_Reklam.Classes.Helpers { @@ -21,4 +26,46 @@ return (reklama.IsidZamowieniaNull() && reklama.TYTU£.ToUpper() == "EXPO"); } + + public static Dictionary GetDatyEmisji(int reklamaId) + { + Dictionary datyEmisji = new Dictionary(); + + const string query = "sp_GetDatyEmisjiByReklama"; + + SqlConnection conn = null; + SqlCommand cmd = null; + SqlDataReader reader = null; + try + { + conn = new SqlConnection(ConnString.getConnString().Value); + conn.Open(); + cmd = new SqlCommand(query, conn); + cmd.CommandType = CommandType.StoredProcedure; + cmd.Parameters.AddWithValue("@reklama", reklamaId); + reader = cmd.ExecuteReader(); + if (reader != null) + { + while (reader.Read()) + datyEmisji.Add(reader.GetInt32(0), reader.GetDateTime(1)); + } + } + finally + { + if (reader != null) + { + reader.Close(); + reader.Dispose(); + } + if (cmd != null) cmd.Dispose(); + if (conn != null) + { + conn.Close(); + conn.Dispose(); + } + + } + return datyEmisji; + + } } } Index: /trunk/BazaReklam/REKLAMADataSet.xss =================================================================== --- /trunk/BazaReklam/REKLAMADataSet.xss (revision 740) +++ /trunk/BazaReklam/REKLAMADataSet.xss (revision 750) @@ -5,5 +5,5 @@ the code is regenerated. --> - + Index: /trunk/BazaReklam/OrderDetails.Designer.cs =================================================================== --- /trunk/BazaReklam/OrderDetails.Designer.cs (revision 732) +++ /trunk/BazaReklam/OrderDetails.Designer.cs (revision 750) @@ -109,4 +109,5 @@ this.zafakturowana = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.netto = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.reklamaIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.rEKLAMAUKAZESIEWNRBindingSource = new System.Windows.Forms.BindingSource(this.components); this.uKAZE_SIE_W_NRTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.UKAZE_SIE_W_NRTableAdapter(); @@ -940,5 +941,6 @@ this.nrWydaniaDataGridViewTextBoxColumn, this.zafakturowana, - this.netto}); + this.netto, + this.reklamaIdColumn}); this.ukazeSieDataGridView.DataSource = this.rEKLAMAUKAZESIEWNRBindingSource; this.ukazeSieDataGridView.Location = new System.Drawing.Point(435, 9); @@ -988,4 +990,13 @@ this.netto.ReadOnly = true; this.netto.Width = 70; + // + // reklamaIdColumn + // + this.reklamaIdColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.reklamaIdColumn.DataPropertyName = "ReklamaId"; + this.reklamaIdColumn.HeaderText = "ReklamaId"; + this.reklamaIdColumn.Name = "ReklamaId"; + this.reklamaIdColumn.ReadOnly = true; + this.reklamaIdColumn.Visible = false; // // rEKLAMAUKAZESIEWNRBindingSource @@ -1998,4 +2009,5 @@ private System.Windows.Forms.DataGridViewCheckBoxColumn zafakturowana; private System.Windows.Forms.DataGridViewTextBoxColumn netto; + private System.Windows.Forms.DataGridViewTextBoxColumn reklamaIdColumn; private System.Windows.Forms.ContextMenuStrip advertSiteContext; private System.Windows.Forms.ToolStripMenuItem deleteItem; Index: /trunk/BazaReklam/Properties/AssemblyInfo.cs =================================================================== --- /trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 742) +++ /trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 750) @@ -30,3 +30,3 @@ // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.1.20")] +[assembly: AssemblyFileVersion("1.1.21")] Index: /trunk/BazaReklam/OrderDetails.resx =================================================================== --- /trunk/BazaReklam/OrderDetails.resx (revision 732) +++ /trunk/BazaReklam/OrderDetails.resx (revision 750) @@ -262,10 +262,4 @@ 1120, 54 - - True - - - True - 293, 17 Index: /trunk/BazaReklamSetup/BazaReklamSetup.vdproj =================================================================== --- /trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 742) +++ /trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 750) @@ -656,6 +656,6 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Baza Reklam" - "ProductCode" = "8:{92418653-499A-4412-B578-50F9AA80E3ED}" - "PackageCode" = "8:{608D51C7-24CC-4BE6-92D3-D979215C9766}" + "ProductCode" = "8:{FAD7A55E-7CB0-4F44-BAFE-A90AEC02A154}" + "PackageCode" = "8:{C88386E1-DFFD-4241-8E1D-E3BFF0B5C808}" "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}" "RestartWWWService" = "11:FALSE" @@ -663,5 +663,5 @@ "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:1.1.20" + "ProductVersion" = "8:1.1.21" "Manufacturer" = "8:AACT" "ARPHELPTELEPHONE" = "8:"