fix part 006

diff --git a/erp24/controllers/EmployeeSalesReportController.php b/erp24/controllers/EmployeeSalesReportController.php
index 7f6acbd1689334aa052203fd9127a95261436810..365e86d21c9db995993e096735c05f770b57c2fd 100644 (file)
--- a/erp24/controllers/EmployeeSalesReportController.php
+++ b/erp24/controllers/EmployeeSalesReportController.php
@@ -7,6 +7,7 @@ use yii\base\DynamicModel;
 use yii\helpers\ArrayHelper;
 use yii\web\Controller;
 use yii_app\records\Admin;
+use yii_app\records\AdminGroup;
 use yii_app\records\CityStore;
 use yii_app\records\ExportImportTable;
 use yii_app\records\Products1c;
@@ -109,15 +110,18 @@ class EmployeeSalesReportController extends Controller {
             'tip' => 'admin', 'id' => array_keys($paymentsPerAdmin)])->all();
         $productAdminNamePerGuid = ArrayHelper::map($productsAdmins, 'id', 'name');
 
-        $admins = Admin::find()->select(['id', 'name'])->where(['id' => $adminIds])->all();
+        $admins = Admin::find()->select(['id', 'name', 'group_id'])->where(['id' => $adminIds])
+//            ->andWhere(['!=', 'group_id', '-1'])
+            ->all();
+        $adminGroupIds = ArrayHelper::map($admins, 'id', 'group_id');
         $admins = ArrayHelper::map($admins, 'id', 'name');
+        $adminGroup = ArrayHelper::map(AdminGroup::find()->all(), 'id', 'name');
 
         usort($adminIds, function($a, $b) use ($adminGuidPerId, $paymentsPerAdmin, $model) {
             return ($model->sorting == 0 ? -1 : 1) * ($paymentsPerAdmin[$adminGuidPerId[$a]] - $paymentsPerAdmin[$adminGuidPerId[$b]]);
         });
 
-
         return $this->render('index', compact('model', 'clusters', 'stores', 'admins', 'adminIds',
-            'paymentsPerAdmin', 'timetable', 'adminGuidPerId', 'productAdminNamePerGuid'));
+            'paymentsPerAdmin', 'timetable', 'adminGuidPerId', 'adminGroupIds', 'productAdminNamePerGuid', 'adminGroup'));
     }
 }
\ No newline at end of file

diff --git a/erp24/views/employee-sales-report/index.php b/erp24/views/employee-sales-report/index.php
index 9c1c918876b081c9197063ec83564fa26687b286..35bb4bb3a55e01ec06c9052b5b242871be7d2bac 100644 (file)
--- a/erp24/views/employee-sales-report/index.php
+++ b/erp24/views/employee-sales-report/index.php
@@ -15,6 +15,8 @@ use dosamigos\datetimepicker\DateTimePicker;
 /** @var $timetable array */
 /** @var $adminGuidPerId array */
 /** @var $productAdminNamePerGuid array */
+/** @var $adminGroup array */
+/** @var $adminGroupIds array */
 
 ?>
 
@@ -64,7 +66,7 @@ use dosamigos\datetimepicker\DateTimePicker;
 
     <div class="row m-5"></div>
 
-    <div style="max-width: 480px">
+    <div style="max-width: 580px">
     <table id="employeePayments" class="row-border stripe">
         <thead>
             <tr>
@@ -72,6 +74,7 @@ use dosamigos\datetimepicker\DateTimePicker;
                 <th style="width: 100px; text-align: right">Продажи</th>
                 <th style="width: 200px; text-align: right">Среднее по продажам</th>
                 <th style="width: 200px; text-align: right">Количество смен</th>
+                <th style="width: 200px; text-align: right">Группа подработчика</th>
             </tr>
         </thead>
         <tbody>
@@ -81,6 +84,7 @@ use dosamigos\datetimepicker\DateTimePicker;
                 <td style="text-align: right;" data-sort="<?= $paymentsPerAdmin[$adminGuidPerId[$adminId]] ?>"><?= number_format($paymentsPerAdmin[$adminGuidPerId[$adminId]], 0, '', ' ') ?></td>
                 <td style="text-align: right;" data-sort="<?= isset($timetable[$adminId]['cnt']) ? $paymentsPerAdmin[$adminGuidPerId[$adminId]] / $timetable[$adminId]['cnt'] : 0 ?>"><?= isset($timetable[$adminId]['cnt']) ? number_format($paymentsPerAdmin[$adminGuidPerId[$adminId]] / $timetable[$adminId]['cnt'], 0, '',' ') : '<span style="color:red">смены не найдены</span>' ?></td>
                 <td style="text-align: right;" data-sort="<?= isset($timetable[$adminId]['cnt']) ? $timetable[$adminId]['cnt'] : 0 ?>"><?= isset($timetable[$adminId]['cnt']) ? $timetable[$adminId]['cnt'] : '<span style="color:red">смены не найдены</span>' ?></td>
+                <td style="text-align: right;"><?= $adminGroup[$adminGroupIds[$adminId]] ?? 'не найден' ?></td>
             </tr>
             <?php endforeach; ?>
         </tbody>