[ERP-189] Перенос profile на yii, добавление айди пользователя в правом верхнем выпад...

diff --git a/erp24/controllers/ProfileController.php b/erp24/controllers/ProfileController.php
index 40ab455ab7e644e975dc77aba3b89104ac301ed8..dd6ed4d78d7d99b992e3f5c45679ef9cf2b04351 100644 (file)
--- a/erp24/controllers/ProfileController.php
+++ b/erp24/controllers/ProfileController.php
@@ -2,9 +2,14 @@
 
 namespace app\controllers;
 
+use Yii;
 use yii\web\Controller;
+use yii_app\records\Admin;
 
 class ProfileController extends Controller
 {
-    public function actionIndex() { return $this->render('index'); }
+    public function actionIndex() {
+        $model = Admin::findOne(Yii::$app->user->id);
+        return $this->render('index', compact('model'));
+    }
 }
\ No newline at end of file

diff --git a/erp24/records/Admin.php b/erp24/records/Admin.php
index 9c04ccf95f53cd64e3426bc5de058c7da2ae6c89..6f6486f8f950484b5e26f6101b1e9b2510822bf1 100755 (executable)
--- a/erp24/records/Admin.php
+++ b/erp24/records/Admin.php
@@ -95,7 +95,7 @@ class Admin extends ActiveRecord implements IdentityInterface
     public function rules()
     {
         return [
-            [['imageFile'], 'file', 'skipOnEmpty' => true, 'extensions' => 'jpg'],
+            [['imageFile'], 'file', 'skipOnEmpty' => true, 'extensions' => 'jpg,jpeg,png'],
             [['store_arrArr', 'store_arr_guidArr'], 'safe'],
             [['login_user'], 'unique'],
 

diff --git a/erp24/views/layouts/header.php b/erp24/views/layouts/header.php
index 84d68d2b628475a9ab6b960ccf391175b6da3f3b..d54ea8453040eba6c559fc1797e37c3e6271c33f 100755 (executable)
--- a/erp24/views/layouts/header.php
+++ b/erp24/views/layouts/header.php
@@ -151,6 +151,7 @@ $this->registerCssFile('/css/timetable/style.css');
                                         <div class="text-center">
                                             <div class="text-center user pb-0 font-weight-bold"><?= $_SESSION["name_admin"] ?? '-' ?></div>
                                             <span class="text-center user-semi-title"><?= $_SESSION["admin_group_name"] ?? '-'?></span>
+                                            <div class="text-center user-semi-title"><?= '#' . $_SESSION["admin_id"] ?? '-'?></div>
                                             <div class="dropdown-divider"></div>
                                         </div>
                                         <a class="dropdown-item d-flex" href="/profile/">

diff --git a/erp24/views/profile/index.php b/erp24/views/profile/index.php
index 320cf29df0fbcdf3c91569c6879ad889c41551a2..01cd910c671ae07db3f9c6bececfb78075cb66bd 100644 (file)
--- a/erp24/views/profile/index.php
+++ b/erp24/views/profile/index.php
@@ -1,6 +1,62 @@
 <?php
 
+//chdir(__DIR__ . '/../../');
+//
+//include 'modul/profile/index.php';
 
-chdir(__DIR__ . '/../../');
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
 
-include 'modul/profile/index.php';
\ No newline at end of file
+use dosamigos\datetimepicker\DateTimePicker;
+
+use yii_app\records\Admin;
+use yii_app\helpers\PrintBlockHelper;
+
+/** @var $model Admin */
+
+?>
+
+<div class="profileIndex m-5">
+    <h1>Профайл</h1>
+
+    <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]) ?>
+
+    <?php PrintBlockHelper::printBlock('ID', $form->field($model, 'id')->textInput()->label(false)); ?>
+
+    <?php PrintBlockHelper::printBlock('*Сотрудник Имя и Фамилия', $form->field($model, 'name')->textInput()->label(false)); ?>
+
+    <?php PrintBlockHelper::printBlock('*Полное ФИО сотрудника', $form->field($model, 'name_full')->textInput()->label(false)); ?>
+
+    <?php PrintBlockHelper::printBlock('Должность(группа)', $model->adminGroup->name ?? '-'); ?>
+
+    <?php PrintBlockHelper::printBlock('Должность', $form->field($model, 'group_name')->textInput()->label(false)); ?>
+
+    <?php PrintBlockHelper::printBlock('*Дата рождения', $form->field($model, 'birthdate')->widget(DateTimePicker::class, [
+        'language' => 'ru',
+        'template' => '{input}',
+        'clientOptions' => [
+            'autoclose' => true,
+            'format' => 'Y-m-d',
+            'todayBtn' => true
+        ],
+    ])->label(false)); ?>
+
+    <?php // PrintBlockHelper::printBlock('*Пол', $form->field($model, 'pol')->dropDownList(["women"=>"женский", "men"=>"мужской"])->label(false)); ?>
+
+    <?php PrintBlockHelper::printBlock('*Телефон', $form->field($model, 'mobile')->textInput()->label(false)); ?>
+
+    <?php // PrintBlockHelper::printBlock('*Адрес фактического проживания', $form->field($model, 'adress_fakt')->textInput()->label(false)); ?>
+
+    <?php PrintBlockHelper::printBlock('*Логин', $form->field($model, 'login_user')->textInput()->label(false)); ?>
+
+    <?php PrintBlockHelper::printBlock('*Пароль', $form->field($model, 'pass_user')->textInput()->label(false)); ?>
+
+    <?php PrintBlockHelper::printBlock('Фото сотрудника', $form->field($model, 'imageFile')->fileInput()->label(false) . ' ' . $model->avatarka); ?>
+
+    <div class="form-group">
+        <?php // Html::submitButton('Сохранить', ['class' => 'btn btn-success btn-lg']) ?>
+    </div>
+
+    <?php ActiveForm::end() ?>
+
+</div>