Это просто Jopa Гит всё сломал
This commit is contained in:
parent
615fbac791
commit
6aa9a9e742
@ -8,6 +8,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels
|
|||||||
|
|
||||||
public string Title { get; set; } = string.Empty;
|
public string Title { get; set; } = string.Empty;
|
||||||
|
|
||||||
public List<ReportProductsViewModel> Products { get; set; } = new();
|
public List<ProductViewModel> Products { get; set; } = new();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels
|
|||||||
|
|
||||||
public string Title { get; set; } = string.Empty;
|
public string Title { get; set; } = string.Empty;
|
||||||
|
|
||||||
public List<ReportPaymeantsViewModel> ListPaymeant { get; set; } = new();
|
public List<PaymeantViewModel> ListPaymeant { get; set; } = new();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels
|
|||||||
|
|
||||||
public string Title { get; set; } = string.Empty;
|
public string Title { get; set; } = string.Empty;
|
||||||
|
|
||||||
public List<ReportProductsViewModel> ListProduct { get; set; } = new();
|
public List<ProductViewModel> ListProduct { get; set; } = new();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,8 +10,8 @@ namespace ElectronicsShopContracts.BusinessLogicContracts
|
|||||||
{
|
{
|
||||||
public interface IReportClientLogic
|
public interface IReportClientLogic
|
||||||
{
|
{
|
||||||
List<ReportPaymeantsViewModel> GetPaymeants(ReportPaymeantBindingModel model);
|
List<ReportPaymeantsViewModel> GetPaymeants(ReportBindingModel model);
|
||||||
void SavePreservesToWordFile(ReportPaymeantBindingModel model);
|
void SavePaymeantToWordFile(ReportBindingModel model);
|
||||||
void SavePreservesToExcelFile(ReportPaymeantBindingModel model);
|
void SavePaymeantToExcelFile(ReportBindingModel model);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,8 +10,8 @@ namespace ElectronicsShopContracts.BusinessLogicContracts
|
|||||||
{
|
{
|
||||||
public interface IReportEmployeeLogic
|
public interface IReportEmployeeLogic
|
||||||
{
|
{
|
||||||
List<ReportProductsViewModel> GetRoute(ReportProductBindingModel model);
|
List<ReportProductsViewModel> GetProduct(ReportProductBindingModel model);
|
||||||
void SaveRoutesToWordFile(ReportProductBindingModel model);
|
void SaveProductsToWordFile(ReportProductBindingModel model);
|
||||||
void SaveRoutesToExcelFile(ReportProductBindingModel model);
|
void SaveProductsToExcelFile(ReportProductBindingModel model);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using System;
|
using ElectronicsShopDataModels.Enums;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@ -8,7 +9,12 @@ namespace ElectronicsShopContracts.ViewModels
|
|||||||
{
|
{
|
||||||
public class ReportPaymeantsViewModel
|
public class ReportPaymeantsViewModel
|
||||||
{
|
{
|
||||||
public string PaymeantName { get; set; } = string.Empty;
|
public int PaymeantID { get; set; }
|
||||||
public List<PaymeantViewModel> PaymeantsList { get; set; } = new();
|
|
||||||
|
public int ProductID { get; set; }
|
||||||
|
|
||||||
|
public int OrderID { get; set; }
|
||||||
|
public double SumPayment { get; set; }
|
||||||
|
public PaymeantOption PayOption { get; set; } = PaymeantOption.Неоплачено;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,36 @@
|
|||||||
|
@{
|
||||||
|
ViewData["Title"] = "Report";
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="text-center">
|
||||||
|
<h2 class="display-4">Отчёты</h2>
|
||||||
|
<div class="list-group">
|
||||||
|
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="ListPreserves">Списки оплат word</a>
|
||||||
|
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="AnimalVisitsAndDrugs">Заповедники и стоимость животных</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form method="post">
|
||||||
|
<div class="align-content-center row mb-3">
|
||||||
|
<div class="col-sm-auto">
|
||||||
|
<label for="startDate">С:</label>
|
||||||
|
</div>
|
||||||
|
<div class="col-3">
|
||||||
|
<input name="startDate" id="startDate" class="form-control" type="date" />
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-auto">
|
||||||
|
<label for="endDate">По:</label>
|
||||||
|
</div>
|
||||||
|
<div class="col-3">
|
||||||
|
<input name="endDate" id="endDate" class="form-control" type="date" />
|
||||||
|
</div>
|
||||||
|
<div class="col-2">
|
||||||
|
<input type="submit" name="getReport" class="btn btn-primary" value="Сформировать отчет" />
|
||||||
|
</div>
|
||||||
|
<div class="col-3">
|
||||||
|
<input type="submit" name="sendToMail" class="btn btn-primary" value="Отправить на почту" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user