diff --git a/common/models/Fields.php b/common/models/Fields.php index c434c42..d39e75c 100755 --- a/common/models/Fields.php +++ b/common/models/Fields.php @@ -57,10 +57,12 @@ class Fields extends \yii\db\ActiveRecord public static function getData($id, $model, $type){ $data = ArrayHelper::toArray(self::find()->where(['table_id'=>$id, 'table_name'=>$model, 'field_type'=>$type])->all()); - print_r($data); + $result = []; + for($i=0; $i < count($data); $i ++){ + $result[$data[$i]['parent_key']][$data[$i]['field_name']] = $data[$i]['value']; + } - die(); - return self::find()->where(['table_id'=>$id, 'table_name'=>$model, 'field_type'=>$type])->indexBy('parent_key')->all(); + return $result; } diff --git a/common/models/UserInfo.php b/common/models/UserInfo.php index 5c93e45..286c0b6 100755 --- a/common/models/UserInfo.php +++ b/common/models/UserInfo.php @@ -79,7 +79,7 @@ class UserInfo extends \yii\db\ActiveRecord public function getLastVisit(){ - return \Yii::$app->formatter->asRelativeTime($this->date_visit); + return \Yii::$app->formatter->asRelativeTime(date('Y-m-d h:m:s',strtotime($this->date_visit))); } diff --git a/frontend/config/main.php b/frontend/config/main.php index 8edda86..e3f8bad 100755 --- a/frontend/config/main.php +++ b/frontend/config/main.php @@ -64,7 +64,7 @@ return [ 'showScriptName' => false, 'rules' => [ 'landing/' => 'landing/view', - 'performer/common/' => 'performer/common', + 'performer//' => 'performer/', ] ], ], diff --git a/frontend/controllers/PerformerController.php b/frontend/controllers/PerformerController.php index 6f37ced..0452da5 100755 --- a/frontend/controllers/PerformerController.php +++ b/frontend/controllers/PerformerController.php @@ -2,27 +2,11 @@ namespace frontend\controllers; use common\models\Fields; -use common\widgets\FieldEditor; 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\web\BadRequestHttpException; +use yii\helpers\ArrayHelper; 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; + /** @@ -31,6 +15,10 @@ use common\models\Social; class PerformerController extends Controller { public $layout = 'performer'; + public $user; + + + /** * @inheritdoc @@ -57,29 +45,41 @@ class PerformerController extends Controller public function actionCommon($performer_id) { - if(\Yii::$app->user->identity instanceof User && \Yii::$app->user->identity->id == $performer_id ){ - $user = \Yii::$app->user->identity; - } else { - $user = User::findOne($performer_id); - } + $user = User::findOne($performer_id); - $educations = Fields::getData($user->id,$user::className(),'education'); + $educations = Fields::getData($user->id,$user->className(),'education'); + $phones = Fields::getData($user->id,$user->className(),'phone'); + $sites = Fields::getData($user->id,$user->className(),'site'); + $soft = implode(', ',ArrayHelper::getColumn(Fields::getData($user->id,$user->className(),'soft'), 'soft')); return $this->render('common',[ 'user' => $user, - 'educations' => $educations + 'educations' => $educations, + 'phones' => $phones, + 'sites' => $sites, + 'soft' => $soft ]); + + } - public function actionPortfolio(/*$performer_id*/) + public function actionPortfolio($performer_id) { - return $this->render('portfolio'); + $user = User::findOne($performer_id); + + return $this->render('portfolio',[ + 'user' => $user + ]); + } - public function actionBlogList(/*$performer_id*/) + public function actionBlogList($performer_id) { - return $this->render('blog-list'); + $user = User::findOne($performer_id); + return $this->render('blog-list',[ + 'user' => $user + ]); } public function actionBlogView(/*$performer_id, $article_id*/) @@ -87,19 +87,28 @@ class PerformerController extends Controller return $this->render('blog-view'); } - public function actionReview(/*$performer_id*/) + public function actionReview($performer_id) { - return $this->render('review'); + $user = User::findOne($performer_id); + return $this->render('review',[ + 'user' => $user + ]); } - public function actionWorkplace(/*$performer_id*/) + public function actionWorkplace($performer_id) { - return $this->render('workplace'); + $user = User::findOne($performer_id); + return $this->render('workplace',[ + 'user' => $user + ]); } - public function actionGallery(/*$performer_id*/) + public function actionGallery($performer_id) { + $user = User::findOne($performer_id); $this->layout = 'gallery'; - return $this->render('gallery'); + return $this->render('gallery',[ + 'user' => $user + ]); } } diff --git a/frontend/views/layouts/gallery.php b/frontend/views/layouts/gallery.php index 38c4835..27c8459 100755 --- a/frontend/views/layouts/gallery.php +++ b/frontend/views/layouts/gallery.php @@ -23,38 +23,38 @@ $this->beginContent('@app/views/layouts/main.php');
[ - 'class' => 'menu-content', + echo Menu::widget([ + 'options' => [ + 'class' => 'menu-content', + ], + 'activeCssClass' => 'active-menu-content', + 'items' => [ + [ + 'label' => 'Общее', + 'url' => ['performer/common', 'performer_id'=>$this->params['user']->id], ], - 'activeCssClass' => 'active-menu-content', - 'items' => [ - [ - 'label' => 'Общее', - 'url' => ['performer/common'], - ], - [ - 'label' => 'Портфолио', - 'url' => ['performer/portfolio'], - ], - [ - 'label' => 'Блог', - 'url' => ['performer/blog-list'], - ], - [ - 'label' => 'Отзывы', - 'url' => ['performer/review'], - ], - [ - 'label' => 'Места работы', - 'url' => ['performer/workplace'], - ], - [ - 'label' => 'Галерея', - 'url' => ['performer/gallery'], - ], + [ + 'label' => 'Портфолио', + 'url' => ['performer/portfolio', 'performer_id'=>$this->params['user']->id], ], - ]); + [ + 'label' => 'Блог', + 'url' => ['performer/blog-list', 'performer_id'=>$this->params['user']->id], + ], + [ + 'label' => 'Отзывы', + 'url' => ['performer/review', 'performer_id'=>$this->params['user']->id], + ], + [ + 'label' => 'Места работы', + 'url' => ['performer/workplace', 'performer_id'=>$this->params['user']->id], + ], + [ + 'label' => 'Галерея', + 'url' => ['performer/gallery', 'performer_id'=>$this->params['user']->id], + ], + ], + ]); ?>
diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php index f96115e..2acc428 100755 --- a/frontend/views/layouts/performer.php +++ b/frontend/views/layouts/performer.php @@ -1,16 +1,18 @@ beginContent('@app/views/layouts/main.php'); + ?>
-
+
@@ -33,27 +35,27 @@ $this->beginContent('@app/views/layouts/main.php'); 'items' => [ [ 'label' => 'Общее', - 'url' => ['performer/common'], + 'url' => ['performer/common', 'performer_id'=>$this->params['user']->id], ], [ 'label' => 'Портфолио', - 'url' => ['performer/portfolio'], + 'url' => ['performer/portfolio', 'performer_id'=>$this->params['user']->id], ], [ 'label' => 'Блог', - 'url' => ['performer/blog-list'], + 'url' => ['performer/blog-list', 'performer_id'=>$this->params['user']->id], ], [ 'label' => 'Отзывы', - 'url' => ['performer/review'], + 'url' => ['performer/review', 'performer_id'=>$this->params['user']->id], ], [ 'label' => 'Места работы', - 'url' => ['performer/workplace'], + 'url' => ['performer/workplace', 'performer_id'=>$this->params['user']->id], ], [ 'label' => 'Галерея', - 'url' => ['performer/gallery'], + 'url' => ['performer/gallery', 'performer_id'=>$this->params['user']->id], ], ], ]); @@ -93,36 +95,36 @@ $this->beginContent('@app/views/layouts/main.php'); написать отзыв
- user->identity->userInfo->image);?> + params['user']->userInfo->image);?>
  • - user->identity->userInfo->social_fb],['target'=>'_blank'])?> + params['user']->userInfo->social_fb],['target'=>'_blank'])?>
  • - user->identity->userInfo->social_t],['target'=>'_blank'])?> + params['user']->userInfo->social_t],['target'=>'_blank'])?>
  • - user->identity->userInfo->social_in],['target'=>'_blank'])?> + params['user']->userInfo->social_in],['target'=>'_blank'])?>
  • - user->identity->userInfo->social_vk],['target'=>'_blank'])?> + params['user']->userInfo->social_vk],['target'=>'_blank'])?>
    -
  • user->identity->userInfo->view_count?> просмотра
    • -
  • Статус: user->identity->userInfo->busyText?>
    • -
  • На сайте: user->identity->liveTime?>
    • -
  • Последний визит:
    user->identity->userInfo->lastVisit?>
    • -
  • Трудовой стаж:
    user->identity->userInfo->experience?>
    • -
  • Звание в МФП:
    user->identity->userInfo->rank?>
    • -
  • Стоимость работ:
    user->identity->userInfo->salary?>
    • -
  • Наличный, безналичный расчет, электронные деньги
    • -
  • Текущее место работы:
    user->identity->userInfo->job?>
    • +
  • params['user']->userInfo->view_count?> просмотра
    • +
  • Статус: params['user']->userInfo->busyText?>
    • +
  • На сайте: params['user']->liveTime?>
    • +
  • Последний визит:
    params['user']->userInfo->lastVisit?>
    • +
  • Трудовой стаж:
    params['user']->userInfo->experience?>
    • +
  • Звание в МФП:
    params['user']->userInfo->rank?>
    • +
  • Стоимость работ:
    params['user']->userInfo->salary?>
    • +
  • params['user']->payments,'name'))?>
    • +
  • Текущее место работы:
    params['user']->userInfo->job?>
