diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs
index bee8d971..7a18b4f2 100644
--- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs
+++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs
@@ -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
diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/ModalDetailsRotatingShiftReport.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/ModalDetailsRotatingShiftReport.cshtml
index c5992cf4..cc737f38 100644
--- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/ModalDetailsRotatingShiftReport.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/ModalDetailsRotatingShiftReport.cshtml
@@ -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)
diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRotatingShiftReport.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRotatingShiftReport.cshtml
index c02a678c..adac297c 100644
--- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRotatingShiftReport.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRotatingShiftReport.cshtml
@@ -2,402 +2,402 @@
 @model CompanyManagment.App.Contracts.Contract.ComputingViewModel
 
 @{
-	<style>
-        
+    var index = 1;
 
-        #MainModal {
-            backdrop-filter: blur(8px);
-        }
+    <style>
+	    #MainModal {
+		    backdrop-filter: blur(8px);
+	    }
 
-        .modal .modal-dialog .modal-content {
-            background-color: white;
-            /* padding: 0px 30px 0 30px; */
-        }
+	    .modal .modal-dialog .modal-content {
+		    background-color: white;
+		    /* padding: 0px 30px 0 30px; */
+	    }
 
-        .modal-header {
-            padding: 1rem 0rem !important;
-        }
+	    .modal-header {
+		    padding: 1rem 0rem !important;
+	    }
 
-        .printBtns {
-            padding: 12px 2px 12px;
-            border-top: unset;
-            position: fixed;
-            top: 10%;
-            left: 50%;
-            transform: translateX(-800%);
-            display: flex;
-            flex-direction: column;
-            background: white;
-            align-items: center;
-            border-radius: 9px;
-            z-index: 9999999;
-            transition: none;
-        }
+	    .printBtns {
+		    padding: 12px 2px 12px;
+		    border-top: unset;
+		    position: fixed;
+		    top: 10%;
+		    left: 50%;
+		    transform: translateX(-800%);
+		    display: flex;
+		    flex-direction: column;
+		    background: white;
+		    align-items: center;
+		    border-radius: 9px;
+		    z-index: 9999999;
+		    transition: none;
+	    }
 
-        @@media (max-width: 1550px) {
-            .printBtns {
-                transform: translateX(-680%);
-            }
-        }
+	    @@media (max-width: 1550px) {
+		    .printBtns {
+			    transform: translateX(-680%);
+		    }
+	    }
 
-        #printThis .modal-content {
-            background-clip: padding-box;
-            background: black !important;
-        }
+	    #printThis .modal-content {
+		    background-clip: padding-box;
+		    background: black !important;
+	    }
 
-        #printThis h1, h2, h3, h4, h5, h6 {
-            color: black;
-            margin: 1rem 0;
-        }
+	    #printThis h1, h2, h3, h4, h5, h6 {
+		    color: black;
+		    margin: 1rem 0;
+	    }
 
-        .top-title {
-            text-align: center;
-        }
+	    .top-title {
+		    text-align: center;
+	    }
 
-        .list-no {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            margin: 1rem 0;
-        }
+	    .list-no {
+		    display: flex;
+		    justify-content: center;
+		    align-items: center;
+		    margin: 1rem 0;
+	    }
 
-            .list-no h4 {
-                margin: 0 9rem;
-            }
+	    .list-no h4 {
+		    margin: 0 9rem;
+	    }
 
-        #printThis span {
-            margin: 0 3rem;
-        }
+	    #printThis span {
+		    margin: 0 3rem;
+	    }
 
-        .table-title {
-            display: flex;
-            justify-content: space-between;
-            padding: 0 1rem;
-            border: 1px solid black;
-            border-top-right-radius: 9px;
-            border-top-left-radius: 9px;
-            border-bottom: 0;
-        }
+	    .table-title {
+		    display: flex;
+		    justify-content: space-between;
+		    padding: 0 1rem;
+		    border: 1px solid black;
+		    border-top-right-radius: 9px;
+		    border-top-left-radius: 9px;
+		    border-bottom: 0;
+	    }
 
-            .table-title h4 {
-                font-size: 1.5rem;
-            }
+	    .table-title h4 {
+		    font-size: 1.5rem;
+	    }
 
