Index: /branches/Emisje/BazaReklam/OrderDetails.cs =================================================================== --- /branches/Emisje/BazaReklam/OrderDetails.cs (revision 780) +++ /branches/Emisje/BazaReklam/OrderDetails.cs (revision 781) @@ -177,13 +177,13 @@ rEKLAMADataSet.UKAZE_SIE_W_NR.TableNewRow += nowaEmisja; - pROMOCJETableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - lISTA_TYPOW_REKLAMYTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - kursy_WalutTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - rEKLAMATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - uKAZE_SIE_W_NRTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - rEKLAMA_STRONATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - reklama_Info_DodTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - aGENCITableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - zmianyEmisjiTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //pROMOCJETableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //lISTA_TYPOW_REKLAMYTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //kursy_WalutTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //rEKLAMATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //uKAZE_SIE_W_NRTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //rEKLAMA_STRONATableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //reklama_Info_DodTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //aGENCITableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; + //zmianyEmisjiTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; pROMOCJETableAdapter.Fill(sLOWNIKDataSet.PROMOCJE); Index: /branches/Emisje/BazaReklam/REKLAMADataSet.xsd =================================================================== --- /branches/Emisje/BazaReklam/REKLAMADataSet.xsd (revision 780) +++ /branches/Emisje/BazaReklam/REKLAMADataSet.xsd (revision 781) @@ -673,7 +673,9 @@ - SELECT U.ID, [Nr Wydania], ReklamaId, dataAnulowania, dataDodania, idFaktury, netto, status, zafakturowana, DoDruku, LokalizacjaId, DzialId, RozdzialId, D.Name AS Dzial + SELECT U.ID, [Nr Wydania], ReklamaId, dataAnulowania, dataDodania, idFaktury, netto, status, zafakturowana, DoDruku, LokalizacjaId, U.DzialId, RozdzialId, D.Name AS Dzial, Roz.Name AS Rozdzial, Lok.[Text] AS Lokalizacja FROM dbo.[UKAŻE SIĘ W NR] U LEFT OUTER JOIN dbo.Dzial D ON U.DzialId = D.Id +LEFT OUTER JOIN dbo.Rozdzial Roz ON U.RozdzialId = Roz.Id +LEFT OUTER JOIN dbo.ReklamaLokalizacja Lok ON U.LokalizacjaId = Lok.Id WHERE (ReklamaId = @param1) ORDER BY [Nr Wydania] @@ -4855,4 +4857,5 @@ + Index: /branches/Emisje/BazaReklam/OrderDetails.Designer.cs =================================================================== --- /branches/Emisje/BazaReklam/OrderDetails.Designer.cs (revision 780) +++ /branches/Emisje/BazaReklam/OrderDetails.Designer.cs (revision 781) @@ -74,4 +74,6 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dzialColumnCellStyle = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle rozdzialColumnCellStyle = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle lokalizacjaColumnCellStyle = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OrderDetails)); this.rEKLAMADataSet = new Baza_Reklam.REKLAMADataSet(); @@ -112,4 +114,6 @@ this.ReklamaIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.DzialColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RozdzialColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.LokalizacjaColumn = 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(); @@ -943,5 +947,7 @@ this.netto, this.ReklamaIdColumn, - this.DzialColumn}); + this.DzialColumn, + this.RozdzialColumn, + this.LokalizacjaColumn}); this.ukazeSieDataGridView.DataSource = this.rEKLAMAUKAZESIEWNRBindingSource; this.ukazeSieDataGridView.Location = new System.Drawing.Point(435, 9); @@ -1015,4 +1021,30 @@ this.DzialColumn.Visible = true; this.DzialColumn.Width = 100; + // + // RozdzialColumn + // + rozdzialColumnCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + rozdzialColumnCellStyle.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.RozdzialColumn.DefaultCellStyle = rozdzialColumnCellStyle; + this.RozdzialColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.RozdzialColumn.DataPropertyName = "Rozdzial"; + this.RozdzialColumn.HeaderText = "Rozdzia³"; + this.RozdzialColumn.Name = "Rozdzial"; + this.RozdzialColumn.ReadOnly = true; + this.RozdzialColumn.Visible = true; + this.RozdzialColumn.Width = 100; + // + // LokalizacjaColumn + // + lokalizacjaColumnCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + lokalizacjaColumnCellStyle.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.LokalizacjaColumn.DefaultCellStyle = lokalizacjaColumnCellStyle; + this.LokalizacjaColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.LokalizacjaColumn.DataPropertyName = "Lokalizacja"; + this.LokalizacjaColumn.HeaderText = "Lokalizacja"; + this.LokalizacjaColumn.Name = "Lokalizacja"; + this.LokalizacjaColumn.ReadOnly = true; + this.LokalizacjaColumn.Visible = true; + this.LokalizacjaColumn.Width = 100; // // rEKLAMAUKAZESIEWNRBindingSource @@ -2023,4 +2055,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn ReklamaIdColumn; private System.Windows.Forms.DataGridViewTextBoxColumn DzialColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn RozdzialColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn LokalizacjaColumn; private System.Windows.Forms.DataGridViewTextBoxColumn nRWYDANIADataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn NR_WYDANIA; Index: /branches/Emisje/BazaReklam/REKLAMADataSet.Designer.cs =================================================================== --- /branches/Emisje/BazaReklam/REKLAMADataSet.Designer.cs (revision 780) +++ /branches/Emisje/BazaReklam/REKLAMADataSet.Designer.cs (revision 781) @@ -2824,4 +2824,6 @@ private global::System.Data.DataColumn columnDzial; + private global::System.Data.DataColumn columnRozdzial; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public UKAZE_SIE_W_NRDataTable() { @@ -2953,4 +2955,11 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn RozdzialColumn { + get { + return this.columnRozdzial; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Browsable(false)] public int Count { @@ -2981,5 +2990,5 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public UKAZE_SIE_W_NRRow AddUKAZE_SIE_W_NRRow(REKLAMARow parentREKLAMARowByREKLAMA_UKAZE_SIE_W_NR, short Nr_Wydania, short status, bool zafakturowana, FAKTURYRow parentFAKTURYRowByFAKTURY_UKAZE_SIE_W_NR, System.DateTime dataDodania, System.DateTime dataAnulowania, decimal netto, bool DoDruku, int LokalizacjaId, int DzialId, int RozdzialId, string Dzial) { + public UKAZE_SIE_W_NRRow AddUKAZE_SIE_W_NRRow(REKLAMARow parentREKLAMARowByREKLAMA_UKAZE_SIE_W_NR, short Nr_Wydania, short status, bool zafakturowana, FAKTURYRow parentFAKTURYRowByFAKTURY_UKAZE_SIE_W_NR, System.DateTime dataDodania, System.DateTime dataAnulowania, decimal netto, bool DoDruku, int LokalizacjaId, int DzialId, int RozdzialId, string Dzial, string Rozdzial) { UKAZE_SIE_W_NRRow rowUKAZE_SIE_W_NRRow = ((UKAZE_SIE_W_NRRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -2997,5 +3006,6 @@ DzialId, RozdzialId, - Dzial}; + Dzial, + Rozdzial}; if ((parentREKLAMARowByREKLAMA_UKAZE_SIE_W_NR != null)) { columnValuesArray[1] = parentREKLAMARowByREKLAMA_UKAZE_SIE_W_NR[0]; @@ -3048,4 +3058,5 @@ this.columnRozdzialId = base.Columns["RozdzialId"]; this.columnDzial = base.Columns["Dzial"]; + this.columnRozdzial = base.Columns["Rozdzial"]; } @@ -3080,4 +3091,6 @@ this.columnDzial = new global::System.Data.DataColumn("Dzial", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDzial); + this.columnRozdzial = new global::System.Data.DataColumn("Rozdzial", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnRozdzial); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnID}, true)); @@ -21196,4 +21209,19 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string Rozdzial { + get { + try { + return ((string)(this[this.tableUKAZE_SIE_W_NR.RozdzialColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Rozdzial\' in table \'UKAZE_SIE_W_NR\' is DBNull.", e); + } + } + set { + this[this.tableUKAZE_SIE_W_NR.RozdzialColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public FAKTURYRow FAKTURYRow { get { @@ -21303,4 +21331,14 @@ public void SetDzialNull() { this[this.tableUKAZE_SIE_W_NR.DzialColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsRozdzialNull() { + return this.IsNull(this.tableUKAZE_SIE_W_NR.RozdzialColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetRozdzialNull() { + this[this.tableUKAZE_SIE_W_NR.RozdzialColumn] = global::System.Convert.DBNull; } @@ -38250,7 +38288,9 @@ this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = @"SELECT U.ID, [Nr Wydania], ReklamaId, dataAnulowania, dataDodania, idFaktury, netto, status, zafakturowana, DoDruku, LokalizacjaId, DzialId, RozdzialId, D.Name AS Dzial + this._commandCollection[5].CommandText = @"SELECT U.ID, [Nr Wydania], ReklamaId, dataAnulowania, dataDodania, idFaktury, netto, status, zafakturowana, DoDruku, LokalizacjaId, U.DzialId, RozdzialId, D.Name AS Dzial, Roz.Name AS Rozdzial, Lok.[Text] AS Lokalizacja FROM dbo.[UKAŻE SIĘ W NR] U LEFT OUTER JOIN dbo.Dzial D ON U.DzialId = D.Id +LEFT OUTER JOIN dbo.Rozdzial Roz ON U.RozdzialId = Roz.Id +LEFT OUTER JOIN dbo.ReklamaLokalizacja Lok ON U.LokalizacjaId = Lok.Id WHERE (ReklamaId = @param1) ORDER BY [Nr Wydania]"; this._commandCollection[5].CommandType = global::System.Data.CommandType.Text; Index: /branches/Emisje/BazaReklam/app.config =================================================================== --- /branches/Emisje/BazaReklam/app.config (revision 777) +++ /branches/Emisje/BazaReklam/app.config (revision 781) @@ -22,7 +22,4 @@ G:\ReklamaFiles\ - - http://10.0.0.39/ReportServer - Index: /branches/Emisje/BazaReklam/Properties/Settings.settings =================================================================== --- /branches/Emisje/BazaReklam/Properties/Settings.settings (revision 777) +++ /branches/Emisje/BazaReklam/Properties/Settings.settings (revision 781) @@ -8,7 +8,4 @@ G:\ReklamaFiles\ - - - http://10.0.0.39/ReportServer Index: /branches/Emisje/BazaReklam/Properties/Settings.Designer.cs =================================================================== --- /branches/Emisje/BazaReklam/Properties/Settings.Designer.cs (revision 777) +++ /branches/Emisje/BazaReklam/Properties/Settings.Designer.cs (revision 781) @@ -44,13 +44,4 @@ [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://10.0.0.39/ReportServer")] - public string reportsServerLocal { - get { - return ((string)(this["reportsServerLocal"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] [global::System.Configuration.DefaultSettingValueAttribute("Data Source=.\\sql2k;Initial Catalog=Baza_Reklam;User ID=sa;Password=mageroni")]