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

Create razorPage for classificationScheme , add isClassificationCompleted bool to workshop Table

Browse Source
This commit is contained in:
SamSys
2025-09-30 21:20:05 +03:30
parent bfa8688c38
commit 8171e06965
10 changed files with 10616 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,8 +185,17 @@ public class Workshop : EntityBase
public bool AddLeavePay { get; private set; }
public string ZoneName { get; private set; }
public bool TotalPaymentHide { get; private set; }
/// <summary>
/// آیا طبقه بندی شده است
/// [کارگاه دارای طرح طبقه بندی می باشد ؟]
/// </summary>
public bool IsClassified { get; private set; }
/// <summary>
/// آیا طرح طبقه بندی تکمیل شده است
/// </summary>
public bool IsClassificationSchemeCompleted { get; private set; }
//نحوه محاسبه مزد مرخصی
public string ComputeOptions { get; private set; }

56
CompanyManagment.Application/WorkshopAppliction.cs
View File

@@ -113,37 +113,37 @@ public class WorkshopAppliction : IWorkshopApplication
return operation.Failed("لطفا جمعیت شهر را انتخاب کنید");
}
if (command.IsClassified)
{
if (string.IsNullOrWhiteSpace(command.CreatePlan.ExecutionDateFa) || command.CreatePlan.ExecutionDateFa.Length < 10)
return operation.Failed("تاریخ اجرای طرح را بصورت صحیح وارد کنید");
if(string.IsNullOrWhiteSpace(command.CreatePlan.IncludingDateFa) || command.CreatePlan.IncludingDateFa.Length <10)
return operation.Failed("تاریخ شمول طرح را بصورت صحیح وارد کنید");
var groupCounter = 0;
// var planEmployeeCounter = command.CreatePlan.EditWorkshopPlanEmployeeList == null ? 0 : command.CreatePlan.EditWorkshopPlanEmployeeList.Count;
for (int i = 0; i <= command.CreatePlan.EditGroupPlanlist.Count - 1; i++)
{
if (!string.IsNullOrWhiteSpace(command.CreatePlan.EditGroupPlanlist[i].AnnualSalaryStr)
&& !string.IsNullOrWhiteSpace(command.CreatePlan.EditGroupPlanlist[i].BaseSalaryStr)
&& !string.IsNullOrWhiteSpace(command.CreatePlan.EditGroupPlanlist[i].JobSalaryStr)
&& command.CreatePlan.EditGroupPlanlist[i].JobIdList.Count > 0)
{
groupCounter += 1;
//if (command.IsClassified)
//{
// if (string.IsNullOrWhiteSpace(command.CreatePlan.ExecutionDateFa) || command.CreatePlan.ExecutionDateFa.Length < 10)
// return operation.Failed("تاریخ اجرای طرح را بصورت صحیح وارد کنید");
// if(string.IsNullOrWhiteSpace(command.CreatePlan.IncludingDateFa) || command.CreatePlan.IncludingDateFa.Length <10)
// return operation.Failed("تاریخ شمول طرح را بصورت صحیح وارد کنید");
// var groupCounter = 0;
// // var planEmployeeCounter = command.CreatePlan.EditWorkshopPlanEmployeeList == null ? 0 : command.CreatePlan.EditWorkshopPlanEmployeeList.Count;
// for (int i = 0; i <= command.CreatePlan.EditGroupPlanlist.Count - 1; i++)
// {
// if (!string.IsNullOrWhiteSpace(command.CreatePlan.EditGroupPlanlist[i].AnnualSalaryStr)
// && !string.IsNullOrWhiteSpace(command.CreatePlan.EditGroupPlanlist[i].BaseSalaryStr)
// && !string.IsNullOrWhiteSpace(command.CreatePlan.EditGroupPlanlist[i].JobSalaryStr)
// && command.CreatePlan.EditGroupPlanlist[i].JobIdList.Count > 0)
// {
// groupCounter += 1;
}
}
// }
// }
if (groupCounter >= 1)
{
createPlanValidations = true;
// if (groupCounter >= 1)
// {
// createPlanValidations = true;
}
else
{
createPlanValidations = false;
return operation.Failed("وارد کردن اطلاعات تمامی گروه ها الزامی است");
}
}
// }
// else
// {
// createPlanValidations = false;
// return operation.Failed("وارد کردن اطلاعات تمامی گروه ها الزامی است");
// }
//}
//if (string.IsNullOrWhiteSpace(command.TypeOfInsuranceSend))
// return operation.Failed("لطفا نوع ارسال لیست بیمه را مشخص کنید");
var account = new AccountViewModel();

