]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
чистка кода и убрал хлебные крошки
authorJoySystem_v <fvv2011@gmail.com>
Mon, 19 Aug 2024 18:05:53 +0000 (21:05 +0300)
committerJoySystem_v <fvv2011@gmail.com>
Mon, 19 Aug 2024 18:05:53 +0000 (21:05 +0300)
erp24/views/crud/employee-payment/_search.php
erp24/views/crud/employee-payment/index.php
erp24/views/crud/employee-payment/view.php
erp24/views/layouts/main.php

index 5709837b6ba03bf91a11cb01cee962c6826ecd0f..777992e2780fdd8eaf3165965559b3a8a36f3a53 100755 (executable)
@@ -19,9 +19,7 @@ use yii\widgets\ActiveForm;
         ],
     ]); ?>
     <div class="row">
-        <!--<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();
@@ -47,25 +45,20 @@ use yii\widgets\ActiveForm;
         </div>
     </div>
    <div class="row">
-        <div class="col-3">
+        <div class="col-4">
             <?= $form->field($model, 'date')->input('date') ?>
         </div>
-        <div class="col-3">
+        <div class="col-4">
             <?= $form->field($model, 'monthly_salary') ?>
         </div>
-        <div class="col-3">
+        <div class="col-4">
             <?= $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(), [
-                'prompt' => '---',
-            ]) */?>
-        </div>
+
     </div>
 
     <div class="form-group">
         <?= Html::submitButton('Найти', ['class' => 'btn btn-primary']) ?>
-       <?/*= Html::resetButton('Сбросить фильтры', ['class' => 'btn btn-outline-secondary']) */?>
         <?= Html::a('Сбросить фильтры', ['index'], ['class' => 'btn btn-outline-secondary']) ?>
     </div>
 
index 6c14cd1596b5aacad20a34119adc96f6c1e85823..7e7b41973fceeeb3c55f4fab299e735ff0fc2a42 100755 (executable)
@@ -23,7 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        //'filterModel' => $searchModel,
+
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
 
@@ -48,19 +48,19 @@ $this->params['breadcrumbs'][] = $this->title;
             'adminGroup.name:text:Должность',
            [
             'attribute' => 'date',
-            'format' => ['date', 'php:d.m.Y'], // Форматируем дату в формате dd.mm.yyyy
+            'format' => ['date', 'php:d.m.Y'],
             ],
             'monthly_salary',
             'daily_payment',
-          //  'creator.name:text:Создавший правило',
+
             [
                 'class' => ActionColumn::class,
-                'template' => '{view}', // Оставляем только кнопку "view"
+                'template' => '{view}',
                 'urlCreator' => function ($action, EmployeePayment $model, $key, $index, $column) {
                     if ($action === 'view') {
                         return Url::to(['employee-payment/view', 'id' => $model->admin_id]);
                     }
-                    return '#'; // на случай если как-то вызовется другое действие
+                    return '#';
                 }
             ],
         ],
index a414b150908645772f213211d647916572e0e7ae..35f7b5154ac1a0a990ac2f16a1dd65635793e968 100755 (executable)
@@ -11,7 +11,7 @@ use yii\widgets\DetailView;
 $this->title = $admin->name . ' - ' . $admin->adminGroup->name;
 $this->params['breadcrumbs'][] = ['label' => 'Оклады', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
-//var_dump($this->params['breadcrumbs']);
+
 ?>
 <div class="employee-payment-view p-4">
 
@@ -43,7 +43,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'creator.name:text:Правило создал',
             [
                 'class' => 'yii\grid\ActionColumn',
-                'template' => ' {update} {delete}', // Оставляем все действия
+                'template' => ' {update} {delete}',
                 'urlCreator' => function ($action, $model, $key, $index, $column) use ($admin) {
                     return [$action, 'id' => $model->id, 'admin_id' => $admin->id];
                 }
index 543798ad84022d4ba905d698b494e60495445591..c47e355329ff80cf59138f7445776645df73d9ed 100755 (executable)
@@ -62,9 +62,9 @@ use yii\widgets\Breadcrumbs;
                 </aside>
                 <div class="app-content main-content">
                     <?= $this->render('header.php'); ?>
-                    <?= Breadcrumbs::widget([
+                    <?/*= Breadcrumbs::widget([
                         'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
-                    ]) ?>
+                    ]) */?>
                     <?= $content ?>
                 </div>
             </div>