From c4139baeb23d6ee01c2e3f74eae841b1826be7b0 Mon Sep 17 00:00:00 2001 From: anatolidew Date: Thu, 25 Nov 2021 14:04:14 +0300 Subject: [PATCH 1/2] =?UTF-8?q?*=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD=D1=83=D1=82=D0=B0=D0=BC=D0=B8=20*=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=BE=D1=80=D1=82=D1=84=D0=BE=D0=BB=D0=B8=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/models/Reports.php | 1 + .../card/controllers/UserCardController.php | 7 ++++++- frontend/modules/card/views/user-card/view.php | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/common/models/Reports.php b/common/models/Reports.php index 8536b1a..76b6f4f 100755 --- a/common/models/Reports.php +++ b/common/models/Reports.php @@ -75,6 +75,7 @@ class Reports extends \yii\db\ActiveRecord foreach ($this->task as $task) { $this->_task[$i]['task'] = $task->task; $this->_task[$i]['hours_spent'] = $task->hours_spent; + $this->_task[$i]['minutes_spent'] = $task->minutes_spent; $i++; } } diff --git a/frontend/modules/card/controllers/UserCardController.php b/frontend/modules/card/controllers/UserCardController.php index f9f7d54..b22cf28 100755 --- a/frontend/modules/card/controllers/UserCardController.php +++ b/frontend/modules/card/controllers/UserCardController.php @@ -51,6 +51,11 @@ class UserCardController extends Controller $result = UserCard::find()->where(['id_user' => $id_user])->asArray()->all(); if($result) { $id = $result[0]['id']; + $model = $this->findModel($id); + if ($model->load(Yii::$app->request->post())) { + $model->updated_at = date('Y-m-d h:i:s'); + $model->save(); + } $dataProvider = new ActiveDataProvider([ 'query' => FieldsValueNew::find() ->where(['item_id' => $id, 'item_type' => FieldsValueNew::TYPE_PROFILE]) @@ -69,7 +74,7 @@ class UserCardController extends Controller ->all(); return $this->render('view', [ - 'model' => $this->findModel($id), + 'model' => $model, 'modelFildValue' => $dataProvider, 'skills' => $skills, 'achievements' => $achievements, diff --git a/frontend/modules/card/views/user-card/view.php b/frontend/modules/card/views/user-card/view.php index 22e3943..8aadba5 100755 --- a/frontend/modules/card/views/user-card/view.php +++ b/frontend/modules/card/views/user-card/view.php @@ -1,7 +1,9 @@ title = 'Профиль'; return $model->value; } ], + 'vc_text' ], ]); ?> + + + field($model, 'vc_text')->widget(EditorClassic::className(), [ + 'clientOptions' => [ + 'language' => 'ru', + ] + ]); ?> +
+ 'btn btn-success']) ?> +
+ From 8400da1033ce0e5968001bddfd7e2f6b299af56a Mon Sep 17 00:00:00 2001 From: anatolidew Date: Thu, 25 Nov 2021 14:19:38 +0300 Subject: [PATCH 2/2] =?UTF-8?q?*=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/modules/card/views/user-card/view.php | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/modules/card/views/user-card/view.php b/frontend/modules/card/views/user-card/view.php index 8aadba5..80bb663 100755 --- a/frontend/modules/card/views/user-card/view.php +++ b/frontend/modules/card/views/user-card/view.php @@ -67,7 +67,6 @@ $this->title = 'Профиль'; return $model->value; } ], - 'vc_text' ], ]); ?>