From 3532ac64dbf6d7c271df329c7e7e7be20e9ae58d Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 3 Sep 2024 11:45:23 +0300
Subject: [PATCH] =?utf8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?utf8?q?=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/actions/cabinet/IndexAction.php | 14 +++++++++++++-
 erp24/views/cabinet/index.php         | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/erp24/actions/cabinet/IndexAction.php b/erp24/actions/cabinet/IndexAction.php
index d87dcbf3..912abca8 100755
--- a/erp24/actions/cabinet/IndexAction.php
+++ b/erp24/actions/cabinet/IndexAction.php
@@ -131,7 +131,19 @@ class IndexAction extends Action
         } else {
             $defaultAdminId = ArrayHelper::getValue($cabinetService->getTimetableAdminByData($dateFrom, $adminFloristPrepared), 'admin_id');
             $employeeSelect = ArrayHelper::getValue($adminFloristPrepared, $defaultAdminId);
-            $employeeId = $employeeSelect['id'];
+            if (!empty($employeeSelect) && isset($employeeSelect['id'])) {
+                $employeeId = $employeeSelect['id'];
+            } else {
+
+                $errorText = 'Сотрудник не найден.';
+                if (!empty($employeeId)) {
+                    $errorText .= ' ID: ' . $employeeId;
+                }
+
+                return $this->controller->render('/error/index', [
+                    'errorText' => $errorText,
+                ]);
+            }
 
         }
 
diff --git a/erp24/views/cabinet/index.php b/erp24/views/cabinet/index.php
index ac163a3c..cec070cc 100755
--- a/erp24/views/cabinet/index.php
+++ b/erp24/views/cabinet/index.php
@@ -80,6 +80,20 @@ $this->registerJsFile('/js/dashboard/index.js', ['position' => \yii\web\View::PO
         <?= Html::dropDownList('employee_id', $employeeSelect['id'] ?? '',
             ArrayHelper::map($adminFlorist, 'id', 'name_full')) ?>
     </table>
+    <div class="d-flex align-items-center justify-content-center gap-2">
+        <div class="mb-3">Сотрудник:</div>
+        <div style="display:inline-block">
+            <?= $searchForm->field($daysSearchForm, 'employee_id')->widget(\kartik\select2\Select2::class, [
+                'data' => ArrayHelper::map($adminFlorist, 'id', 'name_full'),
+                'language' => 'ru',
+                'options' => ['placeholder' => 'Сотрудник...'],
+                'pluginOptions' => [
+                    'allowClear' => true
+                ],
+            ])->label(false) ?>
+        </div>
+    </div>
+
     <div class="row mb-3">
         <div class="col-lg-2">
             <?= $searchForm->field($daysSearchForm, 'dateFrom', [
-- 
2.39.5