admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

customize checkout add - service worker disabled

Browse Source
This commit is contained in:
SamSys
2024-10-06 18:24:14 +03:30
parent d0f69ea27c
commit 6dc4785057
15 changed files with 6130 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
0_Framework/Application/Version.cs
View File

@@ -10,8 +10,8 @@ public static class Version
{
static Version()
{
StyleVersion = "2.12.16";
AdminVersion = "2.5.36";
StyleVersion = "2.12.17";
AdminVersion = "2.5.37";
CameraVersion = "1.0.7";
}

22
Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs
View File

@@ -1,6 +1,8 @@
using _0_Framework.Domain;
using System;
using _0_Framework.Application;
using Company.Domain.EmployeeAgg;
using Company.Domain.WorkshopAgg;
namespace Company.Domain.CustomizeCheckoutAgg;
@@ -56,8 +58,18 @@ public class CustomizeCheckout : EntityBase
public string Month => MonthInt.ToFarsiMonthByIntNumber();
#endregion
#region DatabaseEntities
#region RelationProperties
public long EmployeeId { get; private set; }
public long WorkshopId { get; private set; }
public long EmployerId { get; private set; }
public long? ContractId { get; private set; }
#endregion
public IsActive IsActiveString { get; private set; }
/// <summary>
@@ -200,10 +212,12 @@ public class CustomizeCheckout : EntityBase
#endregion
#region Relations
public long EmployeeId { get; private set; }
public long WorkshopId { get; private set; }
public long EmployerId { get; private set; }
public long? ContractId { get; private set; }
public Workshop Workshop { get; set; }
public Employee Employee { get; set; }
#endregion
}

3
Company.Domain/EmployeeAgg/Employee.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using _0_Framework.Domain;
using Company.Domain.ClientEmployeeWorkshopAgg;
using Company.Domain.ContractAgg;
using Company.Domain.CustomizeCheckoutAgg;
using Company.Domain.EmployeeChildrenAgg;
using Company.Domain.EmployeeInsuranceRecordAgg;
using Company.Domain.InsuranceEmployeeInfoAgg;
@@ -124,6 +125,7 @@ public class Employee : EntityBase
public List<EmployeeInsuranceRecord> EmployeeInsuranceRecords { get; private set; }
public List<PersonnelCodeDomain> PersonnelCodeList { get; set; }
public List<CustomizeCheckout> CustomizeCheckouts { get; set; }
public string FullName => $"{FName} {LName}";
@@ -136,6 +138,7 @@ public class Employee : EntityBase
LeftWorkInsurances = new List<LeftWorkInsurance>();
PersonnelCodeList = new List<PersonnelCodeDomain>();
ClientEmployeeWorkshopList =new List<ClientEmployeeWorkshop>();
CustomizeCheckouts = new List<CustomizeCheckout>();
//Checkouts = new List<Checkout>();
}

4
Company.Domain/WorkshopAgg/Workshop.cs
View File

