From 99610c4b69de42e68e09f659a11adf167f30890a Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Mon, 27 Jan 2020 12:10:11 +0300
Subject: [PATCH 1/5] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D1=8F=D0=BA=20=D1=81=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commands/AddAdminController.php | 33 +++++++++++++++++++++++++++++++++
 models/CreateUser.php           |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 commands/AddAdminController.php

diff --git a/commands/AddAdminController.php b/commands/AddAdminController.php
new file mode 100644
index 0000000..0c694cb
--- /dev/null
+++ b/commands/AddAdminController.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace app\commands;
+
+use app\models\CreateUser;
+use app\models\Users;
+use yii\console\Controller;
+use yii\console\ExitCode;
+
+
+class AddAdminController extends Controller
+{
+  public function actionIndex()
+  {
+    $user = new Users();
+    $user->email = 'admin@admin.ad';
+    $user->username = 'admin';
+    $user->setPassword('PMU8nrOr');
+    if ($user->save()) {
+      echo 'admin created' . PHP_EOL;
+    }
+    $this->addRole($user->id);
+  }
+
+  private function addRole($id)
+  {
+   $am = \Yii::$app->authManager;
+   $role = $am->getRole('admin');
+   if($am->assign($role, $id)){
+     echo 'role assigned' . PHP_EOL;
+   };
+  }
+}
diff --git a/models/CreateUser.php b/models/CreateUser.php
index 0736e3b..109ee3d 100644
--- a/models/CreateUser.php
+++ b/models/CreateUser.php
@@ -55,6 +55,7 @@ class CreateUser extends Model
         }
         $user = new Users();
         $user->username = $this->username;
+        $user->isAdmin = $this->isAdmin;
         $user->email = $this->email;
         $user->object_id = $this->object_id;
         $user->setPassword($this->password);
-- 
GitLab


From 13a2063d3cfa79108f3e1e38cab31a44d08f5922 Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Thu, 30 Jan 2020 18:30:57 +0300
Subject: [PATCH 2/5] sdfsdf

---
 config/web.php                                |   1 +
 .../gii/templates/crud/simple/controller.php  | 176 ++++++++++++++++++
 .../gii/templates/crud/simple/search.php      |  87 +++++++++
 .../gii/templates/crud/simple/views/_form.php |  47 +++++
 .../templates/crud/simple/views/_search.php   |  49 +++++
 .../templates/crud/simple/views/create.php    |  29 +++
 .../gii/templates/crud/simple/views/index.php |  78 ++++++++
 .../templates/crud/simple/views/update.php    |  31 +++
 .../gii/templates/crud/simple/views/view.php  |  55 ++++++
 ...127_141526_create_transport_hubs_table.php |  28 +++
 ...200130_150251_add_superadmin_user_role.php |  30 +++
 .../m200130_151014_alter_users_table.php      |  26 +++
 models/CreateUser.php                         |   7 +-
 models/TransportHubs.php                      |  44 +++++
 models/TransportHubsSearch.php                |  70 +++++++
 models/User.php                               |   1 +
 models/Users.php                              |  24 ++-
 .../controllers/TransportHubsController.php   | 124 ++++++++++++
 .../views/transport-hubs/_form.php            |  27 +++
 .../views/transport-hubs/_search.php          |  29 +++
 .../views/transport-hubs/create.php           |  19 ++
 .../views/transport-hubs/index.php            |  31 +++
 .../views/transport-hubs/update.php           |  20 ++
 .../views/transport-hubs/view.php             |  34 ++++
 views/layouts/left.php                        |  38 ++--
 25 files changed, 1084 insertions(+), 21 deletions(-)
 create mode 100644 generators/gii/templates/crud/simple/controller.php
 create mode 100644 generators/gii/templates/crud/simple/search.php
 create mode 100644 generators/gii/templates/crud/simple/views/_form.php
 create mode 100644 generators/gii/templates/crud/simple/views/_search.php
 create mode 100644 generators/gii/templates/crud/simple/views/create.php
 create mode 100644 generators/gii/templates/crud/simple/views/index.php
 create mode 100644 generators/gii/templates/crud/simple/views/update.php
 create mode 100644 generators/gii/templates/crud/simple/views/view.php
 create mode 100644 migrations/m200127_141526_create_transport_hubs_table.php
 create mode 100644 migrations/m200130_150251_add_superadmin_user_role.php
 create mode 100644 migrations/m200130_151014_alter_users_table.php
 create mode 100644 models/TransportHubs.php
 create mode 100644 models/TransportHubsSearch.php
 create mode 100644 modules/administrator/controllers/TransportHubsController.php
 create mode 100644 modules/administrator/views/transport-hubs/_form.php
 create mode 100644 modules/administrator/views/transport-hubs/_search.php
 create mode 100644 modules/administrator/views/transport-hubs/create.php
 create mode 100644 modules/administrator/views/transport-hubs/index.php
 create mode 100644 modules/administrator/views/transport-hubs/update.php
 create mode 100644 modules/administrator/views/transport-hubs/view.php

diff --git a/config/web.php b/config/web.php
index 7e69def..2f2b59b 100644
--- a/config/web.php
+++ b/config/web.php
@@ -109,6 +109,7 @@ if (YII_ENV_DEV) {
         'class' => 'yii\gii\generators\crud\Generator',
         'templates' => [
           'adminlte' => '@vendor/dmstr/yii2-adminlte-asset/gii/templates/crud/simple',
+          'adminlteRus' => '@app/generators/gii/templates/crud/simple',
         ]
       ]
     ],
