diff --git a/backend/config/main.php b/backend/config/main.php
index bdd19d8..373caac 100755
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -80,6 +80,12 @@ return [
'document' => [
'class' => 'backend\modules\document\Document',
],
+ 'request' => [
+ 'class' => 'backend\modules\request\Request',
+ ],
+ 'knowledgelevel' => [
+ 'class' => 'backend\modules\knowledgelevel\KnowledgeLevel',
+ ],
],
'components' => [
'request' => [
diff --git a/backend/modules/card/models/UserCardSearch.php b/backend/modules/card/models/UserCardSearch.php
index 1c9ba20..e7d26cd 100755
--- a/backend/modules/card/models/UserCardSearch.php
+++ b/backend/modules/card/models/UserCardSearch.php
@@ -51,10 +51,13 @@ class UserCardSearch extends UserCard
->where(['id_user' => Yii::$app->user->id])
->one();
- $employeeIdList = ManagerEmployee::find()
- ->where(['manager_id' => $userCard->manager->id])
- ->select('user_card_id')
- ->column();
+ $employeeIdList = false;
+ if (isset($userCard->manager)) {
+ $employeeIdList = ManagerEmployee::find()
+ ->where(['manager_id' => $userCard->manager->id])
+ ->select('user_card_id')
+ ->column();
+ }
$query = UserCard::find()->where(['in', 'user_card.id', $employeeIdList]);
}
diff --git a/backend/modules/knowledgelevel/KnowledgeLevel.php b/backend/modules/knowledgelevel/KnowledgeLevel.php
new file mode 100644
index 0000000..80dff42
--- /dev/null
+++ b/backend/modules/knowledgelevel/KnowledgeLevel.php
@@ -0,0 +1,24 @@
+render('index');
+ }
+}
diff --git a/backend/modules/knowledgelevel/controllers/KnowledgeLevelController.php b/backend/modules/knowledgelevel/controllers/KnowledgeLevelController.php
new file mode 100644
index 0000000..24bd018
--- /dev/null
+++ b/backend/modules/knowledgelevel/controllers/KnowledgeLevelController.php
@@ -0,0 +1,127 @@
+ [
+ 'class' => VerbFilter::className(),
+ 'actions' => [
+ 'delete' => ['POST'],
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * Lists all KnowledgeLevel models.
+ * @return mixed
+ */
+ public function actionIndex()
+ {
+ $searchModel = new KnowledgeLevelSearch();
+ $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+ return $this->render('index', [
+ 'searchModel' => $searchModel,
+ 'dataProvider' => $dataProvider,
+ ]);
+ }
+
+ /**
+ * Displays a single KnowledgeLevel 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 KnowledgeLevel model.
+ * If creation is successful, the browser will be redirected to the 'view' page.
+ * @return mixed
+ */
+ public function actionCreate()
+ {
+ $model = new KnowledgeLevel();
+
+ 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 KnowledgeLevel 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 KnowledgeLevel 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 KnowledgeLevel model based on its primary key value.
+ * If the model is not found, a 404 HTTP exception will be thrown.
+ * @param integer $id
+ * @return KnowledgeLevel the loaded model
+ * @throws NotFoundHttpException if the model cannot be found
+ */
+ protected function findModel($id)
+ {
+ if (($model = KnowledgeLevel::findOne($id)) !== null) {
+ return $model;
+ }
+
+ throw new NotFoundHttpException('The requested page does not exist.');
+ }
+}
diff --git a/backend/modules/knowledgelevel/models/KnowledgeLevel.php b/backend/modules/knowledgelevel/models/KnowledgeLevel.php
new file mode 100644
index 0000000..93798da
--- /dev/null
+++ b/backend/modules/knowledgelevel/models/KnowledgeLevel.php
@@ -0,0 +1,8 @@
+ $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,
+ 'status' => $this->status,
+ ]);
+
+ $query->andFilterWhere(['like', 'title', $this->title]);
+
+ return $dataProvider;
+ }
+}
diff --git a/backend/modules/knowledgelevel/views/default/index.php b/backend/modules/knowledgelevel/views/default/index.php
new file mode 100644
index 0000000..17c5cd7
--- /dev/null
+++ b/backend/modules/knowledgelevel/views/default/index.php
@@ -0,0 +1,12 @@
+
+
context->action->uniqueId ?>
+
+ This is the view content for action "context->action->id ?>".
+ The action belongs to the controller "context) ?>"
+ in the "context->module->id ?>" module.
+
+
+ You may customize this page by editing the following file:
+
+
+
+ ['index'],
+ 'method' => 'get',
+ ]); ?>
+
+ field($model, 'id') ?>
+
+ field($model, 'title') ?>
+
+ field($model, 'status') ?>
+
+
+ 'btn btn-primary']) ?>
+ 'btn btn-default']) ?>
+
+
+
+
+
+
+ render('_form', [
+ 'model' => $model,
+ ]) ?>
+
+
diff --git a/backend/modules/knowledgelevel/views/knowledge-level/index.php b/backend/modules/knowledgelevel/views/knowledge-level/index.php
new file mode 100644
index 0000000..8826c5f
--- /dev/null
+++ b/backend/modules/knowledgelevel/views/knowledge-level/index.php
@@ -0,0 +1,39 @@
+title = 'Уровень знаний';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+
+ render('_search', ['model' => $searchModel]); ?>
+
+
+ 'btn btn-success']) ?>
+
+
+ $dataProvider,
+ 'filterModel' => $searchModel,
+ 'columns' => [
+ ['class' => 'yii\grid\SerialColumn'],
+
+ // 'id',
+ 'title',
+ [
+ 'attribute' => 'status',
+ 'value' => function($model){
+ return \common\models\KnowledgeLevel::getStatus()[$model->status];
+ }
+ ],
+
+ ['class' => 'yii\grid\ActionColumn'],
+ ],
+ ]); ?>
+
+
+ render('_form', [
+ 'model' => $model,
+ ]) ?>
+
+
diff --git a/backend/modules/knowledgelevel/views/knowledge-level/view.php b/backend/modules/knowledgelevel/views/knowledge-level/view.php
new file mode 100644
index 0000000..e6583e0
--- /dev/null
+++ b/backend/modules/knowledgelevel/views/knowledge-level/view.php
@@ -0,0 +1,42 @@
+title = $model->title;
+$this->params['breadcrumbs'][] = ['label' => 'Knowledge Levels', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+\yii\web\YiiAsset::register($this);
+?>
+
+
+
+ $model->id], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-primary']) ?>
+ $model->id], [
+ 'class' => 'btn btn-danger',
+ 'data' => [
+ 'confirm' => 'Are you sure you want to delete this item?',
+ 'method' => 'post',
+ ],
+ ]) ?>
+
+
+ $model,
+ 'attributes' => [
+ 'id',
+ 'title',
+ [
+ 'attribute' => 'status',
+ 'value' => function($model){
+ return \common\models\KnowledgeLevel::getStatus()[$model->status];
+ }
+ ],
+ ],
+ ]) ?>
+
+
+
context->action->uniqueId ?>
+
+ This is the view content for action "context->action->id ?>".
+ The action belongs to the controller "context) ?>"
+ in the "context->module->id ?>" module.
+
+
+ You may customize this page by editing the following file:
+
+
+
+ ['index'],
+ 'method' => 'get',
+ ]); ?>
+
+ field($model, 'id') ?>
+
+ field($model, 'created_at') ?>
+
+ field($model, 'updated_at') ?>
+
+ field($model, 'user_id') ?>
+
+ field($model, 'title') ?>
+
+ field($model, 'position_id') ?>
+
+ field($model, 'skill_ids') ?>
+
+ field($model, 'knowledge_level_id') ?>
+
+ field($model, 'descr') ?>
+
+ field($model, 'specialist_count') ?>
+
+ field($model, 'status') ?>
+
+
+ 'btn btn-primary']) ?>
+ 'btn btn-default']) ?>
+
+
+
+
+
+
+ render('_form', [
+ 'model' => $model,
+ ]) ?>
+
+
diff --git a/backend/modules/request/views/request/index.php b/backend/modules/request/views/request/index.php
new file mode 100644
index 0000000..5f880db
--- /dev/null
+++ b/backend/modules/request/views/request/index.php
@@ -0,0 +1,62 @@
+title = 'Запросы';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+
+ render('_search', ['model' => $searchModel]); ?>
+
+
+ 'btn btn-success']) ?>
+
+
+ $dataProvider,
+ 'filterModel' => $searchModel,
+ 'columns' => [
+ ['class' => 'yii\grid\SerialColumn'],
+
+ //'id',
+ 'created_at',
+ //'updated_at',
+ [
+ 'attribute' => 'user_id',
+ 'value' => function(\common\models\Request $model){
+ return $model->user->userCard->fio ?? 'Не задано';
+ }
+ ],
+ 'title',
+ [
+ 'attribute' => 'position_id',
+ 'value' => function(\common\models\Request $model){
+ return $model->position->name ?? 'Не задано';
+ }
+ ],
+ //'skill_ids',
+ [
+ 'attribute' => 'knowledge_level_id',
+ 'value' => function(\common\models\Request $model){
+ return \common\models\UserCard::getLevelList()[$model->knowledge_level_id];
+ }
+ ],
+ //'descr:ntext',
+ 'specialist_count',
+ [
+ 'attribute' => 'status',
+ 'value' => function(\common\models\Request $model){
+ return \common\models\KnowledgeLevel::getStatus()[$model->status];
+ }
+ ],
+
+ ['class' => 'yii\grid\ActionColumn'],
+ ],
+ ]); ?>
+
+
+ render('_form', [
+ 'model' => $model,
+ ]) ?>
+
+
diff --git a/backend/modules/request/views/request/view.php b/backend/modules/request/views/request/view.php
new file mode 100644
index 0000000..9891d43
--- /dev/null
+++ b/backend/modules/request/views/request/view.php
@@ -0,0 +1,88 @@
+title = $model->title;
+$this->params['breadcrumbs'][] = ['label' => 'Requests', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+\yii\web\YiiAsset::register($this);
+?>
+
+
+
+ $model->id], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-primary']) ?>
+ $model->id], [
+ 'class' => 'btn btn-danger',
+ 'data' => [
+ 'confirm' => 'Are you sure you want to delete this item?',
+ 'method' => 'post',
+ ],
+ ]) ?>
+
+
+ $model,
+ 'attributes' => [
+ 'id',
+ 'created_at',
+ 'updated_at',
+ [
+ 'attribute' => 'user_id',
+ 'value' => function (\common\models\Request $model) {
+ return $model->user->userCard->fio ?? 'Не задано';
+ }
+ ],
+ 'title',
+ [
+ 'attribute' => 'position_id',
+ 'value' => function (\common\models\Request $model) {
+ return $model->position->name ?? 'Не задано';
+ }
+ ],
+// 'skill_ids',
+ [
+ 'attribute' => 'skill_ids',
+ 'value' => function (\common\models\Request $model) {
+ $skillStr = '';
+ foreach ($model->skills as $skill) {
+ $skillStr .= $skill['name'] . ", ";
+ }
+ return $skillStr;
+ }
+ ],
+ [
+ 'attribute' => 'knowledge_level_id',
+ 'value' => function (\common\models\Request $model) {
+ return \common\models\UserCard::getLevelList()[$model->knowledge_level_id];
+ }
+ ],
+ 'descr:ntext',
+ 'specialist_count',
+ [
+ 'attribute' => 'status',
+ 'value' => function (\common\models\Request $model) {
+ return \common\models\Request::getStatus()[$model->status] ?? 'Не задано';
+ }
+ ],
+ ],
+ ]) ?>
+
+
Подходящие кандидаты
+
+ $searchDataProvider,
+ 'columns' => [['class' => 'yii\grid\SerialColumn'],
+ 'id',
+ 'fio',
+ ],
+ ]); ?>
+
+
+