add mark to project

backend/modules/project/controllers/ProjectMarkController.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace backend\modules\project\controllers;
+
+use backend\modules\project\models\ProjectMark;
+use backend\modules\project\models\ProjectMarkSearch;
+use Yii;
+use yii\filters\VerbFilter;
+use yii\helpers\ArrayHelper;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\web\Response;
+
+/**
+ * ProjectMarkController implements the CRUD actions for ProjectMark model.
+ */
+class ProjectMarkController extends Controller
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all ProjectMark models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new ProjectMarkSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single ProjectMark model.
+     * @param integer $id
+     * @return mixed
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new ProjectMark model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $marks = \Yii::$app->request->post('ProjectMark');
+
+        if (!empty($marks)) {
+            $mark_id_arr = ArrayHelper::getValue($marks, 'mark_id');
+            $project_id = $marks['project_id'];
+
+            foreach ($mark_id_arr as $mark_id) {
+                $emtModel = new ProjectMark();
+                $emtModel->project_id = $project_id;
+                $emtModel->mark_id = $mark_id;
+
+                if (!$emtModel->save()) {
+                    return $this->render('create', [
+                        'model' => $emtModel,
+                    ]);
+                }
+            }
+            return $this->redirect(['index']);
+        }
+
+        $model = new ProjectMark();
+        return $this->render('create', [
+            'model' => $model,
+        ]);
+    }
+
+    /**
+     * Updates an existing ProjectMark model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        }
+
+        return $this->render('update', [
+            'model' => $model,
+        ]);
+    }
+
+    /**
+     * Deletes an existing ProjectMark model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the ProjectMark model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return ProjectMark the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = ProjectMark::findOne($id)) !== null) {
+            return $model;
+        }
+
+        throw new NotFoundHttpException('The requested page does not exist.');
+    }
+
+    public function actionUsersNotOnProject(): array
+    {
+        Yii::$app->response->format = Response::FORMAT_JSON;
+
+        if (isset($_POST['depdrop_parents'])) {
+            $parents = $_POST['depdrop_parents'];
+            if ($parents != null) {
+                $project_id = $parents[0];
+                $categories = ProjectMark::getMarkNotAtProject($project_id);
+
+                $formattedCatArr = array();
+                foreach ($categories as $key => $value){
+                    $formattedCatArr[] = array('id' => $key, 'name' => $value);
+                }
+
+                return ['output'=>$formattedCatArr, 'selected'=>''];
+            }
+        }
+        return ['output'=>'', 'selected'=>''];
+    }
+}

backend/modules/project/models/ProjectMark.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace backend\modules\project\models;
+
+class ProjectMark extends \common\models\ProjectMark
+{
+
+}

backend/modules/project/models/ProjectMarkSearch.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace backend\modules\project\models;
+
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use backend\modules\project\models\ProjectMark;
+
+/**
+ * ProjectMarkSearch represents the model behind the search form of `backend\modules\project\models\ProjectMark`.
+ */
+class ProjectMarkSearch extends ProjectMark
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['id', 'project_id', 'mark_id'], 'integer'],
+        ];
+    }
+
+    /**
+     * {@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 = ProjectMark::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $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,
+            'project_id' => $this->project_id,
+            'mark_id' => $this->mark_id,
+        ]);
+
+        return $dataProvider;
+    }
+}

backend/modules/project/views/project-mark/_form.php

@@ -0,0 +1,58 @@
+<?php
+
+use backend\modules\project\models\Project;
+use yii\helpers\Url;
+use kartik\depdrop\DepDrop;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\project\models\ProjectMark */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="project-mark-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'project_id')->dropDownList(
+        Project::find()->select(['name', 'id'])->indexBy('id')->column(),
+        [
+            'id' => 'project-id',
+            'placeholder' => 'Выберите',
+            'prompt' => 'Выберите'
+        ]
+    ) ?>
+
+    <?= $form->field($model, 'mark_id')->widget(DepDrop::className(),
+        [
+            'options' => ['id' => 'mark_id'],
+            'pluginOptions' => [
+                'depends' => ['project-id'],
+                'url' => Url::to(['/project/project-mark/users-not-on-project'])
+                ,'initialize' => false,
+            ],
+
+            'type' => DepDrop::TYPE_SELECT2,
+            'select2Options' => [
+                'hideSearch' => false,
+                'pluginOptions' => [
+                    'placeholder' => 'Вводите название метки',
+                    'allowClear' => true,
+                    'closeOnSelect' => false,
+                    'multiple' => true,
+                    'hideSearch' => false
+                ],
+                'showToggleAll' => true,
+            ],
+        ]
+    );
+    ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Save', ['class' => 'btn btn-success']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>

