Zbiór zmian 854 dla branches/Abonament/Wierszowki/Wierszowki.Model/Linq/WierszowkiDataContext.cs

Data:

2009-10-15 15:45:07 (17 years ago)

Autor:

marek

Opis:

re #184 - merged with latest trunk

Lokalizacja:

branches/Abonament

Pliki:

• . (zmodyfikowane) (1 prop)
• Wierszowki/Wierszowki.Model/Linq/WierszowkiDataContext.cs (zmodyfikowane) (4 diffs)

branches/Abonament

@@ -2 +2 @@
 /branches/ReklamaReorganizacja:568-731
 /tags/BazaReklam_1.1.28:831
-/trunk:708-758,760-838
+/trunk:708-758,760-853

@@ -2 +2 @@
 /branches/ReklamaReorganizacja:568-731
 /tags/BazaReklam_1.1.28:831
-/trunk:708-758,760-838
+/trunk:708-758,760-853

branches/Abonament/Wierszowki/Wierszowki.Model/Linq/WierszowkiDataContext.cs

@@ -9 +9 @@
         public Author GetAuthorById(int id)
         {
-            return Authors.Single(a => a.Id == id);
+            return Authors.SingleOrDefault(a => a.Id == id);
         }
         
@@ -23 +23 @@
             return Users.ToList();
         }
+        public List<Issue> GetIssue()
+        {
+            return Issues.ToList();
+        }
 
         public User GetUserById(int id)
         {
-            return Users.Single(u => u.Id == id);
+            return Users.SingleOrDefault(u => u.Id == id);
         }
 
         public User GetUserByLogin(string login)
         {
-            return Users.Single(u => u.Login == login);
+            return Users.SingleOrDefault(u => u.Login == login);
         }
 
@@ -58 +62 @@
         }
 
-        public IQueryable<Issue> FindIssuesByMagazineId(int magazineId)
+        public IQueryable<Issue> FindIssuesByMagazineId(int magazineId, int addId)
         {
             var startDate = DateTime.Now.AddMonths(-3);
             var endDate = DateTime.Now.AddMonths(1);
-
-            var query = from i in Issues
-                        where i.MagazineId == magazineId
-                              && i.Date >= startDate
-                              && i.Date <= endDate
-                        select i;
-            return query;
+            if (addId != 0)
+            {
+                var query = from i in Issues
+                            where (i.Id == addId) || 
+                                  (i.MagazineId == magazineId && i.Date >= startDate && i.Date <= endDate )                                  
+                            select i;
+                return query;
+            }
+            else
+            {
+                var query = from i in Issues
+                            where i.MagazineId == magazineId
+                                  && i.Date >= startDate
+                                  && i.Date <= endDate
+                            select i;
+                return query;
+            }
         }
 
-        public IQueryable<Issue> FindIssuesByMagazineItemId(int issueId)
+        public IQueryable<Issue> FindIssuesByMagazineItemId(int issueId, int addId)
         {
             var issue = Issues.Single(i => i.Id == issueId);
-            return FindIssuesByMagazineId(issue.MagazineId);
+            return FindIssuesByMagazineId(issue.MagazineId, addId);
         }
 
@@ -151 +165 @@
             InsertUser(user);
         }
+        
     }
 }

@@ -2 +2 @@
 /branches/ReklamaReorganizacja:568-731
 /tags/BazaReklam_1.1.28:831
-/trunk:708-758,760-838
+/trunk:708-758,760-853