From eefde26a2c21a0f6071c889b51db33453f984304 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Thu, 23 Jan 2025 17:22:18 +0300
Subject: [PATCH] =?utf8?q?ERP-282=20=D0=9D=D1=83=D0=B6=D0=BD=D0=BE=20?=
 =?utf8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D0=B8=D0=BD=D1=82?=
 =?utf8?q?=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=20=D0=BD=D0=B0=D1=81=D1=82?=
 =?utf8?q?=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BC=D0=B0=D0=B3=D0=B0=D0=B7?=
 =?utf8?q?=D0=B8=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/StoreTypeController.php     |  2 +-
 ...41638_add_new_column_city_store_params.php | 25 +++++++++++
 erp24/records/CityStoreParams.php             |  4 +-
 erp24/views/city-store-params/index.php       | 18 ++++----
 erp24/views/store-type/index.php              |  2 +-
 .../js/city-store-params/city-store-params.js | 42 +++++++++++++++++--
 6 files changed, 77 insertions(+), 16 deletions(-)
 create mode 100644 erp24/migrations/m250123_141638_add_new_column_city_store_params.php

diff --git a/erp24/controllers/StoreTypeController.php b/erp24/controllers/StoreTypeController.php
index 52249124..d4462f64 100644
--- a/erp24/controllers/StoreTypeController.php
+++ b/erp24/controllers/StoreTypeController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yii_app\controllers;
+namespace app\controllers;
 
 use Yii;
 use yii\web\Controller;
diff --git a/erp24/migrations/m250123_141638_add_new_column_city_store_params.php b/erp24/migrations/m250123_141638_add_new_column_city_store_params.php
new file mode 100644
index 00000000..40f16508
--- /dev/null
+++ b/erp24/migrations/m250123_141638_add_new_column_city_store_params.php
@@ -0,0 +1,25 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m250123_141638_add_new_column_city_store_params
+ */
+class m250123_141638_add_new_column_city_store_params extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn('city_store_params', 'bush_id', $this->integer()->comment('ID куста'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropColumn('city_store_params', 'bush_id');
+    }
+}
diff --git a/erp24/records/CityStoreParams.php b/erp24/records/CityStoreParams.php
index d57008d3..c6a1ba5f 100644
--- a/erp24/records/CityStoreParams.php
+++ b/erp24/records/CityStoreParams.php
@@ -29,6 +29,7 @@ use yii\filters\VerbFilter;
  * @property string $created_at
  * @property int|null $updated_by
  * @property string|null $updated_at
