Merge pull request #90 from apuc/add_a_test_task_completion_date_to_user_card

Add a test task completion date to user card

backend/modules/achievements/views/achievements/index.php

@@ -21,7 +21,14 @@ $this->params['breadcrumbs'][] = $this->title;
         'filterModel' => $searchModel,
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
-//            'id',
+
+            [
+                'attribute' => 'img',
+                'format' => 'raw',
+                'value' => function ($model) {
+                    return Html::tag('img', null, ['src' => $model->img, 'width' => '100px']);
+                }
+            ],
             'title',
              'slug',
              'description',

backend/modules/reports/views/ajax/_gridViewAllUsers.php

@@ -12,6 +12,14 @@ echo GridView::widget([
     'dataProvider' => $dataProvider,
     'columns' => [
         ['class' => 'yii\grid\SerialColumn'],
+        [
+            'format' => 'raw',
+            'attribute' => 'user_card_id',
+            'value' => function ($model) {
+                return Html::a(Reports::getFio($model) . ' ' . Html::tag('i', null, ['class' => 'far fa-calendar-alt']),
+                    \yii\helpers\Url::base(true) . '/reports/reports/calendar?user_id=' . $model['user_card_id'], ['data-pjax' => 0]);
+            },
+        ],
         [
             'attribute' => 'today',
             'format' => 'raw',
@@ -30,14 +38,6 @@ echo GridView::widget([
         ],
         'difficulties',
         'tomorrow',
-        [
-            'format' => 'raw',
-            'attribute' => 'user_card_id',
-            'value' => function ($model) {
-                return Html::a(Reports::getFio($model) . ' ' . Html::tag('i', null, ['class' => 'far fa-calendar-alt']),
-                    \yii\helpers\Url::base(true) . '/reports/reports/calendar?user_id=' . $model['user_card_id'], ['data-pjax' => 0]);
-            },
-        ],
         [
             'class' => 'yii\grid\ActionColumn',
             'urlCreator' => function ($action, $model, $key, $index) {

backend/modules/test/Test.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace backend\modules\test;
+
+/**
+ * test module definition class
+ */
+class Test extends \yii\base\Module
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $controllerNamespace = 'backend\modules\test\controllers';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function init()
+    {
+        parent::init();
+
+        // custom initialization code goes here
+    }
+}

backend/modules/test/controllers/TestTaskController.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace backend\modules\test\controllers;
+
+use Yii;
+use backend\modules\test\models\TestTask;
+use backend\modules\test\models\TestTaskSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * TestTaskController implements the CRUD actions for TestTask model.
+ */
+class TestTaskController extends Controller
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all TestTask models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TestTaskSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single TestTask 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 TestTask model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new TestTask();
+
+        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 TestTask 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 TestTask 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 TestTask model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return TestTask the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = TestTask::findOne($id)) !== null) {
+            return $model;
+        }
+
+        throw new NotFoundHttpException('The requested page does not exist.');
+    }
+}

backend/modules/test/models/TestTask.php

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

backend/modules/test/models/TestTaskSearch.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace backend\modules\test\models;
+
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use backend\modules\test\models\TestTask;
+
+/**
+ * TestTaskSearch represents the model behind the search form of `backend\modules\test\models\TestTask`.
+ */
+class TestTaskSearch extends TestTask
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['id', 'level', 'status'], 'integer'],
+            [['description', 'link'], '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 = TestTask::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,
+            'level' => $this->level,
+            'status' => $this->status,
+        ]);
+
+        $query->andFilterWhere(['like', 'description', $this->description])
+            ->andFilterWhere(['like', 'link', $this->link]);
+
+        return $dataProvider;
+    }
+}

backend/modules/test/views/test-task/_form.php

@@ -0,0 +1,38 @@
+<?php
+
+use common\helpers\StatusHelper;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\test\models\TestTask */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="test-task-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'description')->textarea(['rows' => 4]) ?>
+
+    <?= $form->field($model, 'link')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'level')->dropDownList(
+        backend\modules\test\models\TestTask::getLevelList(),
+        ['prompt' => '...']
+    ) ?>
+
+    <?= $form->field($model, 'status')->dropDownList(
+        StatusHelper::statusList(),
+        [
+            'prompt' => 'Выберите'
+        ]
+    ) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>

backend/modules/test/views/test-task/_search.php

@@ -0,0 +1,35 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\test\models\TestTaskSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="test-task-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <?= $form->field($model, 'description') ?>
+
+    <?= $form->field($model, 'link') ?>
+
+    <?= $form->field($model, 'level') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <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/test/views/test-task/create.php

