Zbiór zmian 949 dla trunk/eCard/eCardMVC/Platnosci.Core

Data:

2009-12-11 16:57:08 (16 years ago)

Autor:

marek

Opis:

re #215 - drobny refactoring

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci.Core

Pliki:

• Interface/IDataContext.cs (zmodyfikowane) (1 diff)
• Interface/IIdentifiable.cs (zmodyfikowane) (1 diff)
• Interface/IRepository.cs (zmodyfikowane) (1 diff)
• Interface/ITranslateManager.cs (zmodyfikowane) (1 diff)
• Linq/DataContext.cs (przeniesione) (przeniesione from trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext1.cs) (1 diff)
• Linq/Merchant.cs (zmodyfikowane) (1 diff)
• Linq/Payer.cs (zmodyfikowane) (1 diff)
• Linq/Platnosci.designer.cs (zmodyfikowane) (1 diff)
• Linq/PlatnosciDataContext.cs (zmodyfikowane) (1 diff)
• Linq/PlatnosciEcard.cs (zmodyfikowane) (2 diffs)
• Linq/PotwierdzeniaEcard.cs (zmodyfikowane) (2 diffs)
• Linq/Repository.cs (zmodyfikowane) (4 diffs)
• Linq/Translation.cs (zmodyfikowane) (2 diffs)
• Linq/Waluta.cs (zmodyfikowane) (1 diff)
• Linq/vPlatnosciEcard.cs (zmodyfikowane) (2 diffs)
• Platnosci.Core.csproj (zmodyfikowane) (1 diff)

trunk/eCard/eCardMVC/Platnosci.Core/Interface/IDataContext.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using Platnosci.Core.Linq;
-using System.Text; 
 
 namespace Platnosci.Core.Interface

