test

Yarik
1 parent 492ed7f7
Showing 9 changed files with 64 additions and 34 deletions Show diff stats
common/models/ProjectSearch.php
common/models/Team.php
common/models/TenderSearch.php
frontend/controllers/AccountsController.php
frontend/controllers/TenderController.php
frontend/views/accounts/_projects_form.php
frontend/views/accounts/projects.php
frontend/views/company/_company_list_view.php
frontend/views/search/_projects_list_view.php
@@ -91,7 +91,7 @@
          */
         public function search($params)
         {
-            $query = Project::find();
+            $query = Project::find()->with('comments');
             // add conditions that should always apply here
@@ -133,7 +133,6 @@
                 'view_count'      => $this->view_count,
                 'payment_variant' => $this->payment_variant,
                 'deadline'        => $this->deadline,
-                'contractual'     => $this->contractual,
             ]);
             $query->andFilterWhere([
@@ -153,23 +152,18 @@
             $query->andFilterWhere([
                 'like',
-                'name',
-                $this->name,
+                'LOWER(name)',
+                mb_strtolower($this->name),
             ])
                   ->andFilterWhere([
                       'like',
-                      'link',
-                      $this->link,
-                  ])
-                  ->andFilterWhere([
-                      'like',
                       'budget',
                       $this->budget,
                   ])
                   ->andFilterWhere([
                       'like',
-                      'city',
-                      $this->city,
+                      'LOWER(city)',
+                      mb_strtolower($this->city),
                   ])
                   ->andFilterWhere([
                       'like',
@@ -197,6 +191,12 @@
                 $query->andWhere(['not', ['contractual' => 1]]);
             }
+            if($this->contractual == 1) {
+                $query->andWhere(['contractual' => 1]);
+            } elseif($this->contractual == 2) {
+                $query->andWhere(['not', ['contractual' => 1]]);
+            }
+
             return $dataProvider;
         }
     }
@@ -139,7 +139,7 @@
         public function getUser()
         {
-            return $this->lastname. ' ' . $this->firstname . ' ' . $this->middlename;
+            return $this->lastname. ' ' . $this->firstname;
         }
     }
@@ -117,7 +117,8 @@
         {
             $query = Project::find()
                             ->joinWith('projectSpecializations')
-                            ->joinWith('projectPayments');
+                            ->joinWith('projectPayments')
+                            ->andWhere([ 'hidden' => 0 ]);
             $dataProvider = new ActiveDataProvider([
                 'query' => $query,
@@ -70,7 +70,7 @@
                         'portfolio-delete' => [ 'POST' ],
                         'projects-delete'  => [ 'POST' ],
                         'blog-delete'      => [ 'POST' ],
-                        'gallery-cover'      => [ 'POST' ],
+                        'gallery-cover'    => [ 'POST' ],
                     ],
                 ],
             ];
@@ -970,14 +970,9 @@
                               ->column();
             $post = \Yii::$app->request->post();
             if($team->load($post) && $team->save()) {
-                return $this->render('_team_form', [
-                    'team'       => $team,
-                    'department' => $department,
-                    'country'    => $country,
+                return $this->redirect([
+                    'team',
                 ]);
-                //                return $this->redirect([
-                //                    'team',
-                //                ]);
             } else {
                 return $this->render('_team_form', [
                     'team'       => $team,
@@ -1179,13 +1174,15 @@
             }
         }
-
         public function actionGalleryCover()
         {
             $gallery_id = Yii::$app->request->post('gallery_id');
-            $cover = Gallery::find()->select('cover')->where(['gallery_id'=>$gallery_id])->column();
-            die($cover[0]);
+            $cover = Gallery::find()
+                            ->select('cover')
+                            ->where([ 'gallery_id' => $gallery_id ])
+                            ->column();
+            die( $cover[ 0 ] );
         }
@@ -52,6 +52,8 @@
                     'class'   => \yii\filters\VerbFilter::className(),
                     'actions' => [
                         'change-state' => [ 'post' ],
+                        'offer-form'   => [ 'post' ],
+                        'offer'        => [ 'post' ],
                     ],
                 ],
                 'access'  => [
@@ -68,8 +70,9 @@
         }
         /**
-         * Displays homepage.
-         * @return mixed
+         * Redirect to search page.
+         *
+         * @return string
          */
         public function actionIndex()
         {
@@ -78,7 +81,13 @@
         public function actionView($tender_id)
         {
+            /**
+             * @var Project $model
+             */
             $model = Project::findOne($tender_id);
+            if(!empty($model)) {
+                $model->updateCounters(['view_count' => 1]);
+            }
             return $this->render('view', [
                 'model' => $model,
@@ -160,8 +169,8 @@
             $projects = $user->getProjects()
                              ->with('parent')
                              ->all();
-            if(empty($projects)) {
-                return ['error' => 'У Вас еще нету проектов'];
+            if(empty( $projects )) {
+                return [ 'error' => 'У Вас еще нету проектов' ];
             }
             return [
                 'message' => $this->renderAjax('forms-modal-offer', [
@@ -248,7 +248,7 @@
 <div class="input-blocks-wrapper">
     <div class="input-blocks admin-project-list admin-currency-second">
-        <?= $form->field($project, 'hidden')->checkbox() ?>
+        <?= $form->field($project, 'hidden')->checkbox()->hint('Проект, снятый с тендера, будет добавлен в Архив (не доступен в поиске, но доступен по ссылке)') ?>
     </div>
 </div>
@@ -71,12 +71,21 @@
                  */
                 if($model->contractual) {
                     return 'Договорной';
+                } elseif(empty($model->budget)) {
+                    return 'Не задано';
                 } else {
                     return $model->budget;
                 }
             },
             'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
         ],
+        [
+            'attribute' => 'contractual',
+            'filter' => Html::activeDropDownList($searchModel, 'contractual', [1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все']),
+            'value' => function($model) {
+                return \Yii::$app->formatter->asBoolean($model->contractual);
+            }
+        ],
         'city',
         [
             'attribute' => 'specializationString',
@@ -84,7 +93,7 @@
         'view_count',
         [
             'value' => function($model, $key, $index, $column) {
-                return 0;
+                return count($model->comments);
             },
             'label' => 'Отклики',
         ],
 <?php
+    /**
+     * @var Team $model
+     */
+    use common\models\Team;
     use yii\helpers\Html;
-    use yii\helpers\Url;
-
 ?>
 <div class="command-block-wrapper">
     <div class="command-block-wr-two">
@@ -14,7 +16,17 @@
                 }
             ?>
         </div>
-        <div class="command-block-name"><?= $model->user ?></div>
+        <div class="command-block-name">
+            <?php
+            if(!empty($model->firstname)) {
+                echo "<p>{$model->firstname}</p>";
+            }
+            ?>
+            <?php
+                if(!empty($model->firstname)) {
+                    echo "<p>{$model->lastname}</p>";
+                }
+            ?>
         <?php
             if(!empty( $model->department->name )) {
                 ?>
@@ -16,8 +16,10 @@ use yii\helpers\Url;
         <span></span>
         Бюджет:
         <?php
-        if(empty($model->contractual)) {
+        if(empty($model->contractual) && !empty($model->budget)) {
             echo $model->budget.' '.$model->budgetCurrency->label;
+        } elseif(empty($model->budget)) {
+            echo "Не задано";
         } else {
             echo "Договорной";
         }