Zbiór zmian 842 dla trunk/Wierszowki/Wierszowki.Model

Data:

2009-10-02 13:15:40 (17 years ago)

Autor:

alina

Opis:

fix #207, #193, #205

Lokalizacja:

trunk/Wierszowki/Wierszowki.Model

Pliki:

• Linq/Author.cs (zmodyfikowane) (1 diff)
• Linq/Info.cs (dodane)
• Linq/UpdateData.cs (dodane)
• Linq/User.cs (zmodyfikowane) (1 diff)
• Linq/WierszowkiDataContext.cs (zmodyfikowane) (4 diffs)
• Wierszowki.Core.csproj (zmodyfikowane) (2 diffs)

trunk/Wierszowki/Wierszowki.Model/Linq/Author.cs

@@ -8 +8 @@
     public partial class Author : AuthorValidation, IIdentifiable
     {
-        public string FullName { get { return FirstName + " " + LastName; } }
+        public string FullName { get { return LastName + " " + FirstName; } }
     }
 }

trunk/Wierszowki/Wierszowki.Model/Linq/User.cs

@@ -8 +8 @@
     public partial class User : UserValidation, IIdentifiable
     {
-        public string FullName { get { return FirstName + " " + LastName; } }
+        public string FullName { get { return LastName + " " + FirstName; } }
     }
 }

trunk/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);
         }
+        
     }
 }

trunk/Wierszowki/Wierszowki.Model/Wierszowki.Core.csproj

@@ -61 +61 @@
     <Compile Include="Interfaces\IUserRepository.cs" />
     <Compile Include="Linq\Author.cs" />
+    <Compile Include="Linq\Info.cs" />
     <Compile Include="Linq\Issue.cs" />
     <Compile Include="Linq\LinqRepository.cs" />
     <Compile Include="Linq\MagazineItem.cs" />
     <Compile Include="Linq\Report.cs" />
+    <Compile Include="Linq\UpdateData.cs" />
     <Compile Include="Linq\User.cs" />
     <Compile Include="Linq\Wierszowki.cs">
@@ -81 +83 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="Validation\AuthorValidation.cs" />
-    <Compile Include="Validation\MagazineItemValidation.cs" />
-    <Compile Include="Validation\UserValidation.cs" />
+    <Compile Include="Linq\Validation\AuthorValidation.cs" />
+    <Compile Include="Linq\Validation\MagazineItemValidation.cs" />
+    <Compile Include="Linq\Validation\UserValidation.cs" />
   </ItemGroup>
   <ItemGroup>