test

Yarik
1 parent 50ed5626
Showing 6 changed files with 94 additions and 34 deletions Show diff stats
common/models/Project.php
common/models/ProjectSearch.php
console/migrations/m160321_132138_project_add_status.php
frontend/controllers/AccountsController.php
frontend/views/accounts/_projects_form.php
frontend/views/accounts/projects.php
@@ -32,6 +32,7 @@
      * @property Specialization[]        $specializations
      * @property Currency                $budgetCurrency
      * @property Project                 $parent
+     * @property int                     $hidden
      */
     class Project extends \yii\db\ActiveRecord
     {
@@ -137,10 +138,37 @@
                     'min' => 1,
                 ],
                 [
-                    [ 'deadline' ],
+                    [
+                        'deadline',
+                    ],
                     'default',
                     'value' => 1,
                 ],
+                [
+                    [ 'date_end' ],
+                    'default',
+                    'value' => date('Y-m-d H:i:s'),
+                ],
+                [
+                    [ 'hidden' ],
+                    'boolean',
+                ],
+                [
+                    ['hidden'],
+                    'default',
+                    'value' => 0,
+                ],
+                [
+                    ['date_end'],
+                    'filter',
+                    'filter' => function($value) {
+                        $unix = strtotime($value);
+                        if($unix <= time()) {
+                            $unix = time() + (3600 * 24 * 7);
+                        }
+                        return date('Y-m-d', $unix);
+                    }
+                ]
             ];
         }
@@ -171,6 +199,7 @@
                 'specializationInput'  => Yii::t('app', 'Специализации'),
                 'paymentInput'         => Yii::t('app', 'Способ оплаты'),
                 'specializationString' => Yii::t('app', 'Специализации'),
+                'hidden'               => Yii::t('app', 'Снять проект с тендера'),
             ];
         }
@@ -15,6 +15,7 @@
         public $date_add_from;
         public $date_add_to;
+        public $budget_approx;
         /**
          * @inheritdoc
          */
@@ -39,6 +40,7 @@
                         'date_add',
                         'date_end',
                         'budget',
+                        'budget_approx',
                         'city',
                         'street',
                         'house',
@@ -190,6 +192,11 @@
                       $this->file,
                   ]);
+            if(!empty($this->budget_approx)) {
+                $query->andWhere(['between', 'budget', ($this->budget_approx - ($this->budget_approx/10)), ($this->budget_approx + ($this->budget_approx/10))]);
+                $query->andWhere(['not', ['contractual' => 1]]);
+            }
+
             return $dataProvider;
         }
     }
+<?php
+
+use yii\db\Migration;
+
+class m160321_132138_project_add_status extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('{{%project}}', 'hidden', $this->integer()->defaultValue(0));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('{{%project}}', 'hidden');
+    }
+}
@@ -649,19 +649,7 @@
                 }
                 $project->validate();
                 if(!$project->hasErrors()) {
-                    $date_end = new \DateTime();
-                    switch($post[ 'Project' ][ 'date_end' ]) {
-                        case 2:
-                            $date_end->modify('+14 day');
-                            break;
-                        case 3:
-                            $date_end->modify('+30 day');
-                            break;
-                        default:
-                            $date_end->modify('+7 day');
-                    };
-                    $project->date_end = \Yii::$app->formatter->asDate($date_end->getTimestamp(), 'short');
-                    $project->save();
+                    $project->save(false);
                     $project->unlinkAll('specializations', true);
                     foreach($project->specializationInput as $one_specialization) {
                         $project->link('specializations', Specialization::findOne($one_specialization));
@@ -747,19 +735,7 @@
                 }
                 $project->validate();
                 if(!$project->hasErrors()) {
-                    $date_end = new \DateTime();
-                    switch($post[ 'Project' ][ 'date_end' ]) {
-                        case 2:
-                            $date_end->modify('+14 day');
-                            break;
-                        case 3:
-                            $date_end->modify('+30 day');
-                            break;
-                        default:
-                            $date_end->modify('+7 day');
-                    };
-                    $project->date_end = \Yii::$app->formatter->asDate($date_end->getTimestamp(), 'short');
-                    $project->save();
+                    $project->save(false);
                     $project->unlinkAll('specializations', true);
                     foreach($project->specializationInput as $one_specialization) {
                         $project->link('specializations', Specialization::findOne($one_specialization));
@@ -14,6 +14,7 @@
     use kartik\select2\Select2;
     use mihaildev\ckeditor\CKEditor;
     use yii\helpers\Html;
+    use yii\jui\DatePicker;
     use yii\web\JsExpression;
     use yii\widgets\ActiveForm;
@@ -210,6 +211,20 @@
     </div>
 </div>
+<?php
+/* == Здесь епты == */
+?>
+<div class="tender-file-wr">
+    <?= $form->field($project, 'files[]')
+             ->fileInput([ 'class' => 'multi', 'multiple' => 'multiple' ])
+             ->label(false) ?>
+    <a href="#" class="addfilemulti">Прикрепить файл</a>
+    <div class="max-size">Максимальный размер<br/>файла 5 МБ</div>
+</div>
+<?php
+/* ==  .i. Конец епты .i. == */
+?>
+
 <div class="input-blocks-wrapper admin-project-file">
     <div class="input-blocks">
         <div style="position: absolute; float: left;top: 0; left: 0; z-index: 1; width: 100%; overflow: hidden">
@@ -227,12 +242,13 @@
 <div class="input-blocks-wrapper">
     <div class="input-blocks admin-project-list admin-currency-second">
-        <?= $form->field($project, 'date_end')
-                 ->dropDownList([
-                     1 => 'Неделя',
-                     2 => '2 недели',
-                     3 => 'Месяц',
-                 ]) ?>
+        <?= $form->field($project, 'date_end')->widget(DatePicker::className(), ['dateFormat' => 'yyyy-MM-dd', 'clientOptions' => ['minDate' => 1]]) ?>
+    </div>
+</div>
+
+<div class="input-blocks-wrapper">
+    <div class="input-blocks admin-project-list admin-currency-second">
+        <?= $form->field($project, 'hidden')->checkbox() ?>
     </div>
 </div>
@@ -3,12 +3,14 @@
      * @var ProjectSearch    $searchModel
      * @var ActiveDataProvider $dataProvider
      */
+    use common\models\Project;
     use common\models\ProjectSearch;
     use yii\data\ActiveDataProvider;
     use yii\grid\ActionColumn;
     use yii\grid\GridView;
     use yii\helpers\Html;
     use yii\jui\DatePicker;
+    use yii\widgets\ActiveField;
     $this->title = 'Проекты';
     $this->params[ 'breadcrumbs' ][] = $this->title;
@@ -60,7 +62,21 @@
 </div>",
             'format' => 'html',
         ],
-        'budget',
+        [
+            'attribute' => 'budget',
+            'filter' => Html::activeInput('text', $searchModel, 'budget_approx'),
+            'value' => function($model, $key, $index, $column) {
+                /**
+                 * @var Project $model
+                 */
+                if($model->contractual) {
+                    return 'Договорной';
+                } else {
+                    return $model->budget;
+                }
+            },
+            'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
+        ],
         'city',
         [
             'attribute' => 'specializationString',