some fixes
This commit is contained in:
parent
b36bfdcb30
commit
47fe6a23a9
@ -3,15 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
|||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.4.33213.308
|
VisualStudioVersion = 17.4.33213.308
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmView", "LawFirm\LawFirmView.csproj", "{599A2ED4-41F4-4D39-8A30-9474710AC617}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmContracts", "LawFirmContracts\LawFirmContracts.csproj", "{E2306BF5-FCE9-4195-85BF-22C35495A8D0}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmContracts", "LawFirmContracts\LawFirmContracts.csproj", "{E2306BF5-FCE9-4195-85BF-22C35495A8D0}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmBusinessLogic", "LawFirmBusinessLogic\LawFirmBusinessLogic.csproj", "{08E0AB8D-1F53-4757-BA64-D76A2EB866C0}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmBusinessLogic", "LawFirmBusinessLogic\LawFirmBusinessLogic.csproj", "{08E0AB8D-1F53-4757-BA64-D76A2EB866C0}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmDatabase", "LawFirmDatabase\LawFirmDatabase.csproj", "{A05000F4-BF89-4515-A8C7-FB5D962E3802}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmDatabase", "LawFirmDatabase\LawFirmDatabase.csproj", "{A05000F4-BF89-4515-A8C7-FB5D962E3802}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmWebApp", "LawFirmWebApp\LawFirmWebApp.csproj", "{8D397FC2-D414-4524-B7EE-1534013E8FE6}"
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmWebApp", "LawFirmWebApp\LawFirmWebApp.csproj", "{8D397FC2-D414-4524-B7EE-1534013E8FE6}"
|
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@ -19,10 +17,6 @@ Global
|
|||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{599A2ED4-41F4-4D39-8A30-9474710AC617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{599A2ED4-41F4-4D39-8A30-9474710AC617}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{599A2ED4-41F4-4D39-8A30-9474710AC617}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{599A2ED4-41F4-4D39-8A30-9474710AC617}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{E2306BF5-FCE9-4195-85BF-22C35495A8D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{E2306BF5-FCE9-4195-85BF-22C35495A8D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{E2306BF5-FCE9-4195-85BF-22C35495A8D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{E2306BF5-FCE9-4195-85BF-22C35495A8D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{E2306BF5-FCE9-4195-85BF-22C35495A8D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{E2306BF5-FCE9-4195-85BF-22C35495A8D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
@ -13,5 +13,7 @@ namespace LawFirmContracts.BindingModels
|
|||||||
public string Name { get; set; } = string.Empty;
|
public string Name { get; set; } = string.Empty;
|
||||||
public DateTime DateCreated { get; set; } = DateTime.Now;
|
public DateTime DateCreated { get; set; } = DateTime.Now;
|
||||||
public int CustomerId { get; set; }
|
public int CustomerId { get; set; }
|
||||||
|
public int WorkerId { get; set; }
|
||||||
|
public int PaymentId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,6 +12,7 @@ namespace LawFirmContracts.BindingModels
|
|||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public int CaseId { get; set; }
|
public int CaseId { get; set; }
|
||||||
public int ServiceId { get; set; }
|
public int ServiceId { get; set; }
|
||||||
|
public int PaymentId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ namespace LawFirmContracts.BindingModels
|
|||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public string Name { get; set; } = string.Empty;
|
public string Name { get; set; } = string.Empty;
|
||||||
public decimal Price { get; set; }
|
public decimal Price { get; set; }
|
||||||
|
public int CaseId { get; set; }
|
||||||
public int PaymentId { get; set; }
|
public int PaymentId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,5 +13,6 @@ namespace LawFirmContracts.BindingModels
|
|||||||
public DateTime DatePayment { get; set; }
|
public DateTime DatePayment { get; set; }
|
||||||
public decimal Sum { get; set; }
|
public decimal Sum { get; set; }
|
||||||
public int CaseId { get; set; }
|
public int CaseId { get; set; }
|
||||||
|
public int CaseServiceId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,9 +20,12 @@ namespace LawFirmContracts.Models
|
|||||||
/// Сумма оплаты
|
/// Сумма оплаты
|
||||||
/// </summary>
|
/// </summary>
|
||||||
decimal Sum { get; }
|
decimal Sum { get; }
|
||||||
|
int CaseId { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Id дела
|
/// Id дела
|
||||||
/// </summary>
|
/// </summary>
|
||||||
int CaseId { get; }
|
// int CaseId { get; }
|
||||||
|
// int CaseServiceId { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,13 +17,10 @@ namespace LawFirmContracts.Models
|
|||||||
/// Цена
|
/// Цена
|
||||||
/// </summary>
|
/// </summary>
|
||||||
decimal Price { get; }
|
decimal Price { get; }
|
||||||
|
int CaseId { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Id статьи затрат
|
/// Id статьи затрат
|
||||||
/// </summary>
|
/// </summary>
|
||||||
int ItemId { get; }
|
|
||||||
/// <summary>
|
|
||||||
/// Id дела
|
|
||||||
/// </summary>
|
|
||||||
int CaseId { get; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,5 +12,6 @@ namespace LawFirmContracts.ViewModels
|
|||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public int CaseId { get; set; }
|
public int CaseId { get; set; }
|
||||||
public int ServiceId { get; set; }
|
public int ServiceId { get; set; }
|
||||||
|
public int PaymentId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,7 @@ namespace LawFirmContracts.ViewModels
|
|||||||
public string Name { get; set; } = string.Empty;
|
public string Name { get; set; } = string.Empty;
|
||||||
[DisplayName("Цена")]
|
[DisplayName("Цена")]
|
||||||
public decimal Price { get; set; }
|
public decimal Price { get; set; }
|
||||||
|
public int CaseId { get; set; }
|
||||||
public int PaymentId { get; set; }
|
public int PaymentId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,5 +16,6 @@ namespace LawFirmContracts.ViewModels
|
|||||||
[DisplayName("Сумма")]
|
[DisplayName("Сумма")]
|
||||||
public decimal Sum { get; set; }
|
public decimal Sum { get; set; }
|
||||||
public int CaseId { get; set; }
|
public int CaseId { get; set; }
|
||||||
|
public int CaseServiceId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ namespace LawFirmDatabase
|
|||||||
optionsBuilder.UseSqlServer
|
optionsBuilder.UseSqlServer
|
||||||
(
|
(
|
||||||
@"Data Source=KITOSYA;
|
@"Data Source=KITOSYA;
|
||||||
Initial Catalog=AircraftPlantDataBaseFull;
|
Initial Catalog=Kursovaya;
|
||||||
Integrated Security=True;
|
Integrated Security=True;
|
||||||
MultipleActiveResultSets=True;;
|
MultipleActiveResultSets=True;;
|
||||||
TrustServerCertificate=True"
|
TrustServerCertificate=True"
|
||||||
|
@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
|||||||
namespace LawFirmDatabase.Migrations
|
namespace LawFirmDatabase.Migrations
|
||||||
{
|
{
|
||||||
[DbContext(typeof(LawFirmDBContext))]
|
[DbContext(typeof(LawFirmDBContext))]
|
||||||
[Migration("20230408133321_InitialCreate")]
|
[Migration("20230408215635_InitMigration")]
|
||||||
partial class InitialCreate
|
partial class InitMigration
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
|
|||||||
namespace LawFirmDatabase.Migrations
|
namespace LawFirmDatabase.Migrations
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public partial class InitialCreate : Migration
|
public partial class InitMigration : Migration
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
protected override void Up(MigrationBuilder migrationBuilder)
|
Loading…
Reference in New Issue
Block a user