diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/Privacy.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/Privacy.cshtml
new file mode 100644
index 0000000..1984ba8
--- /dev/null
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/Privacy.cshtml
@@ -0,0 +1,29 @@
+@using HardwareShopContracts.ViewModels;
+
+
+@model UserViewModel
+
+@{
+ ViewData["Title"] = "Privacy Policy";
+ Layout = "~/Views/Shared/_LayoutWorker.cshtml";
+}
+
+
Личные данные
+
+
\ No newline at end of file
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/Purchases.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/Purchases.cshtml
index 26cc615..cad04da 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/Purchases.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/Purchases.cshtml
@@ -19,7 +19,7 @@
Добавить
Удалить покупку
Выдан
-
Обновить
+
Изменить
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/UpdatePurchase.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/UpdatePurchase.cshtml
index 0ce73e8..0b2b803 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/UpdatePurchase.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/UpdatePurchase.cshtml
@@ -17,7 +17,6 @@
Товары
Добавить
- Удалить
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/WorkerReport.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/WorkerReport.cshtml
index 8d6a8ce..93ebc95 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/WorkerReport.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/WorkerReport.cshtml
@@ -3,29 +3,15 @@
Layout = "~/Views/Shared/_LayoutWorker.cshtml";
}
-Отчет по покупкам
-
-
-
-
+
-
-
-
-
-
- Показать
-
-
- На почту
-
+
Вывод на страницу
+
Отправить на почту
@@ -34,21 +20,20 @@
по
...
-
-
-
-
- Номер покупки
- Дата покупки
- Сумма покупки
- Комментарии
- Комплектующие
-
-
-
-
-
-
+
+
+
+
+ Номер покупки
+ Дата покупки
+ Сумма покупки
+ Комментарии
+ Комплектующие
+
+
+
+
+
@section Scripts
{
@@ -72,9 +57,6 @@
"DateFrom": dateFrom,
"DateTo": dateTo
};
- if (!validate(reportModel)) {
- return;
- }
$.ajax({
url: "/home/WorkerReport",
type: "POST",
@@ -94,9 +76,6 @@
"DateFrom": dateFrom,
"DateTo": dateTo
};
- if (!validate(reportModel)) {
- return;
- }
$.ajax({
url: "/home/SendByMailPurchaseReport",
type: "POST",
@@ -159,22 +138,6 @@
// [Other]
- const validate = function (reportModel) {
- if (isNaN(reportModel["DateFrom"])) {
- errorP.innerHTML = "Выберите начальную дату";
- return false;
- }
- if (isNaN(reportModel["DateTo"])) {
- errorP.innerHTML = "Выберите конечную дату";
- return false;
- }
- if (reportModel["DateFrom"] >= reportModel["DateTo"]) {
- errorP.innerHTML = "Начальная дата должна быть меньше конечной";
- return false;
- }
- return true;
- }
-
const getDate = function (iso) {
const year = iso.substring(0, 4);
const month = iso.substring(5, 7);
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml
index ea4942c..ed1dc8d 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml
@@ -24,8 +24,8 @@
- Сохранить в doc-формате
- Сохранить в xls-формате
+ Сохранить в doc-формате
+ Сохранить в xls-формате
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Shared/_LayoutWorker.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Shared/_LayoutWorker.cshtml
index 2b7096b..aa26c35 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Shared/_LayoutWorker.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Shared/_LayoutWorker.cshtml
@@ -36,6 +36,9 @@