@@ -5,6 +5,7 @@ using _0_Framework.Domain;
using Company.Domain.CheckoutAgg;
using Company.Domain.ClientEmployeeWorkshopAgg;
using Company.Domain.ContractAgg;
using Company.Domain.CustomizeCheckoutAgg;
using Company.Domain.EmployeeInsuranceRecordAgg;
using Company.Domain.empolyerAgg;
using Company.Domain.InsuranceAgg;
@@ -200,6 +201,7 @@ public class Workshop : EntityBase
public Workshop()
{
RollCallServicesList = new List<RollCallService>();
CustomizeCheckouts = new List<CustomizeCheckout>();
}
public List<RollCallService> RollCallServicesList { get; set; }
public List<PersonnelCodeDomain> PersonnelCodeList { get; set; }
@@ -215,7 +217,7 @@ public class Workshop : EntityBase
public List<ClientEmployeeWorkshop> ClientEmployeeWorkshopList { get; set; }
public InsuranceWorkshopInfo InsuranceWorkshopInfo { get; set; }
public List<TaxLeftWorkCategory> TaxLeftWorkCategoryList { get; set; }
public List<CustomizeCheckout> CustomizeCheckouts { get; set; }
public void Edit(string workshopName, string workshopSureName, string insuranceCode,string typeOfOwnership, string archiveCode, string agentName, string agentPhone,
string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,

4
CompanyManagment.EFCore/CompanyContext.cs
View File

@@ -12,6 +12,7 @@ using Company.Domain.ContractingPartyAccountAgg;
using Company.Domain.CrossJobAgg;
using Company.Domain.CrossJobGuildAgg;
using Company.Domain.CrossJobItemsAgg;
using Company.Domain.CustomizeCheckoutAgg;
using Company.Domain.DateSalaryAgg;
using Company.Domain.DateSalaryItemAgg;
using Company.Domain.EmployeeAccountAgg;
@@ -129,7 +130,10 @@ public class CompanyContext : DbContext
//public DbSet<Task> Tasks { get; set; }
//public DbSet<TaskStatus> TaskStatuses { get; set; }
//public DbSet<TaskTitle> TaskTitles { get; set; }
//-------Main-Project----------------------------
public DbSet<CustomizeCheckout> CustomizeCheckouts { get; set; }
public DbSet<TaxLeftWorkItem> TaxLeftWorkItems { get; set; }
public DbSet<TaxLeftWorkCategory> TaxLeftWorkCategories { get; set; }
public DbSet<TaxJobCategory> TaxJobCategories { get; set; }

49
CompanyManagment.EFCore/Mapping/CustomizeCheckoutMapping.cs
View File

@@ -11,7 +11,54 @@ public class CustomizeCheckoutMapping : IEntityTypeConfiguration<CustomizeChecko
builder.ToTable("CustomizeCheckouts");
builder.HasKey(x => x.id);
#region relationProperties
builder.Property(x => x.EmployeeId);
builder.Property(x => x.WorkshopId);
builder.Property(x => x.EmployerId);
builder.Property(x => x.ContractId).IsRequired(false);
#endregion
builder.Property(x => x.IsActiveString).HasConversion<string>().HasMaxLength(5);
builder.Property(x => x.ContractNo).HasMaxLength(50);
builder.Property(x => x.ContractNo).HasMaxLength(20);
builder.Property(x => x.YearInt);
builder.Property(x => x.MonthInt);
builder.Property(x => x.MonthlySalary);
builder.Property(x => x.ContractStart);
builder.Property(x => x.ContractEnd);
builder.Property(x => x.FridayPay);
builder.Property(x => x.OverTimePay);
builder.Property(x => x.BaseYearsPay);
builder.Property(x => x.BonusesPay);
builder.Property(x => x.NightWorkPay);
builder.Property(x => x.MarriedAllowance);
builder.Property(x => x.ShiftPay);
builder.Property(x => x.FamilyAllowance);
builder.Property(x => x.LeavePay);
builder.Property(x => x.InsuranceDeduction);
builder.Property(x => x.FineAbsenceDeduction);
builder.Property(x => x.LateToWorkDeduction);
builder.Property(x => x.EarlyExitDeduction);
builder.Property(x => x.RewardPay);
builder.Property(x => x.SalaryAidDeduction);
builder.Property(x => x.InstallmentDeduction);
builder.Property(x => x.FineDeduction);
builder.Property(x => x.TaxDeduction);
builder.Property(x => x.SumOfWorkingDays);
builder.Property(x => x.TotalClaims);
builder.Property(x => x.TotalDeductions);
builder.Property(x => x.TotalPayment);
#region Relastions
builder.HasOne(x => x.Workshop)
.WithMany(x => x.CustomizeCheckouts)
.HasForeignKey(x => x.WorkshopId);
builder.HasOne(x => x.Employee)
.WithMany(x => x.CustomizeCheckouts)
.HasForeignKey(x => x.EmployeeId);
#endregion
}
}

4
CompanyManagment.EFCore/Mapping/EmployeeMapping.cs
View File

