test

Yarik
1 parent 5077a0ec
Showing 6 changed files with 140 additions and 8 deletions Show diff stats
common/models/Bookmark.php
common/models/Project.php
console/migrations/m160316_134249_bookmarks_table.php
frontend/views/tender/view.php
frontend/web/css/style.css
frontend/web/images/button_add_fav_01.png
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "bookmark".
+ *
+ * @property integer $bookmark_id
+ * @property integer $user_id
+ * @property string $model
+ * @property integer $model_id
+ * @property integer $type
+ *
+ * @property User $user
+ */
+class Bookmark extends \yii\db\ActiveRecord
+{
+
+    const TYPE_PERFORMER = 1;
+    const TYPE_CUSTOMER = 2;
+    const TYPE_PROJECT = 3;
+    const TYPE_VACANCY = 4;
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'bookmark';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['user_id', 'model', 'model_id', 'type'], 'required'],
+            [['user_id', 'model_id', 'type'], 'integer'],
+            [['model'], 'string', 'max' => 255],
+            [['user_id'], 'exist', 'skipOnError' => true, 'targetClass' => User::className(), 'targetAttribute' => ['user_id' => 'id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'bookmark_id' => Yii::t('app', 'Bookmark ID'),
+            'user_id' => Yii::t('app', 'User ID'),
+            'model' => Yii::t('app', 'Model'),
+            'model_id' => Yii::t('app', 'Model ID'),
+            'type' => Yii::t('app', 'Type'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getUser()
+    {
+        return $this->hasOne(User::className(), ['id' => 'user_id']);
+    }
+}
@@ -34,6 +34,7 @@
     {
         public $files;
+
         /**
          * @inheritdoc
          */
@@ -60,10 +61,10 @@
                     'value'              => new Expression('NOW()'),
                 ],
                 'slug' => [
-                    'class' => 'common\behaviors\Slug',
-                    'in_attribute' => 'name',
+                    'class'         => 'common\behaviors\Slug',
+                    'in_attribute'  => 'name',
                     'out_attribute' => 'link',
-                    'translit' => true
+                    'translit'      => true
                 ]
             ];
         }
@@ -75,7 +76,10 @@
         {
             return [
                 [
-                    [ 'name', 'link' ],
+                    [
+                        'name',
+                        'link'
+                    ],
                     'required',
                 ],
                 [
@@ -181,7 +185,6 @@
                         ->viaTable('project_payment', [ 'project_id' => 'project_id' ]);
         }
-
         /**
          * @return \yii\db\ActiveQuery
          */
@@ -198,8 +201,6 @@
             return $this->hasOne(self::className(), [ 'project_id' => 'project_pid' ]);
         }
-
-
         public function getBudgetCurrency()
         {
             return $this->hasOne(Currency::className(), [ 'currency_id' => 'budget_currency' ]);
@@ -273,4 +274,9 @@
                 return [ ];
             }
         }
+
+        public function getIsBookmarked()
+        {
+            return false;
+        }
     }
+<?php
+
+    use yii\db\Migration;
+
+    class m160316_134249_bookmarks_table extends Migration
+    {
+
+        public function up()
+        {
+            $this->createTable('{{%bookmark}}', [
+                'bookmark_id' => $this->primaryKey(),
+                'user_id'     => $this->integer()
+                                      ->notNull(),
+                'model'       => $this->string()
+                                      ->notNull(),
+                'model_id'    => $this->integer()
+                                      ->notNull(),
+                'type'        => $this->integer()
+                                      ->notNull(),
+            ]);
+            $this->addForeignKey('bookmark_user', '{{%bookmark}}', 'user_id', '{{%user}}', 'id', 'CASCADE', 'CASCADE');
+    }
+
+        public function down()
+        {
+            $this->dropForeignKey('bookmark_user', '{{%bookmark}}');
+            $this->dropTable('{{%bookmark}}');
+        }
+
+    }
@@ -65,7 +65,27 @@ $this-&gt;title = &#39;My Yii Application&#39;;
                                 <?= Html::a(Html::img('/images/ico-vk.png'),"{$model->user->userInfo->social_vk}",['target'=>'_blank'])?>
                             </div>
                         </div>
-                        <div class="performance-vacancy-add-favorite"><a href="#"></a></div>
+                        <?php
+                            if(!empty( \Yii::$app->user->identity )) {
+                                ?>
+                                <div class="performance-vacancy-add-favorite">
+                                    <?php
+                                        if($model->isBookmarked) {
+                                            echo Html::a('', [ '#' ], [
+                                                'class'   => 'artbox_bookmark_remove_performer',
+                                                'data-id' => $model->project_id,
+                                            ]);
+                                        } else {
+                                            echo Html::a('', [ '#' ], [
+                                                'class'   => 'artbox_bookmark_add_performer',
+                                                'data-id' => $model->project_id,
+                                            ]);
+                                        }
+                                    ?>
+                                </div>
+                                <?php
+                            }
+                        ?>
                         <div class="cab-mes-read-last-visit">
                             <div class="cab-mes-read-min-bl" style="width: 204px">
                                 <div class="profile-phone-site style">
@@ -1571,6 +1571,15 @@ input[type=file]::-webkit-file-upload-button {
 .performance-vacancy-add-favorite a.artbox_bookmark_remove_performer{
     background: url("/images/button_add_fav_01.png") no-repeat;
 }
+.performance-vacancy-add-favorite a.artbox_bookmark_remove_customer{
+    background: url("/images/button_add_fav_01.png") no-repeat;
+}
+.performance-vacancy-add-favorite a.artbox_bookmark_remove_project{
+    background: url("/images/button_add_fav_01.png") no-repeat;
+}
+.performance-vacancy-add-favorite a.artbox_bookmark_remove_vacancy{
+    background: url("/images/button_add_fav_01.png") no-repeat;
+}
 .performance-vacancy-add-favorite a:hover{opacity: 0.95}
 .menu-content-wr {
     height: 43px;