accesses new

2020-01-21 17:33:07 +03:00
parent 188758c79c
commit 6880eaa2ba
20 changed files with 575 additions and 98 deletions
--- a/backend/modules/accesses/models/AccessesSearch.php
+++ b/backend/modules/accesses/models/AccessesSearch.php
@ -18,7 +18,7 @@ class AccessesSearch extends Accesses
    {
        return [
            [['id'], 'integer'],
-            [['name', 'access'], 'safe'],
+            [['name', 'login', 'password', 'link', 'project', 'info'], 'safe'],
        ];
    }

@ -62,7 +62,11 @@ class AccessesSearch extends Accesses
        ]);

        $query->andFilterWhere(['like', 'name', $this->name])
-            ->andFilterWhere(['like', 'access', $this->access]);
+            ->andFilterWhere(['like', 'login', $this->login])
+            ->andFilterWhere(['like', 'password', $this->password])
+            ->andFilterWhere(['like', 'link', $this->link])
+            ->andFilterWhere(['like', 'project', $this->project])
+            ->andFilterWhere(['like', 'info', $this->info]);

        return $dataProvider;
    }
--- a/backend/modules/accesses/views/accesses/_form.php
+++ b/backend/modules/accesses/views/accesses/_form.php
@ -18,28 +18,38 @@ use kartik\select2\Select2;

    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>

-    <?= $form->field($model, 'access')->textarea(['maxlength' => true]) ?>
+    <?= $form->field($model, 'login')->textInput(['maxlength' => true]) ?>

-    <div class="row">
-        <div class="col-xs-12">
-            <?= Select2::widget(
-                [
-                    'model' => $model,
-                    'attribute' => '_projects',
-                    'data' => \yii\helpers\ArrayHelper::map(\common\models\Project::find()->all(), 'id', 'name'),
-                    'options' => ['placeholder' => '...', 'class' => 'form-control', 'multiple' => true],
-                    'pluginOptions' => [
-                        'allowClear' => true
-                    ],
-                ]
-            ) ?>
-        </div>
-    </div>
+    <?= $form->field($model, 'password')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'link')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'project')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'info')->textarea(['maxlength' => true]) ?>
+
+<!--    <div class="row">-->
+<!--        <div class="col-xs-12">-->
+<!--            --><?php
+    // echo Select2::widget(
+//                [
+//                    'model' => $model,
+//                    'attribute' => '_projects',
+//                    'data' => \yii\helpers\ArrayHelper::map(\common\models\Project::find()->all(), 'id', 'name'),
+//                    'options' => ['placeholder' => '...', 'class' => 'form-control', 'multiple' => true],
+//                    'pluginOptions' => [
+//                        'allowClear' => true
+//                    ],
+//                ]
+//            ) ?>
+<!--        </div>-->
+<!--    </div>-->

    <div class="row">
        <div class="col-xs-12">
            <text>Пользователи</text>
-            <?= Select2::widget(
+            <?php
+                echo Select2::widget(
                [
                    'model'=> $model,
                    'attribute' => '_users',
@ -48,13 +58,12 @@ use kartik\select2\Select2;
                    'pluginOptions' => [
                        'allowClear' => true
                    ],
-                ]
-            ) ?>
+                ]); ?>
        </div>
    </div>

    <div class="form-group">
-        <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
+        <?= '<br>' . Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
    </div>

    <?php ActiveForm::end(); ?>
--- a/backend/modules/accesses/views/accesses/_search.php
+++ b/backend/modules/accesses/views/accesses/_search.php
@ -19,8 +19,6 @@ use yii\widgets\ActiveForm;

    <?= $form->field($model, 'name') ?>

-    <?= $form->field($model, 'access') ?>
-
    <div class="form-group">
        <?= Html::submitButton('Поиск', ['class' => 'btn btn-primary']) ?>
        <?= Html::resetButton('Сброс', ['class' => 'btn btn-default']) ?>
--- a/backend/modules/accesses/views/accesses/index.php
+++ b/backend/modules/accesses/views/accesses/index.php
@ -24,10 +24,11 @@ $this->params['breadcrumbs'][] = $this->title;
        'filterModel' => $searchModel,
        'columns' => [
            ['class' => 'yii\grid\SerialColumn'],
-
-
            'name',
-            'access',
+            'login',
+            'password',
+            'link',
+            'project',
            [
                'attribute' => 'userCard.fio',
                'format' => 'raw',
@ -35,15 +36,13 @@ $this->params['breadcrumbs'][] = $this->title;
                    return $model->getUserCardName();
                },
            ],
