diff --git a/Factory/FactoryWorkerApp/Controllers/HomeController.cs b/Factory/FactoryWorkerApp/Controllers/HomeController.cs index bb27be8..7d02134 100644 --- a/Factory/FactoryWorkerApp/Controllers/HomeController.cs +++ b/Factory/FactoryWorkerApp/Controllers/HomeController.cs @@ -215,28 +215,51 @@ namespace FactoryWorkerApp.Controllers }; return View(reports); } - [HttpGet] + [HttpGet] + public IActionResult WorkpieceTimeChoose() + { + if (!IsLoggedIn) + return RedirectToAction("Index"); + return View(); + } + + [HttpPost] + public IActionResult SendReport() + { + + return Ok(); + } + [HttpPost] + public IActionResult TimeReportWeb(DateTime startDate, DateTime endDate) + { + if (!IsLoggedIn) + return RedirectToAction("Index"); + + + HttpContext.Session.SetString("StartDate", startDate.ToString()); + HttpContext.Session.SetString("EndDate", endDate.ToString()); + + return RedirectToAction("DetailTimeReport"); + } + + [HttpGet] public IActionResult WorkpieceDateReport() { - List workpieceTimeReports = new List - { - new WorkpieceTimeReportViewModel - { - WorkpieceName = "Заготовка А", - ExecutionPhases = new List { "Этап 1", "Этап 2" }, - Machines = new List { "Станок X", "Станок Y" } - }, - new WorkpieceTimeReportViewModel - { - WorkpieceName = "Деталь B", - ExecutionPhases = new List { "Этап 3", "Этап 4" }, - Machines = new List { "Станок Z", "Станок W" } - } - }; - return View(workpieceTimeReports); + var startDateStr = HttpContext.Session.GetString("StartDate"); + var endDateStr = HttpContext.Session.GetString("EndDate"); + var startDate = DateTime.Parse(startDateStr); + var endDate = DateTime.Parse(endDateStr).AddDays(1); - } - [HttpGet] + var values = _logic.GetTimeReport(startDate, endDate, UserId); + + ViewBag.StartDate = startDate; + ViewBag.EndDate = endDate; + + return View(values); + + + } + [HttpGet] public IActionResult ExecutionPhases() { if (Client.user != null) diff --git a/Factory/FactoryWorkerApp/Views/Home/WorkpiecesTimeChoose.cshtml b/Factory/FactoryWorkerApp/Views/Home/WorkpiecesTimeChoose.cshtml new file mode 100644 index 0000000..e2b63c4 --- /dev/null +++ b/Factory/FactoryWorkerApp/Views/Home/WorkpiecesTimeChoose.cshtml @@ -0,0 +1,74 @@ +@{ + ViewData["Title"] = "Создание отчета"; +} + +
+

Создание отчета

+
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + \ No newline at end of file