diff --git a/.DS_Store b/.DS_Store
index 4c1b65d..6c1bb6c 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/AutoRepairShopBusinessLogic.csproj b/AutoRepairShop/AutoRepairShopBusinessLogic/AutoRepairShopBusinessLogic.csproj
index 26ae577..ea9b788 100644
--- a/AutoRepairShop/AutoRepairShopBusinessLogic/AutoRepairShopBusinessLogic.csproj
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/AutoRepairShopBusinessLogic.csproj
@@ -7,7 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/BusinessLogic/ClientLogic.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/BusinessLogic/ClientLogic.cs
index 12f8ec8..8ffe2fb 100644
--- a/AutoRepairShop/AutoRepairShopBusinessLogic/BusinessLogic/ClientLogic.cs
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/BusinessLogic/ClientLogic.cs
@@ -45,7 +45,6 @@ namespace AutoRepairShopBusinessLogic.BusinessLogic
             }
             return true;
         }
-
         public ClientViewModel? ReadElement(ClientSearchModel model)
         {
             if (model == null)
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/BusinessLogic/WorkLogic.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/BusinessLogic/WorkLogic.cs
index 68773d8..4736c51 100644
--- a/AutoRepairShop/AutoRepairShopBusinessLogic/BusinessLogic/WorkLogic.cs
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/BusinessLogic/WorkLogic.cs
@@ -93,8 +93,36 @@ namespace AutoRepairShopBusinessLogic.BusinessLogic
                 return false;
             }
             return true;
