Generate username

assets/AppAsset.php

@@ -35,6 +35,7 @@ class AppAsset extends AssetBundle
         'js/bootstrap-tour.min.js',
         'js/lobiplugins/bootstrap-datepicker.js',
         'js/modal.js',
+        'js/user-form.js',
     ];
 
     public $depends = [

controllers/UserController.php

@@ -26,7 +26,7 @@ public function behaviors()
                 'rules' => [
                     [
                         'allow' => true,
-                        'roles' => [User::ROLE_MANAGER],
+                        'roles' => [User::ROLE_MANAGER, User::ROLE_ADMINISTRATOR],
                     ],
                 ],
             ],
@@ -73,6 +73,10 @@ public function actionView($id)
      */
     public function actionCreate()
     {
+        //todo pass user specific roles
+        $userRoles = Yii::$app->authManager->getRolesByUser(Yii::$app->user->getId());
+        $userRoleName = array_keys($userRoles);
+
         $model = new UserForm();
         $model->setScenario('create');
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
@@ -81,7 +85,7 @@ public function actionCreate()
 
         return $this->render('create', [
             'model' => $model,
-            'roles' => ArrayHelper::map(Yii::$app->authManager->getRoles(), 'name', 'name')
+            'roles' => ArrayHelper::map(Yii::$app->authManager->getChildRoles($userRoleName[0]), 'name', 'name')
         ]);
     }
 

models/search/BankHolidaySearch.php

@@ -69,7 +69,7 @@ public function search($params)
 
         // grid filtering conditions
         $query->andFilterWhere([
-            'id' => $this->id,
+            'bank_holiday.id' => $this->id,
             'date' => $this->date,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,

models/search/DepartmentSearch.php

@@ -21,9 +21,10 @@ class DepartmentSearch extends Department
     public function rules()
     {
         return [
-            [['id', 'created_at', 'updated_at', 'created_by', 'updated_by'], 'integer'],
-            [['name'], 'safe'],
+            [['id', 'updated_at', 'created_by', 'updated_by'], 'integer'],
+            [['name','created_at'], 'safe'],
             [['creator'], 'safe'],
+
         ];
     }
 
@@ -68,13 +69,19 @@ public function search($params)
 
         // grid filtering conditions
         $query->andFilterWhere([
-            'id' => $this->id,
-            'created_at' => $this->created_at,
+            'department.id' => $this->id,
             'updated_at' => $this->updated_at,
             'created_by' => $this->created_by,
             'updated_by' => $this->updated_by,
         ]);
 
+        if ($this->created_at) {
+
+            $query->andFilterWhere([
+                'FROM_UNIXTIME(department.created_at, "%Y-%m-%d")' => $this->created_at
+            ]);
+        }
+
         $query->andFilterWhere(['like', 'name', $this->name]);
         if ($this->creator) {
 

models/search/UserSearch.php

@@ -18,7 +18,7 @@ class UserSearch extends User
 {
     public function attributes()
     {
-        return ['id', 'fullName', 'username', 'email', 'status', 'created_at', 'updated_at', 'logged_at', 'position'];
+        return ['id', 'fullName', 'department_id', 'username', 'email', 'status', 'created_at', 'updated_at', 'logged_at', 'position'];
     }
 
     /**
@@ -27,10 +27,11 @@ public function attributes()
     public function rules()
     {
         return [
-            [['id', 'status', 'position'], 'integer'],
-            [['created_at', 'updated_at', 'logged_at'], 'filter', 'filter' => 'strtotime', 'skipOnEmpty' => true],
-            [['created_at', 'updated_at', 'logged_at'], 'default', 'value' => null],
+            [['id', 'status', 'position', 'department_id'], 'integer'],
+            [['updated_at', 'logged_at'], 'filter', 'filter' => 'strtotime', 'skipOnEmpty' => true],
+            [['updated_at', 'logged_at'], 'default', 'value' => null],
             [['fullName', 'username', 'auth_key', 'password_hash', 'email'], 'safe'],
+            [['created_at'], 'string'],
         ];
     }
 
@@ -62,21 +63,27 @@ public function search($params)
             'desc' => ["CONCAT(up.firstname, ' ', up.lastname)" => SORT_DESC],
         ];
 
-        if (!( $this->load($params) && $this->validate() )) {
+
+        if (!($this->load($params) && $this->validate())) {
             return $dataProvider;
         }
 
+
         $query->andFilterWhere([
-            'id' => $this->id,
+            'up.id' => $this->id,
             'position' => $this->position,
             'status' => $this->status,
+            'department_id' => $this->department_id
         ]);
 
-        if ($this->created_at !== null) {
-            $query->andFilterWhere(['between', 'created_at', $this->created_at, $this->created_at + 3600 * 24]);
+        if ($this->created_at) {
+
+            $query->andFilterWhere([
+                'FROM_UNIXTIME(user.created_at, "%Y-%m-%d")' => $this->created_at
+            ]);
         }
 
-        if ($this->updated_at !== null) {
+        if ($this->updated_at) {
             $query->andFilterWhere(['between', 'updated_at', $this->updated_at, $this->updated_at + 3600 * 24]);
         }
 

views/bank-holiday/index.php

@@ -26,9 +26,11 @@
         'dataProvider' => $dataProvider,
         'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'id',
+            [
+                'attribute' => 'id',
+                'value' => 'id',
+                'contentOptions' => ['style' => 'width:80px; '],
+            ],
             'date',
             'description:ntext',
             [

views/department/index.php

@@ -1,7 +1,9 @@
 <?php
 
+use trntv\yii\datetime\DateTimeWidget;
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\web\JsExpression;
 use yii\widgets\Pjax;
 
 /* @var $this yii\web\View */
@@ -26,9 +28,11 @@
         'dataProvider' => $dataProvider,
         'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'id',
+            [
+                'attribute' => 'id',
+                'value' => 'id',
+                'contentOptions' => ['style' => 'width:80px; '],
+            ],
             'name',
             [
                 'label' => Yii::t('app', 'Created By'),
@@ -38,6 +42,22 @@
                     return $model->creator->userProfile->getFullName();
                 }
             ],
+            [
+                'attribute' => 'created_at',
+                'value' => function ($model) {
+                    return Yii::$app->formatter->asDate($model->created_at);
+                },
+                'label' => 'Created at',
+                'filter' => DateTimeWidget::widget([
+                    'model' => $searchModel,
+                    'attribute' => 'created_at',
+                    'phpDatetimeFormat' => "yyyy-MM-dd",
+                    'momentDatetimeFormat' => 'YYYY-MM-DD',
+                    'clientEvents' => [
+                        'dp.change' => new JsExpression('(e) => $(e.target).find("input").trigger("change.yiiGridView")')
+                    ],
+                ])
+            ],
             ['class' => 'yii\grid\ActionColumn'],
         ],
     ]); ?>

