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

workshop added workingHoliday

Browse Source
This commit is contained in:
SamSys
2024-09-24 18:36:04 +03:30
parent 29f3422643
commit e226bed5ed
14 changed files with 6274 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ public class Workshop : EntityBase
//}
public Workshop(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,
string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip)
string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking)
{
WorkshopName = workshopName;
WorkshopSureName = workshopSureName;
@@ -128,6 +128,7 @@ public class Workshop : EntityBase
BonusesOptions = bonusesOptions;
YearsOptions = yearsOptions;
HasRollCallFreeVip = hasRollCallFreeVip;
WorkshopHolidayWorking = workshopHolidayWorking;
}
@@ -181,6 +182,7 @@ public class Workshop : EntityBase
public bool TotalPaymentHide { get; private set; }
public bool IsClassified { get; private set; }
//نحوه محاسبه مزد مرخصی
public string ComputeOptions { get; private set; }
//نحوه محاسبه عیدی
@@ -190,11 +192,12 @@ public class Workshop : EntityBase
//نگهدارنده وضعیت قراردادهای گذشته
public bool IsOldContract { get; private set; }
public string HasRollCallFreeVip { get; private set; }
//کارگاه هایی که در تعطیلات رسمی باز هستند
public bool WorkshopHolidayWorking { get; private set; }
//public Employer Employer { get; private set; }
//public Employer Employer { get; private set; }
public Workshop()
public Workshop()
{
RollCallServicesList = new List<RollCallService>();
}
@@ -216,7 +219,7 @@ public class Workshop : EntityBase
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,
string agreementNumber, bool fixedSalary, string population, long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay,bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip)
string agreementNumber, bool fixedSalary, string population, long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay,bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking)
{
WorkshopName = workshopName;
WorkshopSureName = workshopSureName;
@@ -254,7 +257,8 @@ public class Workshop : EntityBase
BonusesOptions = bonusesOptions;
YearsOptions = yearsOptions;
HasRollCallFreeVip = hasRollCallFreeVip;
}
WorkshopHolidayWorking = workshopHolidayWorking;
}
public void Active(string archiveCode)

4
CompanyManagment.App.Contracts/Workshop/CreateWorkshop.cs
View File

@@ -62,7 +62,9 @@ public class CreateWorkshop
public string YearsOptions { get; set; }
//نگهدارنده وضعیت قراردادهای گذشته
public bool IsOldContract { get; set; }
public List<EmployerViewModel> Employers { get; set; }
//کارگاه هایی که در تعطیلات رسمی باز هستند
public bool WorkshopHolidayWorking { get; set; }
public List<EmployerViewModel> Employers { get; set; }
public List<long> EmployerIdList { get; set; }
public CreateWorkshopPlan CreatePlan {get; set; }

1
CompanyManagment.App.Contracts/Workshop/WorkshopSearchModel.cs
View File

@@ -46,4 +46,5 @@ public class WorkshopSearchModel
public List<long> AccountIds { get; set; }
public long AccountId { get; set; }
public bool WorkshopHolidayWorking { get; set; }
}

5
CompanyManagment.App.Contracts/Workshop/WorkshopViewModel.cs
View File

@@ -68,9 +68,10 @@ public class WorkshopViewModel
public string ActivePlan { get; set; }
public string RollCallServiceDeadline { get; set; }
public string RollCallServicePersonnelActive { get; set; }
#region Mahan
public bool WorkshopHolidayWorking { get; set; }
#region Mahan
public string Slug { get; set; }
public string Slug { get; set; }
#endregion

8
CompanyManagment.Application/WorkshopAppliction.cs
View File

@@ -140,7 +140,7 @@ public class WorkshopAppliction : IWorkshopApplication
command.ArchiveCode, command.AgentName, command.AgentPhone, command.State, command.City,
command.Address,
command.TypeOfInsuranceSend, command.TypeOfContract,command.ContractTerm,command.AgreementNumber
,command.FixedSalary, command.Population,command.InsuranceJobId,command.ZoneName,command.AddBonusesPay,command.AddYearsPay,command.AddLeavePay,command.TotalPaymentHide,command.IsClassified,command.ComputeOptions,command.BonusesOptions,command.YearsOptions,command.HasRollCallFreeVip);
,command.FixedSalary, command.Population,command.InsuranceJobId,command.ZoneName,command.AddBonusesPay,command.AddYearsPay,command.AddLeavePay,command.TotalPaymentHide,command.IsClassified,command.ComputeOptions,command.BonusesOptions,command.YearsOptions,command.HasRollCallFreeVip,command.WorkshopHolidayWorking);
_workshopRepository.Create(workshop);
_workshopRepository.SaveChanges();
@@ -273,7 +273,7 @@ public class WorkshopAppliction : IWorkshopApplication
command.Address,
command.TypeOfInsuranceSend, command.TypeOfContract,command.ContractTerm, command.AgreementNumber
, command.FixedSalary, command.Population, command.InsuranceJobId, command.ZoneName,
command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay, command.TotalPaymentHide,command.IsClassified, command.ComputeOptions,command.BonusesOptions, command.YearsOptions,command.HasRollCallFreeVip);
command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay, command.TotalPaymentHide,command.IsClassified, command.ComputeOptions,command.BonusesOptions, command.YearsOptions,command.HasRollCallFreeVip, command.WorkshopHolidayWorking);
_workshopRepository.SaveChanges();
_workshopRepository.RemoveOldRelation(command.Id);
@@ -539,7 +539,7 @@ public class WorkshopAppliction : IWorkshopApplication
command.ArchiveCode, command.AgentName, command.AgentPhone, command.State, command.City,
command.Address,
command.TypeOfInsuranceSend, command.TypeOfContract, command.ContractTerm, command.AgreementNumber
, command.FixedSalary, command.Population, command.InsuranceJobId, command.ZoneName, command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay,command.TotalPaymentHide, command.IsClassified, command.ComputeOptions, command.BonusesOptions, command.YearsOptions,command.HasRollCallFreeVip);
, command.FixedSalary, command.Population, command.InsuranceJobId, command.ZoneName, command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay,command.TotalPaymentHide, command.IsClassified, command.ComputeOptions, command.BonusesOptions, command.YearsOptions,command.HasRollCallFreeVip, command.WorkshopHolidayWorking);
_workshopRepository.Create(workshop);
_workshopRepository.SaveChanges();
@@ -616,7 +616,7 @@ public class WorkshopAppliction : IWorkshopApplication
command.Address,
command.TypeOfInsuranceSend, command.TypeOfContract, command.ContractTerm, command.AgreementNumber
, command.FixedSalary, command.Population, command.InsuranceJobId, command.ZoneName,
command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay,command.TotalPaymentHide,command.IsClassified, command.ComputeOptions, command.BonusesOptions, command.YearsOptions,command.HasRollCallFreeVip);
command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay,command.TotalPaymentHide,command.IsClassified, command.ComputeOptions, command.BonusesOptions, command.YearsOptions,command.HasRollCallFreeVip, command.WorkshopHolidayWorking);
_workshopRepository.SaveChanges();
//_workshopRepository.RemoveOldRelation(command.Id);

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