-        #printThis span {
-            margin: 0 1rem;
-        }
+	    #printThis span {
+		    margin: 0 1rem;
+	    }
 
-        #printThis table {
-            direction: ltr;
-            width: 100%;
-        }
+	    #printThis table {
+		    direction: ltr;
+		    width: 100%;
+	    }
 
-        #printThis .table-bordered {
-            /* border: 1px solid #94a3b8; */
-            border-radius: 9px;
-            /* border-collapse: separate; */
-            margin-bottom: 0;
-            table-layout: fixed;
-            width: 100%;
-        }
+	    #printThis .table-bordered {
+		    /* border: 1px solid #94a3b8; */
+		    border-radius: 9px;
+		    /* border-collapse: separate; */
+		    margin-bottom: 0;
+		    table-layout: fixed;
+		    width: 100%;
+	    }
 
-            #printThis .table-bordered > thead > tr > th {
-                font-size: 1.3rem;
-                color: black;
-                text-align: center;
-                vertical-align: middle;
-                padding: 0;
-	            overflow: hidden;
-                /* border: 1px solid #c7c7c7 !important; */
-                background: #E1E1E1;
-            }
+	    #printThis .table-bordered > thead > tr > th {
+		    font-size: 1.3rem;
+		    color: black;
+		    text-align: center;
+		    vertical-align: middle;
+		    padding: 0;
+		    overflow: hidden;
+		    /* border: 1px solid #c7c7c7 !important; */
+		    background: #E1E1E1;
+	    }
 
-            #printThis .table-bordered > tbody > tr > td {
-                padding: 4px 2px;
-                text-align: center;
-                font-size: 10px;
-                /* border: 1px solid #c7c7c7 !important; */
-                background: transparent;
-                overflow: hidden;
-            }
+	    #printThis .table-bordered > tbody > tr > td {
+		    padding: 4px 2px;
+		    text-align: center;
+		    font-size: 10px;
+		    /* border: 1px solid #c7c7c7 !important; */
+		    background: transparent;
+		    overflow: hidden;
+	    }
 
-            #printThis .table-bordered > tbody > tr.withdraw > td {
-                background-color: #b5b5b5 !important;
-            }
+	    #printThis .table-bordered > tbody > tr.withdraw > td {
+		    background-color: #b5b5b5 !important;
+	    }
 
-        #printThis tr:nth-child(2n) td {
-            background: #f0f0f0 !important;
-        }
+	    #printThis tr:nth-child(2n) td {
+		    background: #f0f0f0 !important;
+	    }
 
-        tr td:first-child {
-            border-top-right-radius: 0px;
-            border-bottom-right-radius: 0px;
-        }
+	    tr td:first-child {
+		    border-top-right-radius: 0px;
+		    border-bottom-right-radius: 0px;
+	    }
 
-        tr td:last-child {
-            border-top-left-radius: 0px;
-            border-bottom-left-radius: 0px;
-        }
+	    tr td:last-child {
+		    border-top-left-radius: 0px;
+		    border-bottom-left-radius: 0px;
+	    }
 
-        tr th:first-child {
-            border-top-right-radius: 0px;
-            border-bottom-right-radius: 0px;
-        }
+	    tr th:first-child {
+		    border-top-right-radius: 0px;
+		    border-bottom-right-radius: 0px;
+	    }
 
-        tr th:last-child {
-            border-top-left-radius: 0px;
-            border-bottom-left-radius: 0px;
-        }
+	    tr th:last-child {
+		    border-top-left-radius: 0px;
+		    border-bottom-left-radius: 0px;
+	    }
 
-        .printBtns .btn-rounded {
-            margin-left: 0.5rem;
-            margin-right: 0.5rem;
-            padding: 5px 18px;
-        }
+	    .printBtns .btn-rounded {
+		    margin-left: 0.5rem;
+		    margin-right: 0.5rem;
+		    padding: 5px 18px;
+	    }
 
-        #printThis .colgp-1 {
-            width: 40px;
-        }
+	    #printThis .colgp-1 {
+		    width: 40px;
+	    }
 
-        #printThis .colgp-2 {
-            width: 150px;
-        }
+	    #printThis .colgp-2 {
+		    width: 120px;
+	    }
 
