From: JoySystem_v <fvv2011@gmail.com>
Date: Fri, 16 Aug 2024 14:07:41 +0000 (+0300)
Subject: изменения основной таблицы и таблицы просмотра а так же методов создания и редактирования
X-Git-Tag: 1.5~20^2~22
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=046940c186825740054828bf6eb309e0c8b29f9c;p=erp24_rep%2Fyii-erp24%2F.git

изменения основной таблицы и таблицы просмотра а так же методов создания и редактирования
---

diff --git a/erp24/controllers/crud/EmployeePaymentController.php b/erp24/controllers/crud/EmployeePaymentController.php
index 082aed0a..7e384145 100755
--- a/erp24/controllers/crud/EmployeePaymentController.php
+++ b/erp24/controllers/crud/EmployeePaymentController.php
@@ -2,6 +2,8 @@
 
 namespace yii_app\controllers\crud;
 
+use yii\data\ActiveDataProvider;
+use yii_app\records\Admin;
 use yii_app\records\EmployeePayment;
 use yii_app\forms\EmployeePaymentSearch;
 use yii\web\Controller;
@@ -41,6 +43,8 @@ class EmployeePaymentController extends Controller
         $searchModel = new EmployeePaymentSearch();
         $dataProvider = $searchModel->search($this->request->queryParams);
 
+        $dataProvider->query->orderBy(['admin_id' => SORT_ASC]);
+
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
@@ -55,8 +59,21 @@ class EmployeePaymentController extends Controller
      */
     public function actionView($id)
     {
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => EmployeePayment::find()->where(['admin_id' => $id]),
+        ]);
+
+        // Получение данных сотрудника для заголовка
+        $admin = Admin::findOne($id);
+
+        if (!$admin) {
+            throw new NotFoundHttpException("Сотрудник не найден");
+        }
+
         return $this->render('view', [
-            'model' => $this->findModel($id),
+            'admin' => $admin,
+            'dataProvider' => $dataProvider,
         ]);
     }
 
@@ -65,13 +82,18 @@ class EmployeePaymentController extends Controller
      * If creation is successful, the browser will be redirected to the 'view' page.
      * @return string|\yii\web\Response
      */
