Zbiór zmian 298

Data:

2009-02-05 10:40:34 (17 years ago)

Autor:

marek

Opis:

fixes #77

Pliki:

• trunk/BazaReklam/ReportsForm.cs (zmodyfikowane) (9 diffs)

trunk/BazaReklam/ReportsForm.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using Microsoft.Reporting.WinForms;
@@ -14 +10 @@
         private static ReportsForm reportsForm;
 
-        private string reportsCatalog = "";
+        private readonly string reportsCatalog = "";
 
         public static ReportsForm getReportsForm(MDIBazaReklam parent)
         {
-            if (reportsForm == null) {
-                reportsForm = new ReportsForm(parent);
-            }
+            if (reportsForm == null) reportsForm = new ReportsForm(parent);
             return reportsForm;
         }
 
-        private ReportsForm(MDIBazaReklam parent)
+        private ReportsForm(Form parent)
         {
             InitializeComponent();
 
-            this.MdiParent = parent;
+            MdiParent = parent;
 
             if (!ConnString.getConnString().Value.Contains("10.0.0.21"))
-            {
                 reportViewer1.ServerReport.ReportServerUrl = new Uri(Properties.Settings.Default.reportsServer);
-            }
             else
-            {
                 reportViewer1.ServerReport.ReportServerUrl = new Uri(Properties.Settings.Default.reportsServerLocal);
-            }
-           
-            if (ConnString.getConnString().Value.Contains("truck"))
-            {
-                reportsCatalog = "ZestawieniaEXPO";
-            }
-            else
-            {
-                reportsCatalog = "Zestawienia";
-            }
-
-            initTreeView(stareRaportyTreeView);
-            initTreeView(raportyTreeView);
+
+            reportsCatalog = ConnString.getConnString().Value.Contains("truck") ? "ZestawieniaEXPO" : "Zestawienia";
+
+            InitTreeView(stareRaportyTreeView);
+            InitTreeView(raportyTreeView);
             
             wczytajRaporty();
@@ -57 +40 @@
         private void ReportsForm_Load(object sender, EventArgs e)
         {
-            this.WindowState = FormWindowState.Maximized;
+            WindowState = FormWindowState.Maximized;
         }
 
@@ -64 +47 @@
         /// </summary>
         private void wczytajRaporty() {
-            
-            TreeNode node;
-            node = new TreeNode();
+            TreeNode node = new TreeNode();
             node.Name = "/" + reportsCatalog + "/ListaReklamNaWydanieNr";
             node.Text = "Lista reklam na wydanie";
@@ -336 +317 @@
         }
 
-        private TreeNode initTreeView(TreeView treeView)
+        private static void InitTreeView(TreeView treeView)
         {
-            TreeNode node;
-
-            node = new TreeNode("Wp³ywy");
+            TreeNode node = new TreeNode("Wp³ywy");
             node.Name = "Wp³ywy";
             treeView.Nodes.Add(node);
@@ -376 +355 @@
             treeView.Nodes.Add(node);
 
-            return node;
+            return;
         }
 
         private void wczytajNoweRaporty()
         {
-            TreeNode node;
-
-            node = new TreeNode();
+            TreeNode node = new TreeNode();
             node.Name = "/" + reportsCatalog + "/ReklamyBezZamowienia";
             node.Text = "Reklamy bez zamowienia";
@@ -730 +707 @@
                     break;
                 case 1:
-                    this.Cursor = Cursors.WaitCursor;
+                    Cursor = Cursors.WaitCursor;
 
                     reportViewer1.ServerReport.ReportPath = e.Node.Name;
 
                     if (reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/ZestawienieMiesieczneFaktur" |
+                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/ZestawienieMiesieczneFaktur2009" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/ZestawienieKontaktow" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieWplywowWgDatyWplaty2" |
-                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SzacowanieSprzedazy" |
-                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame")
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieWplywowWgDatyWplaty2009" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame2009" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SzacowanieSprzedazy"
+                       )
                     {
                         if (!User.getUser().St_kierownik)
@@ -760 +741 @@
 
                     if (reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/Zaleglosci" |
+                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/Zaleglosci2009" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/WynikAgencji" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam2009" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame2009" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/OcenaAgenta")
                     {
@@ -785 +769 @@
                     reportViewer1.RefreshReport();
 
-                    this.Cursor = Cursors.Default;
+                    Cursor = Cursors.Default;
                     break;
                 default: