diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationGroupAndJobModel.cs b/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationGroupAndJobModel.cs
index 7a2a0aa0..6a80346e 100644
--- a/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationGroupAndJobModel.cs
+++ b/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationGroupAndJobModel.cs
@@ -7,8 +7,10 @@ namespace CompanyManagment.App.Contracts.ClassificationScheme;
///
public class ClassificationGroupAndJobModel
{
-
-
+ ///
+ /// آی دی گروه
+ ///
+ public long GroupId { get; set; }
///
/// شماره گروه
/// استرینگ
diff --git a/CompanyManagment.EFCore/Repository/ClassificationGroupRepository.cs b/CompanyManagment.EFCore/Repository/ClassificationGroupRepository.cs
index 90e93376..3dadaa41 100644
--- a/CompanyManagment.EFCore/Repository/ClassificationGroupRepository.cs
+++ b/CompanyManagment.EFCore/Repository/ClassificationGroupRepository.cs
@@ -27,6 +27,7 @@ public class ClassificationGroupRepository : RepositoryBase x.ClassificationSchemeId == schemeId)
.Include(x => x.ClassificationGroupJobs).Select(x => new ClassificationGroupAndJobModel
{
+ GroupId = x.id,
GroupNo = x.GroupNo,
GroupNoInt = Convert.ToInt32(x.GroupNo),
WorkshopId = x.WorkshopId,
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs
index 97f76ff8..0b518c45 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs
@@ -39,6 +39,8 @@ public class ClassificationSchemeModel : PageModel
SchemeId = scheme.HasScheme ? scheme.ClassificationSchemesList.FirstOrDefault()!.Id : 0;
}
+ //تب لیست طرح
+ #region ClassificationSchemetTab
///
/// تب ایجاد طرح
///
@@ -48,7 +50,7 @@ public class ClassificationSchemeModel : PageModel
//دریافت طرح
var scheme = _classificationSchemeApplication.ClassificationSchemePartialModel(workshopId).GetAwaiter().GetResult();
scheme.WorkshopId = workshopId;
-
+
return Partial("_ClassificationPartials/ClassificationSchemeTab", scheme);
}
@@ -94,7 +96,11 @@ public class ClassificationSchemeModel : PageModel
var result = _classificationSchemeApplication.EditClassificationScheme(command).GetAwaiter().GetResult();
return new JsonResult(result);
}
+ #endregion
+ //تب تعیین مشاغل
+ #region GroupJobsTab
+
///
/// تب تعیین مشاغل گروه
///
@@ -102,10 +108,26 @@ public class ClassificationSchemeModel : PageModel
///
public IActionResult OnGetGroupJobsTab(long schemeId)
{
- var groupAndJobs = _classificationSchemeApplication.GetGroupAndJobs(schemeId).GetAwaiter().GetResult();
+ var groupAndJobs = _classificationSchemeApplication.GetGroupAndJobs(schemeId).GetAwaiter().GetResult();
return Partial("_ClassificationPartials/ClassificationGroupJobsTab", groupAndJobs);
}
+ ///
+ /// لود مدال ایجاد یا ویرایش مشاغل گروه
+ ///
+ ///
+ ///
+ public IActionResult OnGetCreateOrEditJobs(long groupId)
+ {
+
+ return Partial("_ClassificationPartials/ClassificationGroupJobsTab");
+ }
+
+
+
+
+ #endregion
+
public IActionResult OnGetCreateSalaries()
{
return Partial("_ClassificationPartials/CreateClassificationGroupSalary");
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationGroupJobsTab.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationGroupJobsTab.cshtml
index f3722754..27623bc7 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationGroupJobsTab.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationGroupJobsTab.cshtml
@@ -81,18 +81,24 @@
@if (itemRight.EditClassificationGroupJob.Count < 1)
{
- افزودن شغل
+ افزودن شغل
+
}
else
{
- ویرایش شغل
+ ویرایش شغل
+
}
-
+