views/holiday/_view_types/_default.php

@@ -34,15 +34,15 @@
                     return $model->getStatusText();
                 }
             ],
-            'start_date',
+            'start_date:date',
             [
                 'attribute' => 'start_time',
                 'value' => function ($model) {
                     /** @var \app\models\Holiday $model */
                     return $model->getStartTimeText();
                 }
             ],
-            'end_date',
+            'end_date:date',
             [
                 'attribute' => 'end_time',
                 'value' => function ($model) {

views/request/index.php

@@ -32,7 +32,11 @@
         'dataProvider' => $dataProvider,
         'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
+            [
+                'attribute' => 'id',
+                'value' => 'id',
+                'contentOptions' => ['style' => 'width:80px; '],
+            ],
             [
                 'attribute' => 'employee',
                 'value' => function ($model) {
@@ -52,6 +56,16 @@
             [
                 'attribute' => 'status',
                 'filter' => Holiday::statuses(),
+                'contentOptions' => function ($model) {
+                    /** @var $model Holiday */
+                    if ($model->getStatusText() == "Accepted") {
+                        return ['style' => 'color: green;'];
+                    } else if ($model->getStatusText() == "Pending") {
+                        return ['style' => 'color: #FFA500;'];
+                    } else {
+                        return ['style' => 'color: red;'];
+                    }
+                },
                 'value' => function ($model) {
                     /** @var $model Holiday */
                     return $model->getStatusText();

views/user/_form.php

@@ -22,11 +22,11 @@
             <?php $form = ActiveForm::begin() ?>
             <div class="row">
                 <div class="col-md-3">
-                    <?php echo $form->field($model, 'firstname') ?>
+                    <?php echo $form->field($model, 'firstname')->textInput(['id' => 'firstname']) ?>
 
                 </div>
                 <div class="col-md-3">
-                    <?php echo $form->field($model, 'lastname') ?>
+                    <?php echo $form->field($model, 'lastname')->textInput(['id' => 'lastname']) ?>
                 </div>
             </div>
 
@@ -43,7 +43,7 @@
 
             <div class="row">
                 <div class="col-md-3">
-                    <?php echo $form->field($model, 'username') ?>
+                    <?php echo $form->field($model, 'username')->textInput(['id' => 'username']) ?>
 
                 </div>
                 <div class="col-md-3">

views/user/create.php

@@ -13,4 +13,6 @@
         'roles' => $roles
     ]) ?>
 
+    <?php $this->registerJsFile('@web/js/user-form.js') ?>
+
 </div>

views/user/index.php

@@ -1,9 +1,12 @@
 <?php
 
 use app\grid\EnumColumn;
+use app\models\Holiday;
 use app\models\User;
+use trntv\yii\datetime\DateTimeWidget;
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\web\JsExpression;
 use yii\widgets\Pjax;
 
 /* @var $this yii\web\View */
@@ -31,26 +34,63 @@
             'class' => 'grid-view table-responsive'
         ],
         'columns' => [
-            'id',
+            [
+                'attribute' => 'id',
+                'value' => 'id',
+                'contentOptions' => ['style' => 'width:80px; '],
+            ],
             [
                 'attribute' => 'fullName',
                 'value' => 'userProfile.fullName'
             ],
-            'username',
             'email:email',
             [
                 'attribute' => 'position',
                 'filter' => User::positions(),
-                'value' => function($model){
+                'value' => function ($model) {
                     return User::positions()[$model->position];
                 }
             ],
+
+            [
+                'attribute' => 'department_id',
+                'filter' => \app\models\Department::getDropdown(),
+                'value' => function ($model) {
+                    return $model->department->name;
+                }
+            ],
             [
                 'class' => EnumColumn::class,
                 'attribute' => 'status',
+                'contentOptions' => function ($model) {
+                    // user status 1 == not active, 2 == active, 3 === deleted
+                    if ($model->status == 1) {
+                        return ['style' => 'color: #FFA500;'];
+                    } else if ($model->status == 2) {
+                        return ['style' => 'color: green;'];
+                    } else {
+                        return ['style' => 'color: red;'];
+                    }
+                },
                 'enum' => User::statuses(),
                 'filter' => User::statuses()
             ],
+            [
+                'attribute' => 'created_at',
+                'value' => function ($model) {
+                    return Yii::$app->formatter->asDate($model->created_at);
+                },
+                'label' => 'Created at',
+                'filter' => DateTimeWidget::widget([
+                    'model' => $searchModel,
+                    'attribute' => 'created_at',
+                    'phpDatetimeFormat' => "yyyy-MM-dd",
+                    'momentDatetimeFormat' => 'YYYY-MM-DD',
+                    'clientEvents' => [
+                        'dp.change' => new JsExpression('(e) => $(e.target).find("input").trigger("change.yiiGridView")')
+                    ],
+                ])
+            ],
             [
                 'class' => 'yii\grid\ActionColumn',
                 'template' => '{view} {update} {delete}',

views/working-day/index.php

@@ -20,14 +20,23 @@
         'dataProvider' => $dataProvider,
 //        'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
 
             'id',
             'weekday',
 //            'week_index',
             'is_working_day:boolean',
-            'start_at',
-            'end_at',
+            [
+                'attribute' => 'start_at',
+                'value' => function ($model) {
+                    return Yii::$app->formatter->asTime($model->start_at, 'H:mm');
+                }
+            ],
+            [
+                'attribute' => 'end_at',
+                'value' => function ($model) {
+                    return Yii::$app->formatter->asTime($model->end_at, 'H:mm');
+                }
+            ],
 
             [
                 'class' => 'yii\grid\ActionColumn',