Merge pull request #30 from apuc/sum_and_calendar

change password

frontend/assets/AppAsset.php

@@ -15,6 +15,7 @@ class AppAsset extends AssetBundle
         'css/site.css',
     ];
     public $js = [
+        'js/site.js'
     ];
     public $depends = [
         'yii\web\YiiAsset',

frontend/modules/access/views/access/_form.php

@@ -16,7 +16,7 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'login')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'password')->passwordInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'password')->textInput(['maxlength' => true]) ?>
 
     <?= $form->field($model, 'link')->textInput(['maxlength' => true]) ?>
 

frontend/modules/card/controllers/UserCardController.php

@@ -3,8 +3,10 @@
 
 namespace frontend\modules\card\controllers;
 
+use common\classes\Debug;
 use common\models\CardSkill;
 use common\models\FieldsValueNew;
+use common\models\User;
 use Yii;
 use frontend\modules\card\models\UserCard;
 use yii\data\ActiveDataProvider;
@@ -57,7 +59,6 @@ class UserCardController extends Controller
             ]);
 
             $skills = CardSkill::find()->where(['card_id' => $id])->with('skill')->all();
-
             return $this->render('view', [
                 'model' => $this->findModel($id),
                 'modelFildValue' => $dataProvider,
@@ -86,6 +87,28 @@ class UserCardController extends Controller
         ]);
     }
 
+    public function actionPassword($id)
+    {
+        $user_card = UserCard::findOne($id);
+        $model = User::findOne(['id' => $user_card->id_user]);
+
+        return $this->render('password', [
+            'model' => $model,
+        ]);
+    }
+
+    public function actionAjax() {
+        if(Yii::$app->request->isAjax) {
+            $id = $_POST['id'];
+            $password = $_POST['password'];
+
+            $user_card = UserCard::findOne($id);
+            $user = User::findOne(['id' => $user_card->id_user]);
+            $user->password = $password;
+            $user->save();
+        }
+    }
+
     /**
      * Finds the Product model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.

frontend/modules/card/views/user-card/_form.php

@@ -17,10 +17,6 @@ use yii\helpers\ArrayHelper;
 
     <?= $form->field($model, 'fio')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'gender')->dropDownList($model->genders, ['prompt' => 'Выберите']) ?>
-
     <?= $form->field($model, 'dob')->input(
         'date',
         [
@@ -30,7 +26,6 @@ use yii\helpers\ArrayHelper;
 
         ]
     ) ?>
-
     <div class="row">
         <div class="col-xs-12">
             <?= $form->field($model, 'skill')->widget(

frontend/modules/card/views/user-card/password.php

@@ -0,0 +1,21 @@
+<?php
+    use yii\helpers\Html;
+    use yii\widgets\ActiveForm;
+?>
+
+<?php $form = ActiveForm::begin([
+    'id' => 'password-form',
+    'enableClientValidation' => true,
+    'enableAjaxValidation'   => false,
+    'method' => 'post',
+]); ?>
+
+<h4>Введите новый пароль</h4>
+
+<?= Html::input('text', 'password', '', ['class' => 'form-control custom-input']) ?>
+
+<br>
+
+<?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
+
+<?php ActiveForm::end(); ?>

frontend/modules/card/views/user-card/view.php

@@ -12,10 +12,11 @@ use yii\widgets\DetailView;
 $this->title = 'Профиль';
 ?>
 <div class="user-card-view">
-
     <h3>Личная информация</h3>
     <?php
-    echo DetailView::widget([
+    echo Html::a('Изменить профиль', ['/card/user-card/update', 'id' => $model->id], ['class' => 'btn btn-success'])
+    . '&nbsp' . Html::a('Изменить пароль', ['/card/user-card/password', 'id' => $model->id], ['class' => 'btn btn-success']);
+    echo  DetailView::widget([
         'model' => $model,
         'attributes' => [
             ['label' => 'ФИО', 'attribute' => 'fio',],
@@ -77,7 +78,4 @@ $this->title = 'Профиль';
             ],
         ],
     ]); ?>
-
-    <?= Html::a('Изменить', ['/card/user-card/update', 'id' => $model->id], ['class' => 'btn btn-success']); ?>
-
 </div>

frontend/web/css/site.css

@@ -118,3 +118,7 @@ a.desc:after {
 .nav > li > form > button.logout:focus {
     outline: none;
 }
+
+.custom-input {
+    width: 50%;
+}

frontend/web/js/site.js

@@ -0,0 +1,24 @@
+$(document).on("beforeSubmit", "#password-form", function (e) {
+    let form = $(this);
+    let formData = form.serialize();
+    let location = document.location.href;
+    location = location.split('=');
+    formData = formData.split('=');
+    console.log(formData[2]);
+
+    $.ajax({
+        url: 'ajax',
+        type: 'POST',
+        data: {
+            id: location[1],
+            password: formData[2],
+        },
+        password: formData[2],
+        success: function (response) {
+            window.location.replace('index');
+        },
+        error: function () {
+        }
+    });
+
+});