test

Yarik
1 parent f25acc4a
Showing 12 changed files with 575 additions and 21 deletions Show diff stats
common/models/Job.php
common/models/JobSearch.php
console/migrations/m160203_082111_jobs.php
frontend/controllers/AccountsController.php
frontend/controllers/JobController.php
frontend/views/accounts/_job_form.php
frontend/views/accounts/employment.php
frontend/views/job/_search.php
frontend/views/job/create.php
frontend/views/job/index.php
frontend/views/job/update.php
frontend/views/job/view.php
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "job".
+ *
+ * @property integer $job_id
+ * @property string $name
+ * @property string $link
+ * @property string $date_start
+ * @property string $date_end
+ * @property string $position
+ * @property integer $user_id
+ * @property integer $total_count
+ * @property integer $complete_count
+ * @property integer $current
+ */
+class Job extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'job';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name'], 'required'],
+            [['date_start', 'date_end'], 'safe'],
+            [['user_id', 'total_count', 'complete_count', 'current'], 'integer'],
+            [['name', 'link', 'position'], 'string', 'max' => 255]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'job_id' => Yii::t('app', 'Job ID'),
+            'name' => Yii::t('app', 'Name'),
+            'link' => Yii::t('app', 'Link'),
+            'date_start' => Yii::t('app', 'Date Start'),
+            'date_end' => Yii::t('app', 'Date End'),
+            'position' => Yii::t('app', 'Position'),
+            'user_id' => Yii::t('app', 'User ID'),
+            'total_count' => Yii::t('app', 'Total Count'),
+            'complete_count' => Yii::t('app', 'Complete Count'),
+            'current' => Yii::t('app', 'Current'),
+        ];
+    }
+}
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Job;
+
+/**
+ * JobSearch represents the model behind the search form about `common\models\Job`.
+ */
+class JobSearch extends Job
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['job_id', 'user_id', 'total_count', 'complete_count', 'current'], 'integer'],
+            [['name', 'link', 'date_start', 'date_end', 'position'], '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 = Job::find();
+
+        $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;
+        }
+
+        $query->andFilterWhere([
+            'job_id' => $this->job_id,
+            'date_start' => $this->date_start,
+            'date_end' => $this->date_end,
+            'user_id' => $this->user_id,
+            'total_count' => $this->total_count,
+            'complete_count' => $this->complete_count,
+            'current' => $this->current,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'link', $this->link])
+            ->andFilterWhere(['like', 'position', $this->position]);
+
+        return $dataProvider;
+    }
+}
@@ -18,6 +18,7 @@ class m160203_082111_jobs extends Migration
             'user_id' =>  $this->integer(),
             'total_count' =>  $this->integer(),
             'complete_count' =>  $this->integer(),
+            'current' => $this->smallInteger(),
         ], $tableOptions);
  
     }
@@ -3,6 +3,7 @@ namespace frontend\controllers;
  
 use common\models\CompanyInfo;
 use common\models\Fields;
+use common\models\Job;
 use common\models\Language;
 use Yii;
 use common\models\User;
@@ -169,7 +170,18 @@ class AccountsController extends Controller
  
     public function actionEmployment()
     {
-
+        $job = Job::find()->where(['user_id' => \Yii::$app->user->getId()])->orderBy(['current' => SORT_DESC])->all();
+        if(empty($job)) {
+            $job[] = new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 0]);
+        }
+        if(!$job[0]->current) {
+            array_unshift($job, new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 1]));
+        }
+        if(!empty(\Yii::$app->request->post())) {
+            var_dump(\Yii::$app->request->post());
+            die();
+        }
+        return $this->render('employment', ['job' => $job]);
     }
  
     public function actionProjects()
@@ -182,6 +194,11 @@ class AccountsController extends Controller
  
     }
  
+    public function actionGetForm($lastindex)
+    {
+        return $this->renderAjax('_job_form', ['index' => $lastindex+1]);
+    }
+
     /**
      * @param $id
      * @return User
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Job;
+use common\models\JobSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * JobController implements the CRUD actions for Job model.
+ */
+class JobController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Job models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new JobSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Job model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Job model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Job();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->job_id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Job 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->job_id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Job 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 Job model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Job the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Job::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
+<?php
+    /**
+     * @var integer $index
+     */
+    use common\models\Job;
+    use yii\jui\DatePicker;
+    use yii\widgets\ActiveForm;
+
+    $model = new Job(['user_id' => \Yii::$app->user->getId (), 'current' => 0]);
+    $form = ActiveForm::begin ();
+    echo "<div class='ajax-loaded'><div class='prev_job_inputs'>";
+    echo $form->field ($model, '[' . $index . ']name')
+              ->label ('Название')
+              ->textInput ();
+    echo $form->field ($model, '[' . $index . ']link')
+              ->label ('Ссылка на компанию на сайте МФП')
+              ->textInput ();
+    echo $form->field ($model, '[' . $index . ']date_start')
+              ->label ('Дата начала работы')
+              ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+    echo $form->field ($model, '[' . $index . ']date_end')
+              ->label ('Дата окончания работы')
+              ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+    echo $form->field ($model, '[' . $index . ']position')
+              ->label ('Должность')
+              ->textInput ();
+    echo $form->field ($model, '[' . $index . ']total_count')
+              ->label ('Количество проектов, в которых принимали участие')
+              ->input ('number');
+    echo $form->field ($model, '[' . $index . ']complete_count')
+              ->label ('из них реализовано')
+              ->input ('number');
+    echo "</div></div>";
+    $form->end ();
+?>
 <?php