-    public function actionCreate()
+    public function actionCreate($admin_id = null)
     {
         $model = new EmployeePayment();
 
+        // Если передан admin_id, устанавливаем его в модели
+        if ($admin_id !== null) {
+            $model->admin_id = $admin_id;
+        }
+
         if ($this->request->isPost) {
             if ($model->load($this->request->post()) && $model->save()) {
-                return $this->redirect(['index']);
+                return $this->redirect(['view', 'id' => $model->admin_id]);
             }
         } else {
             $model->loadDefaultValues();
@@ -95,7 +117,7 @@ class EmployeePaymentController extends Controller
         $model = $this->findModel($id);
 
         if ($this->request->isPost && $model->load($this->request->post()) && $model->save()) {
-            return $this->redirect(['index']);
+            return $this->redirect(['view', 'id' => $model->admin_id]);
         }
 
         return $this->render('update', [
@@ -112,9 +134,13 @@ class EmployeePaymentController extends Controller
      */
     public function actionDelete($id)
     {
-        $this->findModel($id)->delete();
+        $model = $this->findModel($id);
+        $admin_id = $model->admin_id;
+
+        $model->delete();
 
-        return $this->redirect(['index']);
+        // Редирект на страницу просмотра сотрудника после удаления записи
+        return $this->redirect(['view', 'id' => $admin_id]);
     }
 
     /**
diff --git a/erp24/forms/EmployeePaymentSearch.php b/erp24/forms/EmployeePaymentSearch.php
index 36e96c10..3d060873 100755
--- a/erp24/forms/EmployeePaymentSearch.php
+++ b/erp24/forms/EmployeePaymentSearch.php
@@ -41,10 +41,16 @@ class EmployeePaymentSearch extends EmployeePayment
      */
     public function search($params)
     {
-        $query = EmployeePayment::find();
+        $subQuery = EmployeePayment::find()
+            ->select(['MAX(id)'])
+            ->groupBy('admin_id');
+
+        $query = EmployeePayment::find()
+            ->where(['id' => $subQuery]);
 
         // add conditions that should always apply here
 
+
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
diff --git a/erp24/views/crud/employee-payment/_form.php b/erp24/views/crud/employee-payment/_form.php
index a7b816a7..72b239dc 100755
--- a/erp24/views/crud/employee-payment/_form.php
+++ b/erp24/views/crud/employee-payment/_form.php
@@ -22,7 +22,10 @@ use yii\widgets\ActiveForm;
     ?>
     <?= $form->field($model, 'admin_id')->widget(Select2::classname(), [
         'data' => $adminsList,
-        'options' => ['placeholder' => 'Select a state ...'],
+        'options' => [
+            'placeholder' => 'Выберите сотрудника...',
+            'value' => $model->admin_id,  // Устанавливаем значение по умолчанию
+        ],
         'pluginOptions' => [
             'allowClear' => true
         ],
@@ -33,6 +36,7 @@ use yii\widgets\ActiveForm;
 
     <div class="form-group">
         <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Назад', ['view', 'id' => $model->admin_id], ['class' => 'btn btn-danger']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/erp24/views/crud/employee-payment/_search.php b/erp24/views/crud/employee-payment/_search.php
index ac3f00cd..f214265b 100755
--- a/erp24/views/crud/employee-payment/_search.php
+++ b/erp24/views/crud/employee-payment/_search.php
@@ -19,9 +19,9 @@ use yii\widgets\ActiveForm;
         ],
     ]); ?>
     <div class="row">
-        <div class="col-4">
-            <?= $form->field($model, 'id') ?>
-        </div>
+        <!--<div class="col-4">
+            <?/*= $form->field($model, 'id') */?>
+        </div>-->
         <div class="col-4">
             <?php
             $adminsWithGroup = \yii_app\records\Admin::find()->select(['name', 'id'])->indexBy('id')->orderBy('name' , SORT_DESC)->all();
@@ -46,26 +46,27 @@ use yii\widgets\ActiveForm;
             ]) ?>
         </div>
     </div>
-    <div class="row">
+    <!--<div class="row">
         <div class="col-3">
-            <?= $form->field($model, 'date') ?>
+            <?/*= $form->field($model, 'date') */?>
         </div>
         <div class="col-3">
-            <?= $form->field($model, 'monthly_salary') ?>
+            <?/*= $form->field($model, 'monthly_salary') */?>
         </div>
         <div class="col-3">
-            <?= $form->field($model, 'daily_payment') ?>
+            <?/*= $form->field($model, 'daily_payment') */?>
         </div>
         <div class="col-3">
-            <?= $form->field($model, 'creator_id')->dropDownList(\yii_app\records\AdminGroup::find()->select(['name', 'id'])->indexBy('id')->column(), [
+            <?/*= $form->field($model, 'creator_id')->dropDownList(\yii_app\records\AdminGroup::find()->select(['name', 'id'])->indexBy('id')->column(), [
                 'prompt' => '---',
-            ]) ?>
+            ]) */?>
         </div>
-    </div>
+    </div>-->
 
     <div class="form-group">
         <?= Html::submitButton('Найти', ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton('Сбросить фильтры', ['class' => 'btn btn-outline-secondary']) ?>
+       <?/*= Html::resetButton('Сбросить фильтры', ['class' => 'btn btn-outline-secondary']) */?>
+        <?= Html::a('Сбросить фильтры', ['index'], ['class' => 'btn btn-outline-secondary']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/erp24/views/crud/employee-payment/create.php b/erp24/views/crud/employee-payment/create.php
index 6be5ea1f..f8bcc254 100755
--- a/erp24/views/crud/employee-payment/create.php
+++ b/erp24/views/crud/employee-payment/create.php
@@ -9,7 +9,7 @@ $this->title = 'Добавить запись оклада';
 $this->params['breadcrumbs'][] = ['label' => 'Оклады', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="employee-payment-create">
+<div class="employee-payment-create p-4">
 
     <h1><?= Html::encode($this->title) ?></h1>
 
diff --git a/erp24/views/crud/employee-payment/index.php b/erp24/views/crud/employee-payment/index.php
index 2c1d4872..d6c3a869 100755
--- a/erp24/views/crud/employee-payment/index.php
+++ b/erp24/views/crud/employee-payment/index.php
@@ -14,7 +14,7 @@ use yii_app\records\EmployeePayment;
 $this->title = 'Оклад и стоимость рабочего дня';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="employee-payment-index">
+<div class="employee-payment-index p-4">
 
     <h1><?= Html::encode($this->title) ?></h1>
 
@@ -32,7 +32,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 'label' => 'ID',
                 'format' => 'raw',
                 'value' => function($model) {
-                    return Html::a($model->id, ['employee-payment/view', 'id' => $model->admin_id]);
+                    return Html::a($model->admin_id, ['employee-payment/view', 'id' => $model->admin_id]);
                 }
             ],
             [
@@ -40,15 +40,15 @@ $this->params['breadcrumbs'][] = $this->title;
                 'label' => 'Сотрудник',
                 'format' => 'raw',
                 'value' => function($model) {
-                    return $model->admin ? Html::a(Html::encode($model->admin->name), ['employee/view', 'id' => $model->admin_id]) : null;
+                    return $model->admin ? Html::a(Html::encode($model->admin->name), ['employee-payment/view', 'id' => $model->admin_id]) : null;
                 }
             ],
 
             'adminGroup.name:text:Должность',
-            'date',
-            'monthly_salary',
-            'daily_payment',
-            'creator.name:text:Создавший правило',
+           // 'date',
+           // 'monthly_salary',
+           // 'daily_payment',
+          //  'creator.name:text:Создавший правило',
             [
                 'class' => ActionColumn::class,
                 'template' => '{view}', // Оставляем только кнопку "view"
@@ -64,6 +64,6 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?php Pjax::end(); ?>
 
-    <?php print_r($searchModel); ?>
+
 
 </div>
diff --git a/erp24/views/crud/employee-payment/update.php b/erp24/views/crud/employee-payment/update.php
index 9ac2bbfa..09eed9d4 100755
--- a/erp24/views/crud/employee-payment/update.php
+++ b/erp24/views/crud/employee-payment/update.php
@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = ['label' => 'Employee Payments', 'url' => ['ind
 $this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
 $this->params['breadcrumbs'][] = 'Update';
 ?>
-<div class="employee-payment-update">
+<div class="employee-payment-update p-4">
 
     <h1><?= Html::encode($this->title) ?></h1>
 
diff --git a/erp24/views/crud/employee-payment/view.php b/erp24/views/crud/employee-payment/view.php
index 77da5dbe..a414b150 100755
--- a/erp24/views/crud/employee-payment/view.php
+++ b/erp24/views/crud/employee-payment/view.php
@@ -1,46 +1,55 @@
 <?php
 
 use yii\helpers\Html;
+use yii\grid\GridView;
 use yii\widgets\DetailView;
 
 /* @var $this yii\web\View */
-/* @var $model yii_app\records\EmployeePayment */
+/* @var $admin yii_app\records\Admin */
+/* @var $dataProvider yii\data\ActiveDataProvider */
 
-$this->title = $model->id;
+$this->title = $admin->name . ' - ' . $admin->adminGroup->name;
 $this->params['breadcrumbs'][] = ['label' => 'Оклады', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
-\yii\web\YiiAsset::register($this);
+//var_dump($this->params['breadcrumbs']);
 ?>
-<div class="employee-payment-view">
+<div class="employee-payment-view p-4">
 
     <h1><?= Html::encode($this->title) ?></h1>
 
     <p>
-        <?= Html::a('Добавить запись', ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
-
-    <p>
-        <?= Html::a('Поменять', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a('Удалить', ['delete', 'id' => $model->id], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => 'Вы точно хотите удалить запись?',
-                'method' => 'post',
-            ],
-        ]) ?>
+        <?= Html::a('Добавить запись', ['create', 'admin_id' => $admin->id], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Назад', ['index'], ['class' => 'btn btn-danger']) ?>
     </p>
 
     <?= DetailView::widget([
-        'model' => $model,
+        'model' => $admin,
         'attributes' => [
-            'id',
-            'admin.name:text:Сотрудник',
+            'id:text:Admin ID',
+            'name:text:Сотрудник',
             'adminGroup.name:text:Должность',
+        ],
+    ]) ?>
+
+    <h2>Записи выплат</h2>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            'id',
             'date',
             'monthly_salary',
             'daily_payment',
             'creator.name:text:Правило создал',
+            [
+                'class' => 'yii\grid\ActionColumn',
+                'template' => ' {update} {delete}', // Оставляем все действия
+                'urlCreator' => function ($action, $model, $key, $index, $column) use ($admin) {
+                    return [$action, 'id' => $model->id, 'admin_id' => $admin->id];
+                }
+            ],
         ],
     ]) ?>
 
 </div>
+
diff --git a/erp24/views/layouts/main.php b/erp24/views/layouts/main.php
index 713d6421..543798ad 100755
--- a/erp24/views/layouts/main.php
+++ b/erp24/views/layouts/main.php
@@ -3,11 +3,17 @@
      * @var string $content rendered content
      * @var \yii\web\View $this
      */
-    global $_CONFIG;
+    global
+
+
+
+$_CONFIG;
 
 app\assets\CommonAsset::register($this);
 app\assets\CachemenutopAsset::register($this);
 app\assets\JQueryPluginsAsset::register($this); /** @TODO удалить после переписывания основного функционала */
+
+use yii\widgets\Breadcrumbs;
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html>
@@ -56,6 +62,9 @@ app\assets\JQueryPluginsAsset::register($this); /** @TODO удалить пос
                 </aside>
                 <div class="app-content main-content">
                     <?= $this->render('header.php'); ?>
+                    <?= Breadcrumbs::widget([
+                        'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+                    ]) ?>
                     <?= $content ?>
                 </div>
             </div>