diff --git a/generators/gii/templates/crud/simple/controller.php b/generators/gii/templates/crud/simple/controller.php
new file mode 100644
index 0000000..cd5572b
--- /dev/null
+++ b/generators/gii/templates/crud/simple/controller.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * This is the template for generating a CRUD controller class file.
+ */
+
+use yii\db\ActiveRecordInterface;
+use yii\helpers\StringHelper;
+
+
+/* @var $this yii\web\View */
+/* @var $generator yii\gii\generators\crud\Generator */
+
+$controllerClass = StringHelper::basename($generator->controllerClass);
+$modelClass = StringHelper::basename($generator->modelClass);
+$searchModelClass = StringHelper::basename($generator->searchModelClass);
+if ($modelClass === $searchModelClass) {
+    $searchModelAlias = $searchModelClass . 'Search';
+}
+
+/* @var $class ActiveRecordInterface */
+$class = $generator->modelClass;
+$pks = $class::primaryKey();
+$urlParams = $generator->generateUrlParams();
+$actionParams = $generator->generateActionParams();
+$actionParamComments = $generator->generateActionParamComments();
+
+echo "<?php\n";
+?>
+
+namespace <?= StringHelper::dirname(ltrim($generator->controllerClass, '\\')) ?>;
+
+use Yii;
+use <?= ltrim($generator->modelClass, '\\') ?>;
+<?php if (!empty($generator->searchModelClass)): ?>
+use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
+<?php else: ?>
+use yii\data\ActiveDataProvider;
+<?php endif; ?>
+use <?= ltrim($generator->baseControllerClass, '\\') ?>;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * <?= $controllerClass ?> implements the CRUD actions for <?= $modelClass ?> model.
+ */
+class <?= $controllerClass ?> extends <?= StringHelper::basename($generator->baseControllerClass) . "\n" ?>
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all <?= $modelClass ?> models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+<?php if (!empty($generator->searchModelClass)): ?>
+        $searchModel = new <?= isset($searchModelAlias) ? $searchModelAlias : $searchModelClass ?>();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+<?php else: ?>
+        $dataProvider = new ActiveDataProvider([
+            'query' => <?= $modelClass ?>::find(),
+        ]);
+
+        return $this->render('index', [
+            'dataProvider' => $dataProvider,
+        ]);
+<?php endif; ?>
+    }
+
+    /**
+     * Displays a single <?= $modelClass ?> model.
+     * <?= implode("\n     * ", $actionParamComments) . "\n" ?>
+     * @return mixed
+     */
+    public function actionView(<?= $actionParams ?>)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel(<?= $actionParams ?>),
+        ]);
+    }
+
+    /**
+     * Creates a new <?= $modelClass ?> model.
+     * If creation is successful, the browser will be redirected to the 'index' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new <?= $modelClass ?>();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['index']);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing <?= $modelClass ?> model.
+     * If update is successful, the browser will be redirected to the 'index' page.
+     * <?= implode("\n     * ", $actionParamComments) . "\n" ?>
+     * @return mixed
+     */
+    public function actionUpdate(<?= $actionParams ?>)
+    {
+        $model = $this->findModel(<?= $actionParams ?>);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['index']);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing <?= $modelClass ?> model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * <?= implode("\n     * ", $actionParamComments) . "\n" ?>
+     * @return mixed
+     */
+    public function actionDelete(<?= $actionParams ?>)
+    {
+        $this->findModel(<?= $actionParams ?>)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the <?= $modelClass ?> model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * <?= implode("\n     * ", $actionParamComments) . "\n" ?>
+     * @return <?=                   $modelClass ?> the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel(<?= $actionParams ?>)
+    {
+<?php
+if (count($pks) === 1) {
+    $condition = '$id';
+} else {
+    $condition = [];
+    foreach ($pks as $pk) {
+        $condition[] = "'$pk' => \$$pk";
+    }
+    $condition = '[' . implode(', ', $condition) . ']';
+}
+?>
+        if (($model = <?= $modelClass ?>::findOne(<?= $condition ?>)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/generators/gii/templates/crud/simple/search.php b/generators/gii/templates/crud/simple/search.php
new file mode 100644
index 0000000..248a9d6
--- /dev/null
+++ b/generators/gii/templates/crud/simple/search.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * This is the template for generating CRUD search class of the specified model.
+ */
+
+use yii\helpers\StringHelper;
+
+
+/* @var $this yii\web\View */
+/* @var $generator yii\gii\generators\crud\Generator */
+
+$modelClass = StringHelper::basename($generator->modelClass);
+$searchModelClass = StringHelper::basename($generator->searchModelClass);
+if ($modelClass === $searchModelClass) {
+    $modelAlias = $modelClass . 'Model';
+}
+$rules = $generator->generateSearchRules();
+$labels = $generator->generateSearchLabels();
+$searchAttributes = $generator->getSearchAttributes();
+$searchConditions = $generator->generateSearchConditions();
+
+echo "<?php\n";
+?>
+
+namespace <?= StringHelper::dirname(ltrim($generator->searchModelClass, '\\')) ?>;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use <?= ltrim($generator->modelClass, '\\') . (isset($modelAlias) ? " as $modelAlias" : "") ?>;
+
+/**
+ * <?= $searchModelClass ?> represents the model behind the search form of `<?= $generator->modelClass ?>`.
+ */
+class <?= $searchModelClass ?> extends <?= isset($modelAlias) ? $modelAlias : $modelClass ?>
+
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            <?= implode(",\n            ", $rules) ?>,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = <?= isset($modelAlias) ? $modelAlias : $modelClass ?>::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,<?= (in_array('id', $searchAttributes)) ? "\n            'sort' => ['defaultOrder' => ['id' => SORT_DESC]]\n" : '' ?>
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        <?= implode("\n        ", $searchConditions) ?>
+
+        return $dataProvider;
+    }
+}
diff --git a/generators/gii/templates/crud/simple/views/_form.php b/generators/gii/templates/crud/simple/views/_form.php
new file mode 100644
index 0000000..a92e3d4
--- /dev/null
+++ b/generators/gii/templates/crud/simple/views/_form.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
+
+/* @var $this yii\web\View */
+/* @var $generator yii\gii\generators\crud\Generator */
+
+/* @var $model \yii\db\ActiveRecord */
+$model = new $generator->modelClass();
+$safeAttributes = $model->safeAttributes();
+if (empty($safeAttributes)) {
+    $safeAttributes = $model->attributes();
+}
+
+echo "<?php\n";
+?>
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-form box box-primary">
+    <?= "<?php " ?>$form = ActiveForm::begin(); ?>
+    <div class="box-body table-responsive">
+
+<?php foreach ($generator->getColumnNames() as $attribute) {
+    if (in_array($attribute, $safeAttributes)) {
+        echo "        <?= " . $generator->generateActiveField($attribute) . " ?>\n\n";
+    }
+} ?>
+    </div>
+    <div class="box-footer">
+        <?= "<?= " ?>Html::submitButton(<?= $generator->generateString('Сохранить') ?>, ['class' => 'btn btn-success
+      btn-flat']) ?>
+      <?= "<?= " ?>Html::a(<?= $generator->generateString('Отменить') ?>, '/<?=$generator->getControllerID()?>/index',
+      ['class' => 'btn
+      btn-warning
+      btn-flat']) ?>
+
+    </div>
+    <?= "<?php " ?>ActiveForm::end(); ?>
+</div>
diff --git a/generators/gii/templates/crud/simple/views/_search.php b/generators/gii/templates/crud/simple/views/_search.php
new file mode 100644
index 0000000..d393baf
--- /dev/null
+++ b/generators/gii/templates/crud/simple/views/_search.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
+
+/* @var $this yii\web\View */
+/* @var $generator yii\gii\generators\crud\Generator */
+
+echo "<?php\n";
+?>
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model <?= ltrim($generator->searchModelClass, '\\') ?> */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-search">
+
+    <?= "<?php " ?>$form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+<?php if ($generator->enablePjax): ?>
+        'options' => [
+            'data-pjax' => 1
+        ],
+<?php endif; ?>
+    ]); ?>
+
+<?php
+$count = 0;
+foreach ($generator->getColumnNames() as $attribute) {
+    if (++$count < 6) {
+        echo "    <?= " . $generator->generateActiveSearchField($attribute) . " ?>\n\n";
+    } else {
+        echo "    <?php // echo " . $generator->generateActiveSearchField($attribute) . " ?>\n\n";
+    }
+}
+?>
+    <div class="form-group">
+        <?= "<?= " ?>Html::submitButton(<?= $generator->generateString('Search') ?>, ['class' => 'btn btn-primary']) ?>
+        <?= "<?= " ?>Html::resetButton(<?= $generator->generateString('Reset') ?>, ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?= "<?php " ?>ActiveForm::end(); ?>
+
+</div>
diff --git a/generators/gii/templates/crud/simple/views/create.php b/generators/gii/templates/crud/simple/views/create.php
new file mode 100644
index 0000000..6930827
--- /dev/null
+++ b/generators/gii/templates/crud/simple/views/create.php
@@ -0,0 +1,29 @@
+<?php
+
+use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
+
+/* @var $this yii\web\View */
+/* @var $generator yii\gii\generators\crud\Generator */
+
+echo "<?php\n";
+?>
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
+
+$this->title = <?= $generator->generateString('Создание ' . Inflector::camel2words(StringHelper::basename
+  ($generator->modelClass))) ?>;
+$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-create">
+
+    <?= "<?= " ?>$this->render('_form', [
+    'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/generators/gii/templates/crud/simple/views/index.php b/generators/gii/templates/crud/simple/views/index.php
new file mode 100644
index 0000000..895121f
--- /dev/null
+++ b/generators/gii/templates/crud/simple/views/index.php
@@ -0,0 +1,78 @@
+<?php
+
+use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
+
+/* @var $this yii\web\View */
+/* @var $generator yii\gii\generators\crud\Generator */
+
+$urlParams = $generator->generateUrlParams();
+$nameAttribute = $generator->getNameAttribute();
+
+echo "<?php\n";
+?>
+
+use yii\helpers\Html;
+use <?= $generator->indexWidgetType === 'grid' ? "yii\\grid\\GridView" : "yii\\widgets\\ListView" ?>;
+<?= $generator->enablePjax ? 'use yii\widgets\Pjax;' : '' ?>
+
+/* @var $this yii\web\View */
+<?= !empty($generator->searchModelClass) ? "/* @var \$searchModel " . ltrim($generator->searchModelClass, '\\') . " */\n" : '' ?>
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>;
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-index box box-primary">
+<?= $generator->enablePjax ? "    <?php Pjax::begin(); ?>\n" : ''
+?>    <div class="box-header with-border">
+        <?= "<?= " ?>Html::a(<?= $generator->generateString('Добавить ' . Inflector::camel2words(StringHelper::basename
+      ($generator->modelClass))) ?>, ['create'], ['class' => 'btn btn-success btn-flat']) ?>
+    </div>
+    <div class="box-body table-responsive no-padding">
+<?php if(!empty($generator->searchModelClass)): ?>
+<?= "        <?php " . ($generator->indexWidgetType === 'grid' ? "// " : "") ?>echo $this->render('_search', ['model' => $searchModel]); ?>
+<?php endif;
+
+if ($generator->indexWidgetType === 'grid'):
+    echo "        <?= " ?>GridView::widget([
+            'dataProvider' => $dataProvider,
+            <?= !empty($generator->searchModelClass) ? "'filterModel' => \$searchModel,\n            'layout' => \"{items}\\n{summary}\\n{pager}\",\n            'columns' => [\n" : "'layout' => \"{items}\\n{summary}\\n{pager}\",\n            'columns' => [\n"; ?>
+
+<?php
+$count = 0;
+if (($tableSchema = $generator->getTableSchema()) === false) {
+    foreach ($generator->getColumnNames() as $name) {
+        if (++$count < 6) {
+            echo "                '" . $name . "',\n";
+        } else {
+            echo "                // '" . $name . "',\n";
+        }
+    }
+} else {
+    foreach ($tableSchema->columns as $column) {
+        $format = $generator->generateColumnFormat($column);
+        if (++$count < 6) {
+            echo "                '" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n";
+        } else {
+            echo "                // '" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n";
+        }
+    }
+}
+?>
+
+                ['class' => 'yii\grid\ActionColumn'],
+            ],
+        ]); ?>
+<?php else: ?>
+        <?= "<?= " ?>ListView::widget([
+            'dataProvider' => $dataProvider,
+            'itemOptions' => ['class' => 'item'],
+            'itemView' => function ($model, $key, $index, $widget) {
+                return Html::a(Html::encode($model-><?= $nameAttribute ?>), ['view', <?= $urlParams ?>]);
+            },
+        ]) ?>
+<?php endif; ?>
+    </div>
+<?= $generator->enablePjax ? "    <?php Pjax::end(); ?>\n" : '' ?>
+</div>
diff --git a/generators/gii/templates/crud/simple/views/update.php b/generators/gii/templates/crud/simple/views/update.php
new file mode 100644
index 0000000..fae6237
--- /dev/null
+++ b/generators/gii/templates/crud/simple/views/update.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
+
+/* @var $this yii\web\View */
+/* @var $generator yii\gii\generators\crud\Generator */
+
+$urlParams = $generator->generateUrlParams();
+
+echo "<?php\n";
+?>
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
+
+$this->title = <?= $generator->generateString('Редактирование {modelClass}: ', ['modelClass' => Inflector::camel2words
+(StringHelper::basename($generator->modelClass))]) ?> . $model-><?= $generator->getNameAttribute() ?>;
+$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
+$this->params['breadcrumbs'][] = <?= $generator->generateString('редактирование') ?>;
+?>
+<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-update">
+
+    <?= "<?= " ?>$this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/generators/gii/templates/crud/simple/views/view.php b/generators/gii/templates/crud/simple/views/view.php
new file mode 100644
index 0000000..6d42baf
--- /dev/null
+++ b/generators/gii/templates/crud/simple/views/view.php
@@ -0,0 +1,55 @@
+<?php
+
+use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
+
+/* @var $this yii\web\View */
+/* @var $generator yii\gii\generators\crud\Generator */
+
+$urlParams = $generator->generateUrlParams();
+
+echo "<?php\n";
+?>
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
+
+$this->title = $model-><?= $generator->getNameAttribute() ?>;
+$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-view box box-primary">
+    <div class="box-header">
+        <?= "<?= " ?>Html::a(<?= $generator->generateString('Редактировать') ?>, ['update', <?= $urlParams ?>], ['class'
+      => 'btn btn-primary btn-flat']) ?>
+        <?= "<?= " ?>Html::a(<?= $generator->generateString('Удалить') ?>, ['delete', <?= $urlParams ?>], [
+            'class' => 'btn btn-danger btn-flat',
+            'data' => [
+                'confirm' => <?= $generator->generateString('Вы действительно хотите удалить?') ?>,
+                'method' => 'post',
+            ],
+        ]) ?>
+    </div>
+    <div class="box-body table-responsive no-padding">
+        <?= "<?= " ?>DetailView::widget([
+            'model' => $model,
+            'attributes' => [
+<?php
+if (($tableSchema = $generator->getTableSchema()) === false) {
+    foreach ($generator->getColumnNames() as $name) {
+        echo "                '" . $name . "',\n";
+    }
+} else {
+    foreach ($generator->getTableSchema()->columns as $column) {
+        $format = stripos($column->name, 'created_at') !== false || stripos($column->name, 'updated_at') !== false ? 'datetime' : $generator->generateColumnFormat($column);
+        echo "                '" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n";
+    }
+}
+?>
+            ],
+        ]) ?>
+    </div>
+</div>
diff --git a/migrations/m200127_141526_create_transport_hubs_table.php b/migrations/m200127_141526_create_transport_hubs_table.php
new file mode 100644
index 0000000..c101b15
--- /dev/null
+++ b/migrations/m200127_141526_create_transport_hubs_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles the creation of table `{{%transport_hubs}}`.
+ */
+class m200127_141526_create_transport_hubs_table extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->createTable('{{%transport_hubs}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(32)->notNull()
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropTable('{{%transport_hubs}}');
+    }
+}
diff --git a/migrations/m200130_150251_add_superadmin_user_role.php b/migrations/m200130_150251_add_superadmin_user_role.php
new file mode 100644
index 0000000..37cf865
--- /dev/null
+++ b/migrations/m200130_150251_add_superadmin_user_role.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m200130_150251_add_superadmin_user_role
+ */
+class m200130_150251_add_superadmin_user_role extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+      $am = Yii::$app->authManager;
+      $superAdmin = $am->createRole('superadmin');
+      $am->add($superAdmin);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        echo "m200130_150251_add_superadmin_user_role cannot be reverted.\n";
+
+        return false;
+    }
+
+}
diff --git a/migrations/m200130_151014_alter_users_table.php b/migrations/m200130_151014_alter_users_table.php
new file mode 100644
index 0000000..d0277f6
--- /dev/null
+++ b/migrations/m200130_151014_alter_users_table.php
@@ -0,0 +1,26 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m200130_151014_alter_users_table
+ */
+class m200130_151014_alter_users_table extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+      $this->addColumn('users', 'hub_id', 'integer default null');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+      $this->dropColumn('users', 'hub_id');
+    }
+
+}
diff --git a/models/CreateUser.php b/models/CreateUser.php
index 109ee3d..c6d58c5 100644
--- a/models/CreateUser.php
+++ b/models/CreateUser.php
@@ -13,6 +13,7 @@ class CreateUser extends Model
     public $password;
     public $isAdmin = false;
     public $object_id = false;
+    public $hub_id = false;
 
     /**
      * {@inheritdoc}
@@ -25,10 +26,12 @@ class CreateUser extends Model
             ['password', 'string', 'min' => 6],
             ['email', 'email'],
             ['email', 'unique', 'targetClass' => Users::className()],
-            [['object_id'], 'integer'],
+            [['object_id', 'hub'], 'integer'],
             [['isAdmin'], 'boolean'],
             [['username', 'password', 'email'], 'string', 'max' => 255],
             [['object_id'], 'exist', 'skipOnError' => true, 'targetClass' => Objects::className(), 'targetAttribute' => ['object_id' => 'id']],
+            [['hub_id'], 'exist', 'skipOnError' => true, 'targetClass' => TransportHubs::className(), 'targetAttribute' =>
+              ['hub_id' => 'id']],
         ];
     }
 
@@ -43,6 +46,7 @@ class CreateUser extends Model
             'password' => 'Пароль',
             'email' => 'Email',
             'object_id' => 'Объект',
+            'hub_id' => 'ТУ',
             'objectName' => 'Объект',
             'isAdmin' => 'Администратор?',
         ];
@@ -58,6 +62,7 @@ class CreateUser extends Model
         $user->isAdmin = $this->isAdmin;
         $user->email = $this->email;
         $user->object_id = $this->object_id;
+        $user->hub_id = $this->hub_id;
         $user->setPassword($this->password);
         return $user->save();
     }
diff --git a/models/TransportHubs.php b/models/TransportHubs.php
new file mode 100644
index 0000000..3f9a8fc
--- /dev/null
+++ b/models/TransportHubs.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace app\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "transport_hubs".
+ *
+ * @property int $id
+ * @property string $name
+ */
+class TransportHubs extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'transport_hubs';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['name'], 'required'],
+            [['name'], 'string', 'max' => 32],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'name' => 'Наименование',
+        ];
+    }
+}
diff --git a/models/TransportHubsSearch.php b/models/TransportHubsSearch.php
new file mode 100644
index 0000000..29e600c
--- /dev/null
+++ b/models/TransportHubsSearch.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace app\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use app\models\TransportHubs;
+
+/**
+ * TransportHubsSearch represents the model behind the search form of `app\models\TransportHubs`.
+ */
+class TransportHubsSearch extends TransportHubs
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id'], 'integer'],
+            [['name'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = TransportHubs::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+            'sort' => ['defaultOrder' => ['id' => SORT_DESC]]
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'id' => $this->id,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/models/User.php b/models/User.php
index 3c9b632..6aff24d 100644
--- a/models/User.php
+++ b/models/User.php
@@ -8,6 +8,7 @@ class User extends \yii\base\BaseObject implements \yii\web\IdentityInterface
   public $username;
   public $email;
   public $object_id;
+  public $hub_id;
   public $password_hash;
   public $authKey;
   public $accessToken;
diff --git a/models/Users.php b/models/Users.php
index 3cfc371..2046402 100644
--- a/models/Users.php
+++ b/models/Users.php
@@ -12,6 +12,7 @@ use Yii;
  * @property string $password_hash
  * @property string $email
  * @property int|null $object_id
+ * @property int|null $hub_id
  * @property boolean $isAdmin
  *
  * @property Objects $object
@@ -35,13 +36,15 @@ class Users extends \yii\db\ActiveRecord
     {
         return [
             [['username', 'password_hash', 'email'], 'required'],
-            [['object_id'], 'integer'],
+            [['object_id', 'hub_id'], 'integer'],
             [['isAdmin'], 'boolean'],
             [['username', 'password_hash', 'email'], 'string', 'max' => 255],
             [['username'], 'unique'],
             [['email'], 'unique'],
             ['email', 'email'],
             [['object_id'], 'exist', 'skipOnError' => true, 'targetClass' => Objects::className(), 'targetAttribute' => ['object_id' => 'id']],
+            [['hub_id'], 'exist', 'skipOnError' => true, 'targetClass' => TransportHubs::className(), 'targetAttribute' =>
+              ['hub_id' => 'id']],
         ];
     }
 
@@ -57,6 +60,7 @@ class Users extends \yii\db\ActiveRecord
             'password' => 'Пароль',
             'email' => 'Email',
             'object_id' => 'Объект',
+            'hub_id' => 'ТУ',
             'objectName' => 'Объект',
             'isAdmin' => 'Администратор?',
         ];
@@ -70,6 +74,14 @@ class Users extends \yii\db\ActiveRecord
         return $this->hasOne(Objects::className(), ['id' => 'object_id']);
     }
 
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getHub()
+    {
+        return $this->hasOne(TransportHubs::className(), ['id' => 'hub_id']);
+    }
+
     /**
      * @return string|null
      */
@@ -78,6 +90,14 @@ class Users extends \yii\db\ActiveRecord
         if (!empty($this->object))
             return $this->object->name;
     }