@@ -70,6 +70,10 @@ public class EmployeeMapping : IEntityTypeConfiguration<Employee>
.WithOne(x => x.Employee)
.HasForeignKey(x => x.EmployeeId);
builder.HasMany(x => x.CustomizeCheckouts)
.WithOne(x => x.Employee)
.HasForeignKey(x => x.EmployeeId);
#region Pooya

4
CompanyManagment.EFCore/Mapping/WorkshopMapping.cs
View File

@@ -71,5 +71,9 @@ partial class WorkshopMapping : IEntityTypeConfiguration<Workshop>
.WithOne(x => x.Workshop)
.HasForeignKey(x => x.WorkshopId);
builder.HasMany(x => x.CustomizeCheckouts)
.WithOne(x => x.Workshop)
.HasForeignKey(x => x.WorkshopId);
}
}

5783
CompanyManagment.EFCore/Migrations/20241005180538_CustomizeCheckout.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

90
CompanyManagment.EFCore/Migrations/20241005180538_CustomizeCheckout.cs Normal file
View File

@@ -0,0 +1,90 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace CompanyManagment.EFCore.Migrations
{
/// <inheritdoc />
public partial class CustomizeCheckout : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "CustomizeCheckouts",
columns: table => new
{
id = table.Column<long>(type: "bigint", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
EmployeeId = table.Column<long>(type: "bigint", nullable: false),
WorkshopId = table.Column<long>(type: "bigint", nullable: false),
EmployerId = table.Column<long>(type: "bigint", nullable: false),
ContractId = table.Column<long>(type: "bigint", nullable: true),
IsActiveString = table.Column<string>(type: "nvarchar(5)", maxLength: 5, nullable: false),
ContractNo = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
YearInt = table.Column<int>(type: "int", nullable: false),
MonthInt = table.Column<int>(type: "int", nullable: false),
MonthlySalary = table.Column<double>(type: "float", nullable: false),
ContractStart = table.Column<DateTime>(type: "datetime2", nullable: false),
ContractEnd = table.Column<DateTime>(type: "datetime2", nullable: false),
FridayPay = table.Column<double>(type: "float", nullable: false),
OverTimePay = table.Column<double>(type: "float", nullable: false),
BaseYearsPay = table.Column<double>(type: "float", nullable: false),
BonusesPay = table.Column<double>(type: "float", nullable: false),
NightWorkPay = table.Column<double>(type: "float", nullable: false),
MarriedAllowance = table.Column<double>(type: "float", nullable: false),
ShiftPay = table.Column<double>(type: "float", nullable: false),
FamilyAllowance = table.Column<double>(type: "float", nullable: false),
LeavePay = table.Column<double>(type: "float", nullable: false),
InsuranceDeduction = table.Column<double>(type: "float", nullable: false),
FineAbsenceDeduction = table.Column<double>(type: "float", nullable: false),
LateToWorkDeduction = table.Column<double>(type: "float", nullable: false),
EarlyExitDeduction = table.Column<double>(type: "float", nullable: false),
RewardPay = table.Column<double>(type: "float", nullable: false),
SalaryAidDeduction = table.Column<double>(type: "float", nullable: false),
InstallmentDeduction = table.Column<double>(type: "float", nullable: false),
FineDeduction = table.Column<double>(type: "float", nullable: false),
TaxDeduction = table.Column<double>(type: "float", nullable: false),
SumOfWorkingDays = table.Column<string>(type: "nvarchar(max)", nullable: true),
TotalClaims = table.Column<string>(type: "nvarchar(max)", nullable: true),
TotalDeductions = table.Column<string>(type: "nvarchar(max)", nullable: true),
TotalPayment = table.Column<double>(type: "float", nullable: false),
CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_CustomizeCheckouts", x => x.id);
table.ForeignKey(
name: "FK_CustomizeCheckouts_Employees_EmployeeId",
column: x => x.EmployeeId,
principalTable: "Employees",
principalColumn: "id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_CustomizeCheckouts_Workshops_WorkshopId",
column: x => x.WorkshopId,
principalTable: "Workshops",
principalColumn: "id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_CustomizeCheckouts_EmployeeId",
table: "CustomizeCheckouts",
column: "EmployeeId");
migrationBuilder.CreateIndex(
name: "IX_CustomizeCheckouts_WorkshopId",
table: "CustomizeCheckouts",
column: "WorkshopId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "CustomizeCheckouts");
}
}
}

145
CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs
View File

@@ -773,6 +773,128 @@ namespace CompanyManagment.EFCore.Migrations
b.ToTable("CrossJobItems", (string)null);
});
modelBuilder.Entity("Company.Domain.CustomizeCheckoutAgg.CustomizeCheckout", b =>
{
b.Property<long>("id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
b.Property<double>("BaseYearsPay")
.HasColumnType("float");
b.Property<double>("BonusesPay")
.HasColumnType("float");
b.Property<DateTime>("ContractEnd")
.HasColumnType("datetime2");
b.Property<long?>("ContractId")
.HasColumnType("bigint");
b.Property<string>("ContractNo")
.HasMaxLength(20)
.HasColumnType("nvarchar(20)");
b.Property<DateTime>("ContractStart")
.HasColumnType("datetime2");
b.Property<DateTime>("CreationDate")
.HasColumnType("datetime2");
b.Property<double>("EarlyExitDeduction")
.HasColumnType("float");
b.Property<long>("EmployeeId")
.HasColumnType("bigint");
b.Property<long>("EmployerId")
.HasColumnType("bigint");
b.Property<double>("FamilyAllowance")
.HasColumnType("float");
b.Property<double>("FineAbsenceDeduction")
.HasColumnType("float");
b.Property<double>("FineDeduction")
.HasColumnType("float");
b.Property<double>("FridayPay")
.HasColumnType("float");
b.Property<double>("InstallmentDeduction")
.HasColumnType("float");
b.Property<double>("InsuranceDeduction")
.HasColumnType("float");
b.Property<string>("IsActiveString")
.IsRequired()
.HasMaxLength(5)
.HasColumnType("nvarchar(5)");
b.Property<double>("LateToWorkDeduction")
.HasColumnType("float");
b.Property<double>("LeavePay")
.HasColumnType("float");
b.Property<double>("MarriedAllowance")
.HasColumnType("float");
b.Property<int>("MonthInt")
.HasColumnType("int");
b.Property<double>("MonthlySalary")
.HasColumnType("float");
b.Property<double>("NightWorkPay")
.HasColumnType("float");
b.Property<double>("OverTimePay")
.HasColumnType("float");
b.Property<double>("RewardPay")
.HasColumnType("float");
b.Property<double>("SalaryAidDeduction")
.HasColumnType("float");
b.Property<double>("ShiftPay")
.HasColumnType("float");
b.Property<string>("SumOfWorkingDays")
.HasColumnType("nvarchar(max)");
b.Property<double>("TaxDeduction")
.HasColumnType("float");
b.Property<string>("TotalClaims")
.HasColumnType("nvarchar(max)");
b.Property<string>("TotalDeductions")
.HasColumnType("nvarchar(max)");
b.Property<double>("TotalPayment")
.HasColumnType("float");
b.Property<long>("WorkshopId")
.HasColumnType("bigint");
b.Property<int>("YearInt")
.HasColumnType("int");
b.HasKey("id");
b.HasIndex("EmployeeId");
b.HasIndex("WorkshopId");
b.ToTable("CustomizeCheckouts", (string)null);
});
modelBuilder.Entity("Company.Domain.DateSalaryAgg.DateSalary", b =>
{
b.Property<long>("id")
@@ -4702,6 +4824,25 @@ namespace CompanyManagment.EFCore.Migrations
b.Navigation("Job");
});
modelBuilder.Entity("Company.Domain.CustomizeCheckoutAgg.CustomizeCheckout", b =>
{
b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
.WithMany("CustomizeCheckouts")
.HasForeignKey("EmployeeId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Company.Domain.WorkshopAgg.Workshop", "Workshop")
.WithMany("CustomizeCheckouts")
.HasForeignKey("WorkshopId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Employee");
b.Navigation("Workshop");
});
modelBuilder.Entity("Company.Domain.DateSalaryItemAgg.DateSalaryItem", b =>
{
b.HasOne("Company.Domain.DateSalaryAgg.DateSalary", "DateSalary")
@@ -5408,6 +5549,8 @@ namespace CompanyManagment.EFCore.Migrations
b.Navigation("Contracts");
b.Navigation("CustomizeCheckouts");
b.Navigation("EmployeeChildrenList");
b.Navigation("EmployeeInsuranceRecords");
@@ -5588,6 +5731,8 @@ namespace CompanyManagment.EFCore.Migrations
b.Navigation("Contracts2");
b.Navigation("CustomizeCheckouts");
b.Navigation("EmployeeInsuranceRecords");
b.Navigation("InsuranceListWorkshops");

4
ServiceHost/Pages/Index.cshtml
View File

@@ -5,7 +5,7 @@
}
@section head
{
<link rel="manifest" href="/manifest.webmanifest" />
@* <link rel="manifest" href="/manifest.webmanifest" /> *@
<meta name="theme-color" content="#ffffff" />
<meta name="description" content="گزارشگیر - خوش آمدید به دنیای پرانرژی سامانه هوشمند مدیریت منابع انسانی. ما خوشحالیم که شما را در اینجا می‌بینیم." />
@@ -309,7 +309,7 @@
<script>'serviceWorker' in navigator && navigator.serviceWorker.register('/serviceworker')</script>
@* <script>'serviceWorker' in navigator && navigator.serviceWorker.register('/serviceworker')</script> *@
<script>
// if ('serviceWorker' in navigator) {
// navigator.serviceWorker.register('/service-worker.js')

12
ServiceHost/Program.cs
View File

@@ -127,12 +127,12 @@ builder.Services.AddSignalR();
//builder.Services.AddProgressiveWebApp();
//new
builder.Services.AddProgressiveWebApp(new PwaOptions
{
RegisterServiceWorker = true,
RegisterWebmanifest = true,
Strategy = ServiceWorkerStrategy.NetworkFirst,
});
//builder.Services.AddProgressiveWebApp(new PwaOptions
//{
// RegisterServiceWorker = true,
// RegisterWebmanifest = true,
// Strategy = ServiceWorkerStrategy.NetworkFirst,
//});
#endregion

2
ServiceHost/appsettings.Development.json
View File

@@ -12,7 +12,7 @@
//"MesbahDb": "Data Source=DESKTOP-NUE119G\\MSNEW;Initial Catalog=Mesbah_db;Integrated Security=True"
//server
// "MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;"
//"MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;"
//local
"MesbahDb": "Data Source=.;Initial Catalog=Mesbah_db;Integrated Security=True;TrustServerCertificate=true;"

34
ServiceHost/wwwroot/service-worker.js
View File

@@ -1,19 +1,19 @@
self.addEventListener('install', event => {
console.log('Service Worker installing.');
// Add a call to skipWaiting here if you want the SW to immediately activate
// self.skipWaiting();
});
//self.addEventListener('install', event => {
// console.log('Service Worker installing.');
// // Add a call to skipWaiting here if you want the SW to immediately activate
// // self.skipWaiting();
//});
self.addEventListener('activate', event => {
console.log('Service Worker activating.');
// Take control of all clients immediately
// event.waitUntil(clients.claim());
});
//self.addEventListener('activate', event => {
// console.log('Service Worker activating.');
// // Take control of all clients immediately
// // event.waitUntil(clients.claim());
//});
self.addEventListener('fetch', event => {
event.respondWith(
fetch(event.request).catch(() => {
return new Response('Offline');
})
);
});
//self.addEventListener('fetch', event => {
// event.respondWith(
// fetch(event.request).catch(() => {
// return new Response('Offline');
// })
// );
//});