[ERP-250] вкладка с историей

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index 48e37a95f75f022b461dae6ba07e1ce9282c12ba..581cba9755570fb9a282cafdc65f012c8292dacf 100644 (file)
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -71,7 +71,7 @@ class UsersMessageManagementController extends Controller
 
         $model = DynamicModel::validateData([
             'date_from' => date('Y-m-d H:i:s', strtotime('-1 week', time())),
-            'date_to' => date('Y-m-d H:i:s'),
+            'date_to' => date('Y-m-d 23:59:59'),
             'field_name' => null,
             'value' => null,
             'created_by' => null,
@@ -99,9 +99,7 @@ class UsersMessageManagementController extends Controller
 
         $dataProvider = new ActiveDataProvider(['query' => $query]);
 
-        $log = new UsersMessageManagementLogs;
-        $keys = array_keys($log->getAttributes());
-        $fieldNames = array_merge([null => '__Любые__'], array_combine($keys, $keys));
+        $fieldNames = array_merge([null => '__Любые__'], (new UsersMessageManagement)->attributeLabels());
 
         $adminArr = [];
         $adminArrOther = [];

diff --git a/erp24/records/UsersMessageManagement.php b/erp24/records/UsersMessageManagement.php
index fa4ad87bf52a5bd8d6a621f07007eca4d664468a..29bdc1f6131a50e280ccad99e45079bd244eb5a5 100644 (file)
--- a/erp24/records/UsersMessageManagement.php
+++ b/erp24/records/UsersMessageManagement.php
@@ -76,16 +76,16 @@ class UsersMessageManagement extends \yii\db\ActiveRecord
             'offer_whatsapp' => 'Whatsapp',
             'offer_text' => 'Таргет',
             'date_last_scenario' => 'Дата последнего сценария',
-            'created_at' => 'Created At',
-            'created_by' => 'Created By',
-            'updated_at' => 'Updated At',
-            'updated_by' => 'Updated By',
-            'hold' => 'Hold',
-            'hold_active' => 'Hold Active',
-            'day_before_step1_active' => 'Day Before Step1 Active',
-            'day_before_step2_active' => 'Day Before Step2 Active',
-            'day_before_step3_active' => 'Day Before Step3 Active',
-            'active' => 'Active',
+            'created_at' => 'Дата создания',
+            'created_by' => 'Кем создан',
+            'updated_at' => 'Дата обновления',
+            'updated_by' => 'Кем обновлён',
+            'hold' => 'HOLD клиента',
+            'hold_active' => 'HOLD клиента активность',
+            'day_before_step1_active' => 'Дней до шага 1 активность',
+            'day_before_step2_active' => 'Дней до шага 2 активность',
+            'day_before_step3_active' => 'Дней до шага 3 активность',
+            'active' => 'Активность рассылки',
         ];
     }
 }

diff --git a/erp24/views/users-message-management/index.php b/erp24/views/users-message-management/index.php
index 3489ffb3010b13506b6b9d60b5d112ea734bb81f..42e1d6a38a58740722bda10dd36a062907447414 100644 (file)
--- a/erp24/views/users-message-management/index.php
+++ b/erp24/views/users-message-management/index.php
@@ -5,6 +5,7 @@ use yii\widgets\ActiveForm;
 
 use dosamigos\datetimepicker\DateTimePicker;
 
+use yii_app\records\Admin;
 use yii_app\records\UsersMessageManagement;
 
 /* @var $model UsersMessageManagement */
@@ -45,6 +46,12 @@ $this->registerCss('
         <li class="nav-item1">
             <a class="nav-link text-primary" id="unloadingTabAnchor" href="javascript:showTab('unloadingTab');">Выгрузки</a>
         </li>
+        <?php $admin = Admin::findOne(['id' => Yii::$app->user->id]); ?>
+        <?php if ($admin->group_id == \yii_app\records\AdminGroup::GROUP_IT): ?>
+            <li class="nav-item1">
+                <a class="nav-link text-primary" href="/users-message-management/logs" target="_blank">История изменений</a>
+            </li>
+        <?php endif; ?>
     </ul>
 
     <div class="card">

diff --git a/erp24/views/users-message-management/logs.php b/erp24/views/users-message-management/logs.php
index c85019584af949d4b26af198b15dcb2424b1fb91..4a365f3a6fa60f96592193a955f1e40803a01bd9 100644 (file)
--- a/erp24/views/users-message-management/logs.php
+++ b/erp24/views/users-message-management/logs.php
@@ -83,7 +83,13 @@ use dosamigos\datetimepicker\DateTimePicker;
                 'dataProvider' => $dataProvider,
                 'columns' => [
                     'id',
-                    'field_name',
+                    [
+                        'attribute' => 'field_name',
+                        'label' => 'Название поля',
+                        'value' => function ($model) {
+                            return (new \yii_app\records\UsersMessageManagement)->attributeLabels()[$model->field_name] ?? '';
+                        },
+                    ],
                     'value_old',
                     'value_new',
                     'created_at',
@@ -91,7 +97,7 @@ use dosamigos\datetimepicker\DateTimePicker;
                         'attribute' => 'created_by',
                         'label' => 'Создано',
                         'value' => function ($model) {
-                            return ($model->admin->name ?? '') . ' #' . $model->created_by;
+                            return ($model->admin->name ?? '');
                         }
                     ],
                 ]