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

employeeUploadPicture bug fixed merged

Browse Source
This commit is contained in:
SamSys
2025-07-07 14:12:27 +03:30
parent 33e3efeef5 38171581d3
commit f2b3a26471
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs
View File

@@ -295,7 +295,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
HasUploadedImage = rollCallEmployee?.HasUploadedImage == "true"
};
if (res.HasUploadedImage)
if (res.HasUploadedImage && res.EmployeeSettings != null)
{
return Partial("ModalTakeImagesEdit", res);
}
@@ -467,7 +467,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
var employeeSettings =
_customizeWorkshopSettingsApplication.GetByEmployeeIdAndWorkshopIdIncludeGroupSettings(
_workshopId, hasRollCallEmployee.EmployeeId);
if (employeeSettings.Id == 0)
if (employeeSettings == null || employeeSettings.Id == 0)
{
return new JsonResult(new
{

5
ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js
View File

@@ -13,7 +13,8 @@ var rollCallStatusIdTemp;
$(document).ready(function () {
$("#next-step").on("click", function () {
if ($("#step-form2").is(":visible") && !hasUploadedImage) {
debugger;
if ($("#step-form2").is(":visible")/* && !hasUploadedImage*/) {
if ($("#workshopSettingSelect").val() === "0") {
$('.alert-msg').show();
@@ -387,7 +388,7 @@ async function set() {
let pic2 = $("#pic2").attr('src');
const img1 = document.getElementById('pic1');
const img2 = document.getElementById('pic2');
debugger;
let workshopId = Number($('#workshopId').val());
let employeeId = Number($('#employeeId').val());