From c20d5820761b45e113e6373c5d0ca28d0f0cd418 Mon Sep 17 00:00:00 2001 From: Yarik Date: Tue, 24 May 2016 17:58:12 +0300 Subject: [PATCH] test --- common/models/Job.php | 14 +++----------- frontend/controllers/CompanyController.php | 7 +++++-- frontend/controllers/PerformerController.php | 2 +- frontend/controllers/TenderController.php | 16 ---------------- frontend/views/accounts/_job_form.php | 9 +++++++++ frontend/views/accounts/general.php | 1 + frontend/views/layouts/performer.php | 39 ++++++++++++++++++++++----------------- frontend/views/patrial/show_site.php | 2 +- frontend/views/performer/common.php | 1 - frontend/views/performer/workplace.php | 4 ++++ frontend/web/css/style.css | 6 +++++- 11 files changed, 51 insertions(+), 50 deletions(-) diff --git a/common/models/Job.php b/common/models/Job.php index 9161796..e2e1af4 100755 --- a/common/models/Job.php +++ b/common/models/Job.php @@ -40,7 +40,9 @@ public function beforeSave($insert) { - $this->date_start = \Yii::$app->formatter->asDatetime($this->date_start, 'Y-MM-d HH:mm:ss'); + if($this->date_start) { + $this->date_start = \Yii::$app->formatter->asDatetime($this->date_start, 'Y-MM-d HH:mm:ss'); + } if($this->date_end) { $this->date_end = \Yii::$app->formatter->asDatetime($this->date_end, 'Y-MM-d HH:mm:ss'); @@ -173,16 +175,6 @@ return false; } return $result; -// if($this->date_end && $this->date_start) { -// $date = new \DateTime(date('Y-m-d H:i:s', $this->date_start)); -// return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime(date('Y-m-d H:i:s', $this->date_end)))); -// } elseif($this->date_start) { -// $now = new \DateTime(); -// $date = new \DateTime(date('Y-m-d H:i:s', strtotime($this->date_start))); -// return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime())); -// } else { -// return 'неизвестна дата начала'; -// } } diff --git a/frontend/controllers/CompanyController.php b/frontend/controllers/CompanyController.php index 0e2e63d..e10336c 100755 --- a/frontend/controllers/CompanyController.php +++ b/frontend/controllers/CompanyController.php @@ -35,6 +35,7 @@ public function afterAction($action, $result) { + $result = parent::afterAction($action, $result); if(!empty( $action->controller->actionParams[ 'company_id' ] )) { $company_id = $action->controller->actionParams[ 'company_id' ]; $user = User::findOne($company_id); @@ -52,10 +53,12 @@ } } } - $user->userInfo->updateCounters([ 'view_count' => 1 ]); + if($user->id != \Yii::$app->user->id) { + $user->userInfo->updateCounters([ 'view_count' => 1 ]); + } } } - return parent::afterAction($action, $result); + return $result; } /** diff --git a/frontend/controllers/PerformerController.php b/frontend/controllers/PerformerController.php index b514097..c9783f4 100755 --- a/frontend/controllers/PerformerController.php +++ b/frontend/controllers/PerformerController.php @@ -269,7 +269,7 @@ $blog = new ActiveDataProvider([ 'query' => $user->getBlog(), 'pagination' => new Pagination([ - 'pageSize' => 1, + 'pageSize' => 5, ]), 'sort' => new Sort([ 'defaultOrder' => [ diff --git a/frontend/controllers/TenderController.php b/frontend/controllers/TenderController.php index 107ccef..2f3a5a5 100755 --- a/frontend/controllers/TenderController.php +++ b/frontend/controllers/TenderController.php @@ -6,26 +6,10 @@ use common\models\Project; use common\modules\comment\models\CommentProject; use Yii; - use common\models\LoginForm; - use frontend\models\PasswordResetRequestForm; - use frontend\models\ResetPasswordForm; - use frontend\models\SignupForm; - use frontend\models\ContactForm; - use frontend\models\Options; - use frontend\models\OptionValues; - use yii\base\InvalidParamException; use yii\helpers\Html; - use yii\web\BadRequestHttpException; use yii\web\Controller; - use yii\filters\VerbFilter; use yii\filters\AccessControl; - use frontend\models\OptionsToValues; - use yii\validators\EmailValidator; use common\models\User; - use yii\helpers\VarDumper; - use common\models\Page; - use frontend\models\Option; - use common\models\Social; use yii\web\NotFoundHttpException; /** diff --git a/frontend/views/accounts/_job_form.php b/frontend/views/accounts/_job_form.php index ef5f264..89bf15e 100755 --- a/frontend/views/accounts/_job_form.php +++ b/frontend/views/accounts/_job_form.php @@ -3,6 +3,7 @@ * @var integer $index */ use common\models\Job; + use mihaildev\ckeditor\CKEditor; use yii\helpers\Html; use yii\jui\DatePicker; use yii\widgets\ActiveForm; @@ -72,6 +73,14 @@ +
+
+ field($model, '[' . $index . ']achievement') + ->label('Достижения') + ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]); ?> +
+
+
field($model, '[' . $index . ']total_count') diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php index 13ddbf5..b2f4c84 100755 --- a/frontend/views/accounts/general.php +++ b/frontend/views/accounts/general.php @@ -274,6 +274,7 @@ 'height' => 380, ], ], + 'remover' => true, 'multi' => false, 'gallery' => $user_info->poster, 'name' => 'Выбрать файл', diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php index 051e872..23737fb 100755 --- a/frontend/views/layouts/performer.php +++ b/frontend/views/layouts/performer.php @@ -80,7 +80,7 @@ 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, ], 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false, - 'active' => preg_match('/^portfolio.*$/', $this->context->action->id) ? true : false, + 'active' => preg_match('/^portfolio.*$/', $this->context->action->id) ? true : false, ], [ 'label' => 'Заказанные работы', @@ -90,15 +90,16 @@ 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, ], 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false, - 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false, + 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false, ], [ - 'label' => 'Блог', - 'url' => [ + 'label' => 'Блог', + 'url' => [ 'performer/blog-list', 'performer_id' => $this->params[ 'user' ]->id, 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, ], + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false, 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false, ], [ @@ -116,6 +117,7 @@ 'performer_id' => $this->params[ 'user' ]->id, 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, ], + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false, ], [ 'label' => 'Галерея', @@ -124,6 +126,7 @@ 'performer_id' => $this->params[ 'user' ]->id, 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, ], + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false, ], ], ]); @@ -143,7 +146,7 @@
  • params[ 'user' ]->userInfo->is_freelancer xor $this->params[ 'user' ]->userInfo->is_customer) { - if(!empty($this->params[ 'type' ]) && $this->params[ 'type' ] == 'customer') { + if(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer') { echo Html::tag('span', 'Заказчик', [ 'class' => 'activejob_span' ]); } else { echo Html::tag('span', 'Исполнитель', [ 'class' => 'activejob_span' ]); @@ -248,19 +251,21 @@ ?>
    • -
  • - -
    - Трудовой стаж:
     - params[ 'user' ]->userInfo->experience )) { - echo 'С ' . $this->params[ 'user' ]->userInfo->experience . ' года'; - } else { - echo 'Не указано'; - } + params[ 'user' ]->userInfo->experience )) { ?> -
    -
    • +
  • + +
    + Трудовой стаж:
     + params[ 'user' ]->userInfo->experience . ' года'; + ?> +
    +
    • + params[ 'user' ]->userInfo->member )) { diff --git a/frontend/views/patrial/show_site.php b/frontend/views/patrial/show_site.php index 8ce58c8..ba1b551 100644 --- a/frontend/views/patrial/show_site.php +++ b/frontend/views/patrial/show_site.php @@ -3,7 +3,7 @@
    - +
    diff --git a/frontend/views/performer/common.php b/frontend/views/performer/common.php index 875eb2e..efb3dfd 100755 --- a/frontend/views/performer/common.php +++ b/frontend/views/performer/common.php @@ -2,7 +2,6 @@ use common\models\User; use kartik\rating\StarRating; - use yii\helpers\ArrayHelper; use \yii\helpers\Html; /* @var yii\web\View $this diff --git a/frontend/views/performer/workplace.php b/frontend/views/performer/workplace.php index 38509f5..d361a3f 100755 --- a/frontend/views/performer/workplace.php +++ b/frontend/views/performer/workplace.php @@ -30,6 +30,10 @@ ?>
    position ?>
    +
    + Достижения: +

    achievement?>

    +
    diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 9ea4ad7..c9a9cb8 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -8842,10 +8842,14 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- text-align: center; } -.admin-avatar-pattern .remover_image { +.admin-avatar-pattern .remover_image#image_remove_img { left: 180px !important; } +.admin-avatar-pattern .remover_image#poster_remove_img { + left: 700px !important; +} + .admin-pattern .file-help-1 { display: none } -- libgit2 0.21.4