add color to rotating shift
This commit is contained in:
@@ -109,7 +109,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.Checkouts
|
||||
var workingHours = _workingHoursTempApplication.GetByContractIdConvertToShiftwork4(checkout.ContractId);
|
||||
if (checkout.HasRollCall)
|
||||
{
|
||||
result = await _rollCallMandatoryApplication.RotatingShiftReport(checkout.WorkshopId, checkout.EmployeeId, checkout.ContractStartGr, checkout.ContractEndGr, workingHours.ShiftWork);
|
||||
result = await _rollCallMandatoryApplication.RotatingShiftReport(checkout.WorkshopId, checkout.EmployeeId, checkout.ContractStartGr, checkout.ContractEndGr, workingHours.ShiftWork, true, workingHours, false);
|
||||
result.HasRollCall = true;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
@model CompanyManagment.App.Contracts.Contract.ComputingViewModel
|
||||
|
||||
@{
|
||||
var index = 1;
|
||||
<style>
|
||||
.modal.show .modal-dialog {
|
||||
max-width: 900px;
|
||||
@@ -33,16 +34,33 @@
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.sticky-div {
|
||||
top: -5px;
|
||||
.Rtable .Rtable-row .Rtable-cell .Rtable-cell--content > span {
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.sticky-div {
|
||||
top: -5px;
|
||||
}
|
||||
|
||||
.noRotatingTxt {
|
||||
color: #ef2d2d;
|
||||
}
|
||||
.hasRotatingTxt {
|
||||
color: #18b74a;
|
||||
}
|
||||
|
||||
|
||||
@@media (max-width: 768px) {
|
||||
.Rtable--collapse .Rtable-row {
|
||||
outline: none;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
string noRotatingTxt = "noRotatingTxt";
|
||||
string hasRotatingTxt = "hasRotatingTxt";
|
||||
}
|
||||
|
||||
|
||||
@@ -60,18 +78,18 @@
|
||||
<div class="wrapper wrapContainerRSR">
|
||||
<div class="row">
|
||||
<div class="col-4 text-start">
|
||||
<div class="titleRSR">وضعیت نوبت کاری: @Model.RotatingStatus </div>
|
||||
<div class="titleRSR">وضعیت نوبت کاری: <span class="@(!Model.HasRotatingShift? @noRotatingTxt :@hasRotatingTxt )">@Model.RotatingStatus</span></div>
|
||||
</div>
|
||||
<div class="col-4 text-center">
|
||||
<div class="titleRSR">
|
||||
نوع ساعت کاری:
|
||||
@if (Model.HasRollCall)
|
||||
{
|
||||
<span> حضور غیاب</span>
|
||||
<span>دارای حضور غیاب</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span>عدم حضور غیاب</span>
|
||||
<span>بدون حضور غیاب</span>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
@@ -83,36 +101,51 @@
|
||||
|
||||
<div class="Rtable Rtable--5cols Rtable--collapse">
|
||||
<div class="Rtable-row Rtable-row--head align-items-center sticky-div d-flex">
|
||||
<div class="Rtable-cell column-heading width1">تاریخ</div>
|
||||
<div class="Rtable-cell column-heading width2 text-center">کارکرد صبح</div>
|
||||
<div class="Rtable-cell column-heading width3 text-center">کارکرد عصر</div>
|
||||
<div class="Rtable-cell column-heading width4 text-center">کارکرد شب</div>
|
||||
<div class="Rtable-cell column-heading width5 text-center">نوبت صبح</div>
|
||||
<div class="Rtable-cell column-heading width6 text-center">نوبت عصر</div>
|
||||
<div class="Rtable-cell column-heading width7 text-center">نوبت شب</div>
|
||||
<div class="Rtable-cell column-heading width1">
|
||||
<span class="text-white prevent-select">
|
||||
ردیف
|
||||
</span>
|
||||
</div>
|
||||
<div class="Rtable-cell column-heading width2">تاریخ</div>
|
||||
<div class="Rtable-cell column-heading width3 text-center">کارکرد صبح</div>
|
||||
<div class="Rtable-cell column-heading width4 text-center">کارکرد عصر</div>
|
||||
<div class="Rtable-cell column-heading width5 text-center">کارکرد شب</div>
|
||||
<div class="Rtable-cell column-heading width6 text-center">نوبت صبح</div>
|
||||
<div class="Rtable-cell column-heading width7 text-center">نوبت عصر</div>
|
||||
<div class="Rtable-cell column-heading width8 text-center">نوبت شب</div>
|
||||
</div>
|
||||
|
||||
|
||||
@foreach (var item in @Model.RotatingResultList)
|
||||
{
|
||||
<div class="Rtable-row align-items-center position-relative ">
|
||||
<div class="Rtable-cell width1">
|
||||
<div class="Rtable-row align-items-center position-relative">
|
||||
<div class="Rtable-cell d-md-block d-none width1">
|
||||
<div class="Rtable-cell--heading">
|
||||
ردیف
|
||||
</div>
|
||||
<label for="@index" class="Rtable-cell--content prevent-select">
|
||||
<span class="d-flex justify-content-center align-items-center">
|
||||
@(index++)
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="Rtable-cell width2">
|
||||
<div class="Rtable-cell--heading">تاریخ</div>
|
||||
<div class="Rtable-cell--content">@item.RotatingDate</div>
|
||||
</div>
|
||||
<div class="Rtable-cell width2">
|
||||
<div class="Rtable-cell width3">
|
||||
<div class="Rtable-cell--heading">کارکرد صبح</div>
|
||||
<div class="Rtable-cell--content text-center">@item.MorningString</div>
|
||||
</div>
|
||||
<div class="Rtable-cell width3">
|
||||
<div class="Rtable-cell width4">
|
||||
<div class="Rtable-cell--heading">کارکرد عصر</div>
|
||||
<div class="Rtable-cell--content text-center">@item.EveningString</div>
|
||||
</div>
|
||||
<div class="Rtable-cell width4">
|
||||
<div class="Rtable-cell width5">
|
||||
<div class="Rtable-cell--heading">کارکرد شب</div>
|
||||
<div class="Rtable-cell--content text-center">@item.NightString</div>
|
||||
</div>
|
||||
<div class="Rtable-cell width5">
|
||||
<div class="Rtable-cell width6">
|
||||
<div class="Rtable-cell--heading">نوبت صبح</div>
|
||||
<div class="Rtable-cell--content text-center">
|
||||
@if (item.IsMorningShift == true)
|
||||
@@ -129,7 +162,7 @@
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
<div class="Rtable-cell d-md-block d-none width6">
|
||||
<div class="Rtable-cell d-md-block d-none width7">
|
||||
<div class="Rtable-cell--heading">نوبت عصر</div>
|
||||
<div class="Rtable-cell--content text-center">
|
||||
@if (item.IsEveningShift == true)
|
||||
@@ -146,7 +179,7 @@
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
<div class="Rtable-cell d-md-block d-none width7">
|
||||
<div class="Rtable-cell d-md-block d-none width8">
|
||||
<div class="Rtable-cell--heading">نوبت شب</div>
|
||||
<div class="Rtable-cell--content text-center">
|
||||
@if (item.IsNightShift == true)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user