From 83cba62cb1e41653de621bd4a3e7de6caa7d85ae Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 24 Feb 2016 14:52:27 +0200
Subject: [PATCH] 24.02.16

---
 common/components/UserCheck.php               | 10 +++++++---
 common/models/Project.php                     |  9 +++++++++
 common/models/User.php                        |  7 -------
 frontend/config/main.php                      |  1 +
 frontend/controllers/SiteController.php       |  1 +
 frontend/models/SignupForm.php                |  4 ++++
 frontend/views/search/_projects_list_view.php | 15 +++++++++++----
 frontend/views/site/forms-modal-login.php     |  1 -
 8 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/common/components/UserCheck.php b/common/components/UserCheck.php
index 7a0fdb7..693f49e 100644
--- a/common/components/UserCheck.php
+++ b/common/components/UserCheck.php
@@ -16,9 +16,13 @@ class UserCheck implements BootstrapInterface
 
             if(\Yii::$app->user->identity instanceof User){
                 $userInfo = \Yii::$app->user->identity->userInfo;
-                $expression = new Expression('NOW()');
-                $userInfo->date_visit = (new \yii\db\Query)->select($expression)->scalar();
-                $userInfo->save();
+                if($userInfo instanceof UserInfo){
+                    $expression = new Expression('NOW()');
+                    $userInfo->date_visit = (new \yii\db\Query)->select($expression)->scalar();
+                    $userInfo->save();
+                }
+
+
             }
 
         });
diff --git a/common/models/Project.php b/common/models/Project.php
index 4f7f83a..f3f6a6e 100644
--- a/common/models/Project.php
+++ b/common/models/Project.php
@@ -173,6 +173,15 @@
                         ->viaTable('project_payment', [ 'project_id' => 'project_id' ]);
         }
 
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getParent()
+        {
+            return $this->hasOne(self::className(), [ 'project_id' => 'project_pid' ]);
+        }
+
+
 
         public function getBudgetCurrency()
         {
diff --git a/common/models/User.php b/common/models/User.php
index faa1c38..830b91d 100755
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -86,13 +86,6 @@
                     'max' => 255,
                 ],
                 [
-                    [
-                        'firstname',
-                        'lastname',
-                    ],
-                    'required',
-                ],
-                [
                     [ 'type' ],
                     'in',
                     'range' => [
diff --git a/frontend/config/main.php b/frontend/config/main.php
index dd3610d..567274a 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -70,6 +70,7 @@ return [
                     'company/portfolio/<company_id:[\w-]+>/<filter:[\d]+>' => 'company/portfolio-filter',
                     'company/blog-view/<company_id:[\w-]+>/<link:[\w-]+>' => 'company/blog-view',
                     'company/<action>/<company_id:[\w-]+>' => 'company/<action>',
+                    'tender/view/<tender_id:[\d-]+>' => 'tender/view',
 
                 ]
         ],
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index af7e7f5..93ef047 100755
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -246,6 +246,7 @@ class SiteController extends Controller
 
         $model = new SignupForm();
         if ($model->load(Yii::$app->request->post())) {
+
             if ($user = $model->signup()) {
 
                 $user_info  = new UserInfo();
diff --git a/frontend/models/SignupForm.php b/frontend/models/SignupForm.php
index 065eec5..6a3aa88 100755
--- a/frontend/models/SignupForm.php
+++ b/frontend/models/SignupForm.php
@@ -59,12 +59,16 @@ class SignupForm extends Model
      */
     public function signup()
     {
+
         if ($this->validate()) {
             $user = new User();
             $user->username = $this->username;
+            $user->firstname = $this->firstname;
+            $user->lastname = $this->lastname;
             $user->email = $this->email;
             $user->setPassword($this->password);
             $user->generateAuthKey();
+
             if ($user->save()) {
                 return $user;
             }
diff --git a/frontend/views/search/_projects_list_view.php b/frontend/views/search/_projects_list_view.php
index 9f73424..e3c54e6 100644
--- a/frontend/views/search/_projects_list_view.php
+++ b/frontend/views/search/_projects_list_view.php
@@ -1,10 +1,17 @@
+<?php
+use yii\helpers\Html;
+use yii\helpers\Url;
+
+?>
 <div class="search-profile-blocks">
-    <a href="" class="srch-prof-title"><?= $model->name?></a>
-    <div class="srch-prof-budget"><span></span>Бюджет: <?= $model->budget?> <?= $model->budgetCurrency->label?> (Договорной)</div>
+    <?= Html::a($model->name, Url::toRoute( ['tender/view','tender_id' =>$model->project_id] )) ?>
+    <div class="srch-prof-budget"><span></span>Бюджет: <?= $model->budget?> <?= $model->budgetCurrency->label?> (<?= $model->contractual ? "Договорной" : "Не договорной" ?>)</div>
     <div class="srch-prof-contract-wr">
         <div class="srch-prof-contract-button">ПОДРЯД</div>
         <div class="srch-prof-contract-txt">
-            <span>Из проекта: </span><a href="#">Печерский квартал</a>
+           <?php if(!empty($model->parent->name)):?>
+               <span>Из проекта: </span><?= Html::a($model->parent->name, Url::toRoute(['tender/view', 'tender_id' =>$model->parent->project_id ])) ?>
+           <?php endif; ?>
         </div>
     </div>
     <div class="srch-prof-text">
@@ -15,7 +22,7 @@
             <img src="/images/ico-city.png" alt=""/><span><?= $model->city?></span>
         </div>
         <div class="srch-prof-params srch-prof-params-clock">
-            <img src="/images/ico-clock.png" alt=""/><span><?= $model->end?></span>
+            <img src="/images/ico-clock.png" alt=""/><span><?= Yii::$app->formatter->asDatetime($model->date_end, 'Y-MM-d')?></span>
         </div>
         <div class="srch-prof-params srch-prof-params-comm">
             <img src="/images/ico-comm.png" alt=""/><span>4 предложения</span>
diff --git a/frontend/views/site/forms-modal-login.php b/frontend/views/site/forms-modal-login.php
index b8381d7..d671b46 100644
--- a/frontend/views/site/forms-modal-login.php
+++ b/frontend/views/site/forms-modal-login.php
@@ -5,7 +5,6 @@ use yii\widgets\ActiveForm;
 
 
 
-
 /**
  * @var LoginForm $model
  */
--
libgit2 0.21.4