kitossy/ISEbd-21_Chernyshov_N.I._LawFirm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
Никита Чернышов 2023-05-13 16:24:54 +04:00
parent b36bfdcb30
commit 47fe6a23a9
14 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LawFirm/LawFirm.sln
View File

@ -3,15 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.33213.308
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
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
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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmDatabase", "LawFirmDatabase\LawFirmDatabase.csproj", "{A05000F4-BF89-4515-A8C7-FB5D962E3802}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmWebApp", "LawFirmWebApp\LawFirmWebApp.csproj", "{8D397FC2-D414-4524-B7EE-1534013E8FE6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmWebApp", "LawFirmWebApp\LawFirmWebApp.csproj", "{8D397FC2-D414-4524-B7EE-1534013E8FE6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -19,10 +17,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
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.Build.0 = Debug|Any CPU
{E2306BF5-FCE9-4195-85BF-22C35495A8D0}.Release|Any CPU.ActiveCfg = Release|Any CPU

2
LawFirm/LawFirmContracts/BindingModels/CaseBindingModel.cs
View File

@ -13,5 +13,7 @@ namespace LawFirmContracts.BindingModels
public string Name { get; set; } = string.Empty;
public DateTime DateCreated { get; set; } = DateTime.Now;
public int CustomerId { get; set; }
public int WorkerId { get; set; }
public int PaymentId { get; set; }
}
}

1
LawFirm/LawFirmContracts/BindingModels/CaseServiceBindingModel.cs
View File

@ -12,6 +12,7 @@ namespace LawFirmContracts.BindingModels
public int Id { get; set; }
public int CaseId { get; set; }
public int ServiceId { get; set; }
public int PaymentId { get; set; }
}
}

1
LawFirm/LawFirmContracts/BindingModels/ItemBindingModel.cs
View File

@ -12,6 +12,7 @@ namespace LawFirmContracts.BindingModels
public int Id { get; set; }
public string Name { get; set; } = string.Empty;
public decimal Price { get; set; }
public int CaseId { get; set; }
public int PaymentId { get; set; }
}
}

1
LawFirm/LawFirmContracts/BindingModels/PaymentBindingModel.cs
View File

@ -13,5 +13,6 @@ namespace LawFirmContracts.BindingModels
public DateTime DatePayment { get; set; }
public decimal Sum { get; set; }
public int CaseId { get; set; }
public int CaseServiceId { get; set; }
}
}

5
LawFirm/LawFirmContracts/Models/IPaymentModel.cs
View File

@ -20,9 +20,12 @@ namespace LawFirmContracts.Models
/// Сумма оплаты
/// </summary>
decimal Sum { get; }
int CaseId { get; }
/// <summary>
/// Id дела
/// </summary>
int CaseId { get; }
// int CaseId { get; }
// int CaseServiceId { get; }
}
}

7
LawFirm/LawFirmContracts/Models/IServiceModel.cs
View File

@ -17,13 +17,10 @@ namespace LawFirmContracts.Models
/// Цена
/// </summary>
decimal Price { get; }
int CaseId { get; }
/// <summary>
/// Id статьи затрат
/// </summary>
int ItemId { get; }
/// <summary>
/// Id дела
/// </summary>
int CaseId { get; }
}
}

1
LawFirm/LawFirmContracts/ViewModels/CaseServiceViewModel.cs
View File

@ -12,5 +12,6 @@ namespace LawFirmContracts.ViewModels
public int Id { get; set; }
public int CaseId { get; set; }
public int ServiceId { get; set; }
public int PaymentId { get; set; }
}
}

1
LawFirm/LawFirmContracts/ViewModels/ItemViewModel.cs
View File

@ -15,6 +15,7 @@ namespace LawFirmContracts.ViewModels
public string Name { get; set; } = string.Empty;
[DisplayName("Цена")]
public decimal Price { get; set; }
public int CaseId { get; set; }
public int PaymentId { get; set; }
}
}

1
LawFirm/LawFirmContracts/ViewModels/PaymentViewModel.cs
View File

@ -16,5 +16,6 @@ namespace LawFirmContracts.ViewModels
[DisplayName("Сумма")]
public decimal Sum { get; set; }
public int CaseId { get; set; }
public int CaseServiceId { get; set; }
}
}

2
LawFirm/LawFirmDatabase/LawFirmDBContext.cs
View File

@ -17,7 +17,7 @@ namespace LawFirmDatabase
optionsBuilder.UseSqlServer
(
@"Data Source=KITOSYA;
Initial Catalog=AircraftPlantDataBaseFull;
Initial Catalog=Kursovaya;
Integrated Security=True;
MultipleActiveResultSets=True;;
TrustServerCertificate=True"

4
LawFirm/LawFirmDatabase/Migrations/20230408133321_InitialCreate.Designer.cs → LawFirm/LawFirmDatabase/Migrations/20230408215635_InitMigration.Designer.cs generated
View File

@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace LawFirmDatabase.Migrations
{
[DbContext(typeof(LawFirmDBContext))]
[Migration("20230408133321_InitialCreate")]
partial class InitialCreate
[Migration("20230408215635_InitMigration")]
partial class InitMigration
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)

2
LawFirm/LawFirmDatabase/Migrations/20230408133321_InitialCreate.cs → LawFirm/LawFirmDatabase/Migrations/20230408215635_InitMigration.cs
View File

@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace LawFirmDatabase.Migrations
{
/// <inheritdoc />
public partial class InitialCreate : Migration
public partial class InitMigration : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)

4
LawFirm/LawFirmDatabase/Models/Case.cs
View File

@ -35,7 +35,7 @@ namespace LawFirmDatabase.Models
}
return new()
{
Name= model.Name,
Name = model.Name,
DateCreated = model.DateCreated,
Customer = context.Customers.First(x => x.Id == model.CustomerId)
};
@ -55,7 +55,7 @@ namespace LawFirmDatabase.Models
public CaseViewModel GetViewModel => new()
{
Id = Id,
Name= Name,
Name = Name,
DateCreated = DateCreated,
CustomerId = CustomerId
};