diff --git a/common/components/UserCheck.php b/common/components/UserCheck.php
new file mode 100644
index 0000000..7a0fdb7
--- /dev/null
+++ b/common/components/UserCheck.php
@@ -0,0 +1,28 @@
+on(\yii\base\Application::EVENT_BEFORE_REQUEST, function ($event) {
+
+ if(\Yii::$app->user->identity instanceof User){
+ $userInfo = \Yii::$app->user->identity->userInfo;
+ $expression = new Expression('NOW()');
+ $userInfo->date_visit = (new \yii\db\Query)->select($expression)->scalar();
+ $userInfo->save();
+ }
+
+ });
+ return $app;
+ }
+
+}
\ No newline at end of file
diff --git a/common/models/User.php b/common/models/User.php
index 3f2fa82..e5a0bd7 100755
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -275,6 +275,12 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
return $this->hasOne(CompanyInfo::className(), ['user_id' => 'id']);
}
+ public function getLiveTime(){
+
+ $now = new \DateTime('now');
+ $date1 = new \DateTime(date ('Y-m-d H:i:s',$this->created_at));
+ return \Yii::$app->formatter->asRelativeTime($date1->diff($now));
+ }
public function getIsPerformer()
{
diff --git a/common/models/UserInfo.php b/common/models/UserInfo.php
index 5e9cee7..5c93e45 100755
--- a/common/models/UserInfo.php
+++ b/common/models/UserInfo.php
@@ -72,6 +72,18 @@ class UserInfo extends \yii\db\ActiveRecord
];
}
+
+ public function getBusyText(){
+ return $this->busy ? 'Занят' : 'Свободный';
+ }
+
+
+ public function getLastVisit(){
+ return \Yii::$app->formatter->asRelativeTime($this->date_visit);
+ }
+
+
+
/**
* @inheritdoc
*/
diff --git a/common/modules/file/controllers/UploaderController.php b/common/modules/file/controllers/UploaderController.php
index 4ec2ce0..1f5567d 100755
--- a/common/modules/file/controllers/UploaderController.php
+++ b/common/modules/file/controllers/UploaderController.php
@@ -50,7 +50,7 @@ class UploaderController extends Controller {
$e1_height = $height/$width;
- if($this->isBigger($width,$height,$w,$h)){
+// if($this->isBigger($width,$height,$w,$h)){
if($e_width<$e1_width){
$new_width = $width*($e_width/$e1_width);
@@ -68,10 +68,10 @@ class UploaderController extends Controller {
}
- } else {
- $img->save($imageAliasSave, array('flatten' => false));
- return true;
- }
+// } else {
+// $img->save($imageAliasSave, array('flatten' => false));
+// return true;
+// }
Image::crop($imageAlias, $width, $height,[$x,$y])
diff --git a/common/widgets/views/courses_field.php b/common/widgets/views/courses_field.php
index c575e2a..71a87b6 100644
--- a/common/widgets/views/courses_field.php
+++ b/common/widgets/views/courses_field.php
@@ -6,9 +6,9 @@
Пройденные курсы, тренинги
- Добавить поле
+
-
-
+
+ Добавить поле