-        #printThis .colgp-3 {
-            width: 95px;
-        }
+	    #printThis .colgp-3 {
+		    width: 95px;
+	    }
 
-        #printThis .colgp-4 {
-            width: 50px;
-        }
+	    #printThis .colgp-4 {
+		    width: 50px;
+	    }
 
-        #printThis .colgp-5 {
-            width: 65px;
-        }
+	    #printThis .colgp-5 {
+		    width: 65px;
+	    }
 
-        #printThis .colgp-6 {
-            width: 65px;
-        }
+	    #printThis .colgp-6 {
+		    width: 65px;
+	    }
 
-        #printThis .colgp-7 {
-            width: 58px;
-        }
+	    #printThis .colgp-7 {
+		    width: 58px;
+	    }
 
-        #printThis .colgp-8 {
-            width: 55px;
-        }
+	    #printThis .colgp-8 {
+		    width: 55px;
+	    }
 
-        .data-total {
-            border-top: 1px solid black;
-            margin-top: 2rem;
-            padding-top: 0.5rem;
-        }
+	    .data-total {
+		    border-top: 1px solid black;
+		    margin-top: 2rem;
+		    padding-top: 0.5rem;
+	    }
 
-        #printThis .table-bordered .total td {
-            background: #dfdfdf !important;
-        }
+	    #printThis .table-bordered .total td {
+		    background: #dfdfdf !important;
+	    }
 
-        .bl-hidden {
-            border-left: hidden !important;
-        }
+	    .bl-hidden {
+		    border-left: hidden !important;
+	    }
 
-        .table-name {
-            font-family: 'IranSans' !important;
-            text-align: right !important;
-            white-space: nowrap !important;
-            max-width: 100%;
-            width: 80px;
-            overflow-x: clip;
-            direction: rtl;
-        }
+	    .table-name {
+		    font-family: 'IranSans' !important;
+		    text-align: right !important;
+		    white-space: nowrap !important;
+		    max-width: 100%;
+		    width: 80px;
+		    overflow-x: clip;
+		    direction: rtl;
+	    }
 
-        @@media screen {
-            #printSection {
-                display: none;
-            }
-        }
+	    @@media screen {
+		    #printSection {
+			    display: none;
+		    }
+	    }
 
-        @@media (max-width: 1550px) {
-            .modal-dialog {
-                width: 1000px !important;
-            }
+	    @@media (max-width: 1550px) {
+		    .modal-dialog {
+			    width: 1000px !important;
+		    }
 
-            .table-title h4 {
-                font-size: 1.3rem;
-            }
+		    .table-title h4 {
+			    font-size: 1.3rem;
+		    }
 
-            .top-title h1 {
-                font-size: 2.5rem;
-            }
+		    .top-title h1 {
+			    font-size: 2.5rem;
+		    }
 
-            .top-title h4 {
-                font-size: 1.5rem;
-            }
+		    .top-title h4 {
+			    font-size: 1.5rem;
+		    }
 
-            .list-no h4 {
-                margin: 0 8rem;
-            }
+		    .list-no h4 {
+			    margin: 0 8rem;
+		    }
 
-            #printThis .table-bordered {
-                /* border: 1px solid #94a3b8 !important; */
-                border-radius: 9px !important;
-            }
+		    #printThis .table-bordered {
+			    /* border: 1px solid #94a3b8 !important; */
+			    border-radius: 9px !important;
+		    }
 
-                #printThis .table-bordered > thead > tr > th {
-                    font-size: 1.1rem;
-                }
+		    #printThis .table-bordered > thead > tr > th {
+			    font-size: 1.1rem;
+		    }
 
-                #printThis .table-bordered > tbody > tr > td {
-                    font-size: 10px;
-                }
+		    #printThis .table-bordered > tbody > tr > td {
+			    font-size: 10px;
+		    }
 
-            #printThis .colgp-3 {
-                width: 90px;
-            }
+		    #printThis .colgp-3 {
+			    width: 90px;
+		    }
 
-            #printThis .colgp-4 {
-                width: 50px;
-            }
+		    #printThis .colgp-4 {
+			    width: 50px;
+		    }
 
-            #printThis .colgp-5 {
-                width: 70px;
-            }
+		    #printThis .colgp-5 {
+			    width: 70px;
+		    }
 