+ * @property int $bush_id
  */
 class CityStoreParams extends ActiveRecord
 {
@@ -64,7 +65,7 @@ class CityStoreParams extends ActiveRecord
     {
         return [
             [['store_id'], 'required'],
-            [['store_id', 'stores_type', 'territorial_manager', 'bush_chef_florist', 'created_by', 'updated_by'], 'integer'],
+            [['store_id', 'stores_type', 'territorial_manager', 'bush_chef_florist', 'created_by', 'updated_by', 'bush_id'], 'integer'],
             [['store_area', 'showcase_volume', 'freeze_area', 'freeze_volume'], 'number'],
             [['created_at', 'updated_at'], 'safe'],
             [['address_city', 'address_region', 'address_district', 'matrix_type'], 'string'],
@@ -90,6 +91,7 @@ class CityStoreParams extends ActiveRecord
             'freeze_area' => 'Площадь холодильника',
             'freeze_volume' => 'Объем холодильника',
             'matrix_type' => 'Тип матрицы',
+            'bush_id' => 'ИД куста',
             'created_by' => 'ИД создателя',
             'created_at' => 'Дата создания',
             'updated_by' => 'ИД редактировавшего',
diff --git a/erp24/views/city-store-params/index.php b/erp24/views/city-store-params/index.php
index a92efd2f..fc19d56b 100644
--- a/erp24/views/city-store-params/index.php
+++ b/erp24/views/city-store-params/index.php
@@ -53,7 +53,7 @@ $this->registerJsFile('/js/city-store-params/city-store-params.js', ['position'
                     ArrayHelper::map(StoreType::find()->all(), 'id', 'name'),
                     ['prompt' => 'Выберите тип магазина', 'class' => 'form-select', 'id' => 'store_type']);
                 ?>
-                <?= Html::a('Редактировать', [\yii\helpers\Url::to('/store_type')], ['class' => 'd-block mt-2 text-decoration-none']); ?>
+                <?= Html::a('Редактировать', [\yii\helpers\Url::to('/store-type')], ['class' => 'd-block mt-2 text-decoration-none']); ?>
             </div>
         </div>
         <div class="col-md-2 border-end border-2">
@@ -100,7 +100,7 @@ $this->registerJsFile('/js/city-store-params/city-store-params.js', ['position'
         <div class="col-md-9">
             <div class="form-group">
                 <div class="row">
-                    <div class="col-md-3 d-flex align-items-center gap-3">
+                    <div class="col-md-4 d-flex align-items-center gap-3">
                         <?= Html::hiddenInput('CityStoreParams[id]') ?>
                         <?= Html::hiddenInput('CityStoreParams[store_id]') ?>
                         <?= Html::hiddenInput('CityStoreParams[territorial_manager]') ?>
@@ -108,10 +108,11 @@ $this->registerJsFile('/js/city-store-params/city-store-params.js', ['position'
                         <?= Html::tag('span', null, ['id' => 'store-name', 'class' => 'h5']); ?>
                     </div>
                     <div class="col-md-4">
-                        <?= Html::dropDownList('CityStoreParams[store_type]', null,
-                            ArrayHelper::map(StoreType::find()->all(), 'id', 'name'),
-                            ['prompt' => 'Тип магазина', 'class' => 'form-select', 'id' => 'store-type']); ?>
-                        <?= Html::a('Редактировать', [\yii\helpers\Url::to('/store_type')], ['class' => 'd-block mt-2 text-decoration-none']); ?>
+                        <?= Html::dropDownList('CityStoreParams[store_type]', null, [], ['prompt' => 'Тип магазина', 'class' => 'form-select', 'id' => 'store-type']); ?>
+                        <?= Html::a('Редактировать', [Url::to('/store-type')], ['class' => 'd-block mt-2 text-decoration-none']); ?>
+                    </div>
+                    <div class="col-md-3">
+                        <?= Html::dropDownList('CityStoreParams[bush_id]', null, [], ['prompt' => 'Номер куста', 'class' => 'form-select', 'id' => 'store-type']); ?>
                     </div>
                 </div>
                 <div class="row">
@@ -134,7 +135,7 @@ $this->registerJsFile('/js/city-store-params/city-store-params.js', ['position'
                 <div class="row">
                     <div class="col-md-2">
                         <?= Html::label('Территориально управляющий', null); ?>
-                        <?= Html::a('Редактировать', [Url::to('/store_type')], ['class' => 'd-block mb-5 text-decoration-none']); ?>
+                        <?= Html::a('Редактировать', [Url::to('/crud/cluster-admin/')], ['class' => 'd-block mb-5 text-decoration-none']); ?>
                     </div>
                     <div class="col-md-9">
                         <?= Html::tag('span', null, ['id' => 'territorial-manager', 'class' => 'h5']); ?>
@@ -143,7 +144,6 @@ $this->registerJsFile('/js/city-store-params/city-store-params.js', ['position'
                 <div class="row border-bottom">
                     <div class="col-md-2">
                         <?= Html::label('КШФ') ?>
-                        <?= Html::a('Редактировать', [Url::to('/store_type')], ['class' => 'd-block mb-5 text-decoration-none']); ?>
                     </div>
                     <div class="col-md-9">
                         <?= Html::dropDownList('CityStoreParams[bush_chef_florist]', null, [], ['prompt' => 'Кустовой шеф-флорист', 'class' => 'form-select', 'id' => 'bush-chef-florist']); ?>
@@ -184,7 +184,7 @@ $this->registerJsFile('/js/city-store-params/city-store-params.js', ['position'
                         <div class="container mt-5">
                             <?= DualListbox::widget([
                                 'name' => 'CityStoreParams[matrix_type]',
-                                'items' => ArrayHelper::map(MatrixType::find()->all(), 'id', 'name'),
+                                'items' => [],
                                 'options' => [
                                     'size' => false
                                 ],
diff --git a/erp24/views/store-type/index.php b/erp24/views/store-type/index.php
index 43c91e1e..009b8595 100644
--- a/erp24/views/store-type/index.php
+++ b/erp24/views/store-type/index.php
@@ -1,7 +1,7 @@
 <?php
 
+use kartik\grid\GridView;
 use yii\helpers\Html;
-use yii\widgets\GridView;
 
 /* @var $this yii\web\View */
 /* @var $storeTypes yii_app\records\StoreType[] */
diff --git a/erp24/web/js/city-store-params/city-store-params.js b/erp24/web/js/city-store-params/city-store-params.js
index cb246fea..df5ec9c9 100644
--- a/erp24/web/js/city-store-params/city-store-params.js
+++ b/erp24/web/js/city-store-params/city-store-params.js
@@ -43,16 +43,14 @@ function getData() {
         success: function (response) {
             var data = response.data;
 
+            // Заполнение других полей
             $('#store-area').val(data.storeArea);
             $('#showcase-volume').val(data.showcaseVolume);
             $('#freeze-area').val(data.freezeArea);
             $('#freeze-volume').val(data.freezeVolume);
-
             $('#store-name').text(data.name);
-
             $('#territorial-manager').text(data.territorialManagerId ? getNameFromArray(data.territorialManagerId, data.bushChefFloristArray) : '');
             $('#bush-chef-florist').text(data.bushChefFloristId ? getNameFromArray(data.bushChefFloristId, data.bushChefFloristArray) : '');
-
             $('input[name="CityStoreParams[id]"]').val(data.id);
             $('input[name="CityStoreParams[store_id]"]').val(data.storeId);
             $('input[name="CityStoreParams[territorial_manager]"]').val(data.territorialManagerId);
@@ -68,7 +66,9 @@ function getData() {
             populateSelect('#city', data.cityArray, data.city);
             populateSelect('#district', data.districtArray, data.district);
             populateSelect('#bush-chef-florist', data.bushChefFloristArray, data.bushChefFloristId);
-            populateSelect('#matrix-type', data.matrixTypeArray);
+
+            // Заполнение DualListbox
+            populateDualListbox(data.matrixTypeArray, data.matrixType); // matrixTypeArray и matrixType передаются с сервера
         },
         error: function (xhr, status, error) {
             console.error("Ошибка AJAX: " + error);
@@ -101,3 +101,37 @@ function populateSelect(selector, values, selectedValue = null) {
         select.val(selectedValue);
     }
 }
+
+// Функция для заполнения DualListbox
+function populateDualListbox(matrixTypeArray, selectedValues) {
+    var $nonSelectedList = $('#bootstrap-duallistbox-nonselected-list_CityStoreParams\\[matrix_type\\]');
+    var $selectedList = $('#bootstrap-duallistbox-selected-list_CityStoreParams\\[matrix_type\\]');
+
+    console.log("Matrix Type Array:", matrixTypeArray); // Отладка
+    console.log("Selected Values:", selectedValues); // Отладка
+
+    // Очистить оба списка
+    $nonSelectedList.empty();
+    $selectedList.empty();
+
+    // Заполняем список невыбранных значений (non-selected list)
+    $.each(matrixTypeArray, function (key, value) {
+        $nonSelectedList.append('<option value="' + key + '">' + value + '</option>');
+    });
+
+    // Если есть выбранные значения, добавляем их в список выбранных (selected list)
+    if (selectedValues && selectedValues.length > 0) {
+        selectedValues.forEach(function (selectedId) {
+            $selectedList.append('<option value="' + selectedId + '">' + matrixTypeArray[selectedId] + '</option>');
+        });
+    }
+
+    // Обновляем состояние виджета, вызываем trigger и возможно init для перерисовки
+    $nonSelectedList.trigger('change');
+    $selectedList.trigger('change');
+
+    // Повторно инициализируем виджет DualListbox, если это необходимо
+    if (typeof $('#matrix-type').bootstrapDualListbox === 'function') {
+        $('#matrix-type').bootstrapDualListbox('refresh'); // или аналогичная функция обновления
+    }
+}
-- 
2.39.5