backend/modules/project/views/project-mark/_form_update.php

@@ -0,0 +1,41 @@
+<?php
+
+use backend\modules\project\models\Project;
+use backend\modules\settings\models\Mark;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\project\models\ProjectMark */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="project-mark-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'project_id')->dropDownList(
+        Project::find()->select(['name', 'id'])->indexBy('id')->column(),
+        [
+            'id' => 'project-id',
+            'placeholder' => 'Выберите',
+            'prompt' => 'Выберите'
+        ]
+    ) ?>
+
+    <?= $form->field($model, 'mark_id')->dropDownList(
+        Mark::find()->select(['title', 'id'])
+            ->indexBy('id')
+            ->column(),
+        [
+            'placeholder' => 'Выберите',
+        ]
+    ) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Save', ['class' => 'btn btn-success']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>

backend/modules/project/views/project-mark/_search.php

@@ -0,0 +1,31 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\project\models\ProjectMarkSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="project-mark-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <?= $form->field($model, 'project_id') ?>
+
+    <?= $form->field($model, 'mark_id') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>

backend/modules/project/views/project-mark/create.php

@@ -0,0 +1,18 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\project\models\ProjectMark */
+
+$this->title = 'Добавление проекту метки';
+$this->params['breadcrumbs'][] = ['label' => 'Project Marks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="project-mark-create">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>

backend/modules/project/views/project-mark/index.php

@@ -0,0 +1,61 @@
+<?php
+
+use backend\modules\project\models\Project;
+use backend\modules\settings\models\Mark;
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\modules\project\models\ProjectMarkSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = 'Метки проектов';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="project-mark-index">
+
+    <p>
+        <?= Html::a('Добавить проекту метку', ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            [
+                'attribute' => 'project_id',
+                'value' => function($model){
+                    return $model->project->name;
+                },
+                'filter'    => kartik\select2\Select2::widget([
+                    'model' => $searchModel,
+                    'attribute' => 'project_id',
+                    'data' => Project::find()->select(['name', 'id'])->indexBy('id')->column(),
+                    'options' => ['placeholder' => 'Начните вводить...','class' => 'form-control'],
+                    'pluginOptions' => [
+                        'allowClear' => true
+                    ],
+                ]),
+            ],
+            [
+                'attribute' => 'mark_id',
+                'value' => function($model){
+                    return $model->mark->title;
+                },
+                'filter'    => kartik\select2\Select2::widget([
+                    'model' => $searchModel,
+                    'attribute' => 'mark_id',
+                    'data' => Mark::find()->select(['title', 'id'])->indexBy('id')->column(),
+                    'options' => ['placeholder' => 'Начните вводить...','class' => 'form-control'],
+                    'pluginOptions' => [
+                        'allowClear' => true
+                    ],
+                ]),
+            ],
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+</div>

backend/modules/project/views/project-mark/update.php

@@ -0,0 +1,19 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\project\models\ProjectMark */
+
+$this->title = 'Изменение метки для проекта: ' . $model->project->name;
+$this->params['breadcrumbs'][] = ['label' => 'Project Marks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = 'Update';
+?>
+<div class="project-mark-update">
+
+    <?= $this->render('_form_update', [
+        'model' => $model,
+    ]) ?>
+
+</div>

backend/modules/project/views/project-mark/view.php

@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\ArrayHelper;
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\project\models\ProjectMark */
+
+$this->title = 'Проект: ' . $model->project->name . '; Метка: ' . $model->mark->title;
+$this->params['breadcrumbs'][] = ['label' => 'Project Marks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+\yii\web\YiiAsset::register($this);
+?>
+<div class="project-mark-view">
+
+    <p>
+        <?= Html::a('Список', ['index', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a('Изменить', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a('Удалитть', ['delete', 'id' => $model->id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => 'Are you sure you want to delete this item?',
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id',
+            [
+                'attribute' => 'project_id',
+                'value' => ArrayHelper::getValue($model, 'project.name' ),
+            ],
+            [
+                'attribute' => 'mark_id',
+                'value' => ArrayHelper::getValue($model, 'mark.title' ),
+            ]
+        ],
+    ]) ?>
+
+</div>

backend/modules/project/views/project-user/_form.php

@@ -16,7 +16,7 @@ use yii\widgets\ActiveForm;
     <?php $form = ActiveForm::begin(); ?>
 
     <?= $form->field($model, 'project_id')->dropDownList(
-            Project::find()->select(['name', 'id'])->indexBy('id')->column(),
+        Project::find()->select(['name', 'id'])->indexBy('id')->column(),
         [
             'id' => 'project-id',
             'prompt' => 'Выберите'
@@ -29,21 +29,19 @@ use yii\widgets\ActiveForm;
             'options' => ['id' => 'card_id'],
             'pluginOptions' => [
                 'depends' => ['project-id'],
-                'placeholder' => 'Выберите',
                 'url' => Url::to(['/project/project-user/users-not-on-project'])
                 ,'initialize' => false,
             ],
 
         'type' => DepDrop::TYPE_SELECT2,
             'select2Options' => [
-                'hideSearch' => false,
                 'pluginOptions' => [
+                    'placeholder' => 'Вводите фио',
                     'allowClear' => true,
                     'closeOnSelect' => false,
                     'multiple' => true,
-                    'hideSearch' => false
                 ],
-                'showToggleAll' => false,
+                'showToggleAll' => true,
             ],
         ]
     );

backend/modules/settings/controllers/MarkController.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace backend\modules\settings\controllers;
+
+use Yii;
+use backend\modules\settings\models\Mark;
+use backend\modules\settings\models\MarkSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * MarkController implements the CRUD actions for Mark model.
+ */
+class MarkController extends Controller
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Mark models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new MarkSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Mark model.
+     * @param integer $id
+     * @return mixed
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Mark model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Mark();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        }
+
+        return $this->render('create', [
+            'model' => $model,
+        ]);
+    }
+
+    /**
+     * Updates an existing Mark model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        }
+
+        return $this->render('update', [
+            'model' => $model,
+        ]);
+    }
+
+    /**
+     * Deletes an existing Mark model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Mark model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Mark the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Mark::findOne($id)) !== null) {
+            return $model;
+        }
+
+        throw new NotFoundHttpException('The requested page does not exist.');
+    }
+}

backend/modules/settings/models/Mark.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace backend\modules\settings\models;
+
+class Mark extends \common\models\Mark
+{
+
+}

backend/modules/settings/models/MarkSearch.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace backend\modules\settings\models;
+
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use backend\modules\settings\models\Mark;
+
+/**
+ * MarkSearch represents the model behind the search form of `backend\modules\settings\models\Mark`.
+ */
+class MarkSearch extends Mark
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['id'], 'integer'],
+            [['title'], '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 = Mark::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $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', 'title', $this->title]);
+
+        return $dataProvider;
+    }
+}