-
-            [
-                'attribute' => 'projects.name',
-                'format' => 'raw',
-                'value' => function(\common\models\Accesses $model){
-                    return $model->getProjectName();
-                },
-            ],
-
+//            [
+//                'attribute' => 'projects.name',
+//                'format' => 'raw',
+//                'value' => function(\common\models\Accesses $model){
+//                    return $model->getProjectName();
+//                },
+//            ],
            ['class' => 'yii\grid\ActionColumn'],
        ],
    ]); ?>
--- a/backend/modules/accesses/views/accesses/view.php
+++ b/backend/modules/accesses/views/accesses/view.php
@ -30,21 +30,25 @@ $this->params['breadcrumbs'][] = $this->title;
        'model' => $model,
        'attributes' => [
            'name',
-            'access',
-            [
-                'attribute' => 'userCard.fio',
-                'format' => 'raw',
-                'value' => function(\common\models\Accesses $model){
-                    return $model->getUserCardName();
-                },
-            ],
-            [
-                'attribute' => 'projects.name',
-                'format' => 'raw',
-                'value' => function(\common\models\Accesses $model){
-                    return $model->getProjectName();
-                },
-            ],
+            'login',
+            'password',
+            'link',
+            'project',
+            'info',
+//            [
+//                'attribute' => 'userCard.fio',
+//                'format' => 'raw',
+//                'value' => function(\common\models\Accesses $model){
+//                    return $model->getUserCardName();
+//                },
+//            ],
+//            [
+//                'attribute' => 'projects.name',
+//                'format' => 'raw',
+//                'value' => function(\common\models\Accesses $model){
+//                    return $model->getProjectName();
+//                },
+//            ],
        ],
    ]) ?>

--- a/backend/modules/calendar/views/calendar/index.php
+++ b/backend/modules/calendar/views/calendar/index.php
@ -1,24 +1,3 @@
-<div class="calendar-default-index">
-
-    <p>
-        <select id="options" class="btn btn-secondary dropdown-toggle">
-            <option selected="selected">Выберите месяц</option>
-            <option value="?month=00">Показать все</option>
-            <option value="?month=01">январь</option>
-            <option value="?month=02">февраль</option>
-            <option value="?month=03">март</option>
-            <option value="?month=04">апрель</option>
-            <option value="?month=05">май</option>
-            <option value="?month=06">июнь</option>
-            <option value="?month=07">июль</option>
-            <option value="?month=08">август</option>
-            <option value="?month=09">сентябрь</option>
-            <option value="?month=10">октябрь</option>
-            <option value="?month=11">ноябрь</option>
-            <option value="?month=12">декабрь</option>
-        </select>
-    </p>
-
 <?php

 /* @var $searchModel backend\modules\card\models\UserCardSearch */
@ -26,7 +5,28 @@

 use yii\grid\GridView;
 use yii\widgets\Pjax;
+?>

+<p>
+    <select id="options" class="btn btn-secondary dropdown-toggle">
+        <option selected="selected" value="?month=00">Выберите месяц</option>
+        <option value="?month=00">Показать все</option>
+        <option value="?month=01">январь</option>
+        <option value="?month=02">февраль</option>
+        <option value="?month=03">март</option>
+        <option value="?month=04">апрель</option>
+        <option value="?month=05">май</option>
+        <option value="?month=06">июнь</option>
+        <option value="?month=07">июль</option>
+        <option value="?month=08">август</option>
+        <option value="?month=09">сентябрь</option>
+        <option value="?month=10">октябрь</option>
+        <option value="?month=11">ноябрь</option>
+        <option value="?month=12">декабрь</option>
+    </select>
+</p>
+
+<?php
 Pjax::begin(['id' => 'reload']);
 echo GridView::widget([
    'dataProvider' => $dataProvider,
--- a/backend/modules/card/models/UserCard.php
+++ b/backend/modules/card/models/UserCard.php
@ -121,7 +121,7 @@ class UserCard extends \common\models\UserCard
        $user->save();

        $log = "Логин: " . $email . " Пароль: " . $password . " | ";
-        //file_put_contents("log.txt", $log, FILE_APPEND | LOCK_EX);
+        file_put_contents("log.txt", $log, FILE_APPEND | LOCK_EX);

        return $user->id;
    }