+    /**
+     * @return string|null
+     */
+    public function getHubName()
+    {
+        if (!empty($this->hub))
+            return $this->hub->name;
+    }
 
     /**
      * @inheritdoc
@@ -124,7 +144,7 @@ class Users extends \yii\db\ActiveRecord
     {
         if ($insert) {
             $am = Yii::$app->authManager;
-            $role = $this->isAdmin ? $am->getRole('admin') : $am->getRole('manager');
+            $role = $this->isAdmin == 1 ? $am->getRole('admin') : $am->getRole('manager');
             $am->assign($role, $this->id);
         }
     }
diff --git a/modules/administrator/controllers/TransportHubsController.php b/modules/administrator/controllers/TransportHubsController.php
new file mode 100644
index 0000000..805129f
--- /dev/null
+++ b/modules/administrator/controllers/TransportHubsController.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace app\modules\administrator\controllers;
+
+use Yii;
+use app\models\TransportHubs;
+use app\models\TransportHubsSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * TransportHubsController implements the CRUD actions for TransportHubs model.
+ */
+class TransportHubsController extends Controller
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all TransportHubs models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TransportHubsSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single TransportHubs model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new TransportHubs model.
+     * If creation is successful, the browser will be redirected to the 'index' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new TransportHubs();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['index']);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing TransportHubs model.
+     * If update is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['index']);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing TransportHubs model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the TransportHubs model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return TransportHubs the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = TransportHubs::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/modules/administrator/views/transport-hubs/_form.php b/modules/administrator/views/transport-hubs/_form.php
new file mode 100644
index 0000000..4057e0e
--- /dev/null
+++ b/modules/administrator/views/transport-hubs/_form.php
@@ -0,0 +1,27 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TransportHubs */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="transport-hubs-form box box-primary">
+  <?php $form = ActiveForm::begin(); ?>
+  <div class="box-body table-responsive">
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+  </div>
+  <div class="box-footer">
+    <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success
+      btn-flat']) ?>
+    <?= Html::a('Отменить', '/administrator/transport-hubs/index',
+      ['class' => 'btn 
+     btn-warning 
+     btn-flat']) ?>
+  </div>
+  <?php ActiveForm::end(); ?>
+</div>
diff --git a/modules/administrator/views/transport-hubs/_search.php b/modules/administrator/views/transport-hubs/_search.php
new file mode 100644
index 0000000..7268aaf
--- /dev/null
+++ b/modules/administrator/views/transport-hubs/_search.php
@@ -0,0 +1,29 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TransportHubsSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="transport-hubs-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/modules/administrator/views/transport-hubs/create.php b/modules/administrator/views/transport-hubs/create.php
new file mode 100644
index 0000000..5bb95cc
--- /dev/null
+++ b/modules/administrator/views/transport-hubs/create.php
@@ -0,0 +1,19 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TransportHubs */
+
+$this->title = 'Создание ТУ';
+$this->params['breadcrumbs'][] = ['label' => 'Транспортные узлы', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transport-hubs-create">
+
+    <?= $this->render('_form', [
+    'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/modules/administrator/views/transport-hubs/index.php b/modules/administrator/views/transport-hubs/index.php
new file mode 100644
index 0000000..37b1c45
--- /dev/null
+++ b/modules/administrator/views/transport-hubs/index.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel app\models\TransportHubsSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = 'Транспортные узлы';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transport-hubs-index box box-primary">
+    <div class="box-header with-border">
+        <?= Html::a('Добавить ТУ', ['create'], ['class' => 'btn btn-success btn-flat']) ?>
+    </div>
+    <div class="box-body table-responsive no-padding">
+        <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+        <?= GridView::widget([
+            'dataProvider' => $dataProvider,
+            'filterModel' => $searchModel,
+            'layout' => "{items}\n{summary}\n{pager}",
+            'columns' => [
+                
+                'name',
+
+                ['class' => 'yii\grid\ActionColumn'],
+            ],
+        ]); ?>
+    </div>
+</div>
diff --git a/modules/administrator/views/transport-hubs/update.php b/modules/administrator/views/transport-hubs/update.php
new file mode 100644
index 0000000..5ce753e
--- /dev/null
+++ b/modules/administrator/views/transport-hubs/update.php
@@ -0,0 +1,20 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TransportHubs */
+
+$this->title = 'Редактирование ТУ: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => 'Транспортные узлы', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = 'редактирование';
+Html::a('dsf')
+?>
+<div class="transport-hubs-update">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/modules/administrator/views/transport-hubs/view.php b/modules/administrator/views/transport-hubs/view.php
new file mode 100644
index 0000000..4425bea
--- /dev/null
+++ b/modules/administrator/views/transport-hubs/view.php
@@ -0,0 +1,34 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\TransportHubs */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => 'Транспортные узлы', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transport-hubs-view box box-primary">
+    <div class="box-header">
+        <?= Html::a('Редактировать', ['update', 'id' => $model->id], ['class'
+      => 'btn btn-primary btn-flat']) ?>
+        <?= Html::a('Удалить', ['delete', 'id' => $model->id], [
+            'class' => 'btn btn-danger btn-flat',
+            'data' => [
+                'confirm' => 'Вы действительно хотите удалить?',
+                'method' => 'post',
+            ],
+        ]) ?>
+    </div>
+    <div class="box-body table-responsive no-padding">
+        <?= DetailView::widget([
+            'model' => $model,
+            'attributes' => [
+                'id',
+                'name',
+            ],
+        ]) ?>
+    </div>
+</div>
diff --git a/views/layouts/left.php b/views/layouts/left.php
index d8aedbf..ed702c6 100644
--- a/views/layouts/left.php
+++ b/views/layouts/left.php
@@ -1,21 +1,23 @@
 <aside class="main-sidebar">
 
   <section class="sidebar">
-      <?= dmstr\widgets\Menu::widget(
-          [
-              'options' => ['class' => 'sidebar-menu tree', 'data-widget' => 'tree'],
-              'items' => [
-                  ['label' => 'Меню', 'options' => ['class' => 'header']],
-                  ['label' => 'Объекты', 'icon' => 'building', 'url' => ['/administrator/objects'], 'visible' =>
-                      Yii::$app->user->can('admin')],
-                  ['label' => 'Пользователи', 'icon' => 'user-o', 'url' => ['/administrator/users'], 'visible' =>
-                      Yii::$app->user->can('admin')],
-                  ['label' => 'Сотрудники', 'icon' => 'users', 'url' => ['/administrator/employees'], 'visible' =>
-                      Yii::$app->user->can('admin')],
-                  ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/administrator/records'], 'visible' =>
-                      Yii::$app->user->can('admin')],
-                  ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/manager/records'], 'visible' =>
-                      Yii::$app->user->can('manager')],
+    <?= dmstr\widgets\Menu::widget(
+      [
+        'options' => ['class' => 'sidebar-menu tree', 'data-widget' => 'tree'],
+        'items' => [
+          ['label' => 'Меню', 'options' => ['class' => 'header']],
+          ['label' => 'Объекты', 'icon' => 'building', 'url' => ['/administrator/objects'], 'visible' =>
+            Yii::$app->user->can('admin')],
+          ['label' => 'ТУ', 'icon' => 'building', 'url' => ['/administrator/transport-hubs'], 'visible' =>
+            Yii::$app->user->can('admin')],
+          ['label' => 'Пользователи', 'icon' => 'user-o', 'url' => ['/administrator/users'], 'visible' =>
+            Yii::$app->user->can('admin')],
+          ['label' => 'Сотрудники', 'icon' => 'users', 'url' => ['/administrator/employees'], 'visible' =>
+            Yii::$app->user->can('admin')],
+          ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/administrator/records'], 'visible' =>
+            Yii::$app->user->can('admin')],
+          ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/manager/records'], 'visible' =>
+            Yii::$app->user->can('manager')],
 //          ['label' => 'Gii', 'icon' => 'file-code-o', 'url' => ['/gii']],
 //          ['label' => 'Debug', 'icon' => 'dashboard', 'url' => ['/debug']],
 //                    [
@@ -44,9 +46,9 @@
 //                            ],
 //                        ],
 //                    ],
-              ],
-          ]
-      ) ?>
+        ],
+      ]
+    ) ?>
 
   </section>
 
-- 
GitLab


From 780ef8efdc5fd26e7f35930039440720a85f8ba2 Mon Sep 17 00:00:00 2001
From: cangreen <latentpickuper@gmail.com>
Date: Mon, 3 Feb 2020 08:36:58 +0300
Subject: [PATCH 3/5] adad

---
 assets/AdminAsset.php                         | 13 +++++++
 controllers/SiteController.php                |  3 +-
 .../m200130_151014_alter_users_table.php      | 14 ++++++-
 .../m200202_173210_alter_objects_table.php    | 37 +++++++++++++++++++
 models/CreateUser.php                         | 33 ++++++++++++++---
 models/Objects.php                            | 23 ++++++++++++
 models/Users.php                              | 30 +++++++++++++--
 models/UsersSearch.php                        |  7 +++-
 .../controllers/DefaultController.php         |  2 +-
 .../controllers/EmployeesController.php       |  2 +-
 .../controllers/ObjectsController.php         |  2 +-
 .../controllers/RecordsController.php         |  2 +-
 .../controllers/TransportHubsController.php   |  9 +++++
 .../controllers/UsersController.php           | 29 +++++++++++++--
 modules/administrator/views/objects/_form.php |  7 ++++
 modules/administrator/views/objects/index.php |  1 +
 modules/administrator/views/objects/view.php  |  1 +
 modules/administrator/views/users/_form.php   | 13 +++----
 modules/administrator/views/users/create.php  | 21 ++++++++++-
 modules/administrator/views/users/index.php   | 14 +++++++
 modules/administrator/views/users/view.php    |  4 ++
 views/layouts/left.php                        | 10 ++---
 web/js/admin.js                               |  9 +++++
 23 files changed, 251 insertions(+), 35 deletions(-)
 create mode 100644 assets/AdminAsset.php
 create mode 100644 migrations/m200202_173210_alter_objects_table.php
 create mode 100644 web/js/admin.js

diff --git a/assets/AdminAsset.php b/assets/AdminAsset.php
new file mode 100644
index 0000000..946cb9a
--- /dev/null
+++ b/assets/AdminAsset.php
@@ -0,0 +1,13 @@
+<?php
+
+
+namespace app\assets;
+
+
+class AdminAsset extends AppAsset
+{
+    public $js = [
+        'js/admin.js'
+    ];
+
+}
\ No newline at end of file
diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index 19c3b1e..74ed272 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -62,7 +62,8 @@ class SiteController extends Controller
    */
   public function actionIndex()
   {
-    if (Yii::$app->user->can('admin')) {
+      $user = Yii::$app->user;
+    if ($user->can('admin') || $user->can('superadmin')) {
       return $this->redirect(['/administrator']);
     }
     else if (Yii::$app->user->can('manager')) {
diff --git a/migrations/m200130_151014_alter_users_table.php b/migrations/m200130_151014_alter_users_table.php
index d0277f6..9dec668 100644
--- a/migrations/m200130_151014_alter_users_table.php
+++ b/migrations/m200130_151014_alter_users_table.php
@@ -12,7 +12,16 @@ class m200130_151014_alter_users_table extends Migration
      */
     public function safeUp()
     {
-      $this->addColumn('users', 'hub_id', 'integer default null');
+        $this->addColumn('users', 'hub_id', $this->integer());
+
+        $this->addForeignKey(
+            'users_hubs_fk',
+            'users',
+            'hub_id',
+            'transport_hubs',
+            'id',
+            'SET NULL'
+        );
     }
 
     /**
@@ -20,7 +29,8 @@ class m200130_151014_alter_users_table extends Migration
      */
     public function safeDown()
     {
-      $this->dropColumn('users', 'hub_id');
+        $this->dropForeignKey('users_hubs_fk', 'users');
+        $this->dropColumn('users', 'hub_id');
     }
 
 }
diff --git a/migrations/m200202_173210_alter_objects_table.php b/migrations/m200202_173210_alter_objects_table.php
new file mode 100644
index 0000000..4e543bb
--- /dev/null
+++ b/migrations/m200202_173210_alter_objects_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m200202_173210_alter_objects_table
+ */
+class m200202_173210_alter_objects_table extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn('objects', 'hub_id', $this->integer());
+
+        $this->addForeignKey(
+            'objects_hubs_fk',
+            'objects',
+            'hub_id',
+            'transport_hubs',
+            'id',
+            'SET NULL'
+        );
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropForeignKey('objects_hubs_fk', 'objects');
+        $this->dropColumn('objects', 'hub_id');
+    }
+
+}
diff --git a/models/CreateUser.php b/models/CreateUser.php
index c6d58c5..c90a7ac 100644
--- a/models/CreateUser.php
+++ b/models/CreateUser.php
@@ -26,12 +26,10 @@ class CreateUser extends Model
             ['password', 'string', 'min' => 6],
             ['email', 'email'],
             ['email', 'unique', 'targetClass' => Users::className()],
-            [['object_id', 'hub'], 'integer'],
+            [['object_id', 'hub_id'], 'safe'],
+            [['object_id', 'hub_id'], 'default', 'value' => null],
             [['isAdmin'], 'boolean'],
             [['username', 'password', 'email'], 'string', 'max' => 255],
-            [['object_id'], 'exist', 'skipOnError' => true, 'targetClass' => Objects::className(), 'targetAttribute' => ['object_id' => 'id']],
-            [['hub_id'], 'exist', 'skipOnError' => true, 'targetClass' => TransportHubs::className(), 'targetAttribute' =>
-              ['hub_id' => 'id']],
         ];
     }
 
@@ -61,11 +59,34 @@ class CreateUser extends Model
         $user->username = $this->username;
         $user->isAdmin = $this->isAdmin;
         $user->email = $this->email;
-        $user->object_id = $this->object_id;
-        $user->hub_id = $this->hub_id;
+        if ($this->object_id) {
+            $user->object_id = $this->object_id;
+        }
+
+        if ($this->hub_id) {
+            $user->hub_id = $this->hub_id;
+        }
+
         $user->setPassword($this->password);
         return $user->save();
     }
 
+    /**
+     * @return TransportHubs|null
+     */
+    public function getHub()
+    {
+        return TransportHubs::findOne([$this->hub_id]);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getHubName()
+    {
+        if (!empty($this->hub))
+            return $this->hub->name;
+    }
+
 
 }
