diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs
index 8212146c..9884e82c 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs
@@ -13,204 +13,216 @@ using System.Security.Claims;
namespace ServiceHost.Areas.Client.Pages.Company.RollCall
{
- [Authorize]
- public class EmployeeUploadPictureModel : PageModel
- {
- public string WorkshopFullName;
- public RollCallEmployeeViewModel Employees;
- public RollCallServiceViewModel RollCallService;
- public bool HasEmployees;
- public int MaxPersonValid;
- public long WorkshopId;
- public int PageIndex;
+ [Authorize]
+ public class EmployeeUploadPictureModel : PageModel
+ {
+ public string WorkshopFullName;
+ public RollCallEmployeeViewModel Employees;
+ public RollCallServiceViewModel RollCallService;
+ public bool HasEmployees;
- private readonly IWorkshopApplication _workshopApplication;
- private readonly IEmployeeApplication _employeeApplication;
- private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication;
- private readonly IRollCallServiceApplication _rollCallServiceApplication;
- private readonly IWebHostEnvironment _webHostEnvironment;
- private readonly IPasswordHasher _passwordHasher;
- private readonly IRollCallEmployeeStatusApplication _rollCallEmployeeStatusApplication;
- public EmployeeUploadPictureModel(IWorkshopApplication workshopApplication, IPasswordHasher passwordHasher, IRollCallEmployeeApplication rollCallEmployeeApplication, IRollCallServiceApplication rollCallServiceApplication, IWebHostEnvironment webHostEnvironment, IEmployeeApplication employeeApplication, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication)
- {
- _workshopApplication = workshopApplication;
- _passwordHasher = passwordHasher;
- _rollCallEmployeeApplication = rollCallEmployeeApplication;
- _rollCallServiceApplication = rollCallServiceApplication;
- _webHostEnvironment = webHostEnvironment;
- _employeeApplication = employeeApplication;
- _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
- }
+ //[BindProperty]
+ public int MaxPersonValid { get; set; }
+ public long WorkshopId;
+ public int PageIndex;
- public IActionResult OnGet()
- {
- var workshopHash = User.FindFirstValue("WorkshopSlug");
- var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
- if (workshopId > 0)
- {
- RollCallService = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId);
-
- if (RollCallService == null)
- return Redirect("/Client/Company/RollCall");
-
- var workshop = _workshopApplication.GetWorkshopInfo(workshopId);
-
- WorkshopFullName = workshop.WorkshopFullName;
-
- MaxPersonValid = RollCallService.MaxPersonValid;
-
- //var distinctEmployees = _rollCallEmployeeApplication.GetPersonnelRollCallListPaginate(new RollCallEmployeeSearchModel()
- //{
-
- //});
- WorkshopId = workshopId;
- PageIndex = 0;
-
- HasEmployees = _rollCallEmployeeApplication.HasEmployees(workshopId);
-
- return Page();
- }
- else
- {
- return NotFound();
- }
+ private readonly IWorkshopApplication _workshopApplication;
+ private readonly IEmployeeApplication _employeeApplication;
+ private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication;
+ private readonly IRollCallServiceApplication _rollCallServiceApplication;
+ private readonly IWebHostEnvironment _webHostEnvironment;
+ private readonly IPasswordHasher _passwordHasher;
+ private readonly IRollCallEmployeeStatusApplication _rollCallEmployeeStatusApplication;
+ public EmployeeUploadPictureModel(IWorkshopApplication workshopApplication, IPasswordHasher passwordHasher, IRollCallEmployeeApplication rollCallEmployeeApplication, IRollCallServiceApplication rollCallServiceApplication, IWebHostEnvironment webHostEnvironment, IEmployeeApplication employeeApplication, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication)
+ {
+ _workshopApplication = workshopApplication;
+ _passwordHasher = passwordHasher;
+ _rollCallEmployeeApplication = rollCallEmployeeApplication;
+ _rollCallServiceApplication = rollCallServiceApplication;
+ _webHostEnvironment = webHostEnvironment;
+ _employeeApplication = employeeApplication;
+ _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
}
- public IActionResult OnGetEmployeeUploadDataAjax(int pageIndex, string searchName)
- {
- var workshopHash = User.FindFirstValue("WorkshopSlug");
- var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
- if (workshopId > 0)
- {
- //MaxPersonValid = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId).MaxPersonValid;
- var distinctEmployees = _rollCallEmployeeApplication.GetPersonnelRollCallListPaginate(new RollCallEmployeeSearchModel()
- {
- WorkshopId = workshopId,
- PageIndex = pageIndex,
+ public IActionResult OnGet()
+ {
+ var workshopHash = User.FindFirstValue("WorkshopSlug");
+ var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+ if (workshopId > 0)
+ {
+ RollCallService = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId);
+ if (RollCallService == null)
+ return Redirect("/Client/Company/RollCall");
+
+ var workshop = _workshopApplication.GetWorkshopInfo(workshopId);
+
+ WorkshopFullName = workshop.WorkshopFullName;
+
+ // if (string.IsNullOrEmpty(HttpContext.Session.GetString("MaxPersonValid")))
+ // {
+ // MaxPersonValid = RollCallService.MaxPersonValid;
+ //HttpContext.Session.SetString("MaxPersonValid", MaxPersonValid.ToString());
+ // }
+ // else
+ // {
+ // MaxPersonValid = Convert.ToInt32(HttpContext.Session.GetString("MaxPersonValid"));
+ // }
+
+ MaxPersonValid = RollCallService.MaxPersonValid;
+ //var distinctEmployees = _rollCallEmployeeApplication.GetPersonnelRollCallListPaginate(new RollCallEmployeeSearchModel()
+ //{
+
+ //});
+ WorkshopId = workshopId;
+ PageIndex = 0;
+
+ HasEmployees = _rollCallEmployeeApplication.HasEmployees(workshopId);
+
+ return Page();
+ }
+ else
+ {
+ return NotFound();
+ }
+ }
+
+ public IActionResult OnGetEmployeeUploadDataAjax(int pageIndex, string searchName)
+ {
+ var workshopHash = User.FindFirstValue("WorkshopSlug");
+ var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+ if (workshopId > 0)
+ {
+ //MaxPersonValid = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId).MaxPersonValid;
+ var distinctEmployees = _rollCallEmployeeApplication.GetPersonnelRollCallListPaginate(new RollCallEmployeeSearchModel()
+ {
+ WorkshopId = workshopId,
+ PageIndex = pageIndex,
Name = searchName
});
- Employees = new RollCallEmployeeViewModel
- {
- PersonnelInfoViewModels = distinctEmployees
- };
- return new JsonResult(new
- {
- isSuccedded = true,
- data = Employees,
- pageIndex = Employees.PersonnelInfoViewModels.Count()
- });
- }
- else
- {
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "کارگاهی یافت نشد"
- });
- }
- }
+ Employees = new RollCallEmployeeViewModel
+ {
+ PersonnelInfoViewModels = distinctEmployees
+ };
+ return new JsonResult(new
+ {
+ isSuccedded = true,
+ data = Employees,
+ pageIndex = Employees.PersonnelInfoViewModels.Count()
+ });
+ }
+ else
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "کارگاهی یافت نشد"
+ });
+ }
+ }
- public IActionResult OnGetLoadInfoCount()
- {
- var workshopHash = User.FindFirstValue("WorkshopSlug");
- var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
- if (workshopId <= 0)
- {
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "کارگاهی یافت نشد"
- });
- }
-
- //var activeService = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId);
- //var maxPersonValid = activeService.MaxPersonValid;
+ public IActionResult OnGetLoadInfoCount()
+ {
+ var workshopHash = User.FindFirstValue("WorkshopSlug");
+ var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+ if (workshopId <= 0)
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "کارگاهی یافت نشد"
+ });
+ }
+ //MaxPersonValid = Convert.ToInt32(HttpContext.Session.GetString("MaxPersonValid"));
+ var activeService = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId);
+ MaxPersonValid = activeService.MaxPersonValid;
- var employeesCount = _rollCallEmployeeApplication.GetActiveAndDeActiveRollCallEmployees(workshopId);
+ var employeesCount = _rollCallEmployeeApplication.GetActiveAndDeActiveRollCallEmployees(workshopId);
- return new JsonResult(new
- {
- isSuccedded = true,
- maxPersonValid = MaxPersonValid == -1 ? "نامحدود" : MaxPersonValid.ToString(),
- isTrueActiveCount = employeesCount.activeEmployees,
- isFalseActiveCount = employeesCount.deActiveEmployees,
- message = "موفق"
- });
- }
+ return new JsonResult(new
+ {
+ isSuccedded = true,
+ maxPersonValid = MaxPersonValid == -1 ? "نامحدود" : MaxPersonValid.ToString(),
+ isTrueActiveCount = employeesCount.activeEmployees,
+ isFalseActiveCount = employeesCount.deActiveEmployees,
+ message = "موفق"
+ });
+ }
- public IActionResult OnGetCheckModalTakeImage()
- {
- var workshopHash = User.FindFirstValue("WorkshopSlug");
- var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+ public IActionResult OnGetCheckModalTakeImage()
+ {
+ var workshopHash = User.FindFirstValue("WorkshopSlug");
+ var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
- if (workshopId <= 0)
- {
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "کارگاه شما یافت نشده است"
- });
- }
+ //MaxPersonValid = Convert.ToInt32(HttpContext.Session.GetString("MaxPersonValid"));
- var plan = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId);
+ if (workshopId <= 0)
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "کارگاه شما یافت نشده است"
+ });
+ }
- if (plan == null)
- {
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "شما سرویس خریداری شده ندارید"
- });
- }
+ var plan = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId);
- if (plan.IsActiveString != "true")
- {
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "سرویس شما فعال نیست"
- });
- }
+ if (plan == null)
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "شما سرویس خریداری شده ندارید"
+ });
+ }
- //var maxValid = RollCallService.MaxPersonValid;
+ if (plan.IsActiveString != "true")
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "سرویس شما فعال نیست"
+ });
+ }
- if (MaxPersonValid == -1 || _rollCallEmployeeApplication.activedPerson(workshopId) < MaxPersonValid)
- {
- return new JsonResult(new
- {
- isSuccedded = true,
- message = "موفق"
- });
- }
+ //var maxValid = RollCallService.MaxPersonValid;
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "محدودیت افزودن پرسنل"
- });
- }
+ if (plan.MaxPersonValid == -1 || _rollCallEmployeeApplication.activedPerson(workshopId) < plan.MaxPersonValid)
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = true,
+ message = "موفق"
+ });
+ }
- public IActionResult OnGetModalTakeImages(long employeeId)
- {
- var workshopHash = User.FindFirstValue("WorkshopSlug");
- var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
- if (workshopId > 0)
- {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "محدودیت افزودن پرسنل"
+ });
+ }
- var employeeWorkshopInfo = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
+ public IActionResult OnGetModalTakeImages(long employeeId)
+ {
+ var workshopHash = User.FindFirstValue("WorkshopSlug");
+ var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+ if (workshopId > 0)
+ {
- bool hasPicture = false;
- if (employeeWorkshopInfo != null && !string.IsNullOrEmpty(employeeWorkshopInfo.HasUploadedImage))
- hasPicture = bool.Parse(employeeWorkshopInfo.HasUploadedImage);
+ var employeeWorkshopInfo = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
- var employeeDetails = _employeeApplication.GetDetails(employeeId);
+ bool hasPicture = false;
+ if (employeeWorkshopInfo != null && !string.IsNullOrEmpty(employeeWorkshopInfo.HasUploadedImage))
+ hasPicture = bool.Parse(employeeWorkshopInfo.HasUploadedImage);
- string employeeName = string.Empty;
- if (employeeDetails != null)
- employeeName = employeeDetails.EmployeeFullName;
+ var employeeDetails = _employeeApplication.GetDetails(employeeId);
+
+ string employeeName = string.Empty;
+ if (employeeDetails != null)
+ employeeName = employeeDetails.EmployeeFullName;
string pic1 = "";
string pic2 = "";
@@ -246,23 +258,23 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
Pic1 = pic1,
Pic2 = pic2,
};
-
- return Partial("ModalTakeImages", res);
- }
- else
- {
- var resultError = new ErrorViewModel()
- {
- IsSuccedded = false,
- Message = "هیج کارگاهی یافت نشد"
- };
- return Partial("../Error/_ErrorModal", resultError);
- }
- }
- public IActionResult OnPostTakePicture(string base64pic1, string base64pic2, long workshopId, long employeeId)
- {
+ return Partial("ModalTakeImages", res);
+ }
+ else
+ {
+ var resultError = new ErrorViewModel()
+ {
+ IsSuccedded = false,
+ Message = "هیج کارگاهی یافت نشد"
+ };
+ return Partial("../Error/_ErrorModal", resultError);
+ }
+ }
+
+ public IActionResult OnPostTakePicture(string base64pic1, string base64pic2, long workshopId, long employeeId)
+ {
try
{
var directoryPath = $"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}";
@@ -293,7 +305,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
};
result = _rollCallEmployeeApplication.Create(createCommand);
_rollCallEmployeeStatusApplication.Create(new CreateRollCallEmployeeStatus()
- { RollCallEmployeeId = result.SendId });
+ { RollCallEmployeeId = result.SendId });
}
else
{
@@ -330,116 +342,116 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
}
- public void CreateImageFromBase64(string base64, string imagePathWithExtension)
- {
- var subBase64 = base64.Substring(base64.LastIndexOf(',') + 1);
- byte[] bytes = Convert.FromBase64String(subBase64);
- System.IO.File.WriteAllBytes(imagePathWithExtension, bytes);
- }
+ public void CreateImageFromBase64(string base64, string imagePathWithExtension)
+ {
+ var subBase64 = base64.Substring(base64.LastIndexOf(',') + 1);
+ byte[] bytes = Convert.FromBase64String(subBase64);
+ System.IO.File.WriteAllBytes(imagePathWithExtension, bytes);
+ }
public IActionResult OnPostActivePersonnel(long id)
- {
- var workshopHash = User.FindFirstValue("WorkshopSlug");
- var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
- if (workshopId > 0)
- {
- var hasRollCallEmployee = _rollCallEmployeeApplication.GetDetails(id);
+ {
+ var workshopHash = User.FindFirstValue("WorkshopSlug");
+ var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+ if (workshopId > 0)
+ {
+ var hasRollCallEmployee = _rollCallEmployeeApplication.GetDetails(id);
- if (hasRollCallEmployee == null)
- {
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "برای این پرسنل، هنوز هیچ عکسی آپلود نشده است. بعد از آپلود عکس بطور خودکار فعال خواهد شد",
- });
- }
- else
- {
- if (hasRollCallEmployee.HasUploadedImage == "false")
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "برای این پرسنل، هنوز هیچ عکسی آپلود نشده است. بعد از آپلود عکس بطور خودکار فعال خواهد شد",
- });
+ if (hasRollCallEmployee == null)
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "برای این پرسنل، هنوز هیچ عکسی آپلود نشده است. بعد از آپلود عکس بطور خودکار فعال خواهد شد",
+ });
+ }
+ else
+ {
+ if (hasRollCallEmployee.HasUploadedImage == "false")
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "برای این پرسنل، هنوز هیچ عکسی آپلود نشده است. بعد از آپلود عکس بطور خودکار فعال خواهد شد",
+ });
- var result = _rollCallEmployeeApplication.Active(hasRollCallEmployee.Id);
- if (result.IsSuccedded)
- {
- return new JsonResult(new
- {
- isSuccedded = result.IsSuccedded,
- message = result.Message,
- });
- }
- else
- {
- return new JsonResult(new
- {
- isSuccedded = result.IsSuccedded,
- message = result.Message,
- });
- }
- }
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "خطایی رخ آمده است",
- });
- }
- else
- {
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "کارگاه شما یافت نشد",
- });
- }
- }
+ var result = _rollCallEmployeeApplication.Active(hasRollCallEmployee.Id);
+ if (result.IsSuccedded)
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = result.IsSuccedded,
+ message = result.Message,
+ });
+ }
+ else
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = result.IsSuccedded,
+ message = result.Message,
+ });
+ }
+ }
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "خطایی رخ آمده است",
+ });
+ }
+ else
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "کارگاه شما یافت نشد",
+ });
+ }
+ }
- public IActionResult OnPostDeActivePersonnel(long id)
- {
- var workshopHash = User.FindFirstValue("WorkshopSlug");
- var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
- if (workshopId > 0)
- {
- var result = _rollCallEmployeeApplication.DeActive(id);
- if (result.IsSuccedded)
- {
- return new JsonResult(new
- {
- isSuccedded = result.IsSuccedded,
- message = result.Message,
- });
- }
+ public IActionResult OnPostDeActivePersonnel(long id)
+ {
+ var workshopHash = User.FindFirstValue("WorkshopSlug");
+ var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+ if (workshopId > 0)
+ {
+ var result = _rollCallEmployeeApplication.DeActive(id);
+ if (result.IsSuccedded)
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = result.IsSuccedded,
+ message = result.Message,
+ });
+ }
- return new JsonResult(new
- {
- isSuccedded = result.IsSuccedded,
- message = result.Message,
- });
- }
- else
- {
- return new JsonResult(new
- {
- isSuccedded = false,
- message = "کارگاه شما یافت نشد",
- });
- }
- }
+ return new JsonResult(new
+ {
+ isSuccedded = result.IsSuccedded,
+ message = result.Message,
+ });
+ }
+ else
+ {
+ return new JsonResult(new
+ {
+ isSuccedded = false,
+ message = "کارگاه شما یافت نشد",
+ });
+ }
+ }
- public IActionResult OnGetLoadFirstImage(long employeeId, long workshopId)
- {
- var directoryPath = $"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}";
- var imageDir = Path.Combine(directoryPath, "1.jpg");
- return PhysicalFile(imageDir, "image/jpeg");
- }
+ public IActionResult OnGetLoadFirstImage(long employeeId, long workshopId)
+ {
+ var directoryPath = $"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}";
+ var imageDir = Path.Combine(directoryPath, "1.jpg");
+ return PhysicalFile(imageDir, "image/jpeg");
+ }
- public IActionResult OnGetLoadSecondImage(long employeeId, long workshopId)
- {
- var directoryPath = $"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}";
- var imageDir = Path.Combine(directoryPath, "2.jpg");
- return PhysicalFile(imageDir, "image/jpeg");
- }
+ public IActionResult OnGetLoadSecondImage(long employeeId, long workshopId)
+ {
+ var directoryPath = $"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}";
+ var imageDir = Path.Combine(directoryPath, "2.jpg");
+ return PhysicalFile(imageDir, "image/jpeg");
+ }
public IActionResult OnGetModalChangeName(long employeeId)
{
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml
index b50f912e..ba002761 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml
@@ -99,6 +99,7 @@
var removeEmployeeFromGroupAjax = `@Url.Page("./Grouping", "RemoveEmployee")`;
var workshopSettingId = Number((@Model.RollCallWorkshopSettings.Id));
var isShiftChangedGlobal = false;
+ var titleOfGroup = "";
}
\ No newline at end of file
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalAddEmployeeToGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalAddEmployeeToGroup.cshtml
index a224caa0..1f0a26c4 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalAddEmployeeToGroup.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalAddEmployeeToGroup.cshtml
@@ -6,7 +6,7 @@
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml
index fc59fc15..7b216951 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml
@@ -127,7 +127,7 @@
-
+
افزودن نوبت سوم
}
- else
+ else if (Model.ShiftViewModel.Count() == 1)
{
افزودن نوبت دوم
}
+ else
+ {
+
+ }
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml
index e129eb13..15c3d79b 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml
@@ -11,7 +11,7 @@
@@ -51,7 +51,20 @@
-
نوبت اول
+
+ @if (indexShiftViewModel == 0)
+ {
+ @("نوبت اول")
+ }
+ else if (indexShiftViewModel == 1)
+ {
+ @("نوبت دوم")
+ }
+ else if (indexShiftViewModel == 2)
+ {
+ @("نوبت سوم")
+ }
+
@@ -115,21 +128,27 @@
}
-
+
+
-
@if (Model.ShiftViewModel.Count() == 2)
{
افزودن نوبت سوم
}
- else
+ else if (Model.ShiftViewModel.Count() == 1)
{
افزودن نوبت دوم
}
+ else
+ {
+
+ }
+
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/_ModalEmployeeSettingPartials/LateToWorkAndEarlyExit.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/_ModalEmployeeSettingPartials/LateToWorkAndEarlyExit.cshtml
index 643e4a72..702f7f5b 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/_ModalEmployeeSettingPartials/LateToWorkAndEarlyExit.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/_ModalEmployeeSettingPartials/LateToWorkAndEarlyExit.cshtml
@@ -21,20 +21,19 @@
@@ -118,21 +117,19 @@
@@ -204,11 +201,10 @@