diff --git a/frontend/views/performer/blog-list.php b/frontend/views/performer/blog-list.php index 0364ed3..b961b01 100755 --- a/frontend/views/performer/blog-list.php +++ b/frontend/views/performer/blog-list.php @@ -3,7 +3,7 @@ use \yii\helpers\Html; /* @var $this yii\web\View */ - +$this->params['user'] = $user; $this->title = 'My Yii Application'; ?>
diff --git a/frontend/views/performer/blog-view.php b/frontend/views/performer/blog-view.php index c74f360..26ade94 100755 --- a/frontend/views/performer/blog-view.php +++ b/frontend/views/performer/blog-view.php @@ -2,6 +2,7 @@ use \yii\helpers\Html; /* @var $this yii\web\View */ +$this->params['user'] = $user; $this->title = 'My Yii Application'; ?>
diff --git a/frontend/views/performer/common.php b/frontend/views/performer/common.php index a8835fa..838e0fb 100755 --- a/frontend/views/performer/common.php +++ b/frontend/views/performer/common.php @@ -5,6 +5,7 @@ use \yii\helpers\Html; /* @var $this yii\web\View * @var $user common\models\User */ +$this->params['user'] = $user; $this->title = 'My Yii Application'; ?> @@ -17,8 +18,8 @@ $this->title = 'My Yii Application';
Образование:
-
year_from ?>-year_to ?>
-
name ?>
+
-
+
@@ -131,34 +132,40 @@ $this->title = 'My Yii Application';
+
- +38 (050) 123-45-67 +
+
-
- - Сайт -
+ +
+ + Сайт +
+
diff --git a/frontend/views/performer/gallery.php b/frontend/views/performer/gallery.php index 3eb3a08..3a12a30 100755 --- a/frontend/views/performer/gallery.php +++ b/frontend/views/performer/gallery.php @@ -3,7 +3,7 @@ use \yii\helpers\Html; /* @var $this yii\web\View */ - +$this->params['user'] = $user; $this->title = 'My Yii Application'; ?>
diff --git a/frontend/views/performer/portfolio.php b/frontend/views/performer/portfolio.php index 50bd117..0a35464 100755 --- a/frontend/views/performer/portfolio.php +++ b/frontend/views/performer/portfolio.php @@ -3,7 +3,7 @@ use \yii\helpers\Html; /* @var $this yii\web\View */ - +$this->params['user'] = $user; $this->title = 'My Yii Application'; ?>
diff --git a/frontend/views/performer/review.php b/frontend/views/performer/review.php index 66ad30a..ff8815b 100755 --- a/frontend/views/performer/review.php +++ b/frontend/views/performer/review.php @@ -3,7 +3,7 @@ use \yii\helpers\Html; /* @var $this yii\web\View */ - +$this->params['user'] = $user; $this->title = 'My Yii Application'; ?>
diff --git a/frontend/views/performer/workplace.php b/frontend/views/performer/workplace.php index d9ee5b7..ff17053 100755 --- a/frontend/views/performer/workplace.php +++ b/frontend/views/performer/workplace.php @@ -3,7 +3,7 @@ use \yii\helpers\Html; /* @var $this yii\web\View */ - +$this->params['user'] = $user; $this->title = 'My Yii Application'; ?>
-- libgit2 0.21.4