\ No newline at end of file
diff --git a/models/Objects.php b/models/Objects.php
index 2c874d2..de3490a 100644
--- a/models/Objects.php
+++ b/models/Objects.php
@@ -10,6 +10,7 @@ use Yii;
  * @property int $id
  * @property string|null $name
  * @property integer $object_number
+ * @property int|null $hub_id
  *
  * @property Users[] $users
  */
@@ -31,6 +32,7 @@ class Objects extends \yii\db\ActiveRecord
         return [
             [['name'], 'string', 'max' => 128],
             [['name', 'object_number'], 'required'],
+            [['hub_id'], 'exist', 'skipOnError' => true, 'targetClass' => TransportHubs::className(), 'targetAttribute' => ['hub_id' => 'id']],
         ];
     }
 
@@ -43,6 +45,8 @@ class Objects extends \yii\db\ActiveRecord
             'id' => 'ID',
             'name' => 'Название',
             'object_number' => 'Номер объекта',
+            'hub_id' => 'ТУ',
+            'hubName' => 'ТУ',
         ];
     }
 
@@ -53,4 +57,23 @@ class Objects extends \yii\db\ActiveRecord
     {
         return $this->hasMany(Users::className(), ['object_id' => 'id']);
     }
+
+    /**
+     * Gets query for [[Hub]].
+     *
+     * @return \yii\db\ActiveQuery
+     */
+    public function getHub()
+    {
+        return $this->hasOne(TransportHubs::className(), ['id' => 'hub_id']);
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getHubName()
+    {
+        return $this->hub->name;
+    }
+
 }
diff --git a/models/Users.php b/models/Users.php
index 2046402..ce26340 100644
--- a/models/Users.php
+++ b/models/Users.php
@@ -36,7 +36,8 @@ class Users extends \yii\db\ActiveRecord
     {
         return [
             [['username', 'password_hash', 'email'], 'required'],
-            [['object_id', 'hub_id'], 'integer'],
+            [['object_id', 'hub_id'], 'safe'],
+            [['object_id', 'hub_id'], 'default', 'value' => null],
             [['isAdmin'], 'boolean'],
             [['username', 'password_hash', 'email'], 'string', 'max' => 255],
             [['username'], 'unique'],
@@ -44,7 +45,7 @@ class Users extends \yii\db\ActiveRecord
             ['email', 'email'],
             [['object_id'], 'exist', 'skipOnError' => true, 'targetClass' => Objects::className(), 'targetAttribute' => ['object_id' => 'id']],
             [['hub_id'], 'exist', 'skipOnError' => true, 'targetClass' => TransportHubs::className(), 'targetAttribute' =>
-              ['hub_id' => 'id']],
+                ['hub_id' => 'id']],
         ];
     }
 
@@ -90,6 +91,7 @@ class Users extends \yii\db\ActiveRecord
         if (!empty($this->object))
             return $this->object->name;
     }
+
     /**
      * @return string|null
      */
@@ -142,9 +144,29 @@ class Users extends \yii\db\ActiveRecord
 
     public function afterSave($insert, $changedAttributes)
     {
+        $am = Yii::$app->authManager;
+
         if ($insert) {
-            $am = Yii::$app->authManager;
-            $role = $this->isAdmin == 1 ? $am->getRole('admin') : $am->getRole('manager');
+            if ($this->isAdmin && !is_null($this->hub_id)) {
+                $role = $am->getRole('admin');
+            } else if ($this->isAdmin && is_null($this->hub_id)) {
+                $role = $am->getRole('superadmin');
+            } else {
+                $role = $am->getRole('manager');
+            }
+
+            $am->assign($role, $this->id);
+        }
+
+        if (!$insert && array_key_exists('hub_id', $changedAttributes) && $changedAttributes['hub_id'] !== (int)$this->hub_id) {
+            if (is_null($this->hub_id)) {
+                $oldRole = $am->getRole('admin');
+                $role = $am->getRole('superadmin');
+            } else {
+                $oldRole = $am->getRole('superadmin');
+                $role = $am->getRole('admin');
+            }
+            $am->revoke($oldRole, $this->id);
             $am->assign($role, $this->id);
         }
     }
diff --git a/models/UsersSearch.php b/models/UsersSearch.php
index 8a45e62..20d9447 100644
--- a/models/UsersSearch.php
+++ b/models/UsersSearch.php
@@ -20,7 +20,7 @@ class UsersSearch extends Users
   public function rules()
   {
     return [
-      [['id', 'object_id'], 'integer'],
+      [['id', 'object_id', 'hub_id'], 'integer'],
       [['username', 'password_hash', 'email', 'objectName'], 'safe'],
     ];
   }
@@ -70,6 +70,10 @@ class UsersSearch extends Users
           'asc' => ['objects.name' => SORT_ASC],
           'desc' => ['objects.name' => SORT_DESC]
         ],
+          'hub_id' => [
+          'asc' => ['hub_id' => SORT_ASC],
+          'desc' => ['hub_id' => SORT_DESC]
+        ],
       ],
       'defaultOrder' => ['id' => SORT_DESC]
     ]);
@@ -90,6 +94,7 @@ class UsersSearch extends Users
     $query->andFilterWhere([
       'users.id' => $this->id,
       'object_id' => $this->object_id,
+      'hub_id' => $this->hub_id,
     ]);
 
     $query->andFilterWhere(['like', 'username', $this->username])
diff --git a/modules/administrator/controllers/DefaultController.php b/modules/administrator/controllers/DefaultController.php
index 982392c..27be060 100644
--- a/modules/administrator/controllers/DefaultController.php
+++ b/modules/administrator/controllers/DefaultController.php
@@ -17,7 +17,7 @@ class DefaultController extends Controller
                 'rules' => [
                     [
                         'allow' => true,
-                        'roles' => ['admin']
+                        'roles' => ['admin', 'superadmin']
                     ],
                 ],
             ],
diff --git a/modules/administrator/controllers/EmployeesController.php b/modules/administrator/controllers/EmployeesController.php
index fe9af00..806ea70 100644
--- a/modules/administrator/controllers/EmployeesController.php
+++ b/modules/administrator/controllers/EmployeesController.php
@@ -32,7 +32,7 @@ class EmployeesController extends Controller
                 'rules' => [
                     [
                         'allow' => true,
-                        'roles' => ['admin']
+                        'roles' => ['superadmin']
                     ],
                 ],
             ],
diff --git a/modules/administrator/controllers/ObjectsController.php b/modules/administrator/controllers/ObjectsController.php
index f5cc708..5ec9401 100644
--- a/modules/administrator/controllers/ObjectsController.php
+++ b/modules/administrator/controllers/ObjectsController.php
@@ -31,7 +31,7 @@ class ObjectsController extends Controller
                 'rules' => [
                     [
                         'allow' => true,
-                        'roles' => ['admin']
+                        'roles' => ['superadmin']
                     ],
                 ],
             ],
diff --git a/modules/administrator/controllers/RecordsController.php b/modules/administrator/controllers/RecordsController.php
index b0bfc66..96ea4fb 100644
--- a/modules/administrator/controllers/RecordsController.php
+++ b/modules/administrator/controllers/RecordsController.php
@@ -31,7 +31,7 @@ class RecordsController extends Controller
                 'rules' => [
                     [
                         'allow' => true,
-                        'roles' => ['admin']
+                        'roles' => ['admin', 'superadmin']
                     ],
                 ],
             ],
diff --git a/modules/administrator/controllers/TransportHubsController.php b/modules/administrator/controllers/TransportHubsController.php
index 805129f..b419192 100644
--- a/modules/administrator/controllers/TransportHubsController.php
+++ b/modules/administrator/controllers/TransportHubsController.php
@@ -26,6 +26,15 @@ class TransportHubsController extends Controller
                     'delete' => ['POST'],
                 ],
             ],
+            'access' => [
+                'class' => '\yii\filters\AccessControl',
+                'rules' => [
+                    [
+                        'allow' => true,
+                        'roles' => ['superadmin']
+                    ],
+                ],
+            ],
         ];
     }
 
diff --git a/modules/administrator/controllers/UsersController.php b/modules/administrator/controllers/UsersController.php
index 5329e26..7a4ff71 100644
--- a/modules/administrator/controllers/UsersController.php
+++ b/modules/administrator/controllers/UsersController.php
@@ -3,9 +3,12 @@
 namespace app\modules\administrator\controllers;
 
 use app\models\CreateUser;
+use app\models\Objects;
+use app\models\TransportHubs;
 use Yii;
 use app\models\Users;
 use app\models\UsersSearch;
+use yii\helpers\ArrayHelper;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
@@ -32,7 +35,7 @@ class UsersController extends Controller
                 'rules' => [
                     [
                         'allow' => true,
-                        'roles' => ['admin']
+                        'roles' => ['superadmin']
                     ],
                 ],
             ],
@@ -104,10 +107,11 @@ class UsersController extends Controller
         }
     }
 
-    public function actionChangePassword($id) {
+    public function actionChangePassword($id)
+    {
         $model = $this->findModel($id);
         $post = Yii::$app->request->post();
-        if(isset($post['password']) && $model->setPassword($post['password']) && $model->save()) {
+        if (isset($post['password']) && $model->setPassword($post['password']) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('change-password', [
@@ -144,4 +148,23 @@ class UsersController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+
+    public function actionGetHubs()
+    {
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $out = [];
+        $parents = $_POST['depdrop_parents'];
+        $result = $parents[0];
+
+        if ($result === 'true') {
+            foreach (ArrayHelper::toArray(TransportHubs::find()->all()) as $hub) {
+                $out[] = ['id' => $hub['id'], 'name' => $hub['name']];
+            }
+            return ['output' => $out, 'selected' => $result];
+        }
+
+        return ['output' => '', 'selected' => ''];
+
+    }
+
 }
diff --git a/modules/administrator/views/objects/_form.php b/modules/administrator/views/objects/_form.php
index e2bbac8..d2638f1 100644
--- a/modules/administrator/views/objects/_form.php
+++ b/modules/administrator/views/objects/_form.php
@@ -1,11 +1,16 @@
 <?php
 
+use app\models\TransportHubs;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /* @var $this yii\web\View */
 /* @var $model app\models\Objects */
 /* @var $form yii\widgets\ActiveForm */
+
+$hubs[null] = '...';;
+$hubs = $hubs + ArrayHelper::map(TransportHubs::find()->all(), 'id', 'name');
 ?>
 
 <div class="objects-form box box-primary">
@@ -16,6 +21,8 @@ use yii\widgets\ActiveForm;
 
         <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
 
+        <?= $form->field($model, 'hub_id')->dropDownList($hubs) ?>
+
     </div>
     <div class="box-footer">
         <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success btn-flat']) ?>
diff --git a/modules/administrator/views/objects/index.php b/modules/administrator/views/objects/index.php
index 91f915f..ba94561 100644
--- a/modules/administrator/views/objects/index.php
+++ b/modules/administrator/views/objects/index.php
@@ -23,6 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'columns' => [
                 'object_number',
                 'name',
+                'hubName',
 
                 ['class' => 'yii\grid\ActionColumn'],
             ],
diff --git a/modules/administrator/views/objects/view.php b/modules/administrator/views/objects/view.php
index 1395ee5..dac9dd2 100644
--- a/modules/administrator/views/objects/view.php
+++ b/modules/administrator/views/objects/view.php
@@ -27,6 +27,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'attributes' => [
                 'object_number',
                 'name',
+                'hubName'
             ],
         ]) ?>
     </div>
diff --git a/modules/administrator/views/users/_form.php b/modules/administrator/views/users/_form.php
index 8bfd81f..160c862 100644
--- a/modules/administrator/views/users/_form.php
+++ b/modules/administrator/views/users/_form.php
@@ -9,7 +9,10 @@ use app\models\Objects;
 /* @var $model app\models\Users */
 /* @var $form yii\widgets\ActiveForm */
 
+
 $objects = ArrayHelper::map(Objects::find()->all(), 'id', 'name');
+$hubs[null] = '...';
+$hubs = $hubs + ArrayHelper::map(\app\models\TransportHubs::find()->all(), 'id', 'name');
 ?>
 
 <div class="users-form box box-primary">
@@ -20,17 +23,11 @@ $objects = ArrayHelper::map(Objects::find()->all(), 'id', 'name');
 
       <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
 
-      <?php if (Yii::$app->controller->action->id === 'create'): ?>
-
-          <?= $form->field($model, 'password')->passwordInput(['maxlength' => true]) ?>
-
-          <?= $form->field($model, 'isAdmin')->checkbox() ?>
-
-      <?php endif; ?>
-
       <?php if (Yii::$app->authManager->checkAccess($model->id, 'manager')): ?>
 
           <?= $form->field($model, 'object_id')->dropDownList($objects) ?>
+      <?php else: ?>
+          <?= $form->field($model, 'hub_id')->dropDownList($hubs) ?>
 
       <?php endif; ?>
 
diff --git a/modules/administrator/views/users/create.php b/modules/administrator/views/users/create.php
index e03a868..1712e3e 100644
--- a/modules/administrator/views/users/create.php
+++ b/modules/administrator/views/users/create.php
@@ -1,10 +1,13 @@
 <?php
 
 use app\models\Objects;
+use app\models\TransportHubs;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
+use yii\helpers\Url;
 use yii\web\View;
 use yii\widgets\ActiveForm;
+use kartik\widgets\DepDrop;
 
 
 /* @var $this yii\web\View */
@@ -14,6 +17,11 @@ $this->title = 'Создание пользователя';
 $this->params['breadcrumbs'][] = ['label' => 'Пользователи', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 
+\app\assets\AdminAsset::register($this);
+
+
+$hubs[null] = '...';;
+$hubs = $hubs + ArrayHelper::map(TransportHubs::find()->all(), 'id', 'name');
 $objects = ArrayHelper::map(Objects::find()->all(), 'id', 'name');
 ?>
 <div class="users-create">
@@ -28,7 +36,18 @@ $objects = ArrayHelper::map(Objects::find()->all(), 'id', 'name');
 
             <?= $form->field($model, 'password')->passwordInput(['maxlength' => true]) ?>
 
-            <?= $form->field($model, 'isAdmin')->checkbox() ?>
+            <?= $form->field($model, 'isAdmin')->checkbox(['id' => 'users-isadmin']) ?>
+
+            <?= $form->field($model, 'hub_id')->widget(\kartik\depdrop\DepDrop::className(), [
+            'options' => [
+                'placeholder' => !empty($model->hub_id) ? $model->hub->name : ''
+            ],
+            'pluginOptions' => [
+                'depends' => ['users-isadmin'],
+                'placeholder' => 'Выбор ТУ...',
+                'url' => Url::to(['/administrator/users/get-hubs'])
+            ]
+        ])?>
 
             <?= $form->field($model, 'object_id')->dropDownList($objects) ?>
 
diff --git a/modules/administrator/views/users/index.php b/modules/administrator/views/users/index.php
index 1dc00d7..7034f05 100644
--- a/modules/administrator/views/users/index.php
+++ b/modules/administrator/views/users/index.php
@@ -27,7 +27,21 @@ $this->params['breadcrumbs'][] = $this->title;
 //                'password_hash',
               'email:email',
               'objectName',
+              'hub_id',
+              [
+                  'label' => 'Роль',
+                  'value' => function (\app\models\Users $model) {
+                      $am = Yii::$app->authManager;
+                      if ($am->checkAccess($model->id, 'admin')) {
+                          return 'Админ';
+                      } else if ($am->checkAccess($model->id, 'superadmin')) {
+                          return 'Суперадмин';
+                      } else {
+                          return 'Менеджер';
+                      }
+                  },
 
+              ],
               [
                   'class' => 'yii\grid\ActionColumn',
                   'template' => '{view} {update} {delete} {change-password}',
diff --git a/modules/administrator/views/users/view.php b/modules/administrator/views/users/view.php
index af9a909..aa5dfbf 100644
--- a/modules/administrator/views/users/view.php
+++ b/modules/administrator/views/users/view.php
@@ -32,6 +32,10 @@ $this->params['breadcrumbs'][] = $this->title;
                     'attribute' => 'objectName',
                     'visible' => Yii::$app->authManager->checkAccess($model->id, 'manager')
                 ],
+                [
+                    'attribute' => 'hubName',
+                    'visible' => Yii::$app->authManager->checkAccess($model->id, 'admin')
+                ],
             ],
         ]) ?>
     </div>
diff --git a/views/layouts/left.php b/views/layouts/left.php
index ed702c6..dadb9c5 100644
--- a/views/layouts/left.php
+++ b/views/layouts/left.php
@@ -7,15 +7,15 @@
         'items' => [
           ['label' => 'Меню', 'options' => ['class' => 'header']],
           ['label' => 'Объекты', 'icon' => 'building', 'url' => ['/administrator/objects'], 'visible' =>
-            Yii::$app->user->can('admin')],
+            Yii::$app->user->can('superadmin')],
           ['label' => 'ТУ', 'icon' => 'building', 'url' => ['/administrator/transport-hubs'], 'visible' =>
-            Yii::$app->user->can('admin')],
+            Yii::$app->user->can('superadmin')],
           ['label' => 'Пользователи', 'icon' => 'user-o', 'url' => ['/administrator/users'], 'visible' =>
-            Yii::$app->user->can('admin')],
+            Yii::$app->user->can('superadmin')],
           ['label' => 'Сотрудники', 'icon' => 'users', 'url' => ['/administrator/employees'], 'visible' =>
-            Yii::$app->user->can('admin')],
+            Yii::$app->user->can('superadmin')],
           ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/administrator/records'], 'visible' =>
