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 = [

components/HolidaySettings.php

@@ -13,14 +13,27 @@
 
 class HolidaySettings extends Component
 {
+    /**
+     * @var string manages holiday color by type on the calendar scheduler.
+     */
+    public $textColor = '#000000d6';
 
     /**
      * @var array manages holiday color by type on the calendar scheduler.
      */
-    public $calendarColor = [
-        Holiday::TYPE_PERSONAL => '#389638',
-        Holiday::TYPE_BUSINESS => '#b93224',
-        Holiday::TYPE_CUSTOM => '#4d8dca'
+    public $calendarBackgroundColor = [
+        Holiday::TYPE_PERSONAL => '#08bbbb4d',
+        Holiday::TYPE_BUSINESS => '#ffd29b4d',
+        Holiday::TYPE_CUSTOM => '#ea75694d'
+    ];
+
+    /**
+     * @var array manages holiday color by type on the calendar scheduler.
+     */
+    public $calendarBorderColor = [
+        Holiday::TYPE_PERSONAL => '#63c598',
+        Holiday::TYPE_BUSINESS => '#ecc262',
+        Holiday::TYPE_CUSTOM => '#ea7569'
     ];
 
     public $customHolidayName = 'Custom';
@@ -29,8 +42,26 @@ class HolidaySettings extends Component
      * @param $type
      * @return mixed
      */
-    public function getColorByType($type)
+    public function getBackgroundColorByType($type)
+    {
+        return $this->calendarBackgroundColor[$type];
+    }
+
+    /**
+     * @param $type
+     * @return mixed
+     */
+    public function getBorderColorByType($type)
+    {
+        return $this->calendarBorderColor[$type];
+    }
+
+    /**
+     * @param $type
+     * @return mixed
+     */
+    public function getTextColor()
     {
-        return $this->calendarColor[$type];
+        return $this->textColor;
     }
 }

controllers/RequestController.php

@@ -24,6 +24,17 @@ public function behaviors()
                         'roles' => [User::ROLE_MANAGER],
                         'actions' => ['index', 'view', 'confirm']
                     ],
+                    [
+                        'actions' => ['delete',],
+                        'allow' => true,
+                        'roles' => ['@'],
+                        'matchCallback' => function ($rule, $action) {
+                            if (Yii::$app->user->identity->position == User::POSITION_HR || Yii::$app->user->can('administrator')) {
+                                return true;
+                            }
+                            return false;
+                        }
+                    ],
                 ],
             ],
             'verbs' => [
@@ -62,15 +73,24 @@ public function actionView($id)
         $user = Yii::$app->user->identity;
         $model = $this->findAllModelExceptOwn($id);
 
-        if ($user->position != User::POSITION_HR && $user->department_id != $model->user->department_id) {
-            throw new NotFoundHttpException(Yii::t('app', 'The requested page does not exist.'));
-        }
+//        if ($user->position != User::POSITION_HR && $user->department_id != $model->user->department_id) {
+//            throw new NotFoundHttpException(Yii::t('app', 'The requested page does not exist.'));
+//        }
 
         return $this->render('view', [
             'model' => $model,
         ]);
     }
 
+    public function actionDelete($id)
+    {
+
+        $this->findModel($id)->delete();
+        return $this->redirect(['index']);
+
+    }
+
+
     /**
      * @return string|\yii\web\Response
      * @throws NotFoundHttpException
@@ -112,4 +132,20 @@ protected function findAllModelExceptOwn($id)
         throw new NotFoundHttpException(Yii::t('app', 'The requested page does not exist.'));
     }
 
+    /**
+     * Finds the User model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Holiday the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Holiday::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+
 }

controllers/SiteController.php

@@ -74,19 +74,20 @@ public function actionEvents()
             ->andWhere(['<=', Holiday::tableName() . '.start_date', \Yii::$app->request->get('end')])
             ->all();
         foreach ($times AS $time) {
-            try{
+            try {
                 $event = new Event();
                 $event->id = $time->id;
-                $event->backgroundColor = \Yii::$app->holidaySettings->getColorByType($time->type);
-                $event->borderColor = \Yii::$app->holidaySettings->getColorByType($time->type);
+                $event->backgroundColor = \Yii::$app->holidaySettings->getBackgroundColorByType($time->type);
+                $event->borderColor = \Yii::$app->holidaySettings->getBorderColorByType($time->type);
+                $event->textColor = \Yii::$app->holidaySettings->getTextColor();
                 $event->title = $time->user->userProfile->getFullName();
                 $event->start = date('Y-m-d\TH:i:s\Z', strtotime($time->start_date));
                 $event->end = date('Y-m-d\TH:i:s\Z', strtotime($time->end_date));
                 $events[] = $event;
-            }catch (\Exception $e){
-                 echo '<pre>';
-                 var_dump($e);
-                 exit;
+            } catch (\Exception $e) {
+                echo '<pre>';
+                var_dump($e);
+                exit;
             }
 
         }

controllers/UserController.php

@@ -73,6 +73,9 @@ public function actionView($id)
      */
     public function actionCreate()
     {
+
+        Yii::$app->authManager->checkAccess(Yii::$app->user->getId(), 'administrator') ? $userRoleName = 'administrator' : $userRoleName = 'manager';
+
         $model = new UserForm();
         $model->setScenario('create');
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
@@ -81,7 +84,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), 'name', 'name')
         ]);
     }
 
@@ -94,6 +97,9 @@ public function actionCreate()
      */
     public function actionUpdate($id)
     {
+        Yii::$app->authManager->checkAccess(Yii::$app->user->getId(), 'administrator') ? $userRoleName = 'administrator' : $userRoleName = 'manager';
+
+
         $model = new UserForm();
         $model->setModel($this->findModel($id));
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
@@ -102,7 +108,7 @@ public function actionUpdate($id)
 
         return $this->render('update', [
             'model' => $model,
-            'roles' => ArrayHelper::map(Yii::$app->authManager->getRoles(), 'name', 'name')
+            'roles' => ArrayHelper::map(Yii::$app->authManager->getChildRoles($userRoleName), 'name', 'name')
         ]);
     }
 

models/search/BankHolidaySearch.php

@@ -69,7 +69,7 @@ public function search($params)
 
         // grid filtering conditions
         $query->andFilterWhere([
-            'id' => $this->id,
+            BankHoliday::tableName() . '.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(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]);
         }