10499
CompanyManagment.EFCore/Migrations/20250929210837_newPropToWorkshop.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
CompanyManagment.EFCore/Migrations/20250929210837_newPropToWorkshop.cs Normal file
View File

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

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

@@ -6144,6 +6144,9 @@ namespace CompanyManagment.EFCore.Migrations
.HasMaxLength(10)
.HasColumnType("nvarchar(10)");
b.Property<bool>("IsClassificationSchemeCompleted")
.HasColumnType("bit");
b.Property<bool>("IsClassified")
.HasColumnType("bit");

7
ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml Normal file
View File

@@ -0,0 +1,7 @@
@page
@model ServiceHost.Areas.Admin.Pages.Company.Workshops.ClassificationSchemeModel
@{
string adminVersion = _0_Framework.Application.Version.AdminVersion;
}
<h2>طرح طبقه بندی مشاغل</h2>

12
ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs Normal file
View File

@@ -0,0 +1,12 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace ServiceHost.Areas.Admin.Pages.Company.Workshops
{
public class ClassificationSchemeModel : PageModel
{
public void OnGet()
{
}
}
}

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

@@ -617,6 +617,11 @@
});
</script>
<div class="" style="display: flex; align-items: center;">
<input id="isClassified" type="checkbox" asp-for="Command.IsClassified" class="form-control" style="width: 15px;margin: 0 0 0 10px;" />
<label asp-for="Command.IsClassified" style="margin: 0;">فعال سازی طرح طبقه بندی مشاغل</label>
</div>
</div>
</div>
<div class="row" id="form5" style="display: none">

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

@@ -662,6 +662,11 @@
});
</script>
<div class="" style="display: flex; align-items: center;">
<input id="isClassified" type="checkbox" asp-for="Command.IsClassified" class="form-control" style="width: 15px;margin: 0 0 0 10px;"/>
<label asp-for="Command.IsClassified" style="margin: 0;">فعال سازی طرح طبقه بندی مشاغل</label>
</div>
</div>
</div>
<div class="row" id="form5" style="display: none">

28
ServiceHost/Areas/Admin/Pages/Company/Workshops/Index.cshtml
View File