@@ -37,6 +37,7 @@ partial class WorkshopMapping : IEntityTypeConfiguration<Workshop>
builder.Property(x => x.YearsOptions).HasMaxLength(50);
builder.Property(x => x.IsOldContract);
builder.Property(x => x.HasRollCallFreeVip).HasMaxLength(5);
builder.Property(x => x.WorkshopHolidayWorking);
//builder.HasOne(x => x.Employer)
// .WithMany(x => x.Workshops)
// .HasForeignKey(x => x.EmployerId);

5638
CompanyManagment.EFCore/Migrations/20240923210345_HolidayWorkigtoWorshopTable.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
CompanyManagment.EFCore/Migrations/20240923210345_HolidayWorkigtoWorshopTable.cs Normal file
View File

@@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace CompanyManagment.EFCore.Migrations
{
/// <inheritdoc />
public partial class HolidayWorkigtoWorshopTable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "WorkshopHolidayWorking",
table: "Workshops",
type: "bit",
nullable: false,
defaultValue: false);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "WorkshopHolidayWorking",
table: "Workshops");
}
}
}

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

@@ -4141,6 +4141,9 @@ namespace CompanyManagment.EFCore.Migrations
.HasMaxLength(255)
.HasColumnType("nvarchar(255)");
b.Property<bool>("WorkshopHolidayWorking")
.HasColumnType("bit");
b.Property<string>("WorkshopName")
.IsRequired()
.HasMaxLength(255)

1
CompanyManagment.EFCore/Repository/WorkshopRepository.cs
View File

@@ -184,6 +184,7 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
IsOldContract = x.IsOldContract,
EmployerIdList = emp,
HasRollCallFreeVip = x.HasRollCallFreeVip,
WorkshopHolidayWorking = x.WorkshopHolidayWorking
}).FirstOrDefault(x => x.Id == id);
}

1247
ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs
View File

File diff suppressed because it is too large Load Diff

5
ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
View File

@@ -761,6 +761,11 @@
<select class="form-control select-city" multiple asp-for="@Model.Command.AccountIdsList" asp-items='new SelectList(Model.Command.AccountsList, "Id", "Fullname")'>
</select>
</div> *@
<div class="" style="display: flex; align-items: center;">
<input type="checkbox" asp-for="Command.WorkshopHolidayWorking" class="form-control" style="width: 15px;margin: 0 0 0 10px;"/>
<label asp-for="Command.WorkshopHolidayWorking" style="margin: 0;">این کارگاه در ایام تعطیلات رسمی باز است</label>
</div>
</div>
<div class="col-xs-12 area-workshop">
@* <div class="form-group">

4
ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
View File

@@ -770,6 +770,10 @@
<select class="form-control select-city" multiple asp-for="@Model.Command.AccountIdsList" asp-items='new SelectList(Model.Command.AccountsList, "Id", "Fullname")'>
</select>
</div> *@
<div class="" style="display: flex; align-items: center;">
<input type="checkbox" asp-for="Command.WorkshopHolidayWorking" class="form-control" style="width: 15px;margin: 0 0 0 10px;"/>
<label asp-for="Command.WorkshopHolidayWorking" style="margin: 0;">این کارگاه در ایام تعطیلات رسمی باز است</label>
</div>
</div>
<div class="col-xs-12 area-workshop">
<div id="radio2" class="card">

4
ServiceHost/Properties/launchSettings.json
View File

@@ -19,8 +19,8 @@
"sqlDebugging": true,
"dotnetRunMessages": "true",
"nativeDebugging": true,
"applicationUrl": "https://localhost:5004;http://localhost:5003;http://192.168.0.118:82;https://192.168.0.118:83",
//"applicationUrl": "https://localhost:5004;http://localhost:5003",
//"applicationUrl": "https://localhost:5004;http://localhost:5003;http://192.168.0.118:82;https://192.168.0.118:83",
"applicationUrl": "https://localhost:5004;http://localhost:5003",
"jsWebView2Debugging": false,
"hotReloadEnabled": true
},