Index: /trunk/BazaReklam/Baza Reklam.csproj
===================================================================
--- /trunk/BazaReklam/Baza Reklam.csproj (revision 834)
+++ /trunk/BazaReklam/Baza Reklam.csproj (revision 862)
@@ -33,5 +33,5 @@
index.htm
false
-
1.1.31.0
+
1.1.33.0
false
@@ -754,36 +754,36 @@
False
+ Exclude
- Exclude
Assembly
False
+ Include
- Include
Assembly
False
+ Include
- Include
Assembly
False
+ Include
- Include
Assembly
Index: /trunk/BazaReklam/Properties/AssemblyInfo.cs
===================================================================
--- /trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 834)
+++ /trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 862)
@@ -30,3 +30,3 @@
//
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.31")]
+[assembly: AssemblyFileVersion("1.1.33")]
Index: /trunk/BazaReklam/OrderViewer.cs
===================================================================
--- /trunk/BazaReklam/OrderViewer.cs (revision 732)
+++ /trunk/BazaReklam/OrderViewer.cs (revision 862)
@@ -13,9 +13,13 @@
using System.Reflection;
+using Baza_Reklam.Classes.Helpers;
+using Baza_Reklam.Classes.Interfaces;
+using Baza_Reklam.Classes.Model;
+using Baza_Reklam.Classes.Repositories;
+
namespace Baza_Reklam
{
public partial class OrderViewer : Form
{
- private readonly InvoiceProviderTableAdapter invoiceProviderTableAdapter;
private int reklamaId;
DataSet ds;
@@ -62,7 +66,4 @@
public OrderViewer(int idZamowienia, int a)
{
- invoiceProviderTableAdapter = new InvoiceProviderTableAdapter();
- invoiceProviderTableAdapter.ClearBeforeFill = true;
-
InitializeComponent();
reklamaId = idZamowienia;
@@ -71,5 +72,4 @@
zamowienie2TableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
- invoiceProviderTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
reportViewer1.LocalReport.ReportEmbeddedResource = "Baza_Reklam.Raporty.zamowienie2.rdlc";
@@ -82,8 +82,11 @@
reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("zamowienie2", dt));
- int invoiceProviderId = (int) invoiceProviderTableAdapter.GetDataByIdZamowienia(idZamowienia).Rows[0]["Id"];
-
+ TitleRepository repository = new TitleRepository(ConnString.getConnString().Value);
+ List
_titles = repository.FindAllActive();
+
+ Title title = _titles.Find(delegate(Title t) { return t.ShortName == dt.Rows[0]["TYTU£"].ToString(); });
+
reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("Baza_Reklam_InvoiceProvider",
- InvoiceProviderFactory.GetInvoiceProvidersById(invoiceProviderId)));
+ InvoiceProviderFactory.GetInvoiceProvidersById(title.InvoiceProvider)));
jezykComboBox.SelectedIndex = 0;