+        } 
+        public bool UpdateStatus(WorkBindingModel model)
+        {
+            CheckModel(model);
+            if (_workStorage.UpdateStatus(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool DeleteClientFromWork(WorkBindingModel model)
+        {
+            CheckModel(model);
+            if (_workStorage.DeleteClientFromWork(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }public bool DeleteTaskFromWork(WorkBindingModel model)
+        {
+            CheckModel(model);
+            if (_workStorage.DeleteTaskFromWork(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
         }
-
         private void CheckModel(WorkBindingModel model, bool withParams = true)
         {
             if (model == null)
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
new file mode 100644
index 0000000..e74dbbb
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -0,0 +1,230 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using AutoRepairShopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToExcel
+    {
+        /*
+        public abstract class AbstractSaveToExcelEmployee
+        {
+            public byte[]? CreateReport(ExcelInfo info)
+            {
+                CreateExcel(info);
+
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = 1,
+                    Text = info.Title,
+                    StyleInfo = ExcelStyleInfoType.Title
+                });
+
+                MergeCells(new ExcelMergeParameters
+                {
+                    CellFromName = "A1",
+                    CellToName = "C1"
+                });
+
+                uint rowIndex = 2;
+                foreach (var client in info.WorkClient)
+                {
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "A",
+                        RowIndex = rowIndex,
+                        Text = client.Name,
+                        StyleInfo = ExcelStyleInfoType.Text
+                    });
+                    rowIndex++;
+                    foreach (var paymeant in client.Values)
+                    {
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "B",
+                            RowIndex = rowIndex,
+                            Text = "Номер оплаты:",
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder,
+
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "c",
+                            RowIndex = rowIndex,
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder,
+
+                        });
+
+                        MergeCells(new ExcelMergeParameters
+                        {
+                            CellFromName = $"B{rowIndex}",
+                            CellToName = $"C{rowIndex}"
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "D",
+                            RowIndex = rowIndex,
+                            Text = paymeant.ClientID.ToString(),
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "E",
+                            RowIndex = rowIndex,
+                            Text = "В количестве:",
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder,
+
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "F",
+                            RowIndex = rowIndex,
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder,
+
+                        });
+
+                        MergeCells(new ExcelMergeParameters
+                        {
+                            CellFromName = $"E{rowIndex}",
+                            CellToName = $"F{rowIndex}"
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "G",
+                            RowIndex = rowIndex,
+                            Text = paymeant.ProducCount.ToString(),
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "H",
+                            RowIndex = rowIndex,
+                            Text = "Статус оплаты:",
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "I",
+                            RowIndex = rowIndex,
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder,
+
+                        });
+
+                        MergeCells(new ExcelMergeParameters
+                        {
+                            CellFromName = $"H{rowIndex}",
+                            CellToName = $"I{rowIndex}"
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "J",
+                            RowIndex = rowIndex,
+                            Text = paymeant.PaymeantStatus.ToString(),
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "k",
+                            RowIndex = rowIndex,
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+
+                        MergeCells(new ExcelMergeParameters
+                        {
+                            CellFromName = $"J{rowIndex}",
+                            CellToName = $"K{rowIndex}"
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "L",
+                            RowIndex = rowIndex,
+                            Text = "Сумма:",
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "M",
+                            RowIndex = rowIndex,
+                            Text = paymeant.ProductSum.ToString(),
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "N",
+                            RowIndex = rowIndex,
+                            Text = "ID Клиента:",
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "O",
+                            RowIndex = rowIndex,
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+
+
+                        MergeCells(new ExcelMergeParameters
+                        {
+                            CellFromName = $"N{rowIndex}",
+                            CellToName = $"O{rowIndex}"
+                        });
+
+                        InsertCellInWorksheet(new ExcelCellParameters
+                        {
+                            ColumnName = "P",
+                            RowIndex = rowIndex,
+                            Text = paymeant.ClientID.ToString(),
+                            StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        });
+                        rowIndex++;
+                    }
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "A",
+                        RowIndex = rowIndex,
+                        Text = "Итого:",
+                        StyleInfo = ExcelStyleInfoType.Title
+                    });
+
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "C",
+                        RowIndex = rowIndex,
+                        Text = client.Total.ToString(),
+                        StyleInfo = ExcelStyleInfoType.Title
+                    });
+                    rowIndex++;
+                }
+
+                var document = SaveExcel(info);
+                return document;
+            }
+
+            protected abstract void CreateExcel(ExcelInfo info);
+
+            protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+
+            protected abstract void MergeCells(ExcelMergeParameters excelParams);
+
+            protected abstract byte[]? SaveExcel(ExcelInfo info);
+        }*/
+    }
+}
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
new file mode 100644
index 0000000..63847d9
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -0,0 +1,90 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using AutoRepairShopBusinessLogic.OfficePackage.HelperModels;
+using PdfSharp.Pdf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToPdf
+    {
+      /*  public PdfDocument CreateDoc(PdfInfo info)
+        {
+            CreatePdf(info);
+
+            CreateParagraph(new PdfParagraph
+            {
+                Text = info.Title,
+                Style = "NormalTitle",
+                alignmentType = PdfParagraphAlignmentType.Center,
+            });
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"{info.DateFrom.ToShortDateString()}",
+                Style = "Normal",
+                alignmentType = PdfParagraphAlignmentType.Right
+            });
+
+            foreach (var product in info.WorkClients)
+            {
+                CreateParagraph(new PdfParagraph
+                {
+                    Text = product.ProductName,
+                    Style = "Normal",
+                    alignmentType = PdfParagraphAlignmentType.Left,
+                });
+                CreateTable(new List<string> { "2cm", "4cm", "4cm", "4cm", "2cm" });
+
+                CreateRow(new PdfRowParameters
+                {
+                    Text = new List<string> { "Оплата №", "Статус", "Количество товара", "Сумма", "ID Клиента" },
+                    Style = "NormalTittle",
+                    alignmentType = PdfParagraphAlignmentType.Center,
+                });
+
+                foreach (var paymeant in product.Values)
+                {
+                    CreateRow(new PdfRowParameters
+                    {
+                        Text = new List<string> {
+                            paymeant.PaymeantID.ToString(),
+                            paymeant.PaymeantStatus.ToString(),
+                            paymeant.ProducCount.ToString(),
+                            paymeant.ProductSum.ToString(),
+                            paymeant.ClientID.ToString(),
+                        },
+                        Style = "Normal",
+                        alignmentType = PdfParagraphAlignmentType.Left,
+                    });
+                }
+                CreateParagraph(new PdfParagraph
+                {
+                    Text = $"Итого: {product.Total}\t",
+                    Style = "Normal",
+                    alignmentType = PdfParagraphAlignmentType.Right
+                });
+            }
+
+            var document = SavePdf(info);
+            return document;
+        }
+
+        // Создание файла
+        protected abstract void CreatePdf(PdfInfo info);
+
+        // Создание параграфа с текстом
+        protected abstract void CreateParagraph(PdfParagraph paragraph);
+
+        // Создание таблицы
+        protected abstract void CreateTable(List<string> columns);
+
+        // Создание и заполнение строки
+        protected abstract void CreateRow(PdfRowParameters rowParameters);
+
+        // Сохранение файла
+        protected abstract PdfDocument SavePdf(PdfInfo info); */
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
new file mode 100644
index 0000000..2ca3142
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -0,0 +1,78 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using AutoRepairShopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage
+{
+  /*  public abstract class AbstractSaveToWord
+    {
+        public byte[]? CreateDoc(WordInfo info)
+        {
+            CreateWord(info);
+
+            CreateParagraph(new WordParagraph
+            {
+                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
+                TextProperties = new WordTextProperties
+                {
+                    Size = "24",
+                    JustificationType = WordJustificationType.Center
+                }
+            });
+
+            foreach (var data in info.WorkClients)
+            {
+                CreateParagraph(new WordParagraph
+                {
+                    Texts = new List<(string, WordTextProperties)> { (data.ProductName, new WordTextProperties { Bold = true, Size = "24", }) },
+                    TextProperties = new WordTextProperties
+                    {
+                        Size = "24",
+                        JustificationType = WordJustificationType.Center
+                    }
+                });
+                foreach (var paymeant in data.Values)
+                {
+                    CreateParagraph(new WordParagraph
+                    {
+                        Texts = new List<(string, WordTextProperties)> { ($"Оплата №:{paymeant.PaymeantID}/В количестве:{paymeant.ProducCount}/" +
+                                                                        $"Cтатус:{paymeant.PaymeantStatus}/Сумма:{paymeant.ProductSum}/ID Клиента:{paymeant.ClientID}",
+                                                                        new WordTextProperties { Bold = false, Size = "24", }) },
+                        TextProperties = new WordTextProperties
+                        {
+                            Size = "24",
+                            JustificationType = WordJustificationType.Both
+                        }
+                    });
+                }
+                CreateParagraph(new WordParagraph
+                {
+                    Texts = new List<(string, WordTextProperties)> { ($"Итого:{data.Total}",
+                                                                    new WordTextProperties { Bold = true, Size = "24", }) },
+                    TextProperties = new WordTextProperties
+                    {
+                        Size = "24",
+                        JustificationType = WordJustificationType.Both
+                    }
+                });
+            }
+
+
+            var document = SaveWord(info);
+            return document;
+        }
+
+        // Создание doc-файла
+        protected abstract void CreateWord(WordInfo info);
+
+        // Создание абзаца с текстом
+        protected abstract void CreateParagraph(WordParagraph paragraph);
+
+        // Сохранение файла
+        protected abstract byte[]? SaveWord(WordInfo info);
+    }*/
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
new file mode 100644
index 0000000..d2f6b3f
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperEnums
+{
+    public enum ExcelStyleInfoType
+    {
+        Title,
+        Text,
+        TextWithBroder
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
new file mode 100644
index 0000000..5bc18bf
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperEnums
+{
+    public enum PdfParagraphAlignmentType
+    {
+        Center,
+        Left,
+        Right,
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
new file mode 100644
index 0000000..82a2328
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperEnums
+{
+    public enum WordJustificationType
+    {
+        Center,
+        Both
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ClientPoints.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ClientPoints.cs
new file mode 100644
index 0000000..07102dd
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ClientPoints.cs
@@ -0,0 +1,25 @@
+using AutoRepairShopDatabaseImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class ClientPoints
+    {
+        public int ClientId { get; set; }
+        public int WorkId { get; set; }
+        public string ClientName { get; set; }
+        public int Points { get; set; }
+
+        public ClientPoints(int clientId, int workId, string clientName, int points)
+        {
+            ClientId = clientId;
+            WorkId = workId;
+            ClientName = clientName;
+            Points = points;
+        }
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
new file mode 100644
index 0000000..779c5f3
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
@@ -0,0 +1,18 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class ExcelCellParameters
+    {
+        public string ColumnName { get; set; } = string.Empty;
+        public uint RowIndex { get; set; }
+        public string Text { get; set; } = string.Empty;
+        public string CellReference => $"{ColumnName}{RowIndex}";
+        public ExcelStyleInfoType StyleInfo { get; set; }
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
new file mode 100644
index 0000000..b21da41
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
@@ -0,0 +1,15 @@
+using AutoRepairShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class ExcelInfo
+    {
+        public string Title { get; set; } = string.Empty;
+        public List<ReportClientInWorkViewModel> WorksClient { get; set; } = new();
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
new file mode 100644
index 0000000..d350746
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class ExcelMergeParameters
+    {
+        public string CellFromName { get; set; } = string.Empty;
+
+        public string CellToName { get; set; } = string.Empty;
+
+        public string Merge => $"{CellFromName}:{CellToName}";
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
new file mode 100644
index 0000000..a8e8c8f
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
@@ -0,0 +1,18 @@
+using AutoRepairShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class PdfInfo
+    {
+        public string FileName { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
+        public DateTime DateFrom { get; set; }
+        public List<ReportClientWorkViewModel> WorkClients { get; set; } = new();
+        public List<ReportWorkTaskViewModel> WorkTasks { get; set; } = new();
+    }
+}
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
new file mode 100644
index 0000000..5129a82
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
@@ -0,0 +1,16 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class PdfParagraph
+    {
+        public string Text { get; set; } = string.Empty;
+        public string Style { get; set; } = string.Empty;
+        public PdfParagraphAlignmentType alignmentType { get; set; }
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
new file mode 100644
index 0000000..751379f
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
@@ -0,0 +1,16 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class PdfRowParameters
+    {
+        public List<string> Text { get; set; } = new();
+        public string Style { get; set; } = string.Empty;
+        public PdfParagraphAlignmentType alignmentType { get; set; }
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
new file mode 100644
index 0000000..9519b51
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -0,0 +1,16 @@
+using AutoRepairShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordInfo
+    {
+        public string Title { get; set; } = string.Empty;
+        public List<ReportClientWorkViewModel> WorkClients { get; set; } = new();
+        public List<ReportWorkTaskViewModel> WorkTasks { get; set; } = new();
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
new file mode 100644
index 0000000..a615442
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordParagraph
+    {
+        public List<(string, WordTextProperties)> Texts { get; set; } = new();
+        public WordTextProperties? TextProperties { get; set; }
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
new file mode 100644
index 0000000..73d7db7
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
@@ -0,0 +1,16 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordTextProperties
+    {
+        public string Size { get; set; } = string.Empty;
+        public bool Bold { get; set; }
+        public WordJustificationType JustificationType { get; set; }
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
new file mode 100644
index 0000000..3bef30d
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -0,0 +1,298 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using AutoRepairShopBusinessLogic.OfficePackage.HelperModels;
+using Microsoft.Extensions.Primitives;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.DocumentObjectModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static AutoRepairShopBusinessLogic.OfficePackage.AbstractSaveToExcel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Office2010.Excel;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.Implements
+{
+    internal class SaveToExcel : AbstractSaveToExcel
+    {
+       /* private SpreadsheetDocument? _spreadsheetDocument;
+
+        private SharedStringTablePart? _shareStringPart;
+
+        private Worksheet? _worksheet;
+
+        private MemoryStream _mem = new MemoryStream();
+
+        // Настройка стилей для файла
+        private static void CreateStyles(WorkbookPart workbookpart)
+        {
+            var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
+            sp.Stylesheet = new Stylesheet();
+
+            var fonts = new Fonts() { Count = 2U, KnownFonts = true };
+
+            var fontUsual = new Font();
+            fontUsual.Append(new FontSize() { Val = 12D });
+            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontUsual.Append(new FontName() { Val = "Times New Roman" });
+            fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
+            fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+            var fontTitle = new Font();
+            fontTitle.Append(new Bold());
+            fontTitle.Append(new FontSize() { Val = 14D });
+            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontTitle.Append(new FontName() { Val = "Times New Roman" });
+            fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
+            fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+            fonts.Append(fontUsual);
+            fonts.Append(fontTitle);
+
+            var fills = new Fills() { Count = 2U };
+
+            var fill1 = new Fill();
+            fill1.Append(new PatternFill() { PatternType = PatternValues.None });
+
+            var fill2 = new Fill();
+            fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
+
+            fills.Append(fill1);
+            fills.Append(fill2);
+
+            var borders = new Borders() { Count = 2U };
+
+            var borderNoBorder = new Border();
+            borderNoBorder.Append(new LeftBorder());
+            borderNoBorder.Append(new RightBorder());
+            borderNoBorder.Append(new TopBorder());
+            borderNoBorder.Append(new BottomBorder());
+            borderNoBorder.Append(new DiagonalBorder());
+
+            var borderThin = new Border();
+
+            var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
+            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
+            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
+            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
+            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            borderThin.Append(leftBorder);
+            borderThin.Append(rightBorder);
+            borderThin.Append(topBorder);
+            borderThin.Append(bottomBorder);
+            borderThin.Append(new DiagonalBorder());
+
+            borders.Append(borderNoBorder);
+            borders.Append(borderThin);
+
+            var cellStyleFormats = new CellStyleFormats() { Count = 1U };
+            var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U };
+
+            cellStyleFormats.Append(cellFormatStyle);
+
+            var cellFormats = new CellFormats() { Count = 3U };
+            var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true };
+            var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true };
+            var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true };
+
+            cellFormats.Append(cellFormatFont);
+            cellFormats.Append(cellFormatFontAndBorder);
+            cellFormats.Append(cellFormatTitle);
+
+            var cellStyles = new CellStyles() { Count = 1U };
+
+            cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U });
+
+            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
+
+            var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" };
+
+            var stylesheetExtensionList = new StylesheetExtensionList();
+
+            var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" };
+            stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+            stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" });
+
+            var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" };
+            stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
+            stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" });
+
+            stylesheetExtensionList.Append(stylesheetExtension1);
+            stylesheetExtensionList.Append(stylesheetExtension2);
+
+            sp.Stylesheet.Append(fonts);
+            sp.Stylesheet.Append(fills);
+            sp.Stylesheet.Append(borders);
+            sp.Stylesheet.Append(cellStyleFormats);
+            sp.Stylesheet.Append(cellFormats);
+            sp.Stylesheet.Append(cellStyles);
+            sp.Stylesheet.Append(differentialFormats);
+            sp.Stylesheet.Append(tableStyles);
+            sp.Stylesheet.Append(stylesheetExtensionList);
+        }
+
+        // Получение номера стиля из типа
+        private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
+        {
+            return styleInfo switch
+            {
+                ExcelStyleInfoType.Title => 2U,
+                ExcelStyleInfoType.TextWithBroder => 1U,
+                ExcelStyleInfoType.Text => 0U,
+                _ => 0U,
+            };
+        }
+
+        protected override void CreateExcel(ExcelInfoEmployee info)
+        {
+            _spreadsheetDocument = SpreadsheetDocument.Create(_mem, SpreadsheetDocumentType.Workbook);
+            // Создаем книгу (в ней хранятся листы)
+            var workbookpart = _spreadsheetDocument.AddWorkbookPart();
+            workbookpart.Workbook = new Workbook();
+
+            CreateStyles(workbookpart);
+
+            // Получаем/создаем хранилище текстов для книги
+            _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
+                ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
+                : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
+
+            // Создаем SharedStringTable, если его нет
+            if (_shareStringPart.SharedStringTable == null)
+            {
+                _shareStringPart.SharedStringTable = new SharedStringTable();
+            }
+
+            // Создаем лист в книгу
+            var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
+            worksheetPart.Worksheet = new Worksheet(new SheetData());
+
+            // Добавляем лист в книгу
+            var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+            var sheet = new Sheet()
+            {
+                Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+                SheetId = 1,
+                Name = "Лист"
+            };
+            sheets.Append(sheet);
+
+            _worksheet = worksheetPart.Worksheet;
+        }
+
+        protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
+        {
+            if (_worksheet == null || _shareStringPart == null)
+            {
+                return;
+            }
+            var sheetData = _worksheet.GetFirstChild<SheetData>();
+            if (sheetData == null)
+            {
+                return;
+            }
+
+            // Ищем строку, либо добавляем ее
+            Row row;
+            if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
+            {
+                row = sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).First();
+            }
+            else
+            {
+                row = new Row() { RowIndex = excelParams.RowIndex };
+                sheetData.Append(row);
+            }
+
+            // Ищем нужную ячейку  
+            Cell cell;
+            if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
+            {
+                cell = row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
+            }
+            else
+            {
+                // Все ячейки должны быть последовательно друг за другом расположены
+                // нужно определить, после какой вставлять
+                Cell? refCell = null;
+                foreach (Cell rowCell in row.Elements<Cell>())
+                {
+                    if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
+                    {
+                        refCell = rowCell;
+                        break;
+                    }
+                }
+
+                var newCell = new Cell() { CellReference = excelParams.CellReference };
+                row.InsertBefore(newCell, refCell);
+
+                cell = newCell;
+            }
+
+            // вставляем новый текст
+            _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
+            _shareStringPart.SharedStringTable.Save();
+
+            cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
+            cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
+            cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
+        }
+
+        protected override void MergeCells(ExcelMergeParameters excelParams)
+        {
+            if (_worksheet == null)
+            {
+                return;
+            }
+            MergeCells mergeCells;
+
+            if (_worksheet.Elements<MergeCells>().Any())
+            {
+                mergeCells = _worksheet.Elements<MergeCells>().First();
+            }
+            else
+            {
+                mergeCells = new MergeCells();
+
+                if (_worksheet.Elements<CustomSheetView>().Any())
+                {
+                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
+                }
+                else
+                {
+                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().First());
+                }
+            }
+
+            var mergeCell = new MergeCell()
+            {
+                Reference = new StringValue(excelParams.Merge)
+            };
+            mergeCells.Append(mergeCell);
+        }
+
+        protected override byte[]? SaveExcel(ExcelInfo info)
+        {
+            if (_spreadsheetDocument == null)
+            {
+                return null;
+            }
+            _spreadsheetDocument.WorkbookPart!.Workbook.Save();
+            _spreadsheetDocument.Dispose();
+            return _mem.ToArray();
+        }
+       */
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
new file mode 100644
index 0000000..7c94d1a
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -0,0 +1,113 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using AutoRepairShopBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.Rendering;
+using MigraDoc.DocumentObjectModel.Tables;
+using PdfSharp.Pdf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.Implements
+{
+    public class SaveToPdf : AbstractSaveToPdf
+    {
+        /*
+        private Document? _document;
+        private Section? _section;
+        private Table? _table;
+
+        // Типы выравнивания
+        private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
+        {
+            return type switch
+            {
+                PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
+                PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
+                PdfParagraphAlignmentType.Right => ParagraphAlignment.Right,
+                _ => ParagraphAlignment.Justify
+            };
+        }
+
+        private static void DefineStyle(Document document)
+        {
+            var style = document.Styles["Normal"];
+            style.Font.Name = "Times New Roman";
+            style.Font.Size = 14;
+            style = document.Styles.AddStyle("NormalTitle", "Normal");
+            style.Font.Bold = true;
+        }
+
+        protected override void CreateParagraph(PdfParagraph pdfParagraph)
+        {
+            if (_section == null)
+            {
+                return;
+            }
+            var paragraph = _section.AddParagraph(pdfParagraph.Text);
+            paragraph.Format.SpaceAfter = "1cm";
+            paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.alignmentType);
+            paragraph.Style = pdfParagraph.Style;
+        }
+
+        protected override void CreatePdf(PdfInfo info)
+        {
+            _document = new Document();
+            DefineStyle(_document);
+            // Ссылка на первую секцию
+            _section = _document.AddSection();
+        }
+
+        protected override void CreateRow(PdfRowParameters rowParameters)
+        {
+            if (_table == null)
+            {
+                return;
+            }
+            var row = _table.AddRow();
+            for (int i = 0; i < rowParameters.Text.Count; ++i)
+            {
+                // заполнение ячейки (добавление параграфа в ячейку)
+                row.Cells[i].AddParagraph(rowParameters.Text[i]);
+                if (!string.IsNullOrEmpty(rowParameters.Style))
+                {
+                    row.Cells[i].Style = rowParameters.Style;
+                }
+                Unit borderWidth = 0.5;
+                row.Cells[i].Borders.Left.Width = borderWidth;
+                row.Cells[i].Borders.Right.Width = borderWidth;
+                row.Cells[i].Borders.Top.Width = borderWidth;
+                row.Cells[i].Borders.Bottom.Width = borderWidth;
+
+                row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.alignmentType);
+                row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
+            }
+        }
+
+        protected override void CreateTable(List<string> columns)
+        {
+            if (_document == null)
+            {
+                return;
+            }
+            _table = _document.LastSection.AddTable();
+            foreach (var elem in columns)
+            {
+                _table.AddColumn(elem);
+            }
+        }
+
+        protected override PdfDocument SavePdf(PdfInfo info)
+        {
+            var renderer = new PdfDocumentRenderer(true)
+            {
+                Document = _document,
+            };
+            renderer.RenderDocument();
+            renderer.PdfDocument.Save(info.FileName);
+            return renderer.PdfDocument;
+        }*/
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
new file mode 100644
index 0000000..813b45a
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -0,0 +1,133 @@
+using AutoRepairShopBusinessLogic.OfficePackage.HelperEnums;
+using AutoRepairShopBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using DocumentFormat.OpenXml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopBusinessLogic.OfficePackage.Implements
+{
+  /*  public class SaveToWord : AbstractSaveToWord
+    {
+        private WordprocessingDocument? _wordDocument;
+
+        private Body? _docBody;
+
+        private MemoryStream _mem = new MemoryStream();
+
+        // Получение типа выравнивания
+        private static JustificationValues GetJustificationValues(WordJustificationType type)
+        {
+            return type switch
+            {
+                WordJustificationType.Both => JustificationValues.Both,
+                WordJustificationType.Center => JustificationValues.Center,
+                _ => JustificationValues.Left,
+            };
+        }
+
+        // Настройки страницы
+        private static SectionProperties CreateSectionProperties()
+        {
+            var properties = new SectionProperties();
+
+            var pageSize = new PageSize
+            {
+                Orient = PageOrientationValues.Portrait
+            };
+
+            properties.AppendChild(pageSize);
+
+            return properties;
+        }
+
+        // Задание форматирования для абзаца
+        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
+        {
+            if (paragraphProperties == null)
+            {
+                return null;
+            }
+
+            var properties = new ParagraphProperties();
+
+            properties.AppendChild(new Justification()
+            {
+                Val = GetJustificationValues(paragraphProperties.JustificationType)
+            });
+
+            properties.AppendChild(new SpacingBetweenLines
+            {
+                LineRule = LineSpacingRuleValues.Auto
+            });
+
+            properties.AppendChild(new Indentation());
+
+            var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
+            if (!string.IsNullOrEmpty(paragraphProperties.Size))
+            {
+                paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
+            }
+            properties.AppendChild(paragraphMarkRunProperties);
+
+            return properties;
+        }
+
+        protected override void CreateWord(WordInfo info)
+        {
+            _wordDocument = WordprocessingDocument.Create(_mem, WordprocessingDocumentType.Document);
+            MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
+            mainPart.Document = new Document();
+            _docBody = mainPart.Document.AppendChild(new Body());
+        }
+
+        protected override void CreateParagraph(WordParagraph paragraph)
+        {
+            if (_docBody == null || paragraph == null)
+            {
+                return;
+            }
+            var docParagraph = new Paragraph();
+
+            docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
+
+            foreach (var run in paragraph.Texts)
+            {
+                var docRun = new Run();
+
+                var properties = new RunProperties();
+                properties.AppendChild(new FontSize { Val = run.Item2.Size });
+                if (run.Item2.Bold)
+                {
+                    properties.AppendChild(new Bold());
+                }
+                docRun.AppendChild(properties);
+
+                docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
+
+                docParagraph.AppendChild(docRun);
+            }
+
+            _docBody.AppendChild(docParagraph);
+        }
+
+        protected override byte[]? SaveWord(WordInfo info)
+        {
+            if (_docBody == null || _wordDocument == null)
+            {
+                return null;
+            }
+            _docBody.AppendChild(CreateSectionProperties());
+
+            _wordDocument.MainDocumentPart!.Document.Save();
+
+            _wordDocument.Dispose();
+
+            return _mem.ToArray();
+        }
+    }*/
+}
diff --git a/AutoRepairShop/AutoRepairShopClientApp/APIClient.cs b/AutoRepairShop/AutoRepairShopClientApp/APIClient.cs
index 2c7b908..379f459 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/APIClient.cs
+++ b/AutoRepairShop/AutoRepairShopClientApp/APIClient.cs
@@ -1,4 +1,5 @@
 using AutoRepairShopContracts.ViewModels;
+using AutoRepairShopDatabaseImplement.Models;
 using Newtonsoft.Json;
 using System.Net.Http.Headers;
 using System.Text;
@@ -13,8 +14,7 @@ namespace AutoRepairShopClientApp
         {
             _manager.BaseAddress = new Uri(configuration["IPAddress"]);
             _manager.DefaultRequestHeaders.Accept.Clear();
-            _manager.DefaultRequestHeaders.Accept.Add(new
-           MediaTypeWithQualityHeaderValue("application/json"));
+           _manager.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
         }
         public static T? GetRequest<T>(string requestUrl)
         {
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Controllers/HomeController.cs b/AutoRepairShop/AutoRepairShopClientApp/Controllers/HomeController.cs
index ed7bf7d..7e697d0 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/Controllers/HomeController.cs
+++ b/AutoRepairShop/AutoRepairShopClientApp/Controllers/HomeController.cs
@@ -1,11 +1,14 @@
 using AutoRepairShopClientApp.Models;
 using AutoRepairShopContracts.BindingModels;
 using AutoRepairShopContracts.BusinessLogicsContracts;
+using AutoRepairShopContracts.SearchModels;
 using AutoRepairShopContracts.ViewModels;
 using AutoRepairShopDatabaseImplement.Models;
 using AutoRepairShopDataModels.Models;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using System.Diagnostics;
+using System.Threading.Tasks;
 
 namespace AutoRepairShopClientApp.Controllers
 {
@@ -24,17 +27,41 @@ namespace AutoRepairShopClientApp.Controllers
             {
                 return Redirect("~/Home/Enter");
             }
-            return View(APIClient.GetRequest<List<WorkViewModel>>($"api/main/getworks?managerId={APIClient.Manager.Id}"));
+            return View(APIClient.GetRequest<List<Tuple<int, int, DateTime, string, List<List<string>>, List<List<string>>>>>($"api/main/getworks?managerId={APIClient.Manager.Id}"));
         }
         [HttpGet]
-        public IActionResult Tasks(int Id)
+        public IActionResult TaskInfo(int Id, int? Status)
+        {
+            if (Id == 0 || Id == null)
+            {
+                return Redirect("~/Home/Index");
+            }
+            if (APIClient.Manager == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            ViewBag.Tasks = APIClient.GetRequest<List<Tuple<int, int, DateTime, string>>>("api/task/gettasklist");
+            ViewBag.Clients = APIClient.GetRequest<List<Tuple<int, string, string, string, int>>>("api/client/getclientlist");
+            return View(APIClient.GetRequest<Tuple<int, int, DateTime, string, List<List<string>>, List<List<string>>>>($"api/main/getworksbyid?Id={Id}"));
+
+        }
+        [HttpGet]
+        public IActionResult Tasks()
         {
             if (APIClient.Manager == null)
             {
                 return Redirect("~/Home/Enter");
             }
-            return View(APIClient.GetRequest<WorkViewModel>($"api/main/getworksbyid?Id={Id}"));
-
+            return View(APIClient.GetRequest<List<Tuple<int, int, DateTime, string>>>($"api/task/GetTaskList"));
+        }
+        [HttpGet]
+        public IActionResult Clients()
+        {
+            if (APIClient.Manager == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return View(APIClient.GetRequest<List<Tuple<int, string, string, string, int>>>($"api/client/GetClientList"));
         }
         [HttpGet]
         public IActionResult Privacy()
@@ -124,15 +151,15 @@ namespace AutoRepairShopClientApp.Controllers
             Response.Redirect("Enter");
             return;
         }
-        
+
         public IActionResult Create()
         {
-            ViewBag.Tasks = APIClient.GetRequest<List<TaskViewModel>>("api/task/gettasklist");
-            ViewBag.Clients = APIClient.GetRequest<List<ClientViewModel>>("api/client/getclientlist");
+            ViewBag.Tasks = APIClient.GetRequest<List<Tuple<int, int, DateTime, string>>>("api/task/gettasklist");
+            ViewBag.Clients = APIClient.GetRequest<List<Tuple<int, string, string, string, int>>>("api/client/getclientlist");
             return View();
         }
         [HttpPost]
-        public void Create(int Points,List<ITaskModel> task, List<IClientModel> client)
+        public void Create(int Points, List<int> task, List<int> client)
         {
             if (APIClient.Manager == null)
             {
@@ -144,21 +171,138 @@ namespace AutoRepairShopClientApp.Controllers
                 Points = Points,
                 DateCreate = DateTime.Now.ToUniversalTime()
             };
- 
             APIClient.PostRequest("api/main/creatework", workModel);
+            var lastWork = APIClient.GetRequest<WorkViewModel>($"api/main/GetLastWork?managerId={APIClient.Manager.Id}");
+            var taskStrings = task.Select(id => new List<string> { JsonConvert.SerializeObject(id.ToString()) }).ToList();
+            var clientStrings = client.Select(id => new List<string> { JsonConvert.SerializeObject(id.ToString()) }).ToList();
+
+            APIClient.PostRequest("api/main/addToWork", Tuple.Create(lastWork.Id, taskStrings, clientStrings, Points));
 
             Response.Redirect("Index");
             return;
         }
-         /* [HttpGet]
-          public IActionResult Mails()
-          {
-              if (APIClient.Manager == null)
-              {
-                  return Redirect("~/Home/Enter");
-              }
 
-              return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Manager.Id}"));
-          }*/
+        [HttpPost]
+        public void TaskInfo(int Id, int? Points, List<int> task, List<int> client)
+        {
+            if (APIClient.Manager == null)
+            {
+                throw new Exception("Ошибка входа!");
+            }
+            var workModel = new WorkBindingModel
+            {
+                Id = Id,
+                ManagerId = APIClient.Manager.Id
+            };
+            if (Points.HasValue)
+            {
+                workModel.Points = Points.Value;
+            }
+            APIClient.PostRequest("api/main/updateWork", workModel);
+            var taskStrings = task.Select(id => new List<string> { JsonConvert.SerializeObject(id.ToString()) }).ToList();
+            var clientStrings = client.Select(id => new List<string> { JsonConvert.SerializeObject(id.ToString()) }).ToList();
+
+            APIClient.PostRequest("api/main/addToWork", Tuple.Create(Id, taskStrings, clientStrings, Points.Value));
+            Response.Redirect("Index");
+            return;
+        }
+        public IActionResult DeleteClient(int workId, string clientId)
+        {
+            if (APIClient.Manager == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            string clientIdWithoutQuotes = clientId.Replace("\"", "");
+            int clientIdInt = int.Parse(clientIdWithoutQuotes);
+            APIClient.PostRequest("api/main/DeleteClientFromWork", Tuple.Create(workId, clientIdInt));
+            Response.Redirect("Index");
+            return View();
+        }
+        public IActionResult DeleteTask(int workId, string taskId)
+        {
+            if (APIClient.Manager == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            string taskIdWithoutQuotes = taskId.Replace("\"", "");
+            int taskIdInt = int.Parse(taskIdWithoutQuotes);
+            APIClient.PostRequest("api/main/DeleteTaskFromWork", Tuple.Create(workId, taskIdInt));
+            Response.Redirect("Index");
+            return View();
+        }
+        public IActionResult StatusDone(int Id)
+        {
+            if (APIClient.Manager == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            var result = APIClient.GetRequest<Tuple<int, int, DateTime, string, List<List<string>>, List<List<string>>>>($"api/main/getworksbyid?Id={Id}");
+
+            int totalPoints = result.Item2;
+            List<List<string>> clients = result.Item6;
+            int clientCount = clients.Count;
+            int pointsPerClient = clientCount > 0 ? totalPoints / clientCount : 0;
+            var clientPointsList = new List<Tuple<int, int>>();
+            foreach (var client in clients)
+            {
+                if (client.Count > 0)
+                {
+                    string actualClientId = client[0];
+                    string clientIdWithoutQuotes = actualClientId.Replace("\"", "");
+                    int actualClientIdInt = Convert.ToInt32(clientIdWithoutQuotes);
+
+                    clientPointsList.Add(new Tuple<int, int>(actualClientIdInt, pointsPerClient));
+                }
+            }
+
+            APIClient.PostRequest("api/main/givePointsToClient", clientPointsList);
+            APIClient.PostRequest("api/main/workDone", Tuple.Create(Id, DateTime.Now.ToUniversalTime()));
+            return View();
+        }
+        public IActionResult CreateTask()
+        {
+            return View();
+        }
+        [HttpPost]
+        public void CreateTask(int Points, string Description, DateTime Date)
+        {
+            if (APIClient.Manager == null)
+            {
+                throw new Exception("Ошибка входа!");
+            }
+            var taskModel = new TaskBindingModel
+            {
+                Points = Points,
+                Description = Description,
+                DateImplement = Date.ToUniversalTime()
+            };
+            APIClient.PostRequest("api/main/createtask", taskModel);
+
+            Response.Redirect("Index");
+            return;
+        }
+        public IActionResult CreateClient()
+        {
+            return View();
+        }
+        [HttpPost]
+        public void CreateClient(int Points, string FIO, string Job, string Email)
+        {
+            if (APIClient.Manager == null)
+            {
+                throw new Exception("Ошибка входа!");
+            }
+            var clientModel = new ClientBindingModel
+            {
+                Points = Points,
+                ClientFIO = FIO,
+                JobTitle = Job,
+                Email = Email
+            };
+            APIClient.PostRequest("api/main/createclient", clientModel);
+
+            Response.Redirect("Index");
+            return;
+        }
     }
 }
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Clients.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Clients.cshtml
new file mode 100644
index 0000000..befa863
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Clients.cshtml
@@ -0,0 +1,54 @@
+@using AutoRepairShopContracts.ViewModels
+@model List<Tuple<int, string, string, string, int>>
+@{
+    ViewData["Title"] = "Клиенты";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Клиенты</h1>
+</div>
+<div class="text-center">
+    @{
+        if (Model == null)
+        {
+            <h3 class="display-4">Авторизируйтесь</h3>
+            return;
+        }
+    }
+    <p>
+        <a class="btn create" asp-action="CreateClient">Создать клиента</a>
+    </p>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>ФИО</th>
+                 <th>Должность</th>
+                <th>Email</th>
+                <th>Баллы</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var item in Model)
+            {
+                 var clientId = item.Item1;
+                var FIO = item.Item2;
+                var Job = item.Item3;
+                var Email = item.Item4;
+                var Points = item.Item5;
+
+                <tr>
+                    <td>@FIO</td>
+                    <td>
+                        @Job
+                    </td>
+                    <td>
+                      @Email
+                    </td>
+                    <td>
+                        @Points
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+</div>
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Create.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Create.cshtml
index 43feca6..38a7714 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Create.cshtml
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Create.cshtml
@@ -1,4 +1,5 @@
-@{
+@using AutoRepairShopContracts.ViewModels
+@{
 	ViewData["Title"] = "Create";
 }
 <div class="text-center">
@@ -6,34 +7,53 @@
 </div>
 <form method="post">
     <div class="row">
-        <div class="col-4">Задание:</div>
-        <div class="col-8">
+        <div class="col-9">Задание:</div>
+        <div class="col-9">
             <select id="task" multiple name="task" class="form-control">
                 @foreach (var task in ViewBag.Tasks)
                 {
-                    <option value="@task.Id">@task.Description</option>
+                    <option class='points' data-points="@task.Item2" value="@task.Item1">@task.Item4 - @task.Item2 баллов</option>
                 }
             </select>
         </div>
     </div>
     <div class="row">
-        <div class="col-4">Клиент:</div>
-        <div class="col-8">
+        <div class="col-9">Клиент:</div>
+        <div class="col-9">
             <select id="client" multiple name="client" class="form-control">
                 @foreach (var client in ViewBag.Clients)
                 {
-                    <option value="@client.Id">@client.ClientFIO</option>
+
+                    <option value="@client.Item1">@client.Item2 - @client.Item3</option>
                 }
             </select>
         </div>
     </div>
     <div class="row">
-	<div class="col-4">Баллы:</div>
-	<div class="col-8"><input type="text" name="points" id="points"
-	/></div>
-	</div>
+	<div class="col-2">Баллы: <span id="points">0</span></div>
+        <input type="hidden" id='poo' value="0" name="points"/>
+	</div><br>
     <div class="row">
-        <div class="col-8"></div>
-        <div class="col-4"><input type="submit" value="Создать" class="btn btn-primary" /></div>
+        <div class="col-2"></div>
+        <div class="col-8"><input type="submit" value="Создать" class="btn create" /></div>
     </div>
+	<script src="~/lib/jquery/dist/jquery.min.js"></script>
 </form>
+<script>
+$('#task').on('change', function () {
+  calc();
+});
+
+calc();
+
+function calc() {
+    const elementRows2 = document.querySelectorAll('#task option:checked');
+     sum = 0;
+  elementRows2.forEach(option => {
+    const count = parseInt(option.dataset.points, 10);
+    sum += count;
+  });
+  $('#points').text(sum);
+    $('#poo').val(sum);
+}
+</script>
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/CreateClient.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/CreateClient.cshtml
new file mode 100644
index 0000000..6cfcb64
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/CreateClient.cshtml
@@ -0,0 +1,37 @@
+
+        @using AutoRepairShopContracts.ViewModels
+@{
+	ViewData["Title"] = "Создать задание";
+}
+<div class="text-center">
+	<h2 class="display-4">Создание заказа</h2>
+</div>
+<form method="post">
+    <div class="row">
+        <div class="col-4">ФИО:</div>
+        <div class="col-10">
+            <input type="text" name="FIO"/>
+        </div>
+    </div>
+    <hr>
+    <div class="row">
+        <div class="col-4">Должность:</div>
+        <div class="col-8">
+            <input type="text" name="Job"/>
+        </div>
+    </div>
+    <hr>
+    <div class="row">
+	<div class="col-4">Email: <input type="text" id='Email' name="email"/></div>
+	</div>
+    <hr>
+     <div class="row">
+	<div class="col-4">Баллы:  <input type="text" id='Email' name="points"/></div>
+	</div>
+    <hr>
+    <div class="row">
+        <div class="col-8"></div>
+        <div class="col-6"><input type="submit" value="Создать" class="btn create" /></div>
+    </div>
+	<script src="~/lib/jquery/dist/jquery.min.js"></script>
+</form>
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/CreateTask.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/CreateTask.cshtml
new file mode 100644
index 0000000..deaa016
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/CreateTask.cshtml
@@ -0,0 +1,32 @@
+@using AutoRepairShopContracts.ViewModels
+@{
+	ViewData["Title"] = "Создать задание";
+}
+<div class="text-center">
+	<h2 class="display-4">Создание заказа</h2>
+</div>
+<form method="post">
+    <div class="row">
+        <div class="col-4">Описание:</div>
+        <div class="col-6">
+            <input type="text" name="description"/>
+        </div>
+    </div>
+    <hr>
+    <div class="row">
+        <div class="col-4">Дата необходимого выполнения:</div>
+        <div class="col-6">
+            <input type="date" name="date"/>
+        </div>
+    </div>
+    <hr>
+    <div class="row">
+	<div class="col-4">Баллы: <input type="text" id='points' value="0" name="points"/></div>
+	</div>
+    <hr>
+    <div class="row">
+        <div class="col-8"></div>
+        <div class="col-6"><input type="submit" value="Создать" class="btn create" /></div>
+    </div>
+	<script src="~/lib/jquery/dist/jquery.min.js"></script>
+</form>
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/DeleteClient.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/DeleteClient.cshtml
new file mode 100644
index 0000000..e1dd794
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/DeleteClient.cshtml
@@ -0,0 +1,5 @@
+@*
+    For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+*@
+@{
+}
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/DeleteTask.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/DeleteTask.cshtml
new file mode 100644
index 0000000..e1dd794
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/DeleteTask.cshtml
@@ -0,0 +1,5 @@
+@*
+    For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+*@
+@{
+}
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Enter.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Enter.cshtml
index 636c82c..70eda56 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Enter.cshtml
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Enter.cshtml
@@ -6,15 +6,15 @@
 </div>
 <form method="post">
 	<div class="row">
-	<div class="col-4">Логин:</div>
-	<div class="col-8"><input type="text" name="login" /></div>
+	<div class="col-8">Логин:</div><br>
+	<div class="col-12"><input type="text" name="login" /></div>
 	</div>
 	<div class="row">
-	<div class="col-4">Пароль:</div>
-	<div class="col-8"><input type="password" name="password" /></div>
+	<div class="col-8">Пароль:</div><br>
+	<div class="col-12"><input type="password" name="password" /></div>
 	</div>
 	<div class="row">
 	<div class="col-8"></div>
-	<div class="col-4"><input type="submit" value="Вход" class="btn btnprimary" /></div>
+	<div class="col-8"><input type="submit" value="Вход" class="btn login" /></div>
 	</div>
 </form>
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Index.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Index.cshtml
index c7c9054..70c65c1 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Index.cshtml
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Index.cshtml
@@ -1,53 +1,77 @@
 @using AutoRepairShopContracts.ViewModels
-@model List<WorkViewModel>
+@model List<Tuple<int, int, DateTime, string, List<List<string>>, List<List<string>>>>
 @{
-	ViewData["Title"] = "Home Page";
+    ViewData["Title"] = "Home Page";
 }
+
 <div class="text-center">
-	<h1 class="display-4">Работы</h1>
+    <h1 class="display-4">Работы</h1>
 </div>
 <div class="text-center">
-	@{
-		if (Model == null)
-		{
-		<h3 class="display-4">Авторизируйтесь</h3>
-			return;
-		}
-	<p>
-		<a asp-action="Create">Создать работу</a>
-	</p>
-	<table class="table">
-		<thead>
-			<tr>
-				<th>Номер</th>
-				<th>Баллы</th>
-				<th>Дата получения</th>
-				<th>Дата выполнения</th>
-				<th>Просмотр</th>
-			</tr>
-		</thead>
-		<tbody>
-				@foreach (var item in Model)
-				{
-					<tr>
-						<td>
-							@Html.DisplayFor(modelItem => item.Id)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Points)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.DateCreate)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.DateImplement)
-						</td>
-						<td>
-						<a asp-controller="Home" asp-action="Tasks" asp-route-Id="@item.Id">Посмотреть задания</a>
-						</td>
-					</tr>
-				}
-		</tbody>
-	</table>
-	}
-</div>
\ No newline at end of file
+    @{
+        if (Model == null)
+        {
+            <h3 class="display-4">Авторизируйтесь</h3>
+            return;
+        }
+    }
+    <p>
+        <a class="btn create" asp-action="Create">Создать работу</a>
+    </p>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Номер</th>
+                 <th>Баллы</th>
+                <th>Дата получения</th>
+                <th>Дата выполнения</th>
+                <th>Клиенты</th>
+                <th>Управление</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var item in Model)
+            {
+                var workId = item.Item1;
+                var Points = item.Item2;
+                var DateCreate = item.Item3;
+                var DateImplement = item.Item4;
+                var color = "red";
+                if(@DateImplement != "Не выполнено"){
+                     color = "green";
+                }
+                var taskInfo = item.Item5;
+                var clientInfo = item.Item6;
+
+                <tr>
+                    <td>@workId</td>
+                    <td>
+                        @Html.DisplayFor(modelItem => Points)
+                    </td>
+                    <td>
+                      @Html.DisplayFor(modelItem => DateCreate)
+                    </td>
+                    <td style="color:  @Html.DisplayFor(modelItem => color);"> 
+                      @Html.DisplayFor(modelItem => DateImplement)
+                    </td>
+                    <td>
+                        @if (clientInfo.Any())
+                        {
+                            <p>
+                            @foreach (var client in clientInfo)
+                            {
+                                @string.Join(", ", client[0])
+                                <br>
+                            }
+                            </p>
+                        }
+                    </td>
+                    <td>
+                        <a asp-controller="Home" asp-action="TaskInfo" class="btn manage" asp-route-Id="@workId">Посмотреть задания</a><br>
+                        <a asp-controller="Home" asp-action="StatusDone" class="btn manage"  asp-route-Id="@workId">Завершить</a>
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+</div>
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Privacy.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Privacy.cshtml
index 9a8e3f2..9c5102b 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Privacy.cshtml
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Privacy.cshtml
@@ -9,12 +9,12 @@
 <form method="post">
 	<div class="row">
 	<div class="col-4">Логин:</div>
-	<div class="col-8"><input type="text" name="login"
+	<div class="col-6"><input type="text" name="login"
 	value="@Model.Email"/></div>
 	</div>
 	<div class="row">
 	<div class="col-4">Пароль:</div>
-	<div class="col-8"><input type="password" name="password"
+	<div class="col-6"><input type="password" name="password"
 	value="@Model.Password"/></div>
 	</div>
 	<div class="row">
@@ -24,7 +24,6 @@
 	</div>
 	<div class="row">
 	<div class="col-8"></div>
-	<div class="col-4"><input type="submit" value="Сохранить" class="btn
-	btn-primary" /></div>
+	<div class="col-8"><input type="submit" value="Сохранить" class="btn create" /></div>
 </div>
 </form>
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Register.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Register.cshtml
index 13589c9..1e0be50 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Register.cshtml
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Register.cshtml
@@ -7,19 +7,18 @@ ViewData["Title"] = "Register";
 <form method="post">
 	<div class="row">
 	<div class="col-4">Логин:</div>
-	<div class="col-8"><input type="text" name="login" /></div>
+	<div class="col-6"><input type="text" name="login" /></div>
 	</div>
 	<div class="row">
 	<div class="col-4">Пароль:</div>
-	<div class="col-8"><input type="password" name="password" /></div>
+	<div class="col-6"><input type="password" name="password" /></div>
 	</div>
 	<div class="row">
 	<div class="col-4">ФИО:</div>
-	<div class="col-8"><input type="text" name="fio" /></div>
+	<div class="col-6"><input type="text" name="fio" /></div>
 	</div>
 	<div class="row">
 	<div class="col-8"></div>
-	<div class="col-4"><input type="submit" value="Регистрация"
-	class="btn btn-primary" /></div>
+	<div class="col-8"><input type="submit" value="Регистрация" class="btn create" /></div>
 	</div>
 </form>
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/StatusDone.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/StatusDone.cshtml
new file mode 100644
index 0000000..7ec06a1
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/StatusDone.cshtml
@@ -0,0 +1,9 @@
+@*
+    For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+*@
+@{
+}
+  <script>
+
+          window.location.href = '@Url.Action("Index", "Home")';
+    </script>
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/TaskInfo.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/TaskInfo.cshtml
new file mode 100644
index 0000000..83f85d7
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/TaskInfo.cshtml
@@ -0,0 +1,106 @@
+@using AutoRepairShopContracts.ViewModels
+@model Tuple<int, int, DateTime, string, List<List<string>>, List<List<string>>>
+@{
+    ViewData["Title"] = "Задания";
+
+                var workId = Model.Item1;
+                var Points = Model.Item2;
+                var DateCreate = Model.Item3;
+                var DateImplement = Model.Item4;
+                var taskInfo = Model.Item5;
+                var clientInfo = Model.Item6;
+
+                var pointOnPerson = clientInfo.Count() == 0 ? Points : (Points / clientInfo.Count());
+}
+    <h1>Задания для работы #@workId</h1>
+
+
+    <p><a>Баллы: </a> @Points</p>
+    <p><a>Дата создания: </a> @DateCreate</p>
+    <p><a>Дата выполнения: </a> @DateImplement</p>
+
+    <h2>Задания:</h2>
+    <ul>
+       @foreach (var task in taskInfo)
+                            {
+                                <li><a>Описание:</a> @string.Join(", ", task[1])<br>
+                                <a>Баллы за выполнение:</a> @string.Join(", ", task[2])
+                                <a>Дата крайнего дня выполнения:</a> @string.Join(", ", task[3])  <a asp-controller="Home" asp-action="DeleteTask" asp-route-workId="@workId" asp-route-taskId="@task[0]">Удалить</a></li><hr>
+                            }
+    </ul>
+
+    <h2>Клиенты:</h2>
+    <ul>
+         @foreach (var client in clientInfo)
+                            {
+                                <li>
+                                ФИО:
+                                @string.Join(", ", client[1])
+                                -
+                              <a style='color: red;'>  +@pointOnPerson </a>баллов добавлено
+                                <a asp-controller="Home" asp-action="DeleteClient" asp-route-workId="@workId" asp-route-clientId="@client[0]">Удалить</a></li><hr>
+                            }
+    </ul>
+
+   <hr>
+   <h1>Добавить</h1>
+<form method="post">
+    <input type='hidden' name='Id' value="@workId"/>
+    <div class="row">
+        <div class="col-10">Задание:</div>
+        <div class="col-10">
+            <select class="multiple" id="task" multiple name="task" class="form-control">
+                <option value="0">Выберите задания: </option>
+                @foreach (var task in ViewBag.Tasks)
+                {
+                    <option class='points' data-points="@task.Item2" value="@task.Item1">@task.Item4</option>
+                }
+            </select>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-10">Клиент:</div>
+        <div class="col-10">
+            <select class="multiple" id="client" multiple name="client" class="form-control">
+                 <option value="0">Выберите клиентов: </option>
+                @foreach (var client in ViewBag.Clients)
+                {
+
+                    <option value="@client.Item1">@client.Item2 - @client.Item3</option>
+                }
+            </select>
+        </div>
+    </div>
+    <div class="row">
+	<div class="col-4">Баллы:</div>
+    <input type="hidden" id='poo' value="0" name="points"/>
+	<div class="col-6"><span id="points"></span></div>
+	</div>
+    <div class="row">
+        <div class="col-6"></div>
+        <div class="col-4"><input type="submit" value="Добавить" class="btn btn-primary" /></div>
+    </div>
+	<script src="~/lib/jquery/dist/jquery.min.js"></script>
+</form>
+<script>
+$('#task').on('change', function () {
+  calc();
+});
+
+calc();
+
+function calc() {
+    const elementRows2 = document.querySelectorAll('#task option:checked');
+     sum = 0;
+  elementRows2.forEach(option => {
+    const count = parseInt(option.dataset.points, 10);
+    sum += count;
+  });
+  $('#points').text(sum);
+  $('#poo').val(sum);
+}
+$(document).ready(function() {
+    $('#client').multiselect();
+     $('#task').multiselect();
+});
+</script>
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Tasks.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Tasks.cshtml
index ad2f219..8c15480 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Tasks.cshtml
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Home/Tasks.cshtml
@@ -1,45 +1,53 @@
-@using AutoRepairShopDataModels.Models
-@model AutoRepairShopContracts.ViewModels.WorkViewModel
-@using Newtonsoft.Json
+@using AutoRepairShopContracts.ViewModels
+@model List<Tuple<int, int, DateTime, string>>
+@{
+    ViewData["Title"] = "Задания";
+}
 
-
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Tasks Page</title>
-</head>
-<body>
-    <h1>Tasks for Work # @Model.Id</h1>
-
-    <p>Points: @Model.Points</p>
-    <p>Date Created: @Model.DateCreate</p>
-    <p>Date Implemented: @Model.DateImplement</p>
-    <p>Manager ID: @Model.ManagerId</p>
-
-    <h2>Tasks:</h2>
-    <ul>
-        @foreach (var taskEntry in Model.WorkTasks)
+<div class="text-center">
+    <h1 class="display-4">Задания</h1>
+</div>
+<div class="text-center">
+    @{
+        if (Model == null)
         {
-            var taskId = taskEntry.Key;
-            var taskInfo = taskEntry.Value;
-            var taskModel = taskInfo.Item1;
-            var taskDescription = taskModel != null ? taskModel.Description : "No description available";
-            
-            <li>
-                Task ID: @taskId <br />
-                Description: @taskDescription
-            </li>
+            <h3 class="display-4">Авторизируйтесь</h3>
+            return;
         }
-    </ul>
-
-    <h2>Clients:</h2>
-    <ul>
-        @foreach (var client in Model.WorkClients)
-        {
-            <li>Client ID: @client.Key</li>
-        }
-    </ul>
-</body>
-</html>
+    }
+    <p>
+        <a class="btn create" asp-controller="Home" asp-action="CreateTask">Создать задание</a>
+    </p>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Номер</th>
+                 <th>Баллы</th>
+                <th>Дата необходимого выполнения</th>
+                <th>Описание работы</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var item in Model)
+            {
+                var taskId = item.Item1;
+                var Points = item.Item2;
+                var DateImplement = item.Item3;
+                var Description = item.Item4;
 
+                <tr>
+                    <td>@taskId</td>
+                    <td>
+                        @Points
+                    </td>
+                    <td>
+                      @DateImplement
+                    </td>
+                    <td>
+                        @Description
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+</div>
diff --git a/AutoRepairShop/AutoRepairShopClientApp/Views/Shared/_Layout.cshtml b/AutoRepairShop/AutoRepairShopClientApp/Views/Shared/_Layout.cshtml
index f7dd142..a5b3756 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/Views/Shared/_Layout.cshtml
+++ b/AutoRepairShop/AutoRepairShopClientApp/Views/Shared/_Layout.cshtml
@@ -14,7 +14,7 @@
    <header>
          <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bgwhite border-bottom box-shadow mb-3">
              <div class="container">
-                 <a class="navbar-brand" asp-area="" asp-controller="Home" aspaction="Index">Мебельный магазин</a>
+                 <a class="navbar-brand" asp-area="" asp-controller="Home" aspaction="Index">СТО "Руки-крюки. Руководитель"</a>
                  <button class="navbar-toggler" type="button" datatoggle="collapse" data-target=".navbar-collapse" ariacontrols="navbarSupportedContent"
                  aria-expanded="false" aria-label="Toggle navigation">
                  <span class="navbar-toggler-icon"></span>
@@ -22,14 +22,17 @@
                  <div class="navbar-collapse collapse d-sm-inline-flex flex-smrow-reverse">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Index">Заказы</a>
+                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Index">Работы</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Tasks">Задания</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Clients">Клиенты</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Mails">Письма</a>
-                        </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Enter">Вход</a>
                         </li>
diff --git a/AutoRepairShop/AutoRepairShopClientApp/wwwroot/css/site.css b/AutoRepairShop/AutoRepairShopClientApp/wwwroot/css/site.css
index f27e5ad..0f807cc 100644
--- a/AutoRepairShop/AutoRepairShopClientApp/wwwroot/css/site.css
+++ b/AutoRepairShop/AutoRepairShopClientApp/wwwroot/css/site.css
@@ -15,4 +15,36 @@ html {
 
 body {
   margin-bottom: 60px;
-}
\ No newline at end of file
+}
+form{
+    marign-top: 5vh;
+}
+.create{
+    background: #111;
+    color: #fff;
+}
+.create:hover{
+    color: #444;
+}
+
+.login {
+    background: #072df9;
+    color: #fff;
+    margin: 3px;
+}
+
+.login:hover {
+        color: #0faeb0;
+ }
+
+.manage {
+    background: #de7209;
+    color: #333;
+    margin: 3px;
+}
+    .manage:hover {
+        color: #c54424;
+    }
+    .row{
+        margin-top: 7px;
+    }
\ No newline at end of file
diff --git a/AutoRepairShop/AutoRepairShopContracts/BindingModels/ReportBindingModels.cs b/AutoRepairShop/AutoRepairShopContracts/BindingModels/ReportBindingModels.cs
new file mode 100644
index 0000000..addf7a0
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopContracts/BindingModels/ReportBindingModels.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopContracts.BindingModels
+{
+    public class ReportBindingModel
+    {
+        public string ClientEmail { get; set; } = string.Empty;
+        public string FileName { get; set; } = string.Empty;
+        public DateTime? DateFrom { get; set; }
+        public DateTime? DateTo { get; set; }
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopContracts/BindingModels/TaskBindingModel.cs b/AutoRepairShop/AutoRepairShopContracts/BindingModels/TaskBindingModel.cs
index 8f7482b..d0e4fce 100644
--- a/AutoRepairShop/AutoRepairShopContracts/BindingModels/TaskBindingModel.cs
+++ b/AutoRepairShop/AutoRepairShopContracts/BindingModels/TaskBindingModel.cs
@@ -11,7 +11,7 @@ namespace AutoRepairShopContracts.BindingModels
     {
         public int Id { get; set; }
         public string Description { get; set; } = string.Empty;
-        public DateTime? DateImplement { get; set; }
+        public DateTime DateImplement { get; set; }
         public int Points { get; set; }
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopContracts/BindingModels/WorkBindingModel.cs b/AutoRepairShop/AutoRepairShopContracts/BindingModels/WorkBindingModel.cs
index 5de0e20..dc61ac2 100644
--- a/AutoRepairShop/AutoRepairShopContracts/BindingModels/WorkBindingModel.cs
+++ b/AutoRepairShop/AutoRepairShopContracts/BindingModels/WorkBindingModel.cs
@@ -14,7 +14,7 @@ namespace AutoRepairShopContracts.BindingModels
         public int Points { get; set; }
         public DateTime DateCreate { get; set; }
         public DateTime? DateImplement { get; set; }
-        public Dictionary<int, (ITaskModel, int)> WorkTasks { get; set; } = new();
-        public Dictionary<int, (IClientModel, int)> WorkClients { get; set; } = new();
+        public Dictionary<int, ITaskModel> WorkTasks { get; set; } = new();
+        public Dictionary<int, IClientModel> WorkClients { get; set; } = new();
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopContracts/BusinessLogicsContracts/IReportLogic.cs b/AutoRepairShop/AutoRepairShopContracts/BusinessLogicsContracts/IReportLogic.cs
new file mode 100644
index 0000000..8ae6219
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -0,0 +1,19 @@
+using AutoRepairShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopContracts.BusinessLogicsContracts
+{
+    public interface IReportLogic
+    {
+       // List<ReportClientInWorkViewModel> GetProducts(ReportWorkBindingModel model);
+        List<ReportClientInWorkViewModel> GetProductsFix(List<WorkViewModel> works);
+
+        byte[]? SaveProductsToWordFile(List<WorkViewModel> products);
+        byte[]? SaveProductsToExcelFile(List<WorkViewModel> products);
+       // PdfDocument SaveProductsToPdfFile(ReportWorkBindingModel model);
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopContracts/BusinessLogicsContracts/IWorkLogic.cs b/AutoRepairShop/AutoRepairShopContracts/BusinessLogicsContracts/IWorkLogic.cs
index c084595..094bc63 100644
--- a/AutoRepairShop/AutoRepairShopContracts/BusinessLogicsContracts/IWorkLogic.cs
+++ b/AutoRepairShop/AutoRepairShopContracts/BusinessLogicsContracts/IWorkLogic.cs
@@ -13,7 +13,11 @@ namespace AutoRepairShopContracts.BusinessLogicsContracts
     {
         List<WorkViewModel>? ReadList(WorkSearchModel? model);
         WorkViewModel? ReadElement(WorkSearchModel model);
+        bool DeleteClientFromWork(WorkBindingModel model);
+        bool DeleteTaskFromWork(WorkBindingModel model);
         bool CreateWork(WorkBindingModel model);
+        bool Update(WorkBindingModel model);
+        bool UpdateStatus(WorkBindingModel model);
         bool AddClientToWork(WorkBindingModel model);
         bool AddTaskToWork(WorkBindingModel model);
     }
diff --git a/AutoRepairShop/AutoRepairShopContracts/StoragesContracts/IWorkStorage.cs b/AutoRepairShop/AutoRepairShopContracts/StoragesContracts/IWorkStorage.cs
index 751739e..976e4ea 100644
--- a/AutoRepairShop/AutoRepairShopContracts/StoragesContracts/IWorkStorage.cs
+++ b/AutoRepairShop/AutoRepairShopContracts/StoragesContracts/IWorkStorage.cs
@@ -15,7 +15,10 @@ namespace AutoRepairShopContracts.StoragesContracts
         List<WorkViewModel> GetFilteredList(WorkSearchModel model);
         WorkViewModel? GetElement(WorkSearchModel model);
         WorkViewModel? Insert(WorkBindingModel model);
+        WorkViewModel? DeleteClientFromWork(WorkBindingModel model);
+        WorkViewModel? DeleteTaskFromWork(WorkBindingModel model);
         WorkViewModel? Update(WorkBindingModel model);
+        WorkViewModel? UpdateStatus(WorkBindingModel model);
         WorkViewModel? Delete(WorkBindingModel model);
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopContracts/ViewModels/ReportClientInWorkViewModel.cs b/AutoRepairShop/AutoRepairShopContracts/ViewModels/ReportClientInWorkViewModel.cs
new file mode 100644
index 0000000..badbd20
--- /dev/null
+++ b/AutoRepairShop/AutoRepairShopContracts/ViewModels/ReportClientInWorkViewModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoRepairShopContracts.ViewModels
+{
+    public class ReportClientInWorkViewModel
+    {
+        public string ClientName { get; set; } = string.Empty;
+
+        public List<(int WorkId, int Points, int ClientID)> Values = new();
+
+        // Итоговое количество оплат
+        public int Total { get; set; }
+    }
+}
diff --git a/AutoRepairShop/AutoRepairShopContracts/ViewModels/TaskViewModel.cs b/AutoRepairShop/AutoRepairShopContracts/ViewModels/TaskViewModel.cs
index ba4481d..b2b8306 100644
--- a/AutoRepairShop/AutoRepairShopContracts/ViewModels/TaskViewModel.cs
+++ b/AutoRepairShop/AutoRepairShopContracts/ViewModels/TaskViewModel.cs
@@ -18,6 +18,6 @@ namespace AutoRepairShopContracts.ViewModels
         public int Points { get; set; }
 
         [DisplayName("Дата выполнения")]
-        public DateTime? DateImplement { get; set; }
+        public DateTime DateImplement { get; set; }
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopContracts/ViewModels/WorkViewModel.cs b/AutoRepairShop/AutoRepairShopContracts/ViewModels/WorkViewModel.cs
index 0f539d9..894994c 100644
--- a/AutoRepairShop/AutoRepairShopContracts/ViewModels/WorkViewModel.cs
+++ b/AutoRepairShop/AutoRepairShopContracts/ViewModels/WorkViewModel.cs
@@ -23,16 +23,17 @@ namespace AutoRepairShopContracts.ViewModels
         [DisplayName("Руководитель")]
         public int ManagerId { get; set; }
         [DisplayName("Задания")]
-        public Dictionary<int, (ITaskModel, int)> WorkTasks { get; set; } = new();
+        public Dictionary<int, ITaskModel> WorkTasks { get; set; } = new();
         [DisplayName("Клиенты")]
-        public Dictionary<int, (IClientModel, int)> WorkClients { get; set; } = new();
+        public Dictionary<int, IClientModel> WorkClients { get; set; } = new();
 
         public WorkViewModel() { }
 
         [JsonConstructor]
-        public WorkViewModel(Dictionary<int, TaskViewModel> WorkTasks )//, Dictionary<int, ClientViewModel> WorkClients)
+        public WorkViewModel(Dictionary<int, TaskViewModel> WorkTasks, Dictionary<int, ClientViewModel> WorkClients)
         {
-         //   this.WorkTasks = WorkTasks.ToDictionary(x => x.Key, x => x.Value as ITaskModel);
+           this.WorkTasks = WorkTasks.ToDictionary(x => x.Key, x => x.Value as ITaskModel);
+           this.WorkClients = WorkClients.ToDictionary(x => x.Key, x => x.Value as IClientModel);
         }
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopDataModels/Models/ITaskModel.cs b/AutoRepairShop/AutoRepairShopDataModels/Models/ITaskModel.cs
index 2d1ea5b..4622e78 100644
--- a/AutoRepairShop/AutoRepairShopDataModels/Models/ITaskModel.cs
+++ b/AutoRepairShop/AutoRepairShopDataModels/Models/ITaskModel.cs
@@ -11,6 +11,6 @@ namespace AutoRepairShopDataModels.Models
         int Id { get; set; }
         int Points { get; }
         string Description { get; }
-        DateTime? DateImplement { get; }
+        DateTime DateImplement { get; }
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopDataModels/Models/IWorkModel.cs b/AutoRepairShop/AutoRepairShopDataModels/Models/IWorkModel.cs
index a31f8aa..f29977f 100644
--- a/AutoRepairShop/AutoRepairShopDataModels/Models/IWorkModel.cs
+++ b/AutoRepairShop/AutoRepairShopDataModels/Models/IWorkModel.cs
@@ -14,8 +14,8 @@ namespace AutoRepairShopDataModels.Models
         int Points { get; }
         DateTime DateCreate { get; }
         DateTime? DateImplement { get; }
-        Dictionary<int, (IClientModel, int)> WorkClients { get; }
-        Dictionary<int, (ITaskModel, int)> WorkTasks { get; }
+        Dictionary<int, IClientModel> WorkClients { get; }
+        Dictionary<int, ITaskModel> WorkTasks { get; }
 
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Implements/TaskStorage.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Implements/TaskStorage.cs
index 68cc213..cb9225a 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Implements/TaskStorage.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Implements/TaskStorage.cs
@@ -5,6 +5,7 @@ using AutoRepairShopContracts.ViewModels;
 using AutoRepairShopDatabaseImplement.Models;
 using System;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using System.Text;
 
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Implements/WorkStorage.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Implements/WorkStorage.cs
index 901c6c4..9c55346 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Implements/WorkStorage.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Implements/WorkStorage.cs
@@ -26,29 +26,28 @@ namespace AutoRepairShopDatabaseImplement.Implements
             }
             return null;
         }
-
         public WorkViewModel? GetElement(WorkSearchModel model)
-        {
-            if (!model.Id.HasValue && (!model.ManagerId.HasValue || !model.DateCreate.HasValue))
-            {
-                return null;
-            }
+        { 
             using var context = new AutoRepairShopDatabase();
+
+            if (model.ManagerId.HasValue)
+            {
+                return context.Works
+                    .Include(x => x.Manager)
+                                    .Include(x => x.Tasks)
+                                    .Include(x => x.Clients)
+                    .OrderBy(x => x.Id)
+                    .LastOrDefault(x => (model.ManagerId.HasValue && x.ManagerId == model.ManagerId))?.GetViewModel;
+            }
             if (model.Id.HasValue)
             {
                 return context.Works
-            .Include(x => x.Manager)
-            .Include(x => x.Tasks)
-            .Include(x => x.Clients)
-            .FirstOrDefault(x => x.Id == model.Id.Value)
-                ?.GetViewModel;
+                                    .Include(x => x.Manager)
+                                    .Include(x => x.Tasks)
+                                    .Include(x => x.Clients)
+                                    .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
             }
-            return context.Works
-            .Include(x => x.Manager)
-            .Include(x => x.Tasks)
-            .Include(x => x.Clients)
-            .FirstOrDefault(x => x.ManagerId == model.ManagerId.Value && x.DateCreate == model.DateCreate.Value)
-            ?.GetViewModel;
+            return null;
         }
 
         public List<WorkViewModel> GetFilteredList(WorkSearchModel model)
@@ -63,39 +62,37 @@ namespace AutoRepairShopDatabaseImplement.Implements
             if (model.Id.HasValue)
             {
                 return context.Works
-                    .Include(x => x.Manager)
-                    .Include(x => x.Tasks)
-                    .Include(x => x.Clients)
-                    .Where(x => x.Id == model.Id)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
+                                    .Include(x => x.Manager)
+                                    .Include(x => x.Tasks)
+                                    .Include(x => x.Clients)
+                                    .Where(x => x.Id == model.Id)
+                                    .Select(x => x.GetViewModel)
+                                    .ToList();
             }
 
             return context.Works
-     .Include(x => x.Manager)
-     .Include(x => x.Tasks)
-     .Include(x => x.Clients)
-     .Where(x =>
-         ((model.DateCreate.HasValue && model.DateImplement.HasValue) && !(model.DateCreate <= x.DateCreate && x.DateCreate <= model.DateImplement))
-         || (!model.DateImplement.HasValue && (model.DateCreate.HasValue && !(model.DateCreate <= x.DateCreate)))
-         || (model.ManagerId.HasValue && x.ManagerId == model.ManagerId)
-     )
-     .Select(x => x.GetViewModel)
-     .ToList();
+                                 .Include(x => x.Manager)
+                                 .Include(x => x.Tasks)
+                                 .Include(x => x.Clients)
+                                 .Where(x =>
+                                     ((model.DateCreate.HasValue) && !(model.DateCreate <= x.DateCreate))
+                                     || ((model.DateCreate.HasValue && !(model.DateCreate <= x.DateCreate)))
+                                     || (model.ManagerId.HasValue && x.ManagerId == model.ManagerId)
+                                 )
+                                 .Select(x => x.GetViewModel)
+                                 .ToList();
 
         }
-
         public List<WorkViewModel> GetFullList()
         {
             using var context = new AutoRepairShopDatabase();
             return context.Works
-            .Include(x => x.Manager)
-            .Include(x => x.Tasks)
-            .Include(x => x.Clients)
-            .Select(x => x.GetViewModel)
-            .ToList();
+                                .Include(x => x.Manager)
+                                .Include(x => x.Tasks)
+                                .Include(x => x.Clients)
+                                .Select(x => x.GetViewModel)
+                                .ToList();
         }
-
         public WorkViewModel? Insert(WorkBindingModel model)
         {
             using var context = new AutoRepairShopDatabase();
@@ -112,14 +109,89 @@ namespace AutoRepairShopDatabaseImplement.Implements
         public WorkViewModel? Update(WorkBindingModel model)
         {
             using var context = new AutoRepairShopDatabase();
-            var work = context.Works.FirstOrDefault(x => x.Id == model.Id);
-            if (work == null)
+            using var transcation = context.Database.BeginTransaction();
+            try
             {
-                return null;
+                var work = context.Works.FirstOrDefault(rec => rec.Id == model.Id);
+                if (work == null)
+                {
+                    return null;
+                }
+                work.UpdatePoints(context, model);
+                work.UpdateTasks(context, model);
+                work.UpdateDateImplement(context, model);
+                work.UpdateClients(context, model);
+                transcation.Commit();
+                return work.GetViewModel;
+            }
+            catch
+            {
+                transcation.Rollback();
+                throw;
+            }
+        }
+
+        public WorkViewModel? UpdateStatus(WorkBindingModel model)
+        {
+            using var context = new AutoRepairShopDatabase();
+            using var transcation = context.Database.BeginTransaction();
+            try
+            {
+                var work = context.Works.FirstOrDefault(rec => rec.Id == model.Id);
+                if (work == null)
+                {
+                    return null;
+                }
+                work.UpdateDateImplement(context, model);
+                transcation.Commit();
+                return work.GetViewModel;
+            }
+            catch
+            {
+                transcation.Rollback();
+                throw;
+            }
+        }
+        public WorkViewModel? DeleteClientFromWork(WorkBindingModel model)
+        {
+            using var context = new AutoRepairShopDatabase();
+            using var transcation = context.Database.BeginTransaction();
+            try
+            {
+                var work = context.Works.FirstOrDefault(rec => rec.Id == model.Id);
+                if (work == null)
+                {
+                    return null;
+                }
+                work.DeleteClientFromWork(context, model);
+                transcation.Commit();
+                return work.GetViewModel;
+            }
+            catch
+            {
+                transcation.Rollback();
+                throw;
+            }
+        }public WorkViewModel? DeleteTaskFromWork(WorkBindingModel model)
+        {
+            using var context = new AutoRepairShopDatabase();
+            using var transcation = context.Database.BeginTransaction();
+            try
+            {
+                var work = context.Works.FirstOrDefault(rec => rec.Id == model.Id);
+                if (work == null)
+                {
+                    return null;
+                }
+                work.DeleteTaskFromWork(context, model);
+                transcation.Commit();
+                return work.GetViewModel;
+            }
+            catch
+            {
+                transcation.Rollback();
+                throw;
             }
-            work.Update(model);
-            context.SaveChanges();
-            return context.Works.Include(x => x.Manager).Include(x => x.Points).Include(x => x.Tasks).Include(x => x.Clients).FirstOrDefault(x => x.Id == work.Id)?.GetViewModel;
         }
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240430185021_init.Designer.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240430185021_init.Designer.cs
deleted file mode 100644
index 9380bb2..0000000
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240430185021_init.Designer.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-// <auto-generated />
-using System;
-using AutoRepairShopDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace AutoRepairShopDatabaseImplement.Migrations
-{
-    [DbContext(typeof(AutoRepairShopDatabase))]
-    [Migration("20240430185021_init")]
-    partial class init
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.12")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("JobTitle")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("Points")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Manager", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Login")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("ManagerFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Managers");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Point", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Amount")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Points");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Task", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Tasks");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Work", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ManagerId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PointsId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ManagerId");
-
-                    b.HasIndex("PointsId");
-
-                    b.ToTable("Works");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.WorkClient", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("WorkId");
-
-                    b.ToTable("WorkClients");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.WorkTask", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("TaskId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("TaskId");
-
-                    b.HasIndex("WorkId");
-
-                    b.ToTable("WorkTasks");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Work", b =>
-                {
-                    b.HasOne("AutoRepairShopDatabaseImplement.Models.Manager", "Manager")
-                        .WithMany()
-                        .HasForeignKey("ManagerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AutoRepairShopDatabaseImplement.Models.Point", "Point")
-                        .WithMany()
-                        .HasForeignKey("PointsId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Manager");
-
-                    b.Navigation("Point");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.WorkClient", b =>
-                {
-                    b.HasOne("AutoRepairShopDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AutoRepairShopDatabaseImplement.Models.Work", "Work")
-                        .WithMany("Clients")
-                        .HasForeignKey("WorkId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Work");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.WorkTask", b =>
-                {
-                    b.HasOne("AutoRepairShopDatabaseImplement.Models.Task", "Task")
-                        .WithMany()
-                        .HasForeignKey("TaskId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AutoRepairShopDatabaseImplement.Models.Work", "Work")
-                        .WithMany("Tasks")
-                        .HasForeignKey("WorkId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Task");
-
-                    b.Navigation("Work");
-                });
-
-            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Work", b =>
-                {
-                    b.Navigation("Clients");
-
-                    b.Navigation("Tasks");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240529201238_init333.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240529201238_init333.cs
deleted file mode 100644
index b27981a..0000000
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240529201238_init333.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace AutoRepairShopDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class init333 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Works_Points_PointsId",
-                table: "Works");
-
-            migrationBuilder.DropTable(
-                name: "Points");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Works_PointsId",
-                table: "Works");
-
-            migrationBuilder.DropColumn(
-                name: "Login",
-                table: "Managers");
-
-            migrationBuilder.RenameColumn(
-                name: "PointsId",
-                table: "Works",
-                newName: "Points");
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "DateCreate",
-                table: "Works",
-                type: "timestamp with time zone",
-                nullable: false,
-                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "DateImplement",
-                table: "Works",
-                type: "timestamp with time zone",
-                nullable: true);
-
-            migrationBuilder.AddColumn<int>(
-                name: "Points",
-                table: "Tasks",
-                type: "integer",
-                nullable: false,
-                defaultValue: 0);
-
-            migrationBuilder.AddColumn<string>(
-                name: "Email",
-                table: "Clients",
-                type: "text",
-                nullable: false,
-                defaultValue: "");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DateCreate",
-                table: "Works");
-
-            migrationBuilder.DropColumn(
-                name: "DateImplement",
-                table: "Works");
-
-            migrationBuilder.DropColumn(
-                name: "Points",
-                table: "Tasks");
-
-            migrationBuilder.DropColumn(
-                name: "Email",
-                table: "Clients");
-
-            migrationBuilder.RenameColumn(
-                name: "Points",
-                table: "Works",
-                newName: "PointsId");
-
-            migrationBuilder.AddColumn<string>(
-                name: "Login",
-                table: "Managers",
-                type: "text",
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.CreateTable(
-                name: "Points",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Amount = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Points", x => x.Id);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Works_PointsId",
-                table: "Works",
-                column: "PointsId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Works_Points_PointsId",
-                table: "Works",
-                column: "PointsId",
-                principalTable: "Points",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Cascade);
-        }
-    }
-}
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240529201238_init333.Designer.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240531084918_1.Designer.cs
similarity index 94%
rename from AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240529201238_init333.Designer.cs
rename to AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240531084918_1.Designer.cs
index a3ab8bb..7b603f8 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240529201238_init333.Designer.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240531084918_1.Designer.cs
@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace AutoRepairShopDatabaseImplement.Migrations
 {
     [DbContext(typeof(AutoRepairShopDatabase))]
-    [Migration("20240529201238_init333")]
-    partial class init333
+    [Migration("20240531084918_1")]
+    partial class _1
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -87,6 +87,7 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateImplement")
+                        .IsRequired()
                         .HasColumnType("timestamp with time zone");
 
                     b.Property<string>("Description")
@@ -188,7 +189,7 @@ namespace AutoRepairShopDatabaseImplement.Migrations
             modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.WorkClient", b =>
                 {
                     b.HasOne("AutoRepairShopDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
+                        .WithMany("Clients")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -207,7 +208,7 @@ namespace AutoRepairShopDatabaseImplement.Migrations
             modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.WorkTask", b =>
                 {
                     b.HasOne("AutoRepairShopDatabaseImplement.Models.Task", "Task")
-                        .WithMany()
+                        .WithMany("Tasks")
                         .HasForeignKey("TaskId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -223,11 +224,21 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                     b.Navigation("Work");
                 });
 
+            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Clients");
+                });
+
             modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Manager", b =>
                 {
                     b.Navigation("Works");
                 });
 
+            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Task", b =>
+                {
+                    b.Navigation("Tasks");
+                });
+
             modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Work", b =>
                 {
                     b.Navigation("Clients");
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240430185021_init.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240531084918_1.cs
similarity index 84%
rename from AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240430185021_init.cs
rename to AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240531084918_1.cs
index 85e2406..7565fed 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240430185021_init.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/20240531084918_1.cs
@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace AutoRepairShopDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class init : Migration
+    public partial class _1 : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -20,6 +20,7 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     ClientFIO = table.Column<string>(type: "text", nullable: false),
                     JobTitle = table.Column<string>(type: "text", nullable: false),
+                    Email = table.Column<string>(type: "text", nullable: false),
                     Points = table.Column<int>(type: "integer", nullable: false)
                 },
                 constraints: table =>
@@ -35,7 +36,6 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     ManagerFIO = table.Column<string>(type: "text", nullable: false),
                     Email = table.Column<string>(type: "text", nullable: false),
-                    Login = table.Column<string>(type: "text", nullable: false),
                     Password = table.Column<string>(type: "text", nullable: false)
                 },
                 constraints: table =>
@@ -43,19 +43,6 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Managers", x => x.Id);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "Points",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Amount = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Points", x => x.Id);
-                });
-
             migrationBuilder.CreateTable(
                 name: "Tasks",
                 columns: table => new
@@ -63,7 +50,8 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                     Id = table.Column<int>(type: "integer", nullable: false)
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     Description = table.Column<string>(type: "text", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "timestamp with time zone", nullable: true)
+                    Points = table.Column<int>(type: "integer", nullable: false),
+                    DateImplement = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
                 },
                 constraints: table =>
                 {
@@ -76,8 +64,10 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                 {
                     Id = table.Column<int>(type: "integer", nullable: false)
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    PointsId = table.Column<int>(type: "integer", nullable: false),
-                    ManagerId = table.Column<int>(type: "integer", nullable: false)
+                    ManagerId = table.Column<int>(type: "integer", nullable: false),
+                    Points = table.Column<int>(type: "integer", nullable: false),
+                    DateCreate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    DateImplement = table.Column<DateTime>(type: "timestamp with time zone", nullable: true)
                 },
                 constraints: table =>
                 {
@@ -88,12 +78,6 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                         principalTable: "Managers",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Works_Points_PointsId",
-                        column: x => x.PointsId,
-                        principalTable: "Points",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
                 });
 
             migrationBuilder.CreateTable(
@@ -163,11 +147,6 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                 table: "Works",
                 column: "ManagerId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_Works_PointsId",
-                table: "Works",
-                column: "PointsId");
-
             migrationBuilder.CreateIndex(
                 name: "IX_WorkTasks_TaskId",
                 table: "WorkTasks",
@@ -199,9 +178,6 @@ namespace AutoRepairShopDatabaseImplement.Migrations
 
             migrationBuilder.DropTable(
                 name: "Managers");
-
-            migrationBuilder.DropTable(
-                name: "Points");
         }
     }
 }
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/AutoRepairShopDatabaseModelSnapshot.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/AutoRepairShopDatabaseModelSnapshot.cs
index 213502d..fd89936 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/AutoRepairShopDatabaseModelSnapshot.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Migrations/AutoRepairShopDatabaseModelSnapshot.cs
@@ -84,6 +84,7 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateImplement")
+                        .IsRequired()
                         .HasColumnType("timestamp with time zone");
 
                     b.Property<string>("Description")
@@ -185,7 +186,7 @@ namespace AutoRepairShopDatabaseImplement.Migrations
             modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.WorkClient", b =>
                 {
                     b.HasOne("AutoRepairShopDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
+                        .WithMany("Clients")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -204,7 +205,7 @@ namespace AutoRepairShopDatabaseImplement.Migrations
             modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.WorkTask", b =>
                 {
                     b.HasOne("AutoRepairShopDatabaseImplement.Models.Task", "Task")
-                        .WithMany()
+                        .WithMany("Tasks")
                         .HasForeignKey("TaskId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -220,11 +221,21 @@ namespace AutoRepairShopDatabaseImplement.Migrations
                     b.Navigation("Work");
                 });
 
+            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Clients");
+                });
+
             modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Manager", b =>
                 {
                     b.Navigation("Works");
                 });
 
+            modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Task", b =>
+                {
+                    b.Navigation("Tasks");
+                });
+
             modelBuilder.Entity("AutoRepairShopDatabaseImplement.Models.Work", b =>
                 {
                     b.Navigation("Clients");
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Client.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Client.cs
index 5433c7b..f4709f7 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Client.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Client.cs
@@ -30,7 +30,24 @@ namespace AutoRepairShopDatabaseImplement.Models
         [DataMember]
         public int Points { get; set; }
         [ForeignKey("ClientId")]
-        public virtual List<WorkClient> WorkClients { get; set; } = new();
+        public virtual List<WorkClient> Clients { get; set; } = new();
+
+        private Dictionary<int, IClientModel> _workClients = null;
+        [DataMember]
+        [NotMapped]
+        public Dictionary<int, IClientModel> WorkClients
+        {
+            get
+            {
+                if (_workClients == null)
+                {
+                    _workClients = Clients
+                       .ToDictionary(x => x.ClientId, x => (x.Client as IClientModel));
+                }
+
+                return _workClients;
+            }
+        }
         public static Client? Create(ClientBindingModel model)
         {
             if (model == null)
@@ -41,6 +58,7 @@ namespace AutoRepairShopDatabaseImplement.Models
             return new Client()
             {
                 Id = model.Id,
+                Email = model.Email,
                 ClientFIO = model.ClientFIO,
                 JobTitle = model.JobTitle,
                 Points = model.Points
@@ -55,10 +73,10 @@ namespace AutoRepairShopDatabaseImplement.Models
             }
 
             ClientFIO = model.ClientFIO;
+             Email = model.Email;
             JobTitle = model.JobTitle;
             Points = model.Points;
         }
-
         public static List<Client> GetFilteredList(List<Client> clients, Func<Client, bool> filter)
         {
             return clients.Where(filter).ToList();
@@ -66,6 +84,7 @@ namespace AutoRepairShopDatabaseImplement.Models
         public ClientViewModel GetViewModel => new()
         {
             Id = Id,
+            Email = Email,
             ClientFIO = ClientFIO,
            JobTitle = JobTitle,
            Points = Points
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Task.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Task.cs
index 51c85f0..3dd49f2 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Task.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Task.cs
@@ -25,9 +25,25 @@ namespace AutoRepairShopDatabaseImplement.Models
         public int Points { get; set; }
         [DataMember]
         [Required]
-        public DateTime? DateImplement { get; set; }
+        public DateTime DateImplement { get; set; }
         [ForeignKey("TaskId")]
-        public virtual List<WorkTask> WorkTasks { get; set; } = new();
+        public virtual List<WorkTask> Tasks { get; set; } = new();
+
+        private Dictionary<int, ITaskModel>? _workTasks = null;
+        [DataMember]
+        [NotMapped]
+        public Dictionary<int, ITaskModel> WorkTasks
+        {
+            get
+            {
+                if (_workTasks == null)
+                {
+                    _workTasks = Tasks
+             .ToDictionary(x => x.TaskId, x => (x.Task as ITaskModel));
+                }
+                return _workTasks;
+            }
+        }
 
         public static Task Create(AutoRepairShopDatabase context, TaskBindingModel model)
         {
@@ -39,6 +55,7 @@ namespace AutoRepairShopDatabaseImplement.Models
             return new Task
             {
                 Id = model.Id,
+                Points = model.Points,
                 Description = model.Description,
                 DateImplement = model.DateImplement
             };
@@ -50,13 +67,14 @@ namespace AutoRepairShopDatabaseImplement.Models
             {
                 return;
             }
-
+            Points = model.Points;
             Description = model.Description;
             DateImplement = model.DateImplement;
         }
         public TaskViewModel GetViewModel => new()
         {
             Id = Id,
+            Points = Points,
             Description = Description,
             DateImplement = DateImplement
         };
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Work.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Work.cs
index ef5fccf..7d27e67 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Work.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/Work.cs
@@ -18,56 +18,57 @@ namespace AutoRepairShopDatabaseImplement.Models
     public class Work : IWorkModel
     {
         public int Id { get; set; }
-        [DataMember]
-        [Required]
         public int ManagerId { get; set; }
         [DataMember]
         [Required]
         public int Points { get; set; }
         [DataMember]
         [Required]
-        public DateTime DateCreate { get; private set; }
+        public DateTime DateCreate { get; set; }
         [DataMember]
         public DateTime? DateImplement { get; set; }
 
         public virtual Manager Manager { get; set; }
-        private Dictionary<int, (IClientModel, int)>? _workClients = null;
-        [DataMember]
-  
-        [NotMapped]
-        public Dictionary<int, (IClientModel, int)> WorkClients
-        {
-            get
-            {
-                if (_workClients == null)
-                {
-                    _workClients = Clients
-                       .ToDictionary(recPC => recPC.ClientId, recPC => (recPC.Client as IClientModel,1));
-                }
-
-                return _workClients;
-            }
-        }
-        private Dictionary<int, (ITaskModel, int)>? _workTasks = null;
-        [DataMember]
-        [NotMapped]
-        public Dictionary<int, (ITaskModel, int)> WorkTasks
-        {
-            get
-            {
-                if (_workTasks == null)
-                {
-                    _workTasks = Tasks
-             .ToDictionary(recPC => recPC.TaskId, recPC => ((recPC.Task as ITaskModel,1)));
-                }
-                    return _workTasks;
-            }
-        }
         [ForeignKey("WorkId")]
         public virtual List<WorkTask> Tasks { get; set; } = new();
 
         [ForeignKey("WorkId")]
         public virtual List<WorkClient> Clients { get; set; } = new();
+        private Dictionary<int, IClientModel>? _workClients = null;
+        [DataMember]
+        [NotMapped]
+        public Dictionary<int, IClientModel> WorkClients
+        {
+            get
+            {
+                if (_workClients == null)
+                {
+                    using var context = new AutoRepairShopDatabase();
+                    _workClients = Clients
+                        .ToDictionary(x => x.ClientId, x => (context.Clients
+                        .FirstOrDefault(y => y.Id == x.ClientId)! as IClientModel));
+                }
+
+                return _workClients;
+            }
+        }
+        private Dictionary<int, ITaskModel>? _workTasks = null;
+        [DataMember]
+        [NotMapped]
+        public Dictionary<int, ITaskModel> WorkTasks
+        {
+            get
+            {
+                if (_workTasks == null)
+                {
+                    using var context = new AutoRepairShopDatabase();
+                    _workTasks = Tasks
+                        .ToDictionary(x => x.TaskId, x => (context.Tasks
+                        .FirstOrDefault(y => y.Id == x.TaskId)! as ITaskModel));
+                }
+                return _workTasks;
+            }
+        }
 
         public static Work Create(AutoRepairShopDatabase context, WorkBindingModel model)
         {
@@ -76,28 +77,32 @@ namespace AutoRepairShopDatabaseImplement.Models
                 Id = model.Id,
                 Points = model.Points,
                 ManagerId = model.ManagerId,
-                Tasks = model.WorkTasks.Select(x => new WorkTask { Task = context.Tasks.First(y => y.Id == x.Key) }).ToList(),
-                Clients = model.WorkClients.Select(x => new WorkClient { Client = context.Clients.First(y => y.Id == x.Key) }).ToList()
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+                Tasks = model.WorkTasks.Select(x => new WorkTask
+                {
+                    Task = context.Tasks.First(y => y.Id == x.Key),
+                }).ToList(),
+                Clients = model.WorkClients.Select(x => new WorkClient
+                {
+                    Client = context.Clients.First(y => y.Id == x.Key),
+                }).ToList()
             };
             
     }
-
-        public void Update(WorkBindingModel model)
-        {
-            ManagerId = model.ManagerId;
-        }
-
         public WorkViewModel GetViewModel => new()
         {
             Id = Id,
             ManagerId = ManagerId,
             Points = Points,
+            DateCreate= DateCreate,
+            DateImplement= DateImplement,
             WorkClients = WorkClients,
             WorkTasks = WorkTasks
         };
 
-        Dictionary<int, (IClientModel, int)> IWorkModel.WorkClients => throw new NotImplementedException();
-        Dictionary<int, (ITaskModel, int)> IWorkModel.WorkTasks => throw new NotImplementedException();
+        Dictionary<int, IClientModel> IWorkModel.WorkClients => throw new NotImplementedException();
+        Dictionary<int, ITaskModel> IWorkModel.WorkTasks => throw new NotImplementedException();
 
         public void UpdateClients(AutoRepairShopDatabase context, WorkBindingModel model)
         {
@@ -110,9 +115,9 @@ namespace AutoRepairShopDatabaseImplement.Models
                 context.SaveChanges();
 
                 // обновили количество у существующих записей
-                foreach (var updateWork in workClients)
+                foreach (var updateClients in workClients)
                 {
-                    model.WorkClients.Remove(updateWork.WorkId);
+                    model.WorkClients.Remove(updateClients.ClientId);
                 }
 
                 context.SaveChanges();
@@ -133,6 +138,39 @@ namespace AutoRepairShopDatabaseImplement.Models
 
             _workClients = null;
         }
+        public void UpdatePoints(AutoRepairShopDatabase context, WorkBindingModel model)
+        {
+            var work = context.Works.FirstOrDefault(x => x.Id == model.Id);
+
+            if (work == null)
+            {
+                throw new Exception($"Work with Id {model.Id} not found.");
+            }
+            work.Points = model.Points;
+            context.SaveChanges();
+        }
+        public void DeleteClientFromWork(AutoRepairShopDatabase context, WorkBindingModel model){
+            var workClients = context.WorkClients.Where(rec => rec.WorkId == model.Id).ToList();
+            context.WorkClients.RemoveRange(workClients.Where(rec => !model.WorkClients.ContainsKey(rec.ClientId)));
+            context.SaveChanges();
+        }
+        public void DeleteTaskFromWork(AutoRepairShopDatabase context, WorkBindingModel model)
+        {
+            var workTasks = context.WorkTasks.Where(rec => rec.WorkId == model.Id).ToList();
+            context.WorkTasks.RemoveRange(workTasks.Where(rec => !model.WorkTasks.ContainsKey(rec.TaskId)));
+            context.SaveChanges();
+        }
+        public void UpdateDateImplement(AutoRepairShopDatabase context, WorkBindingModel model)
+        {
+            var work = context.Works.FirstOrDefault(x => x.Id == model.Id);
+
+            if (work == null)
+            {
+                throw new Exception($"Work with Id {model.Id} not found.");
+            }
+            work.DateImplement = model.DateImplement;
+            context.SaveChanges();
+        }
         public void UpdateTasks(AutoRepairShopDatabase context, WorkBindingModel model)
         {
             var workTasks = context.WorkTasks.Where(rec => rec.WorkId == model.Id).ToList();
@@ -144,9 +182,9 @@ namespace AutoRepairShopDatabaseImplement.Models
                 context.SaveChanges();
 
                 // обновили количество у существующих записей
-                foreach (var updateWork in workTasks)
+                foreach (var updateTask in workTasks)
                 {
-                    model.WorkTasks.Remove(updateWork.WorkId);
+                    model.WorkTasks.Remove(updateTask.TaskId);
                 }
 
                 context.SaveChanges();
diff --git a/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/WorkTask.cs b/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/WorkTask.cs
index 8c5b4aa..6c07591 100644
--- a/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/WorkTask.cs
+++ b/AutoRepairShop/AutoRepairShopDatabaseImplement/Models/WorkTask.cs
@@ -10,9 +10,7 @@ namespace AutoRepairShopDatabaseImplement.Models
     public class WorkTask
     {
         public int Id { get; set; }
-        [Required]
         public int WorkId { get; set; }
-        [Required]
         public int TaskId { get; set; }
         public virtual Task Task { get; set; } = new();
         public virtual Work Work { get; set; } = new();
diff --git a/AutoRepairShop/AutoRepairShopRestApi/AutoRepairShopRestApi.csproj b/AutoRepairShop/AutoRepairShopRestApi/AutoRepairShopRestApi.csproj
index 8bfbda1..2588902 100644
--- a/AutoRepairShop/AutoRepairShopRestApi/AutoRepairShopRestApi.csproj
+++ b/AutoRepairShop/AutoRepairShopRestApi/AutoRepairShopRestApi.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
diff --git a/AutoRepairShop/AutoRepairShopRestApi/Controllers/ClientController.cs b/AutoRepairShop/AutoRepairShopRestApi/Controllers/ClientController.cs
index 5b62aee..dd88135 100644
--- a/AutoRepairShop/AutoRepairShopRestApi/Controllers/ClientController.cs
+++ b/AutoRepairShop/AutoRepairShopRestApi/Controllers/ClientController.cs
@@ -20,7 +20,7 @@ namespace AutoRepairShopRestApi.Controllers
         }
 
         [HttpGet]
-        public void GetClientInfo(int id)
+        public ClientViewModel GetClientInfo(int id)
         {
             try
             {
@@ -28,11 +28,25 @@ namespace AutoRepairShopRestApi.Controllers
                 if (clientInfo != null)
                 {
                     Response.WriteAsync(clientInfo.ToString());
+                    return clientInfo;
                 }
-                else
+                    return null; 
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error fetching client information");
+                return null;
+            }
+        }
+       /* [HttpPost]
+        public void DeleteClient(ClientBindingModel model)
+        {
+            try
+            {
+                var clientInfo = model;
+                if (clientInfo != null)
                 {
-                    Response.StatusCode = 404;
-                    Response.WriteAsync($"Client with ID {id} not found");
+                    _client.Delete(model);
                 }
             }
             catch (Exception ex)
@@ -40,7 +54,7 @@ namespace AutoRepairShopRestApi.Controllers
                 _logger.LogError(ex, "Error fetching client information");
             }
         }
-
+        */
         [HttpPost]
         public void CreateClient(ClientBindingModel model)
         {
@@ -54,15 +68,21 @@ namespace AutoRepairShopRestApi.Controllers
             }
         }
         [HttpGet]
-        public List<ClientViewModel>? GetClientList()
+        public List<Tuple<int, string, string, string, int>> GetClientList()
         {
             try
             {
-                return _client.ReadList(null);
+                var clients = _client.ReadList(null);
+                var list = new List<Tuple<int, string, string, string, int>>();
+                foreach (var client in clients)
+                {
+                    list.Add(Tuple.Create(client.Id, client.ClientFIO, client.JobTitle, client.Email, client.Points));
+                }
+                return list;
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка получения списка задач");
+                _logger.LogError(ex, "Ошибка получения списка товаров");
                 throw;
             }
         }
diff --git a/AutoRepairShop/AutoRepairShopRestApi/Controllers/MainController.cs b/AutoRepairShop/AutoRepairShopRestApi/Controllers/MainController.cs
index 2682b8a..a4947be 100644
--- a/AutoRepairShop/AutoRepairShopRestApi/Controllers/MainController.cs
+++ b/AutoRepairShop/AutoRepairShopRestApi/Controllers/MainController.cs
@@ -4,8 +4,13 @@ using AutoRepairShopContracts.BusinessLogicsContracts;
 using AutoRepairShopContracts.SearchModels;
 using AutoRepairShopContracts.ViewModels;
 using AutoRepairShopDatabaseImplement.Models;
+using AutoRepairShopDataModels.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Newtonsoft.Json;
+using System;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 
 namespace AutoRepairShopRestApi.Controllers
@@ -19,6 +24,9 @@ namespace AutoRepairShopRestApi.Controllers
         private readonly IWorkLogic _work;
         private readonly ITaskLogic _task;
         private readonly IManagerLogic _manager;
+        private Dictionary<int, ITaskModel> _tasklist;
+        private Dictionary<int, IClientModel> _clientlist;
+
         public MainController(ILogger<MainController> logger, IClientLogic client, ITaskLogic task, IManagerLogic manager, IWorkLogic work)
         {
             _logger = logger;
@@ -26,37 +34,115 @@ namespace AutoRepairShopRestApi.Controllers
             _task = task;
             _manager = manager;
             _work = work;
+            _tasklist = new Dictionary<int, ITaskModel>();
+            _clientlist = new Dictionary<int, IClientModel>();
         }
 
         [HttpGet]
-        public List<WorkViewModel>? GetWorks(int managerId)
+        public List<Tuple<int, int, DateTime, string, List<List<string>>, List<List<string>>>> GetWorks(int managerId)
         {
             try
             {
-                return _work.ReadList(new WorkSearchModel
+                var works = _work.ReadList(new WorkSearchModel { ManagerId = managerId });
+                var list = new List<Tuple<int, int, DateTime, string, List<List<string>>, List<List<string>>>>();
+                foreach (var work in works)
+                {
+                    var listC = new List<List<string>>();
+                    var listT = new List<List<string>>();
+                    foreach (var tk in work.WorkTasks)
+                    {
+                        var sentence = new List<string> {
+                    JsonConvert.SerializeObject(tk.Value.Description.ToString()),
+                    JsonConvert.SerializeObject(tk.Value.Points.ToString()),
+                    JsonConvert.SerializeObject(tk.Value.DateImplement.ToString())
+                    };
+                        listT.Add(sentence);
+                    }
+                    foreach (var pr in work.WorkClients)
+                    {
+                        var sentence = new List<string> {
+                    JsonConvert.SerializeObject(pr.Value.ClientFIO.ToString()),
+                    JsonConvert.SerializeObject(pr.Value.Points.ToString())
+                    };
+                        listC.Add(sentence);
+                    }
+                    list.Add(Tuple.Create(work.Id, work.Points, work.DateCreate, work.DateImplement?.ToString() ?? "Не выполнено", listT, listC));
+                }
+                return list;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения списка товаров");
+                throw;
+            }
+        }
+        [HttpGet]
+        public Tuple<int, int, DateTime, string, List<List<string>>, List<List<string>>> GetWorksById(int Id)
+        {
+            var listC = new List<List<string>>();
+            var listT = new List<List<string>>();
+            try
+            {
+                var works = _work.ReadElement(new WorkSearchModel { Id = Id });
+
+                    foreach (var tk in works.WorkTasks)
+                    {
+                        var sentence = new List<string> {
+                            JsonConvert.SerializeObject(tk.Value.Id.ToString()),
+                    JsonConvert.SerializeObject(tk.Value.Description.ToString()),
+                    JsonConvert.SerializeObject(tk.Value.Points.ToString()),
+                    JsonConvert.SerializeObject(tk.Value.DateImplement.ToString())
+                    };
+
+                        listT.Add(sentence);
+                    }
+                    foreach (var pr in works.WorkClients)
+                    {
+                        var sentence = new List<string> {
+                    JsonConvert.SerializeObject(pr.Value.Id.ToString()),
+                    JsonConvert.SerializeObject(pr.Value.ClientFIO.ToString()),
+                    JsonConvert.SerializeObject(pr.Value.Points.ToString())
+                    };
+
+                        listC.Add(sentence);
+                    }
+                return Tuple.Create(works.Id, works.Points, works.DateCreate, works.DateImplement?.ToString() ?? "Не выполнено", listT, listC);
+        }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения списка товаров");
+                throw;
+            }
+        }
+        [HttpGet]
+        public TaskViewModel? GetTask(int _taskId)
+        {
+            try
+            {
+                return _task.ReadElement(new TaskSearchModel
+                {
+                    Id = _taskId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения товаров id={Id}", _taskId);
+                throw;
+            }
+        }
+        [HttpGet]
+        public WorkViewModel? GetLastWork(int managerId)
+        {
+            try
+            {
+                return _work.ReadElement(new WorkSearchModel
                 {
                     ManagerId = managerId
                 });
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка получения списка заказов клиента id ={ Id}", managerId);
-                throw;
-            }
-        }
-        [HttpGet]
-        public WorkViewModel GetWorksById(int Id)
-        {
-            try
-            {
-                return _work.ReadElement(new WorkSearchModel
-                {
-                    Id = Id
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения работы с id = {Id}", Id);
+                _logger.LogError(ex, "Ошибка получения товаров id={Id}", managerId);
                 throw;
             }
         }
@@ -73,5 +159,273 @@ namespace AutoRepairShopRestApi.Controllers
                 throw;
             }
         }
+        [HttpPost]
+        public void CreateTask(TaskBindingModel TaskModel)
+        {
+            try
+            {
+                _task.Create(TaskModel);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка создания заказа");
+                throw;
+            }
+        }
+        [HttpPost]
+        public void CreateClient(ClientBindingModel ClientModel)
+        {
+            try
+            {
+                _client.Create(ClientModel);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка создания заказа");
+                throw;
+            }
+        }
+        [HttpPost]
+        public void UpdateWork(WorkBindingModel workModel)
+        {
+            try
+            {
+                _work.Update(workModel);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка создания заказа");
+                throw;
+            }
+        }
+        [HttpPost]
+        public void AddToWork(Tuple<int, List<List<string>>, List<List<string>>, int> _tuple)
+        {
+            int workId = _tuple.Item1;
+            int Points = _tuple.Item4;
+            List<List<string>> taskStrings = _tuple.Item2;
+            List<List<string>> clientStrings = _tuple.Item3;
+            List<int> task = taskStrings.Select(t => int.Parse(JsonConvert.DeserializeObject<string>(t[0]))).ToList();
+            List<int> client = clientStrings.Select(c => int.Parse(JsonConvert.DeserializeObject<string>(c[0]))).ToList();
+
+            var view = _work.ReadElement(new WorkSearchModel { Id = workId });
+
+            foreach (var tId in task) {
+                var task2 = _task.ReadElement(new TaskSearchModel { Id = tId });
+                if (view != null)
+                {
+                    _tasklist = view.WorkTasks;
+                }
+                if (_tasklist.ContainsKey(task2.Id))
+                {
+                    _tasklist[task2.Id] = task2;
+                }
+                else
+                {
+                    _tasklist.Add(task2.Id, task2);
+                }
+            }
+            foreach (var cId in client)
+            {
+                var client2 = _client.ReadElement(new ClientSearchModel { Id = cId });
+                if (view != null)
+                {
+                    _clientlist = view.WorkClients;
+                }
+                if (_clientlist.ContainsKey(client2.Id))
+                {
+                    _clientlist[client2.Id] = client2;
+                }
+                else
+                {
+                    _clientlist.Add(client2.Id, client2);
+                }
+            }
+
+            if (_tasklist == null)
+                {
+                    _logger.LogInformation("Пусто, ошибка");
+                }
+                _logger.LogInformation("Сохранение Заказа");
+            try
+            {
+                var model = new WorkBindingModel
+                {
+                    Id = workId,
+                    ManagerId = view.ManagerId,
+                    Points = Points,
+                    DateCreate = view.DateCreate,
+                    WorkTasks = _tasklist,
+                    WorkClients = _clientlist
+                };
+                var operationResult = _work.Update(model);
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при сохранении, дополнительная информация в логах");
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка добавления товара");
+                throw;
+            }
+        }
+        [HttpPost]
+        public void DeleteClientFromWork(Tuple<int, int> _tuple)
+        {
+            int workId = _tuple.Item1;
+            int ClientId = _tuple.Item2;
+
+            var view = _work.ReadElement(new WorkSearchModel { Id = workId });
+
+                var client = _client.ReadElement(new ClientSearchModel { Id = ClientId });
+                if (view != null)
+                {
+                    _clientlist = view.WorkClients;
+                }
+                foreach(var item in _clientlist)
+            {
+                if(item.Key == workId)
+                {
+                    _clientlist.Remove(ClientId);
+                }
+            }
+            try
+            {
+                var model = new WorkBindingModel
+                {
+                    Id = workId,
+                    ManagerId = view.ManagerId,
+                    Points = view.Points,
+                    DateCreate = view.DateCreate,
+                    WorkTasks = view.WorkTasks,
+                    WorkClients = _clientlist
+                };
+                var operationResult = _work.DeleteClientFromWork(model);
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при сохранении, дополнительная информация в логах");
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка добавления товара");
+                throw;
+            }
+        }
+        [HttpPost]
+        public void DeleteTaskFromWork(Tuple<int, int> _tuple)
+        {
+            int workId = _tuple.Item1;
+            int taskId = _tuple.Item2;
+
+            var view = _work.ReadElement(new WorkSearchModel { Id = workId });
+
+            var task = _task.ReadElement(new TaskSearchModel { Id = taskId });
+            if (view != null)
+            {
+                _tasklist = view.WorkTasks;
+            }
+            foreach (var item in _tasklist)
+            {
+                if (item.Key == workId)
+                {
+                    _tasklist.Remove(taskId);
+                }
+            }
+            try
+            {
+                var model = new WorkBindingModel
+                {
+                    Id = workId,
+                    ManagerId = view.ManagerId,
+                    Points = view.Points,
+                    DateCreate = view.DateCreate,
+                    WorkTasks = _tasklist,
+                    WorkClients = view.WorkClients
+                };
+                var operationResult = _work.DeleteTaskFromWork(model);
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при сохранении, дополнительная информация в логах");
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка добавления товара");
+                throw;
+            }
+        }
+        [HttpPost]
+        public void WorkDone(Tuple<int, DateTime> _tuple)
+        {
+            int workId = _tuple.Item1;
+            DateTime Date = _tuple.Item2;
+
+            var view = _work.ReadElement(new WorkSearchModel { Id = workId });
+            try
+            {
+                var model = new WorkBindingModel
+                {
+                    Id = view.Id,
+                    ManagerId = view.ManagerId,
+                    Points = view.Points,
+                    DateCreate = view.DateCreate,
+                    DateImplement = Date,
+                    WorkTasks = view.WorkTasks,
+                    WorkClients = view.WorkClients
+                };
+
+                var operationResult = _work.UpdateStatus(model);
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при сохранении, дополнительная информация в логах");
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка добавления товара");
+                throw;
+            }
+        }
+        [HttpPost]
+        public void GivePointsToClient(List<Tuple<int, int>> _list)
+        {
+            foreach (var item in _list)
+            {
+                int clientId = item.Item1;
+                int points = item.Item2;
+
+                var view = _client.ReadElement(new ClientSearchModel { Id = clientId });
+                if (view == null)
+                {
+                    _logger.LogError($"Client with Id {clientId} not found.");
+                    continue;
+                }
+
+                try
+                {
+                    var model = new ClientBindingModel
+                    {
+                        Id = view.Id,
+                        Points = view.Points + points,
+                        ClientFIO = view.ClientFIO,
+                        Email = view.Email,
+                        JobTitle = view.JobTitle
+                    };
+
+                    var operationResult = _client.Update(model);
+                    if (operationResult == null)
+                    {
+                        throw new Exception("Ошибка при сохранении, дополнительная информация в логах");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка обновления клиента");
+                    throw;
+                }
+            }
+        }
     }
-}
+ }
diff --git a/AutoRepairShop/AutoRepairShopRestApi/Controllers/TaskController.cs b/AutoRepairShop/AutoRepairShopRestApi/Controllers/TaskController.cs
index 3e45799..6b7fa5b 100644
--- a/AutoRepairShop/AutoRepairShopRestApi/Controllers/TaskController.cs
+++ b/AutoRepairShop/AutoRepairShopRestApi/Controllers/TaskController.cs
@@ -1,8 +1,10 @@
 using AutoRepairShopContracts.BindingModels;
 using AutoRepairShopContracts.BusinessLogicsContracts;
+using AutoRepairShopContracts.SearchModels;
 using AutoRepairShopContracts.ViewModels;
 using AutoRepairShopDatabaseImplement.Models;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 
 namespace AutoRepairShopRestApi.Controllers
 {
@@ -30,16 +32,23 @@ namespace AutoRepairShopRestApi.Controllers
                 throw;
             }
         }
+
         [HttpGet]
-        public List<TaskViewModel>? GetTaskList()
+        public List<Tuple<int, int, DateTime, string>> GetTaskList()
         {
             try
             {
-                return _task.ReadList(null);
+                var tasks = _task.ReadList(null);
+                var list = new List<Tuple<int, int, DateTime, string>>();
+                foreach (var task in tasks)
+                {
+                    list.Add(Tuple.Create(task.Id, task.Points, task.DateImplement, task.Description));
+                }
+                return list;
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка получения списка задач");
+                _logger.LogError(ex, "Ошибка получения списка товаров");
                 throw;
             }
         }
diff --git a/AutoRepairShop/AutoRepairShopRestApi/Controllers/WorkController.cs b/AutoRepairShop/AutoRepairShopRestApi/Controllers/WorkController.cs
index 3edf18d..7a46809 100644
--- a/AutoRepairShop/AutoRepairShopRestApi/Controllers/WorkController.cs
+++ b/AutoRepairShop/AutoRepairShopRestApi/Controllers/WorkController.cs
@@ -4,6 +4,7 @@ using AutoRepairShopContracts.SearchModels;
 using AutoRepairShopContracts.ViewModels;
 using AutoRepairShopDatabaseImplement.Models;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 
 namespace AutoRepairShopRestApi.Controllers
 {