@@ -762,7 +762,17 @@
<div class="more-buttons flexible-div">
<a class="btn pull-left employee-operations">عملیات</a>
<div class="buttons-container">
<a permission="10317" asp-page="/Company/PersonnelInfo/Index" asp-route-workshopID="@item.Id" class="btn btn-success rad btn-rounded @(item.HasBlockContractingParty?"disabled":"")">
@if (item.IsClassified)
{
<a permission="10317" asp-page="./ClassificationScheme" class="btn btn-success rad btn-rounded @(item.HasBlockContractingParty ? "disabled" : "")" style="background-color: #ec407a; border:#ec407a;">
<i class="fa fa-user"></i>
<p>
طرح طبقه بندی
</p>
</a>
}
<a permission="10317" asp-page="/Company/PersonnelInfo/Index" asp-route-workshopID="@item.Id" class="btn btn-success rad btn-rounded @(item.HasBlockContractingParty ? "disabled" : "")">
<i class="fa fa-user"></i>
<p>
اطلاعات پرسنل
@@ -771,17 +781,17 @@
@* <a href="#showmodal=@Url.Page("./Index", "ShowPersonnelList", new { id = item.Id })" class="btn btn-success rad btn-rounded @(item.HasBlockContractingParty?"disabled":"")"> *@
<a permission="10319" asp-page="/Company/ConnectedPersonnels/Index" asp-route-workshopID="@item.Id" class="btn btn-success rad btn-rounded custom-btn-technical @(item.HasBlockContractingParty ? "disabled" : "")">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5439 14C17.8028 14 18.0196 14.1962 18.0454 14.4538C18.0854 14.8539 18.5548 15.0483 18.866 14.7937C19.0663 14.6298 19.3584 14.6443 19.5414 14.8274L19.8393 15.1252C20.0223 15.3083 20.0369 15.6003 19.8729 15.8007C19.6183 16.1119 19.8128 16.5813 20.2128 16.6213C20.4705 16.647 20.6667 16.8638 20.6667 17.1227V17.544C20.6667 17.8028 20.4705 18.0196 20.2129 18.0454C19.8129 18.0854 19.6184 18.5547 19.873 18.8659C20.0369 19.0662 20.0224 19.3582 19.8393 19.5413L19.5414 19.8391C19.3584 20.0222 19.0664 20.0368 18.866 19.8728C18.5548 19.6182 18.0854 19.8127 18.0454 20.2128C18.0196 20.4704 17.8028 20.6667 17.5439 20.6667H17.1227C16.8638 20.6667 16.647 20.4705 16.6213 20.2129C16.5813 19.8128 16.1119 19.6183 15.8007 19.873C15.6003 20.0369 15.3083 20.0223 15.1252 19.8393L14.8274 19.5414C14.6443 19.3584 14.6297 19.0664 14.7937 18.866C15.0483 18.5548 14.8539 18.0854 14.4538 18.0454C14.1962 18.0196 14 17.8028 14 17.5439V17.1228C14 16.8639 14.1962 16.647 14.4539 16.6213C14.854 16.5813 15.0484 16.1118 14.7938 15.8006C14.6298 15.6002 14.6443 15.3081 14.8274 15.125L15.1252 14.8273C15.3083 14.6442 15.6003 14.6296 15.8007 14.7936C16.1119 15.0482 16.5813 14.8538 16.6213 14.4538C16.647 14.1962 16.8638 14 17.1227 14H17.5439ZM17.3333 18.6667C18.0697 18.6667 18.6667 18.0697 18.6667 17.3333C18.6667 16.597 18.0697 16 17.3333 16C16.597 16 16 16.597 16 17.3333C16 18.0697 16.597 18.6667 17.3333 18.6667Z" fill="white" />
<circle cx="12" cy="8" r="5" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3249 15.0763C12.8883 15.0257 12.4456 15 12 15C10.0188 15 8.09292 15.5085 6.52112 16.4465C5.30069 17.1749 4.34666 18.1307 3.74108 19.2183C3.46638 19.7117 3.79562 20.2902 4.34843 20.4054C7.85678 21.1365 11.4437 21.3594 15 21.074V21H14C12.3431 21 11 19.6569 11 18C11 16.5753 11.9932 15.3825 13.3249 15.0763Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5439 14C17.8028 14 18.0196 14.1962 18.0454 14.4538C18.0854 14.8539 18.5548 15.0483 18.866 14.7937C19.0663 14.6298 19.3584 14.6443 19.5414 14.8274L19.8393 15.1252C20.0223 15.3083 20.0369 15.6003 19.8729 15.8007C19.6183 16.1119 19.8128 16.5813 20.2128 16.6213C20.4705 16.647 20.6667 16.8638 20.6667 17.1227V17.544C20.6667 17.8028 20.4705 18.0196 20.2129 18.0454C19.8129 18.0854 19.6184 18.5547 19.873 18.8659C20.0369 19.0662 20.0224 19.3582 19.8393 19.5413L19.5414 19.8391C19.3584 20.0222 19.0664 20.0368 18.866 19.8728C18.5548 19.6182 18.0854 19.8127 18.0454 20.2128C18.0196 20.4704 17.8028 20.6667 17.5439 20.6667H17.1227C16.8638 20.6667 16.647 20.4705 16.6213 20.2129C16.5813 19.8128 16.1119 19.6183 15.8007 19.873C15.6003 20.0369 15.3083 20.0223 15.1252 19.8393L14.8274 19.5414C14.6443 19.3584 14.6297 19.0664 14.7937 18.866C15.0483 18.5548 14.8539 18.0854 14.4538 18.0454C14.1962 18.0196 14 17.8028 14 17.5439V17.1228C14 16.8639 14.1962 16.647 14.4539 16.6213C14.854 16.5813 15.0484 16.1118 14.7938 15.8006C14.6298 15.6002 14.6443 15.3081 14.8274 15.125L15.1252 14.8273C15.3083 14.6442 15.6003 14.6296 15.8007 14.7936C16.1119 15.0482 16.5813 14.8538 16.6213 14.4538C16.647 14.1962 16.8638 14 17.1227 14H17.5439ZM17.3333 18.6667C18.0697 18.6667 18.6667 18.0697 18.6667 17.3333C18.6667 16.597 18.0697 16 17.3333 16C16.597 16 16 16.597 16 17.3333C16 18.0697 16.597 18.6667 17.3333 18.6667Z" fill="white"/>
<circle cx="12" cy="8" r="5" fill="white"/>
</svg>
<p>
تنظیمات فنی پرسنل
</p>
</a>