-            Yii::$app->user->can('admin')],
+            Yii::$app->user->can('superadmin')],
           ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/manager/records'], 'visible' =>
             Yii::$app->user->can('manager')],
 //          ['label' => 'Gii', 'icon' => 'file-code-o', 'url' => ['/gii']],
diff --git a/web/js/admin.js b/web/js/admin.js
new file mode 100644
index 0000000..4e4f45f
--- /dev/null
+++ b/web/js/admin.js
@@ -0,0 +1,9 @@
+"use strict";
+
+$('#users-isadmin').change(function (e) {
+    if (e.target.checked) {
+        $('#createuser-object_id').attr('disabled', true);
+    } else {
+        $('#createuser-object_id').attr('disabled', false);
+    }
+});
\ No newline at end of file
-- 
GitLab


From 422f43fc6a5173a258ed9b30013d176f1f7e26cc Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Mon, 3 Feb 2020 18:10:21 +0300
Subject: [PATCH 4/5] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=B5=D0=BB=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                 |   4 +-
 composer.lock                                 | 218 +++++++++++++++++-
 config/web.php                                |  14 +-
 models/TableForm.php                          | 133 +++++++++++
 .../controllers/TableController.php           |  53 +++++
 modules/administrator/views/records/index.php | 184 ++++++++-------
 modules/administrator/views/table/index.php   |  78 +++++++
 modules/administrator/views/users/_form.php   |  22 +-
 modules/manager/views/records/index.php       | 190 ++++++++-------
 views/layouts/left.php                        |   3 +
 10 files changed, 713 insertions(+), 186 deletions(-)
 create mode 100644 models/TableForm.php
 create mode 100644 modules/administrator/controllers/TableController.php
 create mode 100644 modules/administrator/views/table/index.php

diff --git a/composer.json b/composer.json
index 76f86ca..2258590 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,9 @@
         "kartik-v/yii2-widget-depdrop": "^1.0",
         "kartik-v/yii2-datecontrol": "^1.9",
         "kartik-v/yii2-widget-datepicker": "^1.4",
-        "kartik-v/yii2-widgets": "^3.4"
+        "kartik-v/yii2-widgets": "^3.4",
+        "kartik-v/yii2-field-range": "^1.3",
+        "kartik-v/yii2-grid": "^3.3"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",
diff --git a/composer.lock b/composer.lock
index 4edf120..5cbd591 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f4535616b5e402ce9332d11690faf010",
+    "content-hash": "1c9a25dc1f5d96ff29e41737a980068f",
     "packages": [
         {
             "name": "almasaeed2010/adminlte",
@@ -98,7 +98,7 @@
             "version": "3.4.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/jquery/jquery-dist.git",
+                "url": "git@github.com:jquery/jquery-dist.git",
                 "reference": "15bc73803f76bc53b654b9fdbbbc096f56d7c03d"
             },
             "dist": {
@@ -773,6 +773,218 @@
             ],
             "time": "2018-09-23T07:29:23+00:00"
         },