backend/modules/settings/views/mark/_form.php

@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\settings\models\Mark */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="mark-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>

backend/modules/settings/views/mark/_search.php

@@ -0,0 +1,29 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\settings\models\MarkSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="mark-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <?= $form->field($model, 'title') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>

backend/modules/settings/views/mark/create.php

@@ -0,0 +1,18 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\settings\models\Mark */
+
+$this->title = 'Создание метки';
+$this->params['breadcrumbs'][] = ['label' => 'Marks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="mark-create">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>

backend/modules/settings/views/mark/index.php

@@ -0,0 +1,30 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\modules\settings\models\MarkSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = 'Метки';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="mark-index">
+
+    <p>
+        <?= Html::a('Создать метку', ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'title',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+</div>

backend/modules/settings/views/mark/update.php

@@ -0,0 +1,19 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\settings\models\Mark */
+
+$this->title = 'Изменение метки: ' . $model->title;
+$this->params['breadcrumbs'][] = ['label' => 'Marks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->title, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = 'Update';
+?>
+<div class="mark-update">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>

backend/modules/settings/views/mark/view.php

@@ -0,0 +1,36 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\settings\models\Mark */
+
+$this->title = $model->title;
+$this->params['breadcrumbs'][] = ['label' => 'Marks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+\yii\web\YiiAsset::register($this);
+?>
+<div class="mark-view">
+
+    <p>
+        <?= Html::a('Список', ['index', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a('Изменить', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a('Удалить', ['delete', 'id' => $model->id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => 'Are you sure you want to delete this item?',
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id',
+            'title',
+        ],
+    ]) ?>
+
+</div>

backend/views/layouts/left.php

@@ -18,6 +18,7 @@
             $projectItems[] = ['label' => $status, 'icon' => 'user', 'url' => ['/project/project?ProjectSearch[status]=' . $key, 'active' => \Yii::$app->controller->id == 'project']];
         }
         $projectItems[] = ['label' => 'Сотрудники на проектах', 'icon' => 'users', 'url' => ['/project/project-user'], 'active' => \Yii::$app->controller->id == 'project-user'];
+        $projectItems[] = ['label' => 'метки проектов', 'icon' => 'tags', 'url' => ['/project/project-mark'], 'active' => \Yii::$app->controller->id == 'project-mark'];
         ?>
 
         <?= dmstr\widgets\Menu::widget(
@@ -31,6 +32,7 @@
                             ['label' => 'Доп. поля', 'icon' => 'file-text-o', 'url' => ['/settings/additional-fields'], 'active' => \Yii::$app->controller->id == 'additional-fields', 'visible' => Yii::$app->user->can('settings')],
                             ['label' => 'Должность', 'icon' => 'spotify', 'url' => ['/settings/position'], 'active' => \Yii::$app->controller->id == 'position', 'visible' => Yii::$app->user->can('settings')],
                             ['label' => 'Навыки', 'icon' => 'flask', 'url' => ['/settings/skill'], 'active' => \Yii::$app->controller->id == 'skill', 'visible' => Yii::$app->user->can('settings/skill')],
+                            ['label' => 'Метки', 'icon' => 'tag', 'url' => ['/settings/mark'], 'active' => \Yii::$app->controller->id == 'mark', 'visible' => Yii::$app->user->can('settings/mark')],
                             ['label' => 'Шаблоны резюме', 'icon' => 'address-card ', 'url' => ['/card/resume-template'], 'active' => \Yii::$app->controller->id == 'resume-template', 'visible' => Yii::$app->user->can('card')],
                             ['label' => 'Шаблоны документов', 'icon' => 'file', 'url' => ['/document/document-template'], 'active' => \Yii::$app->controller->id == 'document-template', 'visible' => Yii::$app->user->can('document')],
                             ['label' => 'Поля документов', 'icon' => 'file-text', 'url' => ['/document/document-field'], 'active' => \Yii::$app->controller->id == 'document-field', 'visible' => Yii::$app->user->can('document')],

common/models/Mark.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "mark".
+ *
+ * @property int $id
+ * @property string $title
+ *
+ * @property ProjectMark[] $projectMarks
+ */
+class Mark extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'mark';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['title'], 'string', 'max' => 255],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'title' => 'Название',
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProjectMarks()
+    {
+        return $this->hasMany(ProjectMark::className(), ['mark_id' => 'id']);
+    }
+}

common/models/ProjectMark.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\helpers\ArrayHelper;
+
+/**
+ * This is the model class for table "project_mark".
+ *
+ * @property int $id
+ * @property int $project_id
+ * @property int $mark_id
+ *
+ * @property Mark $mark
+ * @property Project $project
+ */
+class ProjectMark extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'project_mark';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['project_id', 'mark_id'], 'integer'],
+            [['project_id', 'mark_id'], 'required'],
+            [['project_id', 'mark_id'], 'unique', 'targetAttribute' => ['project_id', 'mark_id']],
+            [['mark_id'], 'exist', 'skipOnError' => true, 'targetClass' => Mark::className(), 'targetAttribute' => ['mark_id' => 'id']],
+            [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'id']],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'project_id' => 'Проект',
+            'mark_id' => 'Метка',
+            'title' => 'Название',
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getMark()
+    {
+        return $this->hasOne(Mark::className(), ['id' => 'mark_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProject()
+    {
+        return $this->hasOne(Project::className(), ['id' => 'project_id']);
+    }
+
+    public static function getMarkNotAtProject($project_id): array
+    {
+        $markIdList = ProjectMark::find()->where(['project_id' => $project_id])->select('mark_id')->column();
+
+        $marks = Mark::find()
+            ->where(['not in', 'id', $markIdList])
+            ->all();
+        return ArrayHelper::map($marks, 'id', 'title');
+    }
+}

console/controllers/RbacController.php

@@ -92,106 +92,154 @@ class RbacController extends Controller
         $admin = $auth->getRole('admin');
         $profileEditor = $auth->getRole('profileEditor');
 
-        $test = $auth->createPermission('test');
+        if(!$auth->getPermission('test')) {
-        $test->description = 'Модуль "Тестовые задания"';
+            $test = $auth->createPermission('test');
-        $auth->add($test);
+            $test->description = 'Модуль "Тестовые задания"';
-        $auth->addChild($admin, $test);
+            $auth->add($test);
+            $auth->addChild($admin, $test);
+        }
 
-        $questionnaire = $auth->createPermission('questionnaire');
+        if(!$auth->getPermission('questionnaire')) {
-        $questionnaire->description = 'Модуль "Анкеты": Создание, редактирование анкет, категорий анкет, вопросов, проверка ответов пользователей';
+            $questionnaire = $auth->createPermission('questionnaire');
-        $auth->add($questionnaire);
+            $questionnaire->description = 'Модуль "Анкеты": Создание, редактирование анкет, категорий анкет, вопросов, проверка ответов пользователей';
-        $auth->addChild($admin, $questionnaire);
+            $auth->add($questionnaire);
+            $auth->addChild($admin, $questionnaire);
+        }
 
-        $interview = $auth->createPermission('interview');
+        if(!$auth->getPermission('interview')) {
-        $interview->description = 'Модуль "Запрос интервью"';
+            $interview = $auth->createPermission('interview');
-        $auth->add($interview);
+            $interview->description = 'Модуль "Запрос интервью"';
-        $auth->addChild($admin, $interview);
+            $auth->add($interview);
+            $auth->addChild($admin, $interview);
+        }
 
-        $options = $auth->createPermission('options');
+        if(!$auth->getPermission('options')) {
-        $options->description = 'Модуль "Опции"';
+            $options = $auth->createPermission('options');
-        $auth->add($options);
+            $options->description = 'Модуль "Опции"';
-        $auth->addChild($admin, $options);
+            $auth->add($options);
+            $auth->addChild($admin, $options);
+        }
 
-        $reports = $auth->createPermission('reports');
+        if(!$auth->getPermission('reports')) {
-        $reports->description = 'Модуль "Отчёты"';
+            $reports = $auth->createPermission('reports');
-        $auth->add($reports);
+            $reports->description = 'Модуль "Отчёты"';
-        $auth->addChild($admin, $reports);
+            $auth->add($reports);
+            $auth->addChild($admin, $reports);
+        }
+        if(!$auth->getPermission('calendar')) {
+            $calendar = $auth->createPermission('calendar');
+            $calendar->description = 'Модуль "Календарь ДР"';
+            $auth->add($calendar);
+            $auth->addChild($admin, $calendar);
+        }
 
-        $calendar = $auth->createPermission('calendar');
+        if(!$auth->getPermission('notes')) {
-        $calendar->description = 'Модуль "Календарь ДР"';
+            $notes = $auth->createPermission('notes');
-        $auth->add($calendar);
+            $notes->description = 'Модуль "Заметки"';
-        $auth->addChild($admin, $calendar);
+            $auth->add($notes);
+            $auth->addChild($admin, $notes);
+        }
 
-        $notes = $auth->createPermission('notes');
+        if(!$auth->getPermission('accesses')) {
-        $notes->description = 'Модуль "Заметки"';
+            $accesses = $auth->createPermission('accesses');
-        $auth->add($notes);
+            $accesses->description = 'Модуль "Доступы"';
-        $auth->addChild($admin, $notes);
+            $auth->add($accesses);
+            $auth->addChild($admin, $accesses);
+        }
 
-        $accesses = $auth->createPermission('accesses');
+        if(!$auth->getPermission('achievements')) {
-        $accesses->description = 'Модуль "Доступы"';
+            $achievements = $auth->createPermission('achievements');
-        $auth->add($accesses);
+            $achievements->description = 'Модуль "Достижения"';
-        $auth->addChild($admin, $accesses);
+            $auth->add($achievements);
+            $auth->addChild($admin, $achievements);
+        }
 
-        $achievements = $auth->createPermission('achievements');
+        if(!$auth->getPermission('holiday')) {
-        $achievements->description = 'Модуль "Достижения"';
+            $holiday = $auth->createPermission('holiday');
-        $auth->add($achievements);
+            $holiday->description = 'Модуль "Отпуска"';
-        $auth->addChild($admin, $achievements);
+            $auth->add($holiday);
+            $auth->addChild($admin, $holiday);
+        }
+        if(!$auth->getPermission('balance')) {
+            $balance = $auth->createPermission('balance');
+            $balance->description = 'Модуль "Баланс"';
+            $auth->add($balance);
+            $auth->addChild($admin, $balance);
+        }
 
-        $holiday = $auth->createPermission('holiday');
+        if(!$auth->getPermission('hh')) {
-        $holiday->description = 'Модуль "Отпуска"';
+            $hh = $auth->createPermission('hh');
-        $auth->add($holiday);
+            $hh->description = 'Модуль "Hh.ru"';
-        $auth->addChild($admin, $holiday);
+            $auth->add($hh);
+            $auth->addChild($admin, $hh);
+        }
 
-        $balance = $auth->createPermission('balance');
+        if(!$auth->getPermission('company')) {
-        $balance->description = 'Модуль "Баланс"';
+            $company = $auth->createPermission('company');
-        $auth->add($balance);
+            $company->description = 'Модуль "Компании"';
-        $auth->addChild($admin, $balance);
+            $auth->add($company);
+            $auth->addChild($admin, $company);
+        }
 
-        $hh = $auth->createPermission('hh');
+        if(!$auth->getPermission('task')) {
-        $hh->description = 'Модуль "Hh.ru"';
+            $task = $auth->createPermission('task');
-        $auth->add($hh);
+            $task->description = 'Модуль "Задачи"';
-        $auth->addChild($admin, $hh);
+            $auth->add($task);
+            $auth->addChild($admin, $task);
+        }
 
-        $company = $auth->createPermission('company');
+        if(!$auth->getPermission('project')) {
-        $company->description = 'Модуль "Компании"';
+            $project = $auth->createPermission('project');
-        $auth->add($company);
+            $project->description = 'Модуль "Проекты"';
-        $auth->addChild($admin, $company);
+            $auth->add($project);
+            $auth->addChild($admin, $project);
+        }
 
-        $task = $auth->createPermission('task');
+        if(!$auth->getPermission('document')) {
-        $task->description = 'Модуль "Задачи"';
+            $documents = $auth->createPermission('document');
-        $auth->add($task);
+            $documents->description = 'Модуль "Документы": Создание, редактирование документов, их полей и шаблонов';
-        $auth->addChild($admin, $task);
+            $auth->add($documents);
+            $auth->addChild($admin, $documents);
+        }
 
-        $project = $auth->createPermission('project');
+        if(!$auth->getPermission('employee')) {
-        $project->description = 'Модуль "Проекты"';
+            $employee = $auth->createPermission('employee');
-        $auth->add($project);
+            $employee->description = 'Модуль "Сотрудники"';
-        $auth->addChild($admin, $project);
+            $auth->add($employee);
+            $auth->addChild($admin, $employee);
+        }
 
-        $documents = $auth->createPermission('document');
+        if(!$auth->getPermission('card')) {
-        $documents->description = 'Модуль "Документы": Создание, редактирование документов, их полей и шаблонов';
+            $card = $auth->createPermission('card');
-        $auth->add($documents);
+            $card->description = 'Модуль "Профили"';
-        $auth->addChild($admin, $documents);
+            $auth->add($card);
+            $auth->addChild($admin, $card);
+            $auth->addChild($profileEditor, $card);
+        }
 
-        $employee = $auth->createPermission('employee');
+        if(!$auth->getPermission('settings')) {
-        $employee->description = 'Модуль "Сотрудники"';
+            $settings = $auth->createPermission('settings');
-        $auth->add($employee);
+            $settings->description = 'Модуль "Настройки"';
-        $auth->addChild($admin, $employee);
+            $auth->add($settings);
+            $auth->addChild($admin, $settings);
+        }
 
-        $card = $auth->createPermission('card');
+        if(!$auth->getPermission('settings/skill')) {
-        $card->description = 'Модуль "Профили"';
+            $skills = $auth->createPermission('settings/skill');
-        $auth->add($card);
+            $skills->description = 'Навыки';
-        $auth->addChild($admin, $card);
+            $auth->add($skills);
-        $auth->addChild($profileEditor, $card);
+            $auth->addChild($admin, $skills);
+            $auth->addChild($profileEditor, $skills);
+        }
 
-        $settings = $auth->createPermission('settings');
+        if(!$auth->getPermission('settings/mark')) {
-        $settings->description = 'Модуль "Настройки"';
+            $mark = $auth->createPermission('settings/mark');
-        $auth->add($settings);
+            $mark->description = 'Метки';
-        $auth->addChild($admin, $settings);
+            $auth->add($mark);
+            $auth->addChild($admin, $mark);
+        }
+
+        var_dump($auth->getPermission('settings/mark'));
 
-        $skills = $auth->createPermission('settings/skill');
-        $skills->description = 'Навыки';
-        $auth->add($skills);
-        $auth->addChild($admin, $skills);
-        $auth->addChild($profileEditor, $skills);
     }
 }

console/migrations/m230123_084421_create_mark_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles the creation of table `{{%mark}}`.
+ */
+class m230123_084421_create_mark_table extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->createTable('{{%mark}}', [
+            'id' => $this->primaryKey(),
+            'title' => $this->string()
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropTable('{{%mark}}');
+    }
+}

console/migrations/m230123_084629_create_project_mark_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles the creation of table `{{%project_mark}}`.
+ */
+class m230123_084629_create_project_mark_table extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->createTable('{{%project_mark}}', [
+            'id' => $this->primaryKey(),
+            'project_id' => $this->integer(),
+            'mark_id' => $this->integer(),
+        ]);
+        $this->addForeignKey('project_mark_project', 'project_mark', 'project_id', 'project', 'id');
+        $this->addForeignKey('project_mark_mark', 'project_mark', 'mark_id', 'mark', 'id');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropForeignKey('project_mark_project', 'project_mark');
+        $this->dropForeignKey('project_mark_mark', 'project_mark');
+        $this->dropTable('{{%project_mark}}');
+    }
+}