trunk/eCard/eCardMVC/Platnosci.Core/Interface/IIdentifiable.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Platnosci.Core.Interface
+namespace Platnosci.Core.Interface
 {
     public interface IIdentifiable

trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using Platnosci.Core.Linq;
 

trunk/eCard/eCardMVC/Platnosci.Core/Interface/ITranslateManager.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Platnosci.Core.Interface
+namespace Platnosci.Core.Interface
 {
     public interface ITranslateManager

trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using Platnosci.Core.Interface;
-using System.Data.Linq;
 
 namespace Platnosci.Core.Linq
 {
-    public class DataContext1 : IDataContext
-        {
-                private readonly PlatnosciDataContext _dataContext;
-            private List<object> listaPlatnosci = new List<object>();
-            public DataContext1()
-                {
-                    _dataContext = new PlatnosciDataContext();
-                }            
-                public IQueryable<T> GetTable<T>() where T : class
-                {
-                    return _dataContext.GetTable<T>();
-                }
-            public void Insert<T>(T item) where T : class
-                {
-                    _dataContext.GetTable<T>().InsertOnSubmit(item);
-                _dataContext.SubmitChanges();
-                }
-            public void Delete<T>(T item) where T : class 
+    public class DataContext : IDataContext
+    {
+        private readonly PlatnosciDataContext _dataContext;
+        private readonly List<object> _listaPlatnosci = new List<object>();
+
+        public DataContext()
+        {
+            _dataContext = new PlatnosciDataContext();
+        }
+
+        public IQueryable<T> GetTable<T>() where T : class
+        {
+            return _dataContext.GetTable<T>();
+        }
+
+        public void Insert<T>(T item) where T : class
+        {
+            _dataContext.GetTable<T>().InsertOnSubmit(item);
+            _dataContext.SubmitChanges();
+        }
+
+        public void Delete<T>(T item) where T : class
+        {
+            if (item == null) return;
+
+            _dataContext.GetTable<T>().DeleteOnSubmit(item);
+            _dataContext.SubmitChanges();
+        }
+
+        public void SubmitChanges()
+        {
+            _dataContext.SubmitChanges();
+        }
+
+        public IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer)
+        {
+            var query = from i in _dataContext.vPlatnosciEcards
+                        where (i.nip == nip && i.Faktura_Numer == numer)
+                        select i;
+            return query;
+        }
+
+        public IQueryable<vPlatnosciEcard> FindInvoiceById(int id)
+        {
+            var query = from i in _dataContext.vPlatnosciEcards
+                        where i.ID_faktury == id
+                        select i;
+            return query;
+        }
+
+        public List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury)
+        {
+            var query = _dataContext.PlatnosciEcards
+                            .Where(vp => vp.IDFaktury == idFaktury && vp.Status == true)
+                            .OrderByDescending(vp => vp.IDFaktury);
+
+            query.ToList();
+
+            var tablica = new List<PotwierdzeniaEcard>();
+
+            foreach (var pt in query)
             {
-                if (item != null)
+                var ecard = pt;
+                var query2 = _dataContext.PotwierdzeniaEcards
+                                .Where(ps => ps.ORDERNUMBER == ecard.ORDERNUMBER && ps.CURRENTSTATE == "payment_deposited")
+                                .OrderBy(ps => ps.id);
+
+                for (var i = 0; i < query2.ToList().Count; i++)
                 {
-                    _dataContext.GetTable<T>().DeleteOnSubmit(item);
-                    _dataContext.SubmitChanges();
+                    tablica.Add(query2.ToList()[i]);
                 }
             }
-            public void SubmitChanges()
-            {
-                _dataContext.SubmitChanges();
-            }
-            public IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer)
-            {
-                var query = from i in _dataContext.vPlatnosciEcards
-                            where (i.nip == nip && i.Faktura_Numer == numer)
-                            select i;
-                return query;
-            }
-            public IQueryable<vPlatnosciEcard> FindInvoiceById(int id)
-            {
-                var query = from i in _dataContext.vPlatnosciEcards
-                            where i.ID_faktury == id
-                            select i;
-                return query;
-            }
-            public List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury)
-            {
-                var query = from vp in _dataContext.PlatnosciEcards
-                            where vp.IDFaktury == idFaktury && vp.Status == true
-                            orderby vp.IDFaktury descending
-                            select vp;
 
-                query.ToList();
-                var tablica = new List<PotwierdzeniaEcard>();
+            return tablica;
+        }
 
-                foreach (var pt in query)
-                {
-                    var query2 = from ps in _dataContext.PotwierdzeniaEcards
-                                 where ps.ORDERNUMBER == pt.ORDERNUMBER && ps.CURRENTSTATE == "payment_deposited"
-                                 orderby ps.id
-                                 select ps;
+        public List<object> Getlista()
+        {
+            return _listaPlatnosci;
+        }
 
-                    for (var i = 0; i < query2.ToList().Count; i++)
-                    {
-                        tablica.Add(query2.ToList()[i]);
-                    }
-                }
-                return tablica;
-            }
-            public List<object> getlista()
-            {
-                return listaPlatnosci;
-            }
-            public IQueryable<PlatnosciEcard> FindPaymentByOrdernumber(int ordernumber)
-            {
-                var query = from l in _dataContext.PlatnosciEcards
-                            where l.ORDERNUMBER == ordernumber
-                            select l;
+        public IQueryable<PlatnosciEcard> FindPaymentByOrdernumber(int ordernumber)
+        {
+            var query = from l in _dataContext.PlatnosciEcards
+                        where l.ORDERNUMBER == ordernumber
+                        select l;
 
-                return query;
-            }
-            public int GetOrdernumber(string description, int? idfaktury, DateTime? data)
-            {
-                int ordernumber = 0;
+            return query;
+        }
 
-                var query = from l in _dataContext.PlatnosciEcards
-                            where l.ORDERDESCRIPTION == description && l.IDFaktury == idfaktury && l.Data == data
-                            select l;
-                
-                List<PlatnosciEcard> pl = query.ToList();
-                if (pl.Count > 0 && pl[0].ORDERNUMBER > 0) ordernumber = pl[0].ORDERNUMBER;
-                return ordernumber;
-            }
+        public int GetOrdernumber(string description, int? idfaktury, DateTime? data)
+        {
+            var ordernumber = 0;
+
+            var query = from l in _dataContext.PlatnosciEcards
+                        where l.ORDERDESCRIPTION == description && l.IDFaktury == idfaktury && l.Data == data
+                        select l;
+
+            var pl = query.ToList();
+            
+            if (pl.Count > 0 && pl[0].ORDERNUMBER > 0) ordernumber = pl[0].ORDERNUMBER;
+            
+            return ordernumber;
+        }
     }
 }

trunk/eCard/eCardMVC/Platnosci.Core/Linq/Merchant.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Platnosci.Core.Linq
+namespace Platnosci.Core.Linq
 {
     public class Merchant
     {
-        public string merchntId { get; set; }
-        public string merchantPassword { get; set; }
+        public string Id { get; set; }
+        public string Password { get; set; }
     }
 }

trunk/eCard/eCardMVC/Platnosci.Core/Linq/Payer.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Platnosci.Core.Linq
+namespace Platnosci.Core.Linq
 {
     public class Payer

trunk/eCard/eCardMVC/Platnosci.Core/Linq/Platnosci.designer.cs

@@ -25 +25 @@
         
         [System.Data.Linq.Mapping.DatabaseAttribute(Name="BAZA_REKLAM_TEST")]
-        public partial class PlatnosciDataContext : DataContext
+        public partial class PlatnosciDataContext : System.Data.Linq.DataContext
         {
         private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource();

trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciDataContext.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Platnosci.Core.Interface;
-
-namespace Platnosci.Core.Linq
+namespace Platnosci.Core.Linq
 {
     

trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciEcard.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using Platnosci.Core.Interface;
+using Platnosci.Core.Interface;
 
 namespace Platnosci.Core.Linq
@@ -9 +7 @@
         public int Id
         {
-            get
-            {
-                return this.ORDERNUMBER;
-            }
+            get { return ORDERNUMBER; }
         }
 
     }
 }
-

trunk/eCard/eCardMVC/Platnosci.Core/Linq/PotwierdzeniaEcard.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Platnosci.Core.Interface;
+using Platnosci.Core.Interface;
 
 namespace Platnosci.Core.Linq
@@ -11 +7 @@
         public int Id
         {
-            get
-            {
-                return this.id;
-            }
+            get { return id; }
         }
     }

trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Linq;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using Platnosci.Core.Interface;
 
@@ -17 +15 @@
     public class Repository<T> : IRepository<T> where T : class, IIdentifiable
     {
-        protected readonly IDataContext _dataContext;
+        protected readonly IDataContext DataContext;
 
         public Repository(IDataContext dataContext)
         {
-            _dataContext = dataContext;
+            DataContext = dataContext;
         }  
         public int Count()
         {
-            return _dataContext.GetTable<T>().Count();
+            return DataContext.GetTable<T>().Count();
         }
         public int Count(Expression<Func<T, bool>> expression)
         {
-            return _dataContext.GetTable<T>().Count(expression);
+            return DataContext.GetTable<T>().Count(expression);
         }
         public T FindOne(int id)
@@ -37 +35 @@
         public T FindOne(Expression<Func<T, bool>> expression)
         {
-            return _dataContext.GetTable<T>().Where(expression).SingleOrDefault();
+            return DataContext.GetTable<T>().Where(expression).SingleOrDefault();
         }
 
@@ -54 +52 @@
         public IList<T> FindAll()
         {
-            return _dataContext.GetTable<T>().ToList();
+            return DataContext.GetTable<T>().ToList();
         }
         public IList<T> FindAll(Expression<Func<T, bool>> expression)
         {
-            return _dataContext.GetTable<T>().Where(expression).ToList();
+            return DataContext.GetTable<T>().Where(expression).ToList();
         }
         public void Insert(T entity)
             {
-                _dataContext.Insert(entity);            
+                DataContext.Insert(entity);            
             }
         public void Delete(T entity)
         {
-            _dataContext.Delete(entity);
+            DataContext.Delete(entity);
         }
         public void SubmitChanges()
         {
-            _dataContext.SubmitChanges();
+            DataContext.SubmitChanges();
         }
         public IQueryable<T> Find(int id)
         {
-            return _dataContext.GetTable<T>().Where(t => t.Id == id);
+            return DataContext.GetTable<T>().Where(t => t.Id == id);
         }
         public IQueryable<T> Find(Expression<Func<T, bool>> expression)
         {
-            return _dataContext.GetTable<T>().Where(expression);        
+            return DataContext.GetTable<T>().Where(expression);        
         }
         public IQueryable<T> Find()
         {
-            return _dataContext.GetTable<T>();
+            return DataContext.GetTable<T>();
         }
         public IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer)
         {
-            return _dataContext.FindInvoiceByNipNumber(nip, numer);
+            return DataContext.FindInvoiceByNipNumber(nip, numer);
         }
         public List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury)
         {
-            return _dataContext.FindItemsByIdFaktury(idFaktury);
+            return DataContext.FindItemsByIdFaktury(idFaktury);
         }
         public int GetOrdernumber(string description, int? idfaktury, DateTime? data)
         {
-            return _dataContext.GetOrdernumber(description, idfaktury, data);
+            return DataContext.GetOrdernumber(description, idfaktury, data);
         }
     }

trunk/eCard/eCardMVC/Platnosci.Core/Linq/Translation.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using System.Web;
 using Platnosci.Core.Interface;
 
@@ -11 +8 @@
         public string Translate(string className, string keyName)
         {
-            string strName = HttpContext.GetGlobalResourceObject(className, keyName).ToString();
+            var strName = HttpContext.GetGlobalResourceObject(className, keyName).ToString();
             return strName;
         }
-
-        
     }
 }

trunk/eCard/eCardMVC/Platnosci.Core/Linq/Waluta.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Platnosci.Core.Linq
+namespace Platnosci.Core.Linq
 {
     public class Waluta

trunk/eCard/eCardMVC/Platnosci.Core/Linq/vPlatnosciEcard.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using Platnosci.Core.Interface;
+using Platnosci.Core.Interface;
 
 namespace Platnosci.Core.Linq
@@ -7 +5 @@
     public partial class vPlatnosciEcard : IIdentifiable
     {
-        public string FullName 
-        { 
-            get 
-            { 
-                return LastName + " " + FirstName; 
-            }
+        public string FullName
+        {
+            get { return LastName + " " + FirstName; }
         }
 
-        public int Id
-        {
-            get { return this.ID_faktury; }
-        }
+        public int Id { get { return ID_faktury; } }
     }
 }
-
-

trunk/eCard/eCardMVC/Platnosci.Core/Platnosci.Core.csproj

@@ -71 +71 @@
     <Compile Include="Interface\IRepository.cs" />
     <Compile Include="Interface\ITranslateManager.cs" />
-    <Compile Include="Linq\DataContext1.cs" />
+    <Compile Include="Linq\DataContext.cs" />
     <Compile Include="Linq\Merchant.cs" />
     <Compile Include="Linq\Payer.cs" />