-            #printThis .colgp-6 {
-                width: 70px;
-            }
+		    #printThis .colgp-6 {
+			    width: 70px;
+		    }
 
-            #printThis .colgp-7 {
-                width: 48px;
-            }
+		    #printThis .colgp-7 {
+			    width: 48px;
+		    }
 
-            #printThis .colgp-8 {
-                width: 55px;
-            }
-        }
+		    #printThis .colgp-8 {
+			    width: 55px;
+		    }
+	    }
 
-        @@page {
-            size: A4;
-	        margin: 0mm;
-	        page-break-after: auto;
-        }
+	    @@page {
+		    size: A4;
+		    margin: 0mm;
+		    page-break-after: auto;
+	    }
 
-        @@media print {
+	    @@media print {
 
-            body * {
-                visibility: hidden;
-                page-break-after: auto;
-                -webkit-print-color-adjust: exact;
-                print-color-adjust: exact;
-            }
+		    body * {
+			    visibility: hidden;
+			    page-break-after: auto;
+			    -webkit-print-color-adjust: exact;
+			    print-color-adjust: exact;
+		    }
 
-            html, body {
-                height: 100%;
-                margin: 0 !important;
-                padding: 0 !important;
-                overflow: clip;
-            }
+		    html, body {
+			    height: 100%;
+			    margin: 0 !important;
+			    padding: 0 !important;
+			    overflow: clip;
+		    }
 
-            /* .modal-dialog {
+		    /* .modal-dialog {
                 max-width: 100%;
                 width: 60cm;
             } */
 
-            .modal .modal-dialog .modal-content {
-                padding: 0;
-            }
+		    .modal .modal-dialog .modal-content {
+			    padding: 0;
+		    }
 
-            #printSection, #printSection * {
-                visibility: visible;
-                page-break-after: auto;
-            }
+		    #printSection, #printSection * {
+			    visibility: visible;
+			    page-break-after: auto;
+		    }
             
-	        #printSection {
-                width: 21cm;
-		        /* height: 29.7cm; */
-		        position: absolute;
-		        padding: 1cm;
-		        margin: 6px auto 0;
-		        right: 0;
-		        top: 0;
-		        page-break-after: auto;
-	        }
+		    #printSection {
+			    width: 21cm;
+			    /* height: 29.7cm; */
+			    position: absolute;
+			    padding: 1cm;
+			    margin: 6px auto 0;
+			    right: 0;
+			    top: 0;
+			    page-break-after: auto;
+		    }
             
-	        .titleRSR {
-		        color: #1F2937;
-		        font-size: 13px;
-		        font-weight: 500;
-	        }
+		    .titleRSR {
+			    color: #1F2937;
+			    font-size: 13px;
+			    font-weight: 500;
+		    }
 		
-	        .hasRotating{
-		        background-color: #C7FF82;
-		        width: 20px;
-		        height: 20px;
-		        display: flex;
-		        align-items: center;
-		        justify-content: center;
-		        border-radius: 50%;
-		        margin: auto;
-	        }
+		    .hasRotating{
+			    background-color: #C7FF82;
+			    width: 20px;
+			    height: 20px;
+			    display: flex;
+			    align-items: center;
+			    justify-content: center;
+			    border-radius: 50%;
+			    margin: auto;
+		    }
 
-            #printThis .table-bordered {
-                /* border-collapse: separate !important; */
-                margin-bottom: 0;
-                table-layout: fixed;
-                width: 100%;
-                border: 0 !important;
-            }
+		    #printThis .table-bordered {
+			    /* border-collapse: separate !important; */
+			    margin-bottom: 0;
+			    table-layout: fixed;
+			    width: 100%;
+			    border: 0 !important;
+		    }
 
-                #printThis .table-bordered > thead > tr > th {
-                    font-size: 1.2rem !important;
-                    color: black;
-                    text-align: center;
-                    vertical-align: middle;
-                    padding: 0;
-                    /* border: 1px solid #94a3b8; */
-	                background: #E1E1E1;
-                    -webkit-print-color-adjust: exact !important;
-                    print-color-adjust: exact !important;
-                }
+		    #printThis .table-bordered > thead > tr > th {
+			    font-size: 1.2rem !important;
+			    color: black;
+			    text-align: center;
+			    vertical-align: middle;
+			    padding: 0;
+			    /* border: 1px solid #94a3b8; */
+			    background: #E1E1E1;
+			    -webkit-print-color-adjust: exact !important;
+			    print-color-adjust: exact !important;
+		    }
 
