ERP-5 Доработать фактический план по сотрудникам

diff --git a/erp24/actions/timetable/StartShiftStepOneAction.php b/erp24/actions/timetable/StartShiftStepOneAction.php
index 26ed5bee4178d10afeef335a548f0e82f3bfc023..47c3ac22c78b83e3609b7d4e5f229628c6c7566b 100755 (executable)
--- a/erp24/actions/timetable/StartShiftStepOneAction.php
+++ b/erp24/actions/timetable/StartShiftStepOneAction.php
@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace yii_app\actions\timetable;
 
+use app\records\TimetableFactModel;
 use yii\base\Action;
 use yii\helpers\ArrayHelper;
 use yii_app\records\Admin;
@@ -49,11 +50,13 @@ class StartShiftStepOneAction extends Action
 
         if ($modelTypeId == AdminCheckin::TYPE_END) {
             $adminStores = CityStore::getNames([$lastCheckin->store_id]);
+            $lastCheckinFact = TimetableFactModel::findOne(['checkin_start_id' => $lastCheckin->id]);
+            $shiftArray = $lastCheckinFact ? ['id' => $lastCheckinFact->shift_id, 'name' => $lastCheckinFact->shift->name] : [];
         } else {
             $adminStores = ArrayHelper::map($userModel->getStores(), 'id', 'name');
+            $shiftArray = ArrayHelper::map(Shift::find()->all(), 'id', 'name');
         }
 
-        $shiftArray = ArrayHelper::map(Shift::find()->all(), 'id', 'name');
 
         return $this->controller->render('/timetable/start_shift_step_one.php', [
             'userModel' => $userModel,

diff --git a/erp24/views/timetable/start_shift_step_one.php b/erp24/views/timetable/start_shift_step_one.php
index 598e345a00c21c1a1093dbe34a8e4450f5129456..ad702cfd97779bbd22b504eee06bf128fe5cf02d 100644 (file)
--- a/erp24/views/timetable/start_shift_step_one.php
+++ b/erp24/views/timetable/start_shift_step_one.php
@@ -117,14 +117,23 @@ use yii_app\forms\timetable\StartForm;
 \r
               </div>\r
 \r
-                <div class="col-lg-3">\r
-                    <div class="text-secondary mb-1">Тип смены</div>\r
-                    <?= Html::dropDownList('shift_id', null,  $shiftArray, [\r
-                        'class' => "form-select",\r
-                        'aria-label' => "Пример выбора по умолчанию",\r
-                    ]) ?>\r
-                </div>\r
-              <div class="col-lg-6 d-flex justify-content-end align-items-end">\r
+                    <div class="col-lg-3">\r
+                        <div class="text-secondary mb-1">Тип смены</div>\r
+                        <?php\r
+                        if (empty($lastCheckin->type_id) || $lastCheckin->isEnd() || $userModel->adminGroup->isRoaming()) {\r
+                            echo Html::dropDownList('shift_id', null, $shiftArray, [\r
+                                'class' => "form-select",\r
+                                'aria-label' => "Пример выбора по умолчанию",\r
+                            ]);\r
+                        } else {\r
+                            echo $shiftArray['name'];\r
+                            echo Html::hiddenInput('shift_id', $shiftArray['id']);\r
+                        }\r
+\r
+                        ?>\r
+\r
+                    </div>\r
+                    <div class="col-lg-6 d-flex justify-content-end align-items-end">\r
 \r
                   <?= Html::submitButton($textButton, ['class' => 'btn btn-bd-primary ps-3 pe-3 mt-2']); ?>\r
 \r