diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/CurrentDay.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/CurrentDay.cshtml index 2eb8328f..0b888cc5 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/CurrentDay.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/CurrentDay.cshtml @@ -195,7 +195,7 @@
-
غیبت
+
عدم حضور
ردیف
نام پرسنل
@@ -328,7 +328,7 @@
- +
diff --git a/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml b/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml index 4496561f..0d225810 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml @@ -231,7 +231,7 @@
- روزهای تعطیل هفته + روزهای فعالیت مجموعه
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml index 19a0734d..b6b7f42f 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml @@ -234,7 +234,7 @@
-
غیبت
+
عدم حضور
ردیف
نام پرسنل
@@ -367,7 +367,7 @@
- +
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml index 91d73f8b..ebf69fce 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml @@ -223,7 +223,7 @@
- روزهای تعطیل هفته + روزهای فعالیت مجموعه
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml index 0daac264..e6ab8bd5 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml @@ -383,7 +383,7 @@
- روزهای تعطیل هفته + روزهای فعالیت مجموعه
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml index 227dc226..bf465763 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml @@ -393,7 +393,7 @@
- روزهای تعطیل هفته + روزهای فعالیت مجموعه
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalCreateSettingWorkshop.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalCreateSettingWorkshop.cshtml index 6322a8a8..7fe97c7c 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalCreateSettingWorkshop.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalCreateSettingWorkshop.cshtml @@ -90,7 +90,7 @@
- روزهای تعطیل هفته + روزهای فعالیت مجموعه
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalSettingWorkTime.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalSettingWorkTime.cshtml index f865c7a3..c94c4fbf 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalSettingWorkTime.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalSettingWorkTime.cshtml @@ -154,7 +154,7 @@
- روزهای تعطیل هفته + روزهای فعالیت مجموعه
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImage.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImage.cshtml index 8357a3f8..0ed1da85 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImage.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImage.cshtml @@ -218,7 +218,7 @@
- روزهای تعطیل هفته + روزهای فعالیت مجموعه
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImageEmpty.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImageEmpty.cshtml index 16be1fcb..14af9a56 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImageEmpty.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImageEmpty.cshtml @@ -168,7 +168,7 @@
- روزهای تعطیل هفته + روزهای فعالیت مجموعه
diff --git a/ServiceHost/Areas/Client/Pages/Company/WorkFlow/RollCall.cshtml b/ServiceHost/Areas/Client/Pages/Company/WorkFlow/RollCall.cshtml index 2d2f3398..da48cc4a 100644 --- a/ServiceHost/Areas/Client/Pages/Company/WorkFlow/RollCall.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/WorkFlow/RollCall.cshtml @@ -71,7 +71,7 @@
  • - غیبت + عدم حضور
    Loading... @@ -218,7 +218,7 @@
    -
    غیبت
    +
    عدم حضور
    diff --git a/ServiceHost/wwwroot/AssetsClient/pages/WorkFlow/css/RollCall.css b/ServiceHost/wwwroot/AssetsClient/pages/WorkFlow/css/RollCall.css index c1be8f1e..7bc5bd90 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/WorkFlow/css/RollCall.css +++ b/ServiceHost/wwwroot/AssetsClient/pages/WorkFlow/css/RollCall.css @@ -420,7 +420,7 @@ input:checked + .sliderEUP:before { background-color: #ffffff; background: rgba(209, 50, 50, 0.15); transition: ease .2s; - width: 55px; + /*width: 55px;*/ } .btn-workflow-rollcall-edit { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/WorkFlow/js/RollCall.js b/ServiceHost/wwwroot/AssetsClient/pages/WorkFlow/js/RollCall.js index c273da0c..d791c975 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/WorkFlow/js/RollCall.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/WorkFlow/js/RollCall.js @@ -292,7 +292,7 @@ function loadEmployeeListByWorkFlowsAbsents(date) {