-            #printThis tr:nth-child(2n) td {
-                background: #f0f0f0 !important;
-            }
+		    #printThis tr:nth-child(2n) td {
+			    background: #f0f0f0 !important;
+		    }
 
-            #printThis .table-bordered > tbody > tr > td {
-                padding: 4px 2px;
-                text-align: center;
-                font-size: 10px !important;
-                /* border: 1px solid #94a3b8; */
-            }
+		    #printThis .table-bordered > tbody > tr > td {
+			    padding: 4px 2px;
+			    text-align: center;
+			    font-size: 10px !important;
+			    /* border: 1px solid #94a3b8; */
+		    }
 
-            #printThis .table-bordered > thead > td:first-child {
-                border: 9px !important;
-            }
+		    #printThis .table-bordered > thead > td:first-child {
+			    border: 9px !important;
+		    }
 
-            #printThis .table-bordered > thead > td:last-child {
-                border: 9px !important;
-            }
+		    #printThis .table-bordered > thead > td:last-child {
+			    border: 9px !important;
+		    }
 
-            .table > tbody > tr.withdraw > td {
-                background-color: #b5b5b5 !important;
-            }
+		    .table > tbody > tr.withdraw > td {
+			    background-color: #b5b5b5 !important;
+		    }
 
-            #printThis .table {
-                /* border: 1px solid transparent !important; */
-                border-collapse: separate !important;
-                overflow: hidden !important;
-                border-spacing: 0 !important;
-                border-radius: 10px !important;
-                text-align: center !important;
-                /* border: 1px solid #aaa !important; */
-            }
+		    #printThis .table {
+			    /* border: 1px solid transparent !important; */
+			    border-collapse: separate !important;
+			    overflow: hidden !important;
+			    border-spacing: 0 !important;
+			    border-radius: 10px !important;
+			    text-align: center !important;
+			    /* border: 1px solid #aaa !important; */
+		    }
 
-                #printThis .table th, #printThis .table td {
-                    vertical-align: middle !important;
-                    border: 1px solid #94a3b8 !important;
-                }
-            /* #printThis .table th:last-child, #printThis .table td:last-child {
+		    #printThis .table th, #printThis .table td {
+			    vertical-align: middle !important;
+			    border: 1px solid #94a3b8 !important;
+		    }
+		    /* #printThis .table th:last-child, #printThis .table td:last-child {
                                 border-right: none !important;
                             }
 
@@ -406,145 +406,152 @@
                             } */
 
 
-            #printThis .colgp-1 {
-                width: 40px;
-            }
+		    #printThis .colgp-1 {
+			    width: 40px;
+		    }
 
-            #printThis .colgp-2 {
-                width: 150px;
-            }
+		    #printThis .colgp-2 {
+			    width: 150px;
+		    }
 
-            #printThis .colgp-3 {
-                width: 70px;
-            }
+		    #printThis .colgp-3 {
+			    width: 70px;
+		    }
 
-            #printThis .colgp-15 {
-                width: 80px;
-            }
+		    #printThis .colgp-15 {
+			    width: 80px;
+		    }
 
-            #printThis .colgp-16 {
-                width: 75px;
-            }
+		    #printThis .colgp-16 {
+			    width: 75px;
+		    }
 
-            #printThis .colgp-14 {
-                width: 80px;
-            }
+		    #printThis .colgp-14 {
+			    width: 80px;
+		    }
 
-            #printThis .colgp-13 {
-                width: 80px;
-            }
+		    #printThis .colgp-13 {
+			    width: 80px;
+		    }
 
-            #printThis .colgp-12 {
-                width: 85px;
-            }
+		    #printThis .colgp-12 {
+			    width: 85px;
+		    }
 
-            #printThis .colgp-8 {
-                width: 55px;
-            }
+		    #printThis .colgp-8 {
+			    width: 55px;
+		    }
 