-use common\models\Option;
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-use \common\widgets\MultiLangForm;
+    /**
+     * @var Job[] $job
+     */
+    use common\models\Job;
+    use yii\helpers\Html;
+    use yii\jui\DatePicker;
+    use yii\widgets\ActiveForm;
  
-    $this->title = 'Мой профиль';
+    $this->title = 'Трудовой стаж';
     $this->params['breadcrumbs'][] = $this->title;
 ?>
-
-<h1><?=  $this->title ?></h1>
-
-
-
+    <h1><?= $this->title ?></h1>
 <?php
-
-$form = $this->render('_form', [
-    'user' => $user,
-    'user_info' => $user_info,
-]);
-
-echo MultiLangForm::widget(['form'=>$form]);
-
+    $form = ActiveForm::begin ();
+    $current = array_shift ($job);
 ?>
-
-
+    <div class="current_job_container">
+        <p>Текущее место работы:</p>
+        <div class="current_job_inputs">
+            <?php
+                echo $form->field ($current, '[0]current')
+                          ->label (false)
+                          ->hiddenInput (['value' => 1]);
+                echo $form->field ($current, '[0]name')
+                          ->label ('Название')
+                          ->textInput ();
+                echo $form->field ($current, '[0]link')
+                          ->label ('Ссылка на компанию на сайте МФП')
+                          ->textInput ();
+                echo $form->field ($current, '[0]date_start')
+                          ->label ('Дата начала работы')
+                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                echo $form->field ($current, '[0]position')
+                          ->label ('Должность')
+                          ->textInput ();
+                echo $form->field ($current, '[0]total_count')
+                          ->label ('Количество проектов, в которых принимали участие')
+                          ->input ('number');
+                echo $form->field ($current, '[0]complete_count')
+                          ->label ('из них реализовано')
+                          ->input ('number');
+            ?>
+        </div>
+    </div>
+    <div class="prev_job_container">
+        <p>Предыдущие места работы</p>
+        <?php
+            foreach ($job as $index => $job_model)
+            {
+                echo "<div class='prev_job_inputs'>";
+                echo $form->field ($job_model, '['. ($index + 1) .']name')
+                          ->label ('Название')
+                          ->textInput ();
+                echo $form->field ($job_model, '['. ($index + 1) .']link')
+                          ->label ('Ссылка на компанию на сайте МФП')
+                          ->textInput ();
+                echo $form->field ($job_model, '['. ($index + 1) .']date_start')
+                          ->label ('Дата начала работы')
+                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                echo $form->field ($job_model, '['. ($index + 1) .']date_end')
+                          ->label ('Дата окончания работы')
+                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                echo $form->field ($job_model, '['. ($index + 1) .']position')
+                          ->label ('Должность')
+                          ->textInput ();
+                echo $form->field ($job_model, '['. ($index + 1) .']total_count')
+                          ->label ('Количество проектов, в которых принимали участие')
+                          ->input ('number');
+                echo $form->field ($job_model, '['. ($index + 1) .']complete_count')
+                          ->label ('из них реализовано')
+                          ->input ('number');
+                echo "</div>";
+            }
+        ?>
+    </div>
+<?php
+    echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
+    $form->end ();
+?>
+<script>
+    $(function() {
+        var regexp = /^[\w]+\[(\d+)\].*$/;
+        $(document).on('click', '#add_job_button', function() {
+            var inputs = $('.prev_job_inputs').last();
+            var name = $(inputs).find('input, textarea').first().attr('name');
+            var lastindex = regexp.exec(name)[1];
+            $.get('/accounts/get-form', { lastindex: lastindex }, function(data) {
+                $('.prev_job_container').append($(data).find('.ajax-loaded').first().html());
+                $(data).filter('script').appendTo('body');
+            });
+        });
+    });
+</script>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\JobSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="job-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'job_id') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'link') ?>
+
+    <?= $form->field($model, 'date_start') ?>
+
+    <?= $form->field($model, 'date_end') ?>
+
+    <?php // echo $form->field($model, 'position') ?>
+
+    <?php // echo $form->field($model, 'user_id') ?>
+
+    <?php // echo $form->field($model, 'total_count') ?>
+
+    <?php // echo $form->field($model, 'complete_count') ?>
+
+    <?php // echo $form->field($model, 'current') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('app', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Job */
+
+$this->title = Yii::t('app', 'Create Job');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Jobs'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="job-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel common\models\JobSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('app', 'Jobs');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="job-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Create Job'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'job_id',
+            'name',
+            'link',
+            'date_start',
+            'date_end',
+            // 'position',
+            // 'user_id',
+            // 'total_count',
+            // 'complete_count',
+            // 'current',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Job */
+
+$this->title = Yii::t('app', 'Update {modelClass}: ', [
+    'modelClass' => 'Job',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Jobs'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->job_id]];
+$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
+?>
+<div class="job-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Job */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Jobs'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="job-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->job_id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->job_id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'job_id',
+            'name',
+            'link',
+            'date_start',
+            'date_end',
+            'position',
+            'user_id',
+            'total_count',
+            'complete_count',
+            'current',
+        ],
+    ]) ?>
+
+</div>