@@ -0,0 +1,18 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\test\models\TestTask */
+
+$this->title = 'Добавить тестовое задание';
+$this->params['breadcrumbs'][] = ['label' => 'Test Tasks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="test-task-create">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>

backend/modules/test/views/test-task/index.php

@@ -0,0 +1,57 @@
+<?php
+
+use backend\modules\test\models\TestTask;
+use common\helpers\StatusHelper;
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\helpers\Url;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\modules\test\models\TestTaskSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = 'Тестовые задания';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="test-task-index">
+
+    <p>
+        <?= Html::a('Создать', ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+//            'id',
+            'description',
+            [
+                'attribute' => 'link',
+                'value' => function ($model) {
+                    return Html::a(Html::encode($model->link), Url::to($model->link));
+                },
+                'format' => 'raw',
+            ],
+            [
+                'attribute' => 'level',
+                'format' => 'raw',
+                'filter' => TestTask::getLevelList(),
+                'value' => function($model){
+                    return TestTask::getLevelLabel($model->level);
+                }
+            ],
+            [
+                'attribute' => 'status',
+                'format' => 'raw',
+                'filter' => StatusHelper::statusList(),
+                'value' => function($model){
+                    return StatusHelper::statusLabel($model->status);
+                }
+            ],
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+</div>

backend/modules/test/views/test-task/update.php

@@ -0,0 +1,19 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\test\models\TestTask */
+
+$this->title = 'Изменить тестовое задание';
+$this->params['breadcrumbs'][] = ['label' => 'Test Tasks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = 'Update';
+?>
+<div class="test-task-update">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>

backend/modules/test/views/test-task/view.php

@@ -0,0 +1,70 @@
+<?php
+
+use backend\modules\test\models\TestTask;
+use common\helpers\StatusHelper;
+use yii\helpers\Html;
+use yii\helpers\Url;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model backend\modules\test\models\TestTask */
+
+$this->title = cut_title($model->description);
+$this->params['breadcrumbs'][] = ['label' => 'Test Tasks', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+\yii\web\YiiAsset::register($this);
+
+function cut_title($str)
+{
+    if(strlen($str) > 35){
+        return mb_substr($str, 0, 35, 'UTF-8') . '...';
+    }
+    return $str;
+}
+?>
+<div class="test-task-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',
+            'description',
+            [
+                'attribute' => 'link',
+                'value' => function ($model) {
+                    return Html::a(Html::encode($model->link), Url::to($model->link));
+                },
+                'format' => 'raw',
+            ],
+            [
+                'attribute' => 'level',
+                'format' => 'raw',
+                'filter' => TestTask::getLevelList(),
+                'value' => function($model){
+                    return TestTask::getLevelLabel($model->level);
+                }
+            ],
+            [
+                'attribute' => 'status',
+                'format' => 'raw',
+                'filter' => StatusHelper::statusList(),
+                'value' => function($model){
+                    return StatusHelper::statusLabel($model->status);
+                }
+            ],
+        ],
+    ]) ?>
+
+</div>

backend/views/layouts/left.php

@@ -32,6 +32,7 @@
                     [
                         'label' => 'Профили', 'icon' => 'address-book-o', 'url' => '#', 'active' => \Yii::$app->controller->id == 'user-card',
                         'items' => $menuItems,
+                        'visible' => Yii::$app->user->can('confidential_information')
                     ],
                     [
                         'label' => 'Сотрудники', 'icon' => 'users', 'url' => '#',
@@ -85,8 +86,8 @@
                     ['label' => 'Достижения', 'icon' => 'trophy', 'url' => ['/achievements/achievements'], 'active' => \Yii::$app->controller->id == 'achievements', 'visible' => Yii::$app->user->can('confidential_information')],
                     ['label' => 'Доступы', 'icon' => 'key', 'url' => ['/accesses/accesses'], 'active' => \Yii::$app->controller->id == 'accesses', 'visible' => Yii::$app->user->can('confidential_information')],
                     ['label' => 'Заметки', 'icon' => 'sticky-note', 'url' => ['/notes/notes'], 'active' => \Yii::$app->controller->id == 'notes', 'visible' => Yii::$app->user->can('confidential_information')],
-                    ['label' => 'Календарь ДР', 'icon' => 'calendar', 'url' => ['/calendar/calendar'], 'active' => \Yii::$app->controller->id == 'calendar', 'visible' => Yii::$app->user->can('confidential_information')],
-                    ['label' => 'Отчеты', 'icon' => 'list-alt', 'url' => ['/reports/reports'], 'active' => \Yii::$app->controller->id == 'reports', 'visible' => Yii::$app->user->can('confidential_information')],
+                    ['label' => 'Календарь ДР', 'icon' => 'calendar-check-o', 'url' => ['/calendar/calendar'], 'active' => \Yii::$app->controller->id == 'calendar', 'visible' => Yii::$app->user->can('confidential_information')],
+                    ['label' => 'Отчеты', 'icon' => 'calendar', 'url' => ['/reports/reports'], 'active' => \Yii::$app->controller->id == 'reports', 'visible' => Yii::$app->user->can('confidential_information')],
                     ['label' => 'Опции', 'icon' => 'list-alt', 'url' => ['/options/options'], 'active' => \Yii::$app->controller->id == 'options', 'visible' => Yii::$app->user->can('confidential_information')],
                     [
                         'label' => 'Запрос интервью (' . \common\models\InterviewRequest::getNewCount() . ')',
@@ -109,6 +110,8 @@
                         ],
                         'visible' => Yii::$app->user->can('confidential_information')
                     ],
+                    ['label' => 'Тестовые задания', 'icon' => 'file-text-o', 'url' => ['/test/test-task'], 'active' => \Yii::$app->controller->id == 'options', 'visible' => Yii::$app->user->can('confidential_information')],
+
 
                     /*['label' => 'Gii', 'icon' => 'file-code-o', 'url' => ['/gii']],
                     ['label' => 'Debug', 'icon' => 'dashboard', 'url' => ['/debug']],

backend/widgets/Calendar/assets/js/src/DateHelper.js

@@ -23,7 +23,7 @@ class DateHelper {
             return 42
         }
         if (this.prevDay(this.nextMonth(date)).getDate() == 28) {
-            return 28;
+            return 35;
         }
         return 35