+        {
+            "name": "kartik-v/yii2-dialog",
+            "version": "v1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-dialog.git",
+                "reference": "c38616d719f52530749457c022ca6134d0ad31ce"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-dialog/zipball/c38616d719f52530749457c022ca6134d0ad31ce",
+                "reference": "c38616d719f52530749457c022ca6134d0ad31ce",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": ">=2.0.0"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "kartik\\dialog\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "An asset bundle for bootstrap3-dialog for Yii 2.0 framework.",
+            "homepage": "https://github.com/kartik-v/yii2-dialog",
+            "keywords": [
+                "alert",
+                "bootstrap",
+                "dialog",
+                "extension",
+                "modal",
+                "yii2"
+            ],
+            "time": "2018-10-09T08:08:51+00:00"
+        },
+        {
+            "name": "kartik-v/yii2-field-range",
+            "version": "v1.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-field-range.git",
+                "reference": "8a18edb343b3beb96ddc86e4a06aee28be160787"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-field-range/zipball/8a18edb343b3beb96ddc86e4a06aee28be160787",
+                "reference": "8a18edb343b3beb96ddc86e4a06aee28be160787",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-helpers": ">=1.3.9",
+                "kartik-v/yii2-widget-activeform": ">=1.5.7"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "kartik\\field\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Easily manage Yii 2 ActiveField ranges (from/to) with Bootstrap 3 addons markup and more",
+            "homepage": "https://github.com/kartik-v/yii2-field-range",
+            "keywords": [
+                "addon",
+                "bootstrap",
+                "bootstrap 3",
+                "bootstrap 4",
+                "date",
+                "extension",
+                "field-range",
+                "from",
+                "range",
+                "to",
+                "widget",
+                "yii2"
+            ],
+            "time": "2019-05-25T07:21:55+00:00"
+        },
+        {
+            "name": "kartik-v/yii2-grid",
+            "version": "v3.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-grid.git",
+                "reference": "e889dd77373961794b6aa2e1d748c8c1e1e83ea8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-grid/zipball/e889dd77373961794b6aa2e1d748c8c1e1e83ea8",
+                "reference": "e889dd77373961794b6aa2e1d748c8c1e1e83ea8",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-dialog": "~1.0"
+            },
+            "suggest": {
+                "kartik-v/yii2-mpdf": "For exporting grids to PDF"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "kartik\\grid\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Yii 2 GridView on steroids. Various enhancements and utilities for the Yii 2.0 GridView widget.",
+            "homepage": "https://github.com/kartik-v/yii2-grid",
+            "keywords": [
+                "extension",
+                "grid",
+                "widget",
+                "yii2"
+            ],
+            "time": "2019-08-26T12:57:09+00:00"
+        },
+        {
+            "name": "kartik-v/yii2-helpers",
+            "version": "v1.3.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-helpers.git",
+                "reference": "0bec7a97bf9d0293d96be5c496fe9654c4dec94b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-helpers/zipball/0bec7a97bf9d0293d96be5c496fe9654c4dec94b",
+                "reference": "0bec7a97bf9d0293d96be5c496fe9654c4dec94b",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": ">=2.0.0"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "kartik\\helpers\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A collection of useful helper functions for Yii Framework 2.0",
+            "homepage": "https://github.com/kartik-v/yii2-helpers",
+            "keywords": [
+                "bootstrap",
+                "extension",
+                "helper",
+                "utilities",
+                "yii",
+                "yii2"
+            ],
+            "time": "2018-10-09T08:03:44+00:00"
+        },
         {
             "name": "kartik-v/yii2-krajee-base",
             "version": "v2.0.5",
diff --git a/config/web.php b/config/web.php
index 2f2b59b..8e85ecd 100644
--- a/config/web.php
+++ b/config/web.php
@@ -1,6 +1,7 @@
 <?php
 
 use kartik\datecontrol\Module;
+
 $params = require __DIR__ . '/params.php';
 $db = require __DIR__ . '/db.php';
 
@@ -54,7 +55,7 @@ $config = [
     'authManager' => [
       'class' => 'yii\rbac\DbManager',
     ],
-    'formatter'    => [
+    'formatter' => [
       'defaultTimeZone' => 'Europe/Moscow',
       'timeZone' => 'GMT+03:00',
       'dateFormat' => 'dd-MM-yyyy',
@@ -69,7 +70,7 @@ $config = [
     'manager' => [
       'class' => 'app\modules\manager\Module',
     ],
-    'datecontrol' =>  [
+    'datecontrol' => [
       'class' => 'kartik\datecontrol\Module',
 
       // format settings for displaying each date attribute (ICU format example)
@@ -85,8 +86,11 @@ $config = [
         Module::FORMAT_TIME => 'php:H:i:s',
         Module::FORMAT_DATETIME => 'php:U',
       ],
-        'displayTimezone' => 'GMT+03:00',
-        'saveTimezone' => 'GMT+03:00',
+      'displayTimezone' => 'GMT+03:00',
+      'saveTimezone' => 'GMT+03:00',
+    ],
+    'gridview' => [
+      'class' => '\kartik\grid\Module'
     ]
   ],
   'params' => $params,
@@ -104,7 +108,7 @@ if (YII_ENV_DEV) {
   $config['bootstrap'][] = 'gii';
   $config['modules']['gii'] = [
     'class' => 'yii\gii\Module',
-    'generators' => [ 
+    'generators' => [
       'crud' => [
         'class' => 'yii\gii\generators\crud\Generator',
         'templates' => [
diff --git a/models/TableForm.php b/models/TableForm.php
new file mode 100644
index 0000000..24a7b49
--- /dev/null
+++ b/models/TableForm.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace app\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+
+class TableForm extends Model
+{
+  public $month;
+  public $object_id;
+
+  public function rules()
+  {
+    return [
+      [['month'], 'string'],
+      [['object_id'], 'integer'],
+      [['month', 'object_id'], 'required'],
+    ];
+  }
+
+  public function getTable()
+  {
+    $records = $this->getRecords()->getModels();
+    $date = explode('-', $this->month);
+    $days_count = cal_days_in_month(CAL_GREGORIAN, $date[0], $date[1]);
+
+    $table = [];
+    $table_body = [];
+    foreach ($records as $record) {
+      $id = $record->employee_id;
+      $sum = 0;
+      if (!array_key_exists($id, $table_body)) {
+        $table_body[$id] = ['full_name' => $record->employee->full_name, 'table_number' =>
+          $record->employee->table_number];
+        for ($i = 1; $i <= $days_count; $i++) {
+          $recordDate = Yii::$app->formatter->asTimestamp("{$i}.{$date[0]}.{$date[1]}");
+          if ($recordDate >= $record->getDay('start')['dayStart'] && $recordDate <= $record->getDay('start')
+            ['dayEnd']) {
+            $table_body[$id][$i] = $record->end - $record->start;
+            $sum += $table_body[$id][$i];
+          } else {
+            $table_body[$id][$i] = 0;
+          }
+          $table_body[$id]['sum'] = $sum;
+        }
+      } else {
+        for ($i = 1; $i <= $days_count; $i++) {
+          $recordDate = Yii::$app->formatter->asTimestamp("{$i}.{$date[0]}.{$date[1]}");
+          if ($recordDate >= $record->getDay('start')['dayStart'] && $recordDate <= $record->getDay('start')
+            ['dayEnd']) {
+            $table_body[$id][$i] += $record->end - $record->start;
+            $table_body[$id]['sum'] += $record->end - $record->start;
+
+          } else {
+            continue;
+          }
+        }
+      }
+    }
+
+    $table_body_formatted = [];
+
+    foreach ($table_body as $id => $record) {
+      $table_body_formatted[$id]['ФИО'] = $table_body[$id]['full_name'];
+      $table_body_formatted[$id]['Таб. №'] = $table_body[$id]['table_number'];
+      foreach ($record as $key => $value) {
+        if(is_integer($key) || $key === 'sum') {
+          $table_body_formatted[$id][$key] = $this->formatInterval($value);
+        }
+      }
+      $sum =  $table_body_formatted[$id]['sum'];
+      unset($table_body_formatted[$id]['sum']);
+      $table_body_formatted[$id]['Сумма'] = $sum;
+
+    }
+    $table['body'] = $table_body_formatted;
+    
+    return $table;
+  }
+
+
+  /**
+   * @return ActiveDataProvider
+   */
+  private function getRecords()
+  {
+    $query = Records::find()->where(['object_id' => $this->object_id])->andWhere([
+        'like', 'DATE_FORMAT(FROM_UNIXTIME(start), "%m-%Y")', $this->month]
+    );
+
+    $dataProvider = new ActiveDataProvider([
+      'query' => $query,
+      'sort' => false
+    ]);
+
+    return $dataProvider;
+  }
+
+  private function formatInterval($interval)
+  {
+    $hours = 0;
+    $minutes = 0;
+    if ($interval > 3600) {
+      $hours = floor($interval / 3600);
+      $interval = $interval % 3600;
+    }
+    $minutes += floor($interval / 60);
+    $result = '';
+
+    if ((int)$hours !== 0) {
+      $result .= "{$hours}ч ";
+    }
+    if ((int)$minutes !== 0) {
+      $result .= "{$minutes}м ";
+    }
+    return $result;
+  }
+
+
+  /**
+   * {@inheritdoc}
+   */
+  public function attributeLabels()
+  {
+    return [
+      'objectName' => 'Объект',
+      'object_id' => 'Объект'
+    ];
+
+  }
+}
\ No newline at end of file
diff --git a/modules/administrator/controllers/TableController.php b/modules/administrator/controllers/TableController.php
new file mode 100644
index 0000000..559705a
--- /dev/null
+++ b/modules/administrator/controllers/TableController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace app\modules\administrator\controllers;
+
+use app\models\TableForm;
+use Yii;
+use app\models\Records;
+use app\models\RecordsSearch;
+use yii\web\Controller;
+use yii\filters\VerbFilter;
+
+/**
+ * TableController Вывод табеля.
+ */
+class TableController extends Controller
+{
+  /**
+   * @inheritdoc
+   */
+  public function behaviors()
+  {
+    return [
+      'verbs' => [
+        'class' => VerbFilter::className(),
+        'actions' => [
+          'delete' => ['POST'],
+        ],
+      ],
+      'access' => [
+        'class' => '\yii\filters\AccessControl',
+        'rules' => [
+          [
+            'allow' => true,
+            'roles' => ['admin', 'superadmin']
+          ],
+        ],
+      ],
+    ];
+  }
+
+
+  public function actionIndex()
+  {
+    $model = new TableForm();
+    $post = Yii::$app->request->post();
+    if (!empty($post)) {
+      $model->load(Yii::$app->request->post());
+    }
+    return $this->render('index', [
+      'model' => $model,
+    ]);
+  }
+}
diff --git a/modules/administrator/views/records/index.php b/modules/administrator/views/records/index.php
index 0b60ac6..637c7ce 100644
--- a/modules/administrator/views/records/index.php
+++ b/modules/administrator/views/records/index.php
@@ -1,7 +1,7 @@
 <?php
 
 use yii\helpers\Html;
-use yii\grid\GridView;
+use kartik\grid\GridView;
 use app\models\Records;
 use kartik\widgets\DatePicker;
 
@@ -12,95 +12,115 @@ use kartik\widgets\DatePicker;
 $this->title = 'Записи';
 $this->params['breadcrumbs'][] = $this->title;
 $types = [
-    1 => 'Рабочий',
-    2 => 'Подработка',
-    3 => 'Мобильный',
+  1 => 'Рабочий',
+  2 => 'Подработка',
+  3 => 'Мобильный',
 ];
 
 ?>
 <div class="records-index box box-primary">
   <div class="box-header with-border">
-      <?= Html::a('Добавить запись', ['create'], ['class' => 'btn btn-success btn-flat']) ?>
+    <?= Html::a('Добавить запись', ['create'], ['class' => 'btn btn-success btn-flat']) ?>
   </div>
   <div class="box-body table-responsive no-padding">
-      <?= GridView::widget([
-          'dataProvider' => $dataProvider,
-          'filterModel' => $searchModel,
-          'layout' => "{items}\n{summary}\n{pager}",
-          'columns' => [
-              [
-                  'attribute' => 'created_at',
-                  'value' => function (Records $model) {
-                      return Yii::$app->formatter->asDatetime($model->created_at);
-                  },
-                  'filter' => DatePicker::widget([
-                      'model' => $searchModel,
-                      'attribute' => 'created_at',
-                      'language' => 'ru',
-                      'pluginOptions' => [
-                          'autoclose' => true,
-                          'todayHighlight' => true,
-                          'format' => 'dd.mm.yyyy',
-                      ],
-                  ]),
-              ],
-              'employeeFullName',
-              'objectName',
-              [
-                  'attribute' => 'type',
-                  'filter' => $types,
-                  'value' => function (Records $model) {
-                      $types = [
-                          1 => 'Рабочий',
-                          2 => 'Подработка',
-                          3 => 'Мобильный',
-                      ];
-                      return $types[$model->type];
-                  }
-              ],
-              [
-                  'attribute' => 'start',
-                  'value' => function (Records $model) {
-                      return Yii::$app->formatter->asDatetime($model->start);
-                  },
-                    'filter' => DatePicker::widget([
-                      'model' => $searchModel,
-                      'attribute' => 'start',
-                      'language' => 'ru',
-                      'pluginOptions' => [
-                          'autoclose' => true,
-                          'todayHighlight' => true,
-                          'format' => 'dd.mm.yyyy',
-                      ],
-                  ]),
-              ],
-              [
-                  'attribute' => 'end',
-                  'value' => function (Records $model) {
-                      return Yii::$app->formatter->asDatetime($model->end);
-                  },
-                  'filter' => DatePicker::widget([
-                      'model' => $searchModel,
-                      'attribute' => 'end',
-                      'language' => 'ru',
-                      'pluginOptions' => [
-                          'autoclose' => true,
-                          'todayHighlight' => true,
-                          'format' => 'dd.mm.yyyy',
-                      ],
-                  ]),
-              ],
-              [
-                  'label' => 'Часы',
-                  'value' => function (Records $model) {
-                      return $model->formatSecondsInterval();
-                  }
+    <?= GridView::widget([
+      'dataProvider' => $dataProvider,
+      'filterModel' => $searchModel,
+      'layout' => "{items}\n{summary}\n{pager}",
+      'responsive' => true,
+      'hover' => true,
+      'toolbar' => [
+        [
+          'options' => ['class' => 'btn-group mr-2']
+        ],
+        '{export}',
+      ],
+      'export' => [
+        'label' => 'Выгрузить',
+        'showConfirmAlert' => false,
+        'header' => '',
+      ],
+      'exportConfig' => [
+        GridView::EXCEL => ['label' => 'Excel'],
 
-              ],
-              // 'updated_at',
+      ],
+      'panel' => [
+        'type' => GridView::TYPE_DEFAULT,
+      ],
+      'columns' => [
+        [
+          'attribute' => 'created_at',
+          'value' => function (Records $model) {
+            return Yii::$app->formatter->asDatetime($model->created_at);
+          },
+          'filter' => DatePicker::widget([
+            'model' => $searchModel,
+            'attribute' => 'created_at',
+            'language' => 'ru',
+            'pluginOptions' => [
+              'autoclose' => true,
+              'todayHighlight' => true,
+              'format' => 'dd.mm.yyyy',
+            ],
+          ]),
+        ],
+        'employeeFullName',
+        'objectName',
+        [
+          'attribute' => 'type',
+          'filter' => $types,
+          'value' => function (Records $model) {
+            $types = [
+              1 => 'Рабочий',
+              2 => 'Подработка',
+              3 => 'Мобильный',
+            ];
+            return $types[$model->type];
+          }
+        ],
+        [
+          'attribute' => 'start',
+          'value' => function (Records $model) {
+            return Yii::$app->formatter->asDatetime($model->start);
+          },
+          'filter' => DatePicker::widget([
+            'model' => $searchModel,
+            'attribute' => 'start',
+            'language' => 'ru',
+            'pluginOptions' => [
+              'autoclose' => true,
+              'todayHighlight' => true,
+              'format' => 'dd.mm.yyyy',
+            ],
+          ]),
+        ],
+        [
+          'attribute' => 'end',
+          'value' => function (Records $model) {
+            return Yii::$app->formatter->asDatetime($model->end);
+          },
+          'filter' => DatePicker::widget([
+            'model' => $searchModel,
+            'attribute' => 'end',
+            'language' => 'ru',
+            'pluginOptions' => [
+              'autoclose' => true,
+              'todayHighlight' => true,
+              'format' => 'dd.mm.yyyy',
+            ],
+          ]),
+        ],
+        [
+          'label' => 'Часы',
+          'value' => function (Records $model) {
+            return $model->formatSecondsInterval();
+          }
 
-              ['class' => 'yii\grid\ActionColumn'],
-          ],
-      ]); ?>
+        ],
+        // 'updated_at',
+
+        ['class' => 'yii\grid\ActionColumn'],
+      ],
+    ]); ?>
   </div>
 </div>
diff --git a/modules/administrator/views/table/index.php b/modules/administrator/views/table/index.php
new file mode 100644
index 0000000..a17c1ad
--- /dev/null
+++ b/modules/administrator/views/table/index.php
@@ -0,0 +1,78 @@
+<?php
+/* @var $this \yii\web\View */
+
+/* @var $model \app\models\TableForm */
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use kartik\widgets\DatePicker;
+use kartik\grid\GridView;
+
+$this->title = 'Табель';
+$this->params['breadcrumbs'][] = $this->title;
+
+$objects = \yii\helpers\ArrayHelper::map(\app\models\Objects::find()->all(), 'id', 'object_number');
+
+?>
+
+<div class="table-form-index box box-primary">
+  <div class="box-header with-border">
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'object_id')->dropDownList($objects) ?>
+    <?= $form->field($model, 'month')->widget(DatePicker::classname(), [
+      'options' => ['placeholder' => Yii::t('app', 'месяц/год')],
+      'pluginOptions' => [
+        'autoclose' => true,
+        'startView' => 'year',
+        'minViewMode' => 'months',
+        'format' => 'mm-yyyy'
+      ]
+    ])->label(false); ?>
+
+    <div class="box-footer">
+      <?= Html::submitButton('Показать', ['class' => 'btn btn-success btn-flat']) ?>
+    </div>
+
+    <?php ActiveForm::end() ?>
+  </div>
+  <div class="box-body table-responsive no-padding">
+    <?php if (!is_null($model->object_id)): ?>
+      <?php $table = $model->getTable() ?>
+      <?php
+      $dataProvider = new \yii\data\ArrayDataProvider([
+        'allModels' => $table['body']
+      ]);
+      ?>
+      <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'responsive' => true,
+        'hover' => true,
+        'toolbar' => [
+          [
+            'options' => ['class' => 'btn-group mr-2']
+          ],
+          '{export}',
+        ],
+        'export' => [
+          'label' => 'Выгрузить',
+          'showConfirmAlert' => false,
+          'header' => '',
+        ],
+        'exportConfig' => [
+          GridView::EXCEL => ['label' => 'Excel'],
+
+        ],
+        'panel' => [
+          'type' => GridView::TYPE_DEFAULT,
+        ],
+
+
+      ]) ?>
+    <?php endif; ?>
+  </div>
+</div>
+
+
+
+
diff --git a/modules/administrator/views/users/_form.php b/modules/administrator/views/users/_form.php
index 160c862..b2ba43c 100644
--- a/modules/administrator/views/users/_form.php
+++ b/modules/administrator/views/users/_form.php
@@ -16,26 +16,28 @@ $hubs = $hubs + ArrayHelper::map(\app\models\TransportHubs::find()->all(), 'id',
 ?>
 
 <div class="users-form box box-primary">
-    <?php $form = ActiveForm::begin(); ?>
+  <?php $form = ActiveForm::begin(); ?>
   <div class="box-body table-responsive">
 
-      <?= $form->field($model, 'username')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'username')->textInput(['maxlength' => true]) ?>
 
-      <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
 
-      <?php if (Yii::$app->authManager->checkAccess($model->id, 'manager')): ?>
+    <?php if (Yii::$app->authManager->checkAccess($model->id, 'manager')): ?>
 
-          <?= $form->field($model, 'object_id')->dropDownList($objects) ?>
-      <?php else: ?>
-          <?= $form->field($model, 'hub_id')->dropDownList($hubs) ?>
+      <?= $form->field($model, 'object_id')->dropDownList($objects) ?>
 
-      <?php endif; ?>
+    <?php elseif ($model->id !== Yii::$app->user->identity->getId()): ?>
+
+      <?= $form->field($model, 'hub_id')->dropDownList($hubs) ?>
+
+    <?php endif; ?>
 
   </div>
   <div class="box-footer">
-      <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success btn-flat']) ?>
+    <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success btn-flat']) ?>
   </div>
-    <?php ActiveForm::end(); ?>
+  <?php ActiveForm::end(); ?>
 </div>
 
 
diff --git a/modules/manager/views/records/index.php b/modules/manager/views/records/index.php
index a197d1e..cb97e7f 100644
--- a/modules/manager/views/records/index.php
+++ b/modules/manager/views/records/index.php
@@ -1,7 +1,7 @@
 <?php
 
 use yii\helpers\Html;
-use yii\grid\GridView;
+use kartik\grid\GridView;
 use app\models\Records;
 use kartik\widgets\DatePicker;
 
@@ -12,98 +12,118 @@ use kartik\widgets\DatePicker;
 $this->title = 'Записи';
 $this->params['breadcrumbs'][] = $this->title;
 $types = [
-    1 => 'Рабочий',
-    2 => 'Подработка',
-    3 => 'Мобильный',
+  1 => 'Рабочий',
+  2 => 'Подработка',
+  3 => 'Мобильный',
 ];
 
 ?>
 <div class="records-index box box-primary">
   <div class="box-header with-border">
-      <?= Html::a('Добавить запись', ['create'], ['class' => 'btn btn-success btn-flat']) ?>
+    <?= Html::a('Добавить запись', ['create'], ['class' => 'btn btn-success btn-flat']) ?>
   </div>
   <div class="box-body table-responsive no-padding">
-      <?= GridView::widget([
-          'dataProvider' => $dataProvider,
-          'filterModel' => $searchModel,
-          'layout' => "{items}\n{summary}\n{pager}",
-          'columns' => [
-              [
-                  'attribute' => 'created_at',
-                  'value' => function (Records $model) {
-                      return Yii::$app->formatter->asDatetime($model->created_at);
-                  },
-                  'filter' => DatePicker::widget([
-                      'model' => $searchModel,
-                      'attribute' => 'created_at',
-                      'language' => 'ru',
-                      'pluginOptions' => [
-                          'autoclose' => true,
-                          'todayHighlight' => true,
-                          'format' => 'dd.mm.yyyy',
-                      ],
-                  ]),
-              ],
-              'employeeFullName',
-              'objectName',
-              [
-                  'attribute' => 'type',
-                  'filter' => $types,
-                  'value' => function (Records $model) {
-                      $types = [
-                          1 => 'Рабочий',
-                          2 => 'Подработка',
-                          3 => 'Мобильный',
-                      ];
-                      return $types[$model->type];
-                  }
-              ],
-              [
-                  'attribute' => 'start',
-                  'value' => function (Records $model) {
-                      return Yii::$app->formatter->asDatetime($model->start);
-                  },
-                    'filter' => DatePicker::widget([
-                      'model' => $searchModel,
-                      'attribute' => 'start',
-                      'language' => 'ru',
-                      'pluginOptions' => [
-                          'autoclose' => true,
-                          'todayHighlight' => true,
-                          'format' => 'dd.mm.yyyy',
-                      ],
-                  ]),
-              ],
-              [
-                  'attribute' => 'end',
-                  'value' => function (Records $model) {
-                      return Yii::$app->formatter->asDatetime($model->end);
-                  },
-                  'filter' => DatePicker::widget([
-                      'model' => $searchModel,
-                      'attribute' => 'end',
-                      'language' => 'ru',
-                      'pluginOptions' => [
-                          'autoclose' => true,
-                          'todayHighlight' => true,
-                          'format' => 'dd.mm.yyyy',
-                      ],
-                  ]),
-              ],
-              [
-                  'label' => 'Часы',
-                  'value' => function (Records $model) {
-                      return $model->formatSecondsInterval();
-                  }
+    <?= GridView::widget([
+      'dataProvider' => $dataProvider,
+      'filterModel' => $searchModel,
+      'layout' => "{items}\n{summary}\n{pager}",
+      'responsive' => true,
+      'hover' => true,
+      'toolbar' => [
+        [
+          'options' => ['class' => 'btn-group mr-2']
+        ],
+        '{export}',
+      ],
+      'export' => [
+        'label' => 'Выгрузить',
+        'showConfirmAlert' => false,
+        'header' => '',
+      ],
+      'exportConfig' => [
+        GridView::EXCEL => ['label' => 'Excel'],
 
-              ],
-              // 'updated_at',
+      ],
+      'panel' => [
+        'type' => GridView::TYPE_DEFAULT,
+      ],
+      'columns' => [
+        [
+          'attribute' => 'created_at',
+          'value' => function (Records $model) {
+            return Yii::$app->formatter->asDatetime($model->created_at);
+          },
+          'filter' => DatePicker::widget([
+            'model' => $searchModel,
+            'attribute' => 'created_at',
+            'language' => 'ru',
+            'pluginOptions' => [
+              'autoclose' => true,
+              'todayHighlight' => true,
+              'format' => 'dd.mm.yyyy',
+            ],
+          ]),
+        ],
+        'employeeFullName',
+        'objectName',
+        [
+          'attribute' => 'type',
+          'filter' => $types,
+          'value' => function (Records $model) {
+            $types = [
+              1 => 'Рабочий',
+              2 => 'Подработка',
+              3 => 'Мобильный',
+            ];
+            return $types[$model->type];
+          }
+        ],
+        [
+          'attribute' => 'start',
+          'value' => function (Records $model) {
+            return Yii::$app->formatter->asDatetime($model->start);
+          },
+          'filter' => DatePicker::widget([
+            'model' => $searchModel,
+            'attribute' => 'start',
+            'language' => 'ru',
+            'pluginOptions' => [
+              'autoclose' => true,
+              'todayHighlight' => true,
+              'format' => 'dd.mm.yyyy',
+            ],
+          ]),
+        ],
+        [
+          'attribute' => 'end',
+          'value' => function (Records $model) {
+            return Yii::$app->formatter->asDatetime($model->end);
+          },
+          'filter' => DatePicker::widget([
+            'model' => $searchModel,
+            'attribute' => 'end',
+            'language' => 'ru',
+            'pluginOptions' => [
+              'autoclose' => true,
+              'todayHighlight' => true,
+              'format' => 'dd.mm.yyyy',
+            ],
+          ]),
+        ],
+        [
+          'label' => 'Часы',
+          'value' => function (Records $model) {
+            return $model->formatSecondsInterval();
+          }
 
-              [
-                  'class' => 'yii\grid\ActionColumn',
-                  'template' => '{view} {update}'
-              ],
-          ],
-      ]); ?>
+        ],
+        // 'updated_at',
+
+        [
+          'class' => 'yii\grid\ActionColumn',
+          'template' => '{view} {update}'
+        ],
+      ],
+    ]); ?>
   </div>
 </div>
diff --git a/views/layouts/left.php b/views/layouts/left.php
index dadb9c5..608aef3 100644
--- a/views/layouts/left.php
+++ b/views/layouts/left.php
@@ -18,6 +18,9 @@
             Yii::$app->user->can('superadmin')],
           ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/manager/records'], 'visible' =>
             Yii::$app->user->can('manager')],
+          ['label' => 'Табель', 'icon' => 'table', 'url' => ['/administrator/table'], 'visible' =>
+            Yii::$app->user->can('superadmin')],
+
 //          ['label' => 'Gii', 'icon' => 'file-code-o', 'url' => ['/gii']],
 //          ['label' => 'Debug', 'icon' => 'dashboard', 'url' => ['/debug']],
 //                    [
-- 
GitLab


From 431e458b2a5aab63f213efc076d677b83871e5e5 Mon Sep 17 00:00:00 2001
From: Igor Borisov <latentpickuper@gmail.com>
Date: Tue, 4 Feb 2020 15:25:12 +0300
Subject: [PATCH 5/5] DONE

---
 models/Records.php                            |  17 ++
 models/RecordsSearch.php                      |  77 ++---
 .../controllers/EmployeesController.php       | 274 ++++++++++--------
 modules/administrator/views/records/_form.php |   8 +-
 modules/administrator/views/records/index.php |   3 +-
 modules/administrator/views/table/index.php   |   8 +-
 .../manager/controllers/TableController.php   |  53 ++++
 modules/manager/views/records/index.php       |   3 +-
 modules/manager/views/table/index.php         |  83 ++++++
 views/layouts/left.php                        |   6 +
 10 files changed, 367 insertions(+), 165 deletions(-)
 create mode 100644 modules/manager/controllers/TableController.php
 create mode 100644 modules/manager/views/table/index.php

diff --git a/models/Records.php b/models/Records.php
index 1cee58b..864be56 100644
--- a/models/Records.php
+++ b/models/Records.php
@@ -55,8 +55,10 @@ class Records extends \yii\db\ActiveRecord
             'id' => 'ID',
             'employee_id' => 'ФИО соотрудника',
             'employeeFullName' => 'ФИО соотрудника',
+            'employeeTableNumber' => 'Таб.№ сотрудника',
             'object_id' => 'Объект',
             'objectName' => 'Объект',
+            'objectNumber' => 'Номер объекта',
             'start' => 'Дата/время начала',
             'end' => 'Дата/время окончания',
             'type' => 'Тип записи',
@@ -80,6 +82,14 @@ class Records extends \yii\db\ActiveRecord
         return $this->employee->full_name;
     }
 
+    /**
+     * @return string
+     */
+    public function getEmployeeTableNumber()
+    {
+        return $this->employee->table_number;
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -95,6 +105,13 @@ class Records extends \yii\db\ActiveRecord
     {
         return $this->object->name;
     }
+    /**
+     * @return string
+     */
+    public function getObjectNumber()
+    {
+        return $this->object->object_number;
+    }
 
     /**
      * Проверка, что дата окончания тот же день, что и дата начала
diff --git a/models/RecordsSearch.php b/models/RecordsSearch.php
index 164ac62..626042c 100644
--- a/models/RecordsSearch.php
+++ b/models/RecordsSearch.php
@@ -13,7 +13,8 @@ use app\models\Records;
 class RecordsSearch extends Records
 {
   public $employeeFullName;
-  public $objectName;
+  public $employeeTableNumber;
+  public $objectNumber;
 
   /**
    * @inheritdoc
@@ -21,8 +22,8 @@ class RecordsSearch extends Records
   public function rules()
   {
     return [
-      [['id', 'employee_id', 'object_id', 'type'], 'integer'],
-      [['objectName', 'employeeFullName',  'start', 'end', 'created_at'], 'safe'],
+      [['id', 'employee_id', 'object_id', 'type', 'employeeTableNumber'], 'integer'],
+      [['objectNumber', 'employeeFullName', 'start', 'end', 'created_at'], 'safe'],
     ];
   }
 
@@ -45,14 +46,18 @@ class RecordsSearch extends Records
   public function search($params)
   {
     $query = Records::find();
-
+    $user = Users::findOne(Yii::$app->user->identity->getId());
     if (Yii::$app->user->can('manager')) {
-        $user = Users::findOne(Yii::$app->user->identity->getId());
-        $query->andWhere([
-            'records.object_id' => $user->object_id
-        ]);
+      $query->andWhere([
+        'records.object_id' => $user->object_id
+      ]);
+    }
+    if (Yii::$app->user->can('admin')) {
+      $query->andWhere(['IN', 'records.object_id', Objects::find()->select('id')->where(['hub_id' => $user->hub_id])
+      ]);
     }
 
+
     // add conditions that should always apply here
 
     $dataProvider = new ActiveDataProvider([
@@ -69,9 +74,13 @@ class RecordsSearch extends Records
           'asc' => ['employees.full_name' => SORT_ASC],
           'desc' => ['employees.full_name' => SORT_DESC]
         ],
-        'objectName' => [
-          'asc' => ['objects.name' => SORT_ASC],
-          'desc' => ['objects.name' => SORT_DESC]
+        'employeeTableNumber' => [
+          'asc' => ['employees.table_number' => SORT_ASC],
+          'desc' => ['employees.table_number' => SORT_DESC]
+        ],
+        'objectNumber' => [
+          'asc' => ['objects.object_number' => SORT_ASC],
+          'desc' => ['objects.object_number' => SORT_DESC]
         ],
 
         'type' => [
@@ -98,17 +107,17 @@ class RecordsSearch extends Records
 
     $this->load($params);
 
-      if (!empty($this->start)) {
-          $this->filterByDate('start', $query);
-      }
+    if (!empty($this->start)) {
+      $this->filterByDate('start', $query);
+    }
 
-      if (!empty($this->end)) {
-          $this->filterByDate('end', $query);
-      }
+    if (!empty($this->end)) {
+      $this->filterByDate('end', $query);
+    }
 
-      if (!empty($this->created_at)) {
-          $this->filterByDate('created_at', $query);
-      }
+    if (!empty($this->created_at)) {
+      $this->filterByDate('created_at', $query);
+    }
 
     if (!$this->validate()) {
       // uncomment the following line if you do not want to return any records when validation fails
@@ -130,13 +139,15 @@ class RecordsSearch extends Records
     ]);
 
     $query->joinWith(['object' => function ($q) {
-      $q->where('objects.name LIKE "%' . $this->objectName . '%"');
+      $q->where('objects.object_number LIKE "%' . $this->objectNumber . '%"');
     }]);
 
     $query->joinWith(['employee' => function ($q) {
       $q->where('employees.full_name LIKE "%' . $this->employeeFullName . '%"');
     }]);
-
+    $query->joinWith(['employee' => function ($q) {
+      $q->where('employees.table_number LIKE "%' . $this->employeeTableNumber . '%"');
+    }]);
 
 
     return $dataProvider;
@@ -160,15 +171,15 @@ class RecordsSearch extends Records
     }
   }
 
-    private function filterByDate($attr, $query)
-    {
-        $dayStart = (int)\Yii::$app->formatter->asTimestamp($this->$attr . ' 00:00:00');
-        $dayStop = (int)\Yii::$app->formatter->asTimestamp($this->$attr . ' 23:59:59');
-        $query->andFilterWhere([
-            'between',
-            self::tableName() . ".$attr",
-            $dayStart,
-            $dayStop,
-        ]);
-    }
+  private function filterByDate($attr, $query)
+  {
+    $dayStart = (int)\Yii::$app->formatter->asTimestamp($this->$attr . ' 00:00:00');
+    $dayStop = (int)\Yii::$app->formatter->asTimestamp($this->$attr . ' 23:59:59');
+    $query->andFilterWhere([
+      'between',
+      self::tableName() . ".$attr",
+      $dayStart,
+      $dayStop,
+    ]);
+  }
 }
diff --git a/modules/administrator/controllers/EmployeesController.php b/modules/administrator/controllers/EmployeesController.php
index 806ea70..6636a86 100644
--- a/modules/administrator/controllers/EmployeesController.php
+++ b/modules/administrator/controllers/EmployeesController.php
@@ -7,6 +7,7 @@ use app\models\Employees;
 use app\models\EmployeesSearch;
 use yii\helpers\ArrayHelper;
 use yii\web\Controller;
+use yii\web\ForbiddenHttpException;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 
@@ -15,143 +16,160 @@ use yii\filters\VerbFilter;
  */
 class EmployeesController extends Controller
 {
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['POST'],
-                ],
-            ],
-            'access' => [
-                'class' => '\yii\filters\AccessControl',
-                'rules' => [
-                    [
-                        'allow' => true,
-                        'roles' => ['superadmin']
-                    ],
-                ],
-            ],
-        ];
+  /**
+   * @inheritdoc
+   */
+  public function behaviors()
+  {
+    return [
+      'verbs' => [
+        'class' => VerbFilter::className(),
+        'actions' => [
+          'delete' => ['POST'],
+        ],
+      ],
+      'access' => [
+        'class' => '\yii\filters\AccessControl',
+        'rules' => [
+          [
+            'allow' => true,
+            'roles' => ['superadmin', 'admin']
+          ],
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * Lists all Employees models.
+   * @return mixed
+   */
+  public function actionIndex()
+  {
+    $searchModel = new EmployeesSearch();
+    $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+    if (!Yii::$app->user->can('superadmin')) {
+      throw new ForbiddenHttpException('Доступ запрещен');
     }
-
-    /**
-     * Lists all Employees models.
-     * @return mixed
-     */
-    public function actionIndex()
-    {
-        $searchModel = new EmployeesSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-
-        return $this->render('index', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
-        ]);
+    return $this->render('index', [
+      'searchModel' => $searchModel,
+      'dataProvider' => $dataProvider,
+    ]);
+  }
+
+  /**
+   * Displays a single Employees model.
+   * @param integer $id
+   * @return mixed
+   */
+  public function actionView($id)
+  {
+    if (!Yii::$app->user->can('superadmin')) {
+      throw new ForbiddenHttpException('Доступ запрещен');
     }
 
-    /**
-     * Displays a single Employees model.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
+    return $this->render('view', [
+      'model' => $this->findModel($id),
+    ]);
+  }
+
+  /**
+   * Creates a new Employees model.
+   * If creation is successful, the browser will be redirected to the 'view' page.
+   * @return mixed
+   */
+  public function actionCreate()
+  {
+    if (!Yii::$app->user->can('superadmin')) {
+      throw new ForbiddenHttpException('Доступ запрещен');
     }
-
-    /**
-     * Creates a new Employees model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionCreate()
-    {
-        $model = new Employees();
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id]);
-        } else {
-            return $this->render('create', [
-                'model' => $model,
-            ]);
-        }
+    $model = new Employees();
+
+    if ($model->load(Yii::$app->request->post()) && $model->save()) {
+      return $this->redirect(['view', 'id' => $model->id]);
+    } else {
+      return $this->render('create', [
+        'model' => $model,
+      ]);
     }
-
-    /**
-     * Updates an existing Employees model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
+  }
+
+  /**
+   * Updates an existing Employees model.
+   * If update is successful, the browser will be redirected to the 'view' page.
+   * @param integer $id
+   * @return mixed
+   */
+  public function actionUpdate($id)
+  {
+    if (!Yii::$app->user->can('superadmin')) {
+      throw new ForbiddenHttpException('Доступ запрещен');
     }
-
-    /**
-     * Deletes an existing Employees model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
+    $model = $this->findModel($id);
+
+    if ($model->load(Yii::$app->request->post()) && $model->save()) {
+      return $this->redirect(['view', 'id' => $model->id]);
+    } else {
+      return $this->render('update', [
+        'model' => $model,
+      ]);
     }
-
-    /**
-     * Finds the Employees model based on its primary key value.
-     * If the model is not found, a 404 HTTP exception will be thrown.
-     * @param integer $id
-     * @return Employees the loaded model
-     * @throws NotFoundHttpException if the model cannot be found
-     */
-    protected function findModel($id)
-    {
-        if (($model = Employees::findOne($id)) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
+  }
+
+  /**
+   * Deletes an existing Employees model.
+   * If deletion is successful, the browser will be redirected to the 'index' page.
+   * @param integer $id
+   * @return mixed
+   */
+  public function actionDelete($id)
+  {
+    if(!Yii::$app->user->can('superadmin')) {
+      throw new ForbiddenHttpException('Доступ запрещен');
     }
-
-    public function actionGetEmployees()
-    {
-        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
-        $out = [];
-        $parents = $_POST['depdrop_parents'];
-        $object_id = $parents[0];
-        $type_id = $parents[1];
-
-        if (isset($parents) && !empty($object_id) && !empty($type_id)) {
-            $objectQuery = (int)$type_id === 3 ? null : $object_id;
-            foreach (ArrayHelper::toArray(Employees::find()->where(
-                [
-                    'object_id' => $objectQuery,
-                    'is_active' => true])->all()) as $employee) {
-                $out[] = ['id' => $employee['id'], 'name' => $employee['full_name']];
-            }
-            return ['output' => $out, 'selected' => ''];
-        }
-        return ['output' => '', 'selected' => ''];
+    
+    $this->findModel($id)->delete();
+
+    return $this->redirect(['index']);
+  }
+
+  /**
+   * Finds the Employees model based on its primary key value.
+   * If the model is not found, a 404 HTTP exception will be thrown.
+   * @param integer $id
+   * @return Employees the loaded model
+   * @throws NotFoundHttpException if the model cannot be found
+   */
+  protected function findModel($id)
+  {
+    if (($model = Employees::findOne($id)) !== null) {
+      return $model;
+    } else {
+      throw new NotFoundHttpException('The requested page does not exist.');
+    }
+  }
+
+  public function actionGetEmployees()
+  {
+    Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+    $out = [];
+    $parents = $_POST['depdrop_parents'];
+    $object_id = $parents[0];
+    $type_id = $parents[1];
+
+    if (isset($parents) && !empty($object_id) && !empty($type_id)) {
+      $objectQuery = (int)$type_id === 3 ? null : $object_id;
+      foreach (ArrayHelper::toArray(Employees::find()->where(
+        [
+          'object_id' => $objectQuery,
+          'is_active' => true])->all()) as $employee) {
+        $out[] = ['id' => $employee['id'], 'name' => $employee['full_name']];
+      }
+      return ['output' => $out, 'selected' => ''];
     }
+    return ['output' => '', 'selected' => ''];
+  }
 
 
 }
diff --git a/modules/administrator/views/records/_form.php b/modules/administrator/views/records/_form.php
index 4eccf23..05b3831 100644
--- a/modules/administrator/views/records/_form.php
+++ b/modules/administrator/views/records/_form.php
@@ -1,5 +1,6 @@
 <?php
 
+use app\models\Users;
 use kartik\widgets\DateTimePicker;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
@@ -14,7 +15,12 @@ use kartik\datecontrol\DateControl;
 /* @var $form yii\widgets\ActiveForm */
 
 $objects[null] = '...';
-$objects = $objects + ArrayHelper::map(Objects::find()->all(), 'id', 'name');
+$query = Objects::find();
+$user = Users::findOne(Yii::$app->user->identity->getId());
+if(Yii::$app->user->can('admin')) {
+  $query->andWhere(['hub_id' => $user->hub_id]);
+}
+$objects = $objects + ArrayHelper::map($query->all(), 'id', 'name');
 ?>
 
 <div class="records-form box box-primary">
diff --git a/modules/administrator/views/records/index.php b/modules/administrator/views/records/index.php
index 637c7ce..90761f4 100644
--- a/modules/administrator/views/records/index.php
+++ b/modules/administrator/views/records/index.php
@@ -65,7 +65,8 @@ $types = [
           ]),
         ],
         'employeeFullName',
-        'objectName',
+        'employeeTableNumber',
+        'objectNumber',
         [
           'attribute' => 'type',
           'filter' => $types,
diff --git a/modules/administrator/views/table/index.php b/modules/administrator/views/table/index.php
index a17c1ad..50c4ff5 100644
--- a/modules/administrator/views/table/index.php
+++ b/modules/administrator/views/table/index.php
@@ -3,6 +3,7 @@
 
 /* @var $model \app\models\TableForm */
 
+use app\models\Users;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use kartik\widgets\DatePicker;
@@ -11,7 +12,12 @@ use kartik\grid\GridView;
 $this->title = 'Табель';
 $this->params['breadcrumbs'][] = $this->title;
 
-$objects = \yii\helpers\ArrayHelper::map(\app\models\Objects::find()->all(), 'id', 'object_number');
+$query = \app\models\Objects::find();
+$user = Users::findOne(Yii::$app->user->identity->getId());
+if(Yii::$app->user->can('admin')) {
+  $query->andWhere(['hub_id' => $user->hub_id]);
+}
+$objects = \yii\helpers\ArrayHelper::map($query->all(), 'id', 'name');
 
 ?>
 
diff --git a/modules/manager/controllers/TableController.php b/modules/manager/controllers/TableController.php
new file mode 100644
index 0000000..2dae758
--- /dev/null
+++ b/modules/manager/controllers/TableController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace app\modules\manager\controllers;
+
+use app\models\TableForm;
+use Yii;
+use yii\web\Controller;
+use yii\filters\VerbFilter;
+
+/**
+ * TableController Вывод табеля.
+ */
+class TableController extends Controller
+{
+  /**
+   * @inheritdoc
+   */
+  public function behaviors()
+  {
+    return [
+      'verbs' => [
+        'class' => VerbFilter::className(),
+        'actions' => [
+          'delete' => ['POST'],
+        ],
+      ],
+      'access' => [
+        'class' => '\yii\filters\AccessControl',
+        'rules' => [
+          [
+            'allow' => true,
+            'roles' => ['admin', 'manager']
+          ],
+        ],
+      ],
+    ];
+  }
+
+
+  public function actionIndex()
+  {
+    $model = new TableForm();
+    $post = Yii::$app->request->post();
+    $user = \app\models\Users::findOne(Yii::$app->user->identity->getId());
+    $model->object_id = $user->object_id;
+    if (!empty($post)) {
+      $model->load(Yii::$app->request->post());
+    }
+    return $this->render('index', [
+      'model' => $model,
+    ]);
+  }
+}
diff --git a/modules/manager/views/records/index.php b/modules/manager/views/records/index.php
index cb97e7f..ad5aa91 100644
--- a/modules/manager/views/records/index.php
+++ b/modules/manager/views/records/index.php
@@ -65,7 +65,8 @@ $types = [
           ]),
         ],
         'employeeFullName',
-        'objectName',
+        'employeeTableNumber',
+        'objectNumber',
         [
           'attribute' => 'type',
           'filter' => $types,
diff --git a/modules/manager/views/table/index.php b/modules/manager/views/table/index.php
new file mode 100644
index 0000000..bf19ce9
--- /dev/null
+++ b/modules/manager/views/table/index.php
@@ -0,0 +1,83 @@
+<?php
+/* @var $this \yii\web\View */
+
+/* @var $model \app\models\TableForm */
+
+use app\models\Users;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use kartik\widgets\DatePicker;
+use kartik\grid\GridView;
+
+$this->title = 'Табель';
+$this->params['breadcrumbs'][] = $this->title;
+
+$query = \app\models\Objects::find();
+$user = Users::findOne(Yii::$app->user->identity->getId());
+if(Yii::$app->user->can('admin')) {
+  $query->andWhere(['hub_id' => $user->hub_id]);
+}
+
+?>
+
+<div class="table-form-index box box-primary">
+  <div class="box-header with-border">
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'object_id')->dropDownList([$user->object_id => $user->object->name], [ 'disabled' => true]) ?>
+    <?= $form->field($model, 'month')->widget(DatePicker::classname(), [
+      'options' => ['placeholder' => Yii::t('app', 'месяц/год')],
+      'pluginOptions' => [
+        'autoclose' => true,
+        'startView' => 'year',
+        'minViewMode' => 'months',
+        'format' => 'mm-yyyy'
+      ]
+    ])->label(false); ?>
+
+    <div class="box-footer">
+      <?= Html::submitButton('Показать', ['class' => 'btn btn-success btn-flat']) ?>
+    </div>
+
+    <?php ActiveForm::end() ?>
+  </div>
+  <div class="box-body table-responsive no-padding">
+    <?php if (!is_null($model->month)): ?>
+      <?php $table = $model->getTable() ?>
+      <?php
+      $dataProvider = new \yii\data\ArrayDataProvider([
+        'allModels' => $table['body']
+      ]);
+      ?>
+      <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'responsive' => true,
+        'hover' => true,
+        'toolbar' => [
+          [
+            'options' => ['class' => 'btn-group mr-2']
+          ],
+          '{export}',
+        ],
+        'export' => [
+          'label' => 'Выгрузить',
+          'showConfirmAlert' => false,
+          'header' => '',
+        ],
+        'exportConfig' => [
+          GridView::EXCEL => ['label' => 'Excel'],
+
+        ],
+        'panel' => [
+          'type' => GridView::TYPE_DEFAULT,
+        ],
+
+
+      ]) ?>
+    <?php endif; ?>
+  </div>
+</div>
+
+
+
+
diff --git a/views/layouts/left.php b/views/layouts/left.php
index 608aef3..f68d382 100644
--- a/views/layouts/left.php
+++ b/views/layouts/left.php
@@ -16,10 +16,16 @@
             Yii::$app->user->can('superadmin')],
           ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/administrator/records'], 'visible' =>
             Yii::$app->user->can('superadmin')],
+          ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/administrator/records'], 'visible' =>
+            Yii::$app->user->can('admin')],
           ['label' => 'Записи', 'icon' => 'clipboard', 'url' => ['/manager/records'], 'visible' =>
             Yii::$app->user->can('manager')],
           ['label' => 'Табель', 'icon' => 'table', 'url' => ['/administrator/table'], 'visible' =>
             Yii::$app->user->can('superadmin')],
+          ['label' => 'Табель', 'icon' => 'table', 'url' => ['/administrator/table'], 'visible' =>
+            Yii::$app->user->can('admin')],
+          ['label' => 'Табель', 'icon' => 'table', 'url' => ['/manager/table'], 'visible' =>
+            Yii::$app->user->can('manager')],
 
 //          ['label' => 'Gii', 'icon' => 'file-code-o', 'url' => ['/gii']],
 //          ['label' => 'Debug', 'icon' => 'dashboard', 'url' => ['/debug']],
-- 
GitLab