Index: trunk/Wierszowki/Wierszowki.Model/Linq/Info.cs
===================================================================
--- trunk/Wierszowki/Wierszowki.Model/Linq/Info.cs (revision 842)
+++ trunk/Wierszowki/Wierszowki.Model/Linq/Info.cs (revision 842)
@@ -0,0 +1,15 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Wierszowki.Core.Linq
+{
+    public class Info
+    {
+        public string powrot { get; set; }
+        public int month { get; set; }
+        public int year { get; set; }
+        public int user_id { get; set; }
+    }
+}
Index: trunk/Wierszowki/Wierszowki.Model/Linq/UpdateData.cs
===================================================================
--- trunk/Wierszowki/Wierszowki.Model/Linq/UpdateData.cs (revision 842)
+++ trunk/Wierszowki/Wierszowki.Model/Linq/UpdateData.cs (revision 842)
@@ -0,0 +1,15 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Wierszowki.Core.Interfaces;
+
+namespace Wierszowki.Core.Linq
+{
+    public class UpdateData : IIdentifiable
+    {
+        public int Id { get; set; }
+        public MagazineItem Magazine { get; set; }
+        public Info inf { get; set; }
+    }
+}
Index: trunk/Wierszowki/Wierszowki.Model/Linq/WierszowkiDataContext.cs
===================================================================
--- trunk/Wierszowki/Wierszowki.Model/Linq/WierszowkiDataContext.cs (revision 814)
+++ trunk/Wierszowki/Wierszowki.Model/Linq/WierszowkiDataContext.cs (revision 842)
@@ -9,5 +9,5 @@
         public Author GetAuthorById(int id)
         {
-            return Authors.Single(a => a.Id == id);
+            return Authors.SingleOrDefault(a => a.Id == id);
         }
         
@@ -23,13 +23,17 @@
             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,21 +62,31 @@
         }
 
-        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,4 +165,5 @@
             InsertUser(user);
         }
+        
     }
 }
Index: trunk/Wierszowki/Wierszowki.Model/Linq/User.cs
===================================================================
--- trunk/Wierszowki/Wierszowki.Model/Linq/User.cs (revision 823)
+++ trunk/Wierszowki/Wierszowki.Model/Linq/User.cs (revision 842)
@@ -8,5 +8,5 @@
     public partial class User : UserValidation, IIdentifiable
     {
-        public string FullName { get { return FirstName + " " + LastName; } }
+        public string FullName { get { return LastName + " " + FirstName; } }
     }
 }
Index: trunk/Wierszowki/Wierszowki.Model/Linq/Author.cs
===================================================================
--- trunk/Wierszowki/Wierszowki.Model/Linq/Author.cs (revision 752)
+++ trunk/Wierszowki/Wierszowki.Model/Linq/Author.cs (revision 842)
@@ -8,5 +8,5 @@
     public partial class Author : AuthorValidation, IIdentifiable
     {
-        public string FullName { get { return FirstName + " " + LastName; } }
+        public string FullName { get { return LastName + " " + FirstName; } }
     }
 }
Index: trunk/Wierszowki/Wierszowki.Model/Wierszowki.Core.csproj
===================================================================
--- trunk/Wierszowki/Wierszowki.Model/Wierszowki.Core.csproj (revision 752)
+++ trunk/Wierszowki/Wierszowki.Model/Wierszowki.Core.csproj (revision 842)
@@ -61,8 +61,10 @@
     <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,7 +83,7 @@
       <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>
