From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 3 Sep 2024 08:45:23 +0000 (+0300)
Subject: добавил поле поиска
X-Git-Tag: 1.5~26^2~8
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=3532ac64dbf6d7c271df329c7e7e7be20e9ae58d;p=erp24_rep%2Fyii-erp24%2F.git

добавил поле поиска
---

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', [