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

report update

Browse Source
This commit is contained in:
SamSys
2025-03-10 13:43:46 +03:30
parent 6d55fd5b34
commit 1158c85d5e
3 changed files with 750 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1198
CompanyManagment.EFCore/Repository/ReportRepository.cs
View File

File diff suppressed because it is too large Load Diff

27
ServiceHost/Areas/Admin/Pages/Company/Reports/Index.cshtml
View File

@@ -428,9 +428,9 @@
}
var firstItem2 = true;
foreach (var personnel in Model.PersonnelContract.OrderBy(x => x.ContractSignPercent))
foreach (var personnel in Model.PersonnelContract.OrderBy(x => x.ContractSignPercent))
{
<div style="display: none" id="ContractSignPercentDiv" class="d-flex align-items-center m-1 select @(firstItem2 ? "active" : "") ContractSignPercent activeBtn" onclick="ajaxContractSignDone(@personnel.AccountId, '@personnel.AccountFullName')">
<div style="display: none" id="ContractSignPercentDiv" class="d-flex align-items-center m-1 select @(firstItem2 ? "active" : "") ContractSignPercent activeBtn" onclick="ajaxContractSignDone(@personnel.AccountId, '@personnel.AccountFullName', @Html.Raw(Json.Serialize(personnel.WorkshopList)))">
<div class="col-xs-4">
<div class="scrolltext text-container">
<span>@personnel.AccountFullName</span>
@@ -463,9 +463,9 @@
}
var firstItem3 = true;
foreach (var personnel in Model.PersonnelCheckout.OrderBy(x => x.CheckoutDonePercent))
foreach (var personnel in Model.PersonnelCheckout.OrderBy(x => x.CheckoutDonePercent))
{
<div id="CheckoutDonePercentDiv" style="display: none" class="d-flex align-items-center m-1 select @(firstItem3 ? "active" : "") CheckoutDonePercent activeBtn" onclick="ajaxWorkshopCheckoutDone(@personnel.AccountId, '@personnel.AccountFullName')">
<div id="CheckoutDonePercentDiv" style="display: none" class="d-flex align-items-center m-1 select @(firstItem3 ? "active" : "") CheckoutDonePercent activeBtn" onclick="ajaxWorkshopCheckoutDone(@personnel.AccountId, '@personnel.AccountFullName', @Html.Raw(Json.Serialize(personnel.WorkshopList)))">
<div class="col-xs-4">
<div class="scrolltext text-container">
<span>@personnel.AccountFullName</span>
@@ -500,7 +500,7 @@
var firstItem4 = true;
foreach (var personnel in Model.PersonnelCheckout.OrderBy(x => x.CheckoutSignPercent))
{
<div id="CheckoutSignPercentDiv" style="display: none" class="d-flex align-items-center m-1 select @(firstItem4 ? "active" : "") CheckoutSignPercent activeBtn" onclick="ajaxWorkshopCheckoutSignDone(@personnel.AccountId, '@personnel.AccountFullName')">
<div id="CheckoutSignPercentDiv" style="display: none" class="d-flex align-items-center m-1 select @(firstItem4 ? "active" : "") CheckoutSignPercent activeBtn" onclick="ajaxWorkshopCheckoutSignDone(@personnel.AccountId, '@personnel.AccountFullName', @Html.Raw(Json.Serialize(personnel.WorkshopList)))">
<div class="col-xs-4">
<div class="scrolltext text-container">
<span>@personnel.AccountFullName</span>
@@ -1051,7 +1051,7 @@
});
}
function ajaxContractSignDone(accountId, accountFullName) {
function ajaxContractSignDone(accountId, accountFullName, workshopList) {
$('#workshopListMobileSection').html('');
$('#appendTableWorkshop').html('');
$('#loading').show();
@@ -1061,7 +1061,8 @@
dataType: 'json',
url: '@Url.Page("/Company/Reports/Index", "WorkshopContractSignDone")',
type: 'GET',
data: { "year": $('#selectYear').val(), "month": $('#selectMonth').val(), "accountId": Number(accountId) },
data: { "year": $('#selectYear').val(), "month": $('#selectMonth').val(), "accountId": Number(accountId), "workshopList" : workshopList},
traditional: true,
headers: { "RequestVerificationToken": $('input[name="__RequestVerificationToken"]').val() },
success: function(response) {
if (response.success) {
@@ -1158,7 +1159,7 @@
});
}
function ajaxWorkshopCheckoutDone(accountId, accountFullName) {
function ajaxWorkshopCheckoutDone(accountId, accountFullName, workshopList) {
$('#workshopListMobileSection').html('');
$('#appendTableWorkshop').html('');
$('#loading').show();
@@ -1168,7 +1169,8 @@
dataType: 'json',
url: '@Url.Page("/Company/Reports/Index", "WorkshopCheckoutDone")',
type: 'GET',
data: { "year": $('#selectYear').val(), "month": $('#selectMonth').val(), "accountId": Number(accountId) },
data: { "year": $('#selectYear').val(), "month": $('#selectMonth').val(), "accountId": Number(accountId), "workshopList" : workshopList},
traditional: true,
headers: { "RequestVerificationToken": $('input[name="__RequestVerificationToken"]').val() },
success: function(response) {
if (response.success) {
@@ -1265,7 +1267,7 @@
});
}
function ajaxWorkshopCheckoutSignDone(accountId, accountFullName) {
function ajaxWorkshopCheckoutSignDone(accountId, accountFullName, workshopList) {
$('#workshopListMobileSection').html('');
$('#appendTableWorkshop').html('');
$('#loading').show();
@@ -1275,7 +1277,8 @@
dataType: 'json',
url: '@Url.Page("/Company/Reports/Index", "WorkshopCheckoutSignDone")',
type: 'GET',
data: { "year": $('#selectYear').val(), "month": $('#selectMonth').val(), "accountId": Number(accountId) },
data: { "year": $('#selectYear').val(), "month": $('#selectMonth').val(), "accountId": Number(accountId), "workshopList" : workshopList },
traditional: true,
headers: { "RequestVerificationToken": $('input[name="__RequestVerificationToken"]').val() },
success: function(response) {
if (response.success) {
@@ -1372,7 +1375,7 @@
});
}
// EmployeeNotDone
//EmployeeNotDone
function ajaxEmployeeContract(workshopId) {
$(`#employeeList_${workshopId}`).html('');
$('#personnelSection').html('');

2
ServiceHost/Pages/Index.cshtml.cs
View File

@@ -72,7 +72,7 @@ namespace ServiceHost.Pages
// _reportRepository.GetAllActiveWorkshopsNew("1403", "12");
//var test = _uidService.GetPersonalInfo("2669318622", "1363/02/25");
HasApkToDownload = _androidApkVersionApplication.HasAndroidApkToDownload();
if (User.Identity is { IsAuthenticated: true })
{