Compare commits
9 Commits
f54de87ca2
...
292ce02370
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
292ce02370 | ||
|
|
df4de5d5f5 | ||
|
|
e4624c92ef | ||
|
|
b0d60461b4 | ||
|
|
c45c1a69a7 | ||
|
|
b268e53e1f | ||
|
|
a1fee6f5c0 | ||
|
|
dbb39354ab | ||
|
|
2ffa389978 |
@@ -1,6 +1,7 @@
|
||||
using DbFirst.Application.Catalogs;
|
||||
|
||||
using DbFirst.Application.Catalogs.Commands;
|
||||
using DbFirst.Application.Catalogs.Queries;
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using MediatR;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using System.Text;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Contracts.Layouts;
|
||||
using DbFirst.Domain.Entities;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using DbFirst.Application.Layouts;
|
||||
using System.Text;
|
||||
|
||||
namespace DbFirst.API.Controllers;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using DbFirst.Application.MassData;
|
||||
using DbFirst.Application.MassData.Commands;
|
||||
using DbFirst.Application.MassData.Queries;
|
||||
using DbFirst.Contracts.MassData;
|
||||
using MediatR;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using DevExpress.DashboardWeb;
|
||||
using Microsoft.Data.SqlClient;
|
||||
using System.Data;
|
||||
using System.Text;
|
||||
using System.Xml.Linq;
|
||||
using DevExpress.DashboardWeb;
|
||||
using Microsoft.Data.SqlClient;
|
||||
|
||||
namespace DbFirst.API.Dashboards;
|
||||
|
||||
|
||||
@@ -7,8 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper" Version="12.0.1" />
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="AutoMapper" Version="16.1.1" />
|
||||
<PackageReference Include="DevExpress.AspNetCore.Dashboard" Version="25.2.3" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.22" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using DbFirst.Domain.Entities;
|
||||
|
||||
namespace DbFirst.Application.Catalogs;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.Catalogs.Commands;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using DbFirst.Domain.Entities;
|
||||
using MediatR;
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.Catalogs.Commands;
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Domain.Entities;
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using DbFirst.Domain;
|
||||
using DbFirst.Domain.Entities;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.Catalogs.Commands;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.Catalogs.Queries;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.Catalogs.Queries;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.Catalogs.Queries;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.Catalogs.Queries;
|
||||
|
||||
@@ -7,14 +7,18 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper" Version="12.0.1" />
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="AutoMapper" Version="16.1.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
|
||||
<PackageReference Include="MediatR" Version="14.1.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\DbFirst.Contracts\DbFirst.Contracts.csproj" />
|
||||
<ProjectReference Include="..\DbFirst.Domain\DbFirst.Domain.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Layouts\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application;
|
||||
|
||||
@@ -7,7 +6,7 @@ public static class DependencyInjection
|
||||
{
|
||||
public static IServiceCollection AddApplication(this IServiceCollection services)
|
||||
{
|
||||
services.AddAutoMapper(typeof(DependencyInjection).Assembly);
|
||||
services.AddAutoMapper(cfg => cfg.AddMaps(typeof(DependencyInjection).Assembly));
|
||||
services.AddMediatR(cfg =>
|
||||
cfg.RegisterServicesFromAssembly(typeof(DependencyInjection).Assembly));
|
||||
return services;
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
namespace DbFirst.Application.Layouts;
|
||||
|
||||
public class LayoutDto
|
||||
{
|
||||
public string LayoutType { get; set; } = string.Empty;
|
||||
public string LayoutKey { get; set; } = string.Empty;
|
||||
public string UserName { get; set; } = string.Empty;
|
||||
public string LayoutData { get; set; } = string.Empty;
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
using DbFirst.Contracts.MassData;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.MassData.Commands;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Contracts.MassData;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.MassData.Commands;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Contracts.MassData;
|
||||
using DbFirst.Domain.Entities;
|
||||
|
||||
namespace DbFirst.Application.MassData;
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
namespace DbFirst.Application.MassData;
|
||||
|
||||
public class MassDataReadDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string CustomerName { get; set; } = string.Empty;
|
||||
public decimal Amount { get; set; }
|
||||
public string Category { get; set; } = string.Empty;
|
||||
public bool StatusFlag { get; set; }
|
||||
public DateTime AddedWhen { get; set; }
|
||||
public DateTime? ChangedWhen { get; set; }
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Contracts.MassData;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.MassData.Queries;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using DbFirst.Contracts.MassData;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.MassData.Queries;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using AutoMapper;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Contracts.MassData;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.MassData.Queries;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using DbFirst.Contracts.MassData;
|
||||
using MediatR;
|
||||
|
||||
namespace DbFirst.Application.MassData.Queries;
|
||||
|
||||
@@ -259,7 +259,7 @@ else
|
||||
{
|
||||
CatTitle = editModel.CatTitle,
|
||||
CatString = editModel.CatString,
|
||||
UpdateProcedure = editModel.UpdateProcedure
|
||||
UpdateProcedure = (CatalogUpdateProcedure)editModel.UpdateProcedure
|
||||
};
|
||||
|
||||
try
|
||||
|
||||
@@ -1,21 +1,28 @@
|
||||
@using System.Net.Http
|
||||
@using System.Net.Http.Json
|
||||
@using System.Text.Json
|
||||
|
||||
@using Microsoft.AspNetCore.Components.Forms
|
||||
@using Microsoft.AspNetCore.Components.Rendering
|
||||
@using Microsoft.AspNetCore.Components.Routing
|
||||
@using Microsoft.AspNetCore.Components.Web
|
||||
@using static Microsoft.AspNetCore.Components.Web.RenderMode
|
||||
@using Microsoft.AspNetCore.Components.Web.Virtualization
|
||||
@using Microsoft.JSInterop
|
||||
@using Microsoft.AspNetCore.SignalR.Client
|
||||
@using Microsoft.JSInterop
|
||||
@using Microsoft.Extensions.Options
|
||||
@using static Microsoft.AspNetCore.Components.Web.RenderMode
|
||||
|
||||
@using DbFirst.BlazorWebApp
|
||||
@using DbFirst.BlazorWebApp.Components
|
||||
@using DbFirst.BlazorWebApp.Models
|
||||
@using DbFirst.BlazorWebApp.Models.Grid
|
||||
@using DbFirst.BlazorWebApp.Services
|
||||
@using DbFirst.Contracts.Catalogs
|
||||
@using DbFirst.Contracts.Dashboards
|
||||
@using DbFirst.Contracts.MassData
|
||||
@using DbFirst.Contracts.Layouts
|
||||
@using DbFirst.Domain
|
||||
|
||||
@using DevExpress.Blazor
|
||||
@using DevExpress.DashboardBlazor
|
||||
@using DevExpress.DashboardWeb
|
||||
@using DevExpress.Data.Filtering
|
||||
@using Microsoft.Extensions.Options
|
||||
@@ -1,4 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
@@ -18,4 +18,8 @@
|
||||
<Folder Include="wwwroot\images\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\DbFirst.Contracts\DbFirst.Contracts.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
namespace DbFirst.BlazorWebApp.Models;
|
||||
|
||||
public class CatalogReadDto
|
||||
{
|
||||
public int Guid { get; set; }
|
||||
public string CatTitle { get; set; } = string.Empty;
|
||||
public string CatString { get; set; } = string.Empty;
|
||||
public string AddedWho { get; set; } = string.Empty;
|
||||
public DateTime AddedWhen { get; set; }
|
||||
public string? ChangedWho { get; set; }
|
||||
public DateTime? ChangedWhen { get; set; }
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
namespace DbFirst.BlazorWebApp.Models;
|
||||
|
||||
public class CatalogWriteDto
|
||||
{
|
||||
public string CatTitle { get; set; } = string.Empty;
|
||||
public string CatString { get; set; } = string.Empty;
|
||||
public int UpdateProcedure { get; set; }
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
namespace DbFirst.BlazorWebApp.Models;
|
||||
|
||||
public class MassDataWriteDto
|
||||
{
|
||||
public string CustomerName { get; set; } = string.Empty;
|
||||
public decimal Amount { get; set; }
|
||||
public string Category { get; set; } = string.Empty;
|
||||
public bool StatusFlag { get; set; }
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.BlazorWebApp.Models.Grid;
|
||||
using DbFirst.BlazorWebApp.Models.Grid;
|
||||
using DbFirst.Contracts.Layouts;
|
||||
using Microsoft.JSInterop;
|
||||
using System.Text.Json;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
|
||||
namespace DbFirst.BlazorWebApp.Services;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.Contracts.Dashboards;
|
||||
|
||||
namespace DbFirst.BlazorWebApp.Services;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.Contracts.Catalogs;
|
||||
|
||||
namespace DbFirst.BlazorWebApp.Services;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.Contracts.Dashboards;
|
||||
|
||||
namespace DbFirst.BlazorWebApp.Services
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.Contracts.Layouts;
|
||||
|
||||
namespace DbFirst.BlazorWebApp.Services
|
||||
{
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.Contracts.MassData;
|
||||
|
||||
namespace DbFirst.BlazorWebApp.Services
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.Contracts.Layouts;
|
||||
|
||||
namespace DbFirst.BlazorWebApp.Services;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using DbFirst.BlazorWebApp.Models;
|
||||
using DbFirst.Contracts.MassData;
|
||||
|
||||
namespace DbFirst.BlazorWebApp.Services;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace DbFirst.Application.Catalogs;
|
||||
namespace DbFirst.Contracts.Catalogs;
|
||||
|
||||
public class CatalogReadDto
|
||||
{
|
||||
@@ -1,6 +1,6 @@
|
||||
using DbFirst.Domain;
|
||||
using DbFirst.Domain;
|
||||
|
||||
namespace DbFirst.Application.Catalogs;
|
||||
namespace DbFirst.Contracts.Catalogs;
|
||||
|
||||
public class CatalogWriteDto
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace DbFirst.BlazorWebApp.Models;
|
||||
namespace DbFirst.Contracts.Dashboards;
|
||||
|
||||
public class DashboardInfoDto
|
||||
{
|
||||
13
DbFirst.Contracts/DbFirst.Contracts.csproj
Normal file
13
DbFirst.Contracts/DbFirst.Contracts.csproj
Normal file
@@ -0,0 +1,13 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\DbFirst.Domain\DbFirst.Domain.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace DbFirst.BlazorWebApp.Models;
|
||||
namespace DbFirst.Contracts.Layouts;
|
||||
|
||||
public class LayoutDto
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace DbFirst.BlazorWebApp.Models;
|
||||
namespace DbFirst.Contracts.MassData;
|
||||
|
||||
public class MassDataReadDto
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace DbFirst.Application.MassData;
|
||||
namespace DbFirst.Contracts.MassData;
|
||||
|
||||
public class MassDataWriteDto
|
||||
{
|
||||
@@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper" Version="12.0.1" />
|
||||
<PackageReference Include="AutoMapper" Version="16.1.1" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.22" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.22">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Domain;
|
||||
using DbFirst.Domain.Entities;
|
||||
using DbFirst.Application.Repositories;
|
||||
using Microsoft.Data.SqlClient;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Data;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using System.Data;
|
||||
using DbFirst.Application.Repositories;
|
||||
using DbFirst.Domain.Entities;
|
||||
using Microsoft.Data.SqlClient;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Data;
|
||||
|
||||
namespace DbFirst.Infrastructure.Repositories;
|
||||
|
||||
|
||||
14
DbFirst.sln
14
DbFirst.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbFirst.Domain", "DbFirst.D
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbFirst.BlazorWebApp", "DbFirst.BlazorWebApp\DbFirst.BlazorWebApp.csproj", "{FF1D77C4-A13D-43E0-BCE1-C18C01F1767C}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbFirst.Contracts", "DbFirst.Contracts\DbFirst.Contracts.csproj", "{94FFCA01-9476-49B3-B7D0-5706514E42E4}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@@ -83,6 +85,18 @@ Global
|
||||
{FF1D77C4-A13D-43E0-BCE1-C18C01F1767C}.Release|x64.Build.0 = Release|Any CPU
|
||||
{FF1D77C4-A13D-43E0-BCE1-C18C01F1767C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{FF1D77C4-A13D-43E0-BCE1-C18C01F1767C}.Release|x86.Build.0 = Release|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|x64.Build.0 = Release|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
Reference in New Issue
Block a user