-            #printThis .colgp-9 {
-                width: 60px;
-            }
+		    #printThis .colgp-9 {
+			    width: 60px;
+		    }
 
-            .bl-hidden {
-                border-left: hidden !important;
-            }
+		    .bl-hidden {
+			    border-left: hidden !important;
+		    }
 
-            .table-name {
-                padding: 8px 0;
-            }
+		    .table-name {
+			    padding: 8px 0;
+		    }
 
-            #printThis .table-bordered > thead tr:first-child {
-                border: 0 !important;
-            }
+		    #printThis .table-bordered > thead tr:first-child {
+			    border: 0 !important;
+		    }
 
-            #printThis .titleSection {
-                border: 1px solid #94a3b8 !important;
-                border-bottom: 0 !important;
-                border-radius: 10px 10px 0 0 !important;
-                background: #fff !important;
-                -webkit-print-color-adjust: exact !important;
-                print-color-adjust: exact !important;
-            }
+		    #printThis .titleSection {
+			    border: 1px solid #94a3b8 !important;
+			    border-bottom: 0 !important;
+			    border-radius: 10px 10px 0 0 !important;
+			    background: #fff !important;
+			    -webkit-print-color-adjust: exact !important;
+			    print-color-adjust: exact !important;
+		    }
 
-            #printThis .table-bordered > thead {
-                display: table-header-group !important;
-                page-break-inside: avoid !important;
-            }
-        }
+		    #printThis .table-bordered > thead {
+			    display: table-header-group !important;
+			    page-break-inside: avoid !important;
+		    }
 
 
+		    .noRotatingTxt {
+			    color: #ef2d2d;
+		    }
+		    .hasRotatingTxt {
+			    color: #18b74a;
+		    }
+	    }
 
-        .cls-1 {
-            fill: url(#linear-gradient-2);
-        }
 
-        .cls-2 {
-            fill: url(#linear-gradient-3);
-        }
+	    .cls-1 {
+		    fill: url(#linear-gradient-2);
+	    }
 
-        .cls-3 {
-            fill: url(#linear-gradient);
-        }
+	    .cls-2 {
+		    fill: url(#linear-gradient-3);
+	    }
 
-        .flex {
-            display: flex;
-        }
+	    .cls-3 {
+		    fill: url(#linear-gradient);
+	    }
 
-        .justify-between {
-            justify-content: space-between;
-        }
+	    .flex {
+		    display: flex;
+	    }
 
-        .justify-end {
-            justify-content: end;
-        }
+	    .justify-between {
+		    justify-content: space-between;
+	    }
 
-        .items-center {
-            align-items: center;
-        }
+	    .justify-end {
+		    justify-content: end;
+	    }
 
-        .titleSection {
-            background: #fff !important;
-            -webkit-print-color-adjust: exact !important;
-            print-color-adjust: exact !important;
-            padding: 5px;
-            margin: 0;
-            border: 1px solid #94a3b8;
-            border-bottom: 0;
-            align-items: center;
-            display: flex;
-        }
+	    .items-center {
+		    align-items: center;
+	    }
 
-        .titleH1 {
-            font-size: 24px;
-            margin: 0 !important;
-            font-weight: 600;
-        }
+	    .titleSection {
+		    background: #fff !important;
+		    -webkit-print-color-adjust: exact !important;
+		    print-color-adjust: exact !important;
+		    padding: 5px;
+		    margin: 0;
+		    border: 1px solid #94a3b8;
+		    border-bottom: 0;
+		    align-items: center;
+		    display: flex;
+	    }
 
-        .lineS {
-            margin: 4px 0 !important;
-        }
+	    .titleH1 {
+		    font-size: 24px;
+		    margin: 0 !important;
+		    font-weight: 600;
+	    }
 
-        .table > tbody > tr.withdraw > td {
-            background-color: #b5b5b5 !important;
-        }
+	    .lineS {
+		    margin: 4px 0 !important;
+	    }
 
-        .table {
-            /* border: 1px solid #94a3b8 !important; */
-            border-collapse: separate !important;
-            overflow: hidden !important;
-            border-spacing: 0 !important;
-            border-radius: 10px !important;
-            text-align: center !important;
-            /* border: 1px solid #94a3b8 !important; */
-        }
+	    .table > tbody > tr.withdraw > td {
+		    background-color: #b5b5b5 !important;
+	    }
 
-            .table th, .table td {
-                vertical-align: middle !important;
-                border: 1px solid #94a3b8 !important;
-            }
+	    .table {
+		    /* border: 1px solid #94a3b8 !important; */
+		    border-collapse: separate !important;
+		    overflow: hidden !important;
+		    border-spacing: 0 !important;
+		    border-radius: 10px !important;
+		    text-align: center !important;
+		    /* border: 1px solid #94a3b8 !important; */
+	    }
 
-        /* .table th:last-child, .table td:last-child {
+	    .table th, .table td {
+		    vertical-align: middle !important;
+		    border: 1px solid #94a3b8 !important;
+	    }
+
+	    /* .table th:last-child, .table td:last-child {
                                 border-right: none !important;
                             }
 
@@ -552,23 +559,25 @@
                                 border-bottom: none !important;
                             } */
 
-        #divTablescrollbar {
-            overflow-y: scroll;
-            max-height: calc(100vh - 200px);
-            position: relative;
-            scrollbar-width: thin;
-            scrollbar-gutter: stable;
-        }
-
+	    #divTablescrollbar {
+		    overflow-y: scroll;
+		    max-height: calc(100vh - 200px);
+		    position: relative;
+		    scrollbar-width: thin;
+		    scrollbar-gutter: stable;
+	    }
         
-		@@media screen and (max-width: 992px) {
-			.wrapContainerRSR {
-				height: auto;
-			}
-		}
+	    @@media screen and (max-width: 992px) {
+		    .wrapContainerRSR {
+			    height: auto;
+		    }
+	    }
 
 
-	</style>
+    </style>
+	
+    string noRotatingTxt = "noRotatingTxt";
+    string hasRotatingTxt = "hasRotatingTxt";
 }
 
 
@@ -645,24 +654,25 @@
                                 </tr>
                                 <tr>
                                     <th colspan="4" style="font-size: 11px !important; text-align: center;padding: 6px;">
-		                                <div class="titleRSR">وضعیت نوبت کاری:  @Model.RotatingStatus </div>
+                                        <div class="titleRSR">وضعیت نوبت کاری: <span class="@(!Model.HasRotatingShift? @noRotatingTxt :@hasRotatingTxt )">@Model.RotatingStatus </span></div>
 	                                </th>
                                     <th colspan="4" style="font-size: 11px !important; text-align: center;padding: 6px;">
 		                                <div class="titleRSR">
 			                                نوع ساعت کاری:
 			                                @if (Model.HasRollCall)
 			                                {
-				                                <span> حضور غیاب</span>
+                                                <span>دارای حضور غیاب</span>
 			                                }
 			                                else
 			                                {
-				                                <span>عدم حضور غیاب</span>
+                                                <span>بدون حضور غیاب</span>
 			                                }
 		                                </div>
 	                                </th>
                                 </tr>
                                 <tr>
-                                    <th colspan="2" style="font-size: 11px !important; text-align: start">تاریخ</th>
+                                    <th style="font-size: 11px !important; text-align: center">ردیف</th>
+                                    <th style="font-size: 11px !important; text-align: start">تاریخ</th>
                                     <th style="font-size: 11px !important; text-align: center; padding: 4px;">کارکرد صبح</th>
                                     <th style="font-size: 11px !important; text-align: center; padding: 4px;">کارکرد عصر</th>
                                     <th style="font-size: 11px !important; text-align: center; padding: 4px;">کارکرد شب</th>
@@ -676,7 +686,10 @@
                                     @foreach (var item in Model.RotatingResultList)
                                     {
                                         <tr>
-                                            <td colspan="2" style="font-family: 'IranText' !important; font-size: 10px !important; text-align: start">
+	                                        <td style="font-family: 'IranText' !important; font-size: 10px !important; text-align: center">
+												@(index++)
+	                                        </td>
+                                            <td style="font-family: 'IranText' !important; font-size: 10px !important; text-align: start">
                                                 @item.RotatingDate
                                             </td>
                                             <td style="font-family: 'IranText' !important; font-size: 10px !important; text-align: center">