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

change employee upload picture change name style

Browse Source
This commit is contained in:
MahanCh
2025-07-08 13:51:52 +03:30
parent 33e3efeef5
commit 2a78a9dc1a
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CompanyManagment.App.Contracts/RollCallEmployee/RollCallEmployeeViewModel.cs
View File

@@ -35,4 +35,6 @@ public class RollCallEmployeeViewModel : EditRollCallEmployee
public string EmployeeFName { get; set; }
public long RollCallEmployeeId { get; set; }
public bool CreatedByClient { get; set; }
public string RollCallEmployeeName { get; set; }
public bool HasChangedName { get; set; }
}

14
CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs
View File

@@ -58,7 +58,7 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
}
else
{
skipRollCallByWorkshopId = workshopId is 368 or 367 or 610;
skipRollCallByWorkshopId = workshopId is 368 or 367 or 610;
}
@@ -209,7 +209,7 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
WorkshopId = command.WorkshopId,
EmployeeId = employee.Id,
Id = joinedRollCall == null ? 0 : joinedRollCall.id,
EmployeeFullName = joinedRollCall == null ? employee.FullName : joinedRollCall.EmployeeFullName,
EmployeeFullName = employee.FullName,
NationalCode = employee.NationalCode,
IsActiveString =
joinedRollCall.EmployeesStatus.Any(y =>
@@ -217,7 +217,9 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
? "true"
: "false",
HasUploadedImage = joinedRollCall == null ? "false" : joinedRollCall.HasUploadedImage,
CreatedByClient = clientTemp != null || (employee.workshopTemp != null && employee.workshopTemp.LeftWorkType == LeftWorkTempType.StartWork)
CreatedByClient = clientTemp != null || (employee.workshopTemp != null && employee.workshopTemp.LeftWorkType == LeftWorkTempType.StartWork),
RollCallEmployeeName = joinedRollCall == null ? null : joinedRollCall.EmployeeFullName,
HasChangedName = joinedRollCall != null && joinedRollCall.HasChangedName
};
@@ -350,8 +352,8 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
var rollCallEmployeesQuery = _context.RollCallEmployees.Include(x => x.EmployeesStatus)
.Where(x => x.WorkshopId == workshopId
&& x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow)
&& x.HasUploadedImage == "true" &&leftWork.Any(l=>l.EmployeeId == x.EmployeeId && l.WorkshopId == x.WorkshopId));
&& x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow)
&& x.HasUploadedImage == "true" && leftWork.Any(l => l.EmployeeId == x.EmployeeId && l.WorkshopId == x.WorkshopId));
var personnel =
@@ -476,7 +478,7 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
public RollCallEmployee GetBy(long employeeId, long workshopId)
{
return _context.RollCallEmployees.Include(x=>x.EmployeesStatus).FirstOrDefault(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId);
return _context.RollCallEmployees.Include(x => x.EmployeesStatus).FirstOrDefault(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId);
}
#endregion

5
ServiceHost/Areas/Client/Pages/Company/RollCall/ModalChangeName.cshtml
View File

@@ -1,4 +1,5 @@
@model CompanyManagment.App.Contracts.RollCallEmployee.RollCallEmployeeViewModel
@using Version = _0_Framework.Application.Version
@model CompanyManagment.App.Contracts.RollCallEmployee.RollCallEmployeeViewModel
@{
string clientVersion = _0_Framework.Application.Version.StyleVersion;
@@ -89,4 +90,4 @@
var saveChangeNameAjax = `@Url.Page("./EmployeeUploadPicture", "ChangeName")`;
var employeeId = Number(@Model.EmployeeId);
</script>
<script src="~/assetsclient/pages/RollCall/js/ModalChangeName.js?ver=963"></script>
<script src="~/assetsclient/pages/RollCall/js/ModalChangeName.js?ver=@Version.StyleVersion"></script>

8
ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js
View File

@@ -121,7 +121,7 @@ function loadDataAjax() {
else {
html += `<img id="ImageEmployee_${item.employeeId}" src="/AssetsClient/images/Credits.png" class="img-avatar" alt="">`;
}
html += `<div id="EmployeeFullName_${item.employeeId}">${item.employeeFullName}</div>
html += `<div id="EmployeeFullName_${item.employeeId}">${item.employeeFullName} <span id="changedNameSpan_${item.employeeId}" style="color: red;font-size: x-small;">${item.hasChangedName ? `(${item.rollCallEmployeeName})` :``}<span/></div>
</div>
</div>
<div class="Rtable-cell d-md-block d-none width3">
@@ -163,8 +163,8 @@ function loadDataAjax() {
</div>
<div class="Rtable-cell--content align-items-center d-flex d-md-block text-end me-1 changeNameBtn_${item.employeeId} ${item.isActiveString === "true" ? `` : item.hasUploadedImage === "false" ? `disable` : ``}">
<button class="btn-upload" type="button" onclick='ModalChaneName(${item.employeeId})' style="width: 95px;">
ویرایش نام
<button class="btn-upload" type="button" onclick='ModalChaneName(${item.employeeId})' style="width: 100px;">
ایجاد نام مستعار
</button>
</div>
@@ -198,7 +198,7 @@ function loadDataAjax() {
html += `</span>
</div>
<div class="Rtable-cell--content my-auto">
<div class="title-mobile" style="width: 132px;" id="EmployeeFullNameMobile_${item.employeeId}">${item.employeeFullName}</div>
<div class="title-mobile" style="width: 132px;" id="EmployeeFullNameMobile_${item.employeeId}">${item.employeeFullName} <span id="changedNameSpanMobile_${item.employeeId}" style="color: red;font-size: x-small;">${item.hasChangedName ? `(${item.rollCallEmployeeName})` : ``}<span/></div>
<div class="content-mobile">`;
if (item.hasUploadedImage === "true") {
html += `<p id="TextUploadMobile_${item.employeeId}" class="m-0">عکس پرسنل آپلود شده است</p>`;

4
ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalChangeName.js
View File

@@ -43,8 +43,8 @@ $('#createData').click(function() {
loading.hide();
}, 2000);
$(`#EmployeeFullName_${employeeId}`).html($('#EmployeeFName').val() + ' ' + $('#EmployeeLName').val());
$(`#EmployeeFullNameMobile_${employeeId}`).html($('#EmployeeFName').val() + ' ' + $('#EmployeeLName').val());
$(`#changedNameSpan_${employeeId}`).html('('+$('#EmployeeFName').val() + ' ' + $('#EmployeeLName').val()+')');
$(`#changedNameSpanMobile_${employeeId}`).html('(' + $('#EmployeeFName').val() + ' ' + $('#EmployeeLName').val() + ')');
$('#MainModal').modal('hide');