From 23f4cb84e6c41e75f5be6e488ae9936259e051b2 Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Mon, 2 Sep 2019 19:06:34 +0530
Subject: [PATCH 01/25] test(roles): roles route permissions tests added (#305)

---
 database/factories/UserFactory.php            |   3 +
 .../RoleControllerPermissionTest.php          | 128 ++++++++++++++++++
 tests/TestCase.php                            |  23 ++++
 3 files changed, 154 insertions(+)
 create mode 100644 tests/Permissiion/RoleControllerPermissionTest.php

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index eee07d140..dce948130 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -22,5 +22,8 @@
         'email_verified_at' => now(),
         'password'          => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
         'remember_token'    => Str::random(10),
+        'is_active'         => true,
+        'is_email_verified' => true,
+        'set_password'      => true,
     ];
 });
diff --git a/tests/Permissiion/RoleControllerPermissionTest.php b/tests/Permissiion/RoleControllerPermissionTest.php
new file mode 100644
index 000000000..45ba3f9cd
--- /dev/null
+++ b/tests/Permissiion/RoleControllerPermissionTest.php
@@ -0,0 +1,128 @@
+<?php
+
+use App\Models\Role;
+use App\Models\User;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class RoleControllerPermissionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public $user;
+
+    /** @var user */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->actingAs($this->user);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_roles_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_roles']);
+        $response = $this->getJson(route('roles.index'));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_roles_without_permission()
+    {
+        $response = $this->get(route('roles.index'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_create_role_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_roles']);
+
+        $role = factory(Role::class)->raw();
+
+        $response = $this->postJson(route('roles.store'), $role);
+
+        $response->assertStatus(302);
+        $response->assertRedirect('roles');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_create_role_without_permission()
+    {
+        $role = factory(Role::class)->raw();
+
+        $response = $this->post(route('roles.store'), $role);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_update_role_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_roles']);
+
+        /** @var Role $role */
+        $role = factory(Role::class)->create();
+        $updateRole = factory(Role::class)->raw(['id' => $role->id]);
+
+        $response = $this->putJson(route('roles.update', $role->id), $updateRole);
+
+        $response->assertStatus(302);
+        $response->assertRedirect('roles');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_role_without_permission()
+    {
+        /** @var Role $role */
+        $role = factory(Role::class)->create();
+        $updateRole = factory(Role::class)->raw(['id' => $role->id]);
+
+        $response = $this->put(route('roles.update', $role->id), $updateRole);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_delete_role_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_roles']);
+
+        /** @var Role $role */
+        $role = factory(Role::class)->create();
+
+        $response = $this->deleteJson(route('roles.destroy', $role->id));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_delete_role_without_permission()
+    {
+        /** @var Role $role */
+        $role = factory(Role::class)->create();
+
+        $response = $this->delete(route('roles.destroy', $role->id));
+
+        $response->assertStatus(403);
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 2b0a3ce7e..af6f26754 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,6 +2,8 @@
 
 namespace Tests;
 
+use App\Models\Permission;
+use App\Models\Role;
 use App\Models\User;
 use Carbon\Carbon;
 use Faker\Factory;
@@ -78,4 +80,25 @@ protected function mockTime($string, $timezone = 'UTC')
 
         return Carbon::now();
     }
+
+    /**
+     * @param array $permissions
+     * @param int   $userId
+     *
+     * @return User
+     */
+    public function attachPermissions($userId, $permissions = [])
+    {
+        /** @var User $user */
+        $user = User::findOrFail($userId);
+        $permissionIds = Permission::whereIn('name', $permissions)->get()->pluck('id');
+
+        /** @var Role $role */
+        $role = factory(Role::class)->create();
+        $role->perms()->sync($permissionIds);
+
+        $user->attachRole($role);
+
+        return $user;
+    }
 }

From d8d4a254df7d477df13e0599b18a168c58841d59 Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 11:57:11 +0530
Subject: [PATCH 02/25] feat(UI): added focus on first input of model on model
 open event #301)

---
 resources/assets/js/custom.js        | 13 +++++++++++++
 resources/assets/js/report/report.js |  4 ++++
 resources/assets/js/users/user.js    |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/custom.js b/resources/assets/js/custom.js
index d1bf03c29..95754fb11 100644
--- a/resources/assets/js/custom.js
+++ b/resources/assets/js/custom.js
@@ -165,3 +165,16 @@ window.displaySuccessMessage = function (message) {
         position: 'top-right',
     });
 };
+
+//focus on select2
+$(document).on('focus', '.select2-selection.select2-selection--single', function (e) {
+    $(this).closest(".select2-container").siblings('select:enabled').select2('open');
+});
+
+$(function () {
+    $(".modal").on('shown.bs.modal', function () {
+        setTimeout(function () {
+            $(".modal").find('input:text, .select2-selection.select2-selection--single').first().focus();
+        },150);
+    });
+});
diff --git a/resources/assets/js/report/report.js b/resources/assets/js/report/report.js
index e2a152a06..dcd8c3509 100644
--- a/resources/assets/js/report/report.js
+++ b/resources/assets/js/report/report.js
@@ -44,6 +44,10 @@ $('#end_date').datetimepicker({
     maxDate: moment()
 });
 
+$(function () {
+    $('form').find('input:text').filter(':input:visible:first').first().focus();
+});
+
 $("#start_date").on("dp.change", function (e) {
     $('#end_date').data("DateTimePicker").minDate(e.date);
 });
diff --git a/resources/assets/js/users/user.js b/resources/assets/js/users/user.js
index a6cd92def..0e8bcfb73 100644
--- a/resources/assets/js/users/user.js
+++ b/resources/assets/js/users/user.js
@@ -4,7 +4,8 @@ $(function () {
     });
     $('#roleId,#editRoleId').select2({
         width: '100%',
-        placeholder: "Select Role"
+        placeholder: "Select Role",
+        minimumResultsForSearch: -1
     });
 });
 

From 2a8593ee9a753fd1cea498a2bb964dedd98fab0a Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 12:01:31 +0530
Subject: [PATCH 03/25] feat(time-entry): when user open new time entry pop up
 end will be selected as current date-time (#304)

---
 resources/assets/js/time_entries/time_entry.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/assets/js/time_entries/time_entry.js b/resources/assets/js/time_entries/time_entry.js
index 5ad667a39..b93c9f762 100644
--- a/resources/assets/js/time_entries/time_entry.js
+++ b/resources/assets/js/time_entries/time_entry.js
@@ -261,6 +261,7 @@ $('#startTime,#endTime').on('dp.change', function (selected) {
     $('#startTime').data("DateTimePicker").maxDate(moment().endOf('now'));
     $('#endTime').data("DateTimePicker").maxDate(moment().endOf('now'));
 });
+$('#endTime').val(format(Date(), 'YYYY-MM-DD HH:mm:ss'));
 
 $('#editTimeEntryForm').submit(function (event) {
     event.preventDefault();

From 056fbf85340e5be792fb97ecbb636b6d7e2beaa6 Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 12:28:45 +0530
Subject: [PATCH 04/25] fix(task-detail): any file should be remove from
 attachment in task detail screen (#311)

---
 resources/assets/js/task/task_detail.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/task/task_detail.js b/resources/assets/js/task/task_detail.js
index 84d08c33f..23df41144 100644
--- a/resources/assets/js/task/task_detail.js
+++ b/resources/assets/js/task/task_detail.js
@@ -239,11 +239,10 @@ Dropzone.options.dropzone = {
         let newFileName = fileNameExtArr[0];
         let newFileExt = fileNameExtArr[1];
         let prevFileName = fileuploded.innerHTML.split('.')[0];
-        let fileUrl = attachmentUrl + fileName;
         fileuploded.innerHTML = fileName;
 
-        $(".dz-preview:last-child").children(':last-child').attr('data-file-id', attachment.id);
-        $(".dz-preview:last-child").children(':last-child').attr('data-file-url', attachment.file_url);
+        $(file.previewTemplate).find('.dz-remove').attr('data-file-id', attachment.id);
+        $(file.previewTemplate).find('.dz-remove').attr('data-file-url', attachment.file_url);
         if($.inArray(newFileExt,['jpg','jpge','png']) > -1) {
             $(".previewEle").find('.' + prevFileName).attr('href', attachment.file_url);
             $(".previewEle").find('.' + prevFileName).attr('class', newFileName);

From 55b5cf72be2a70bd7285750559efce0a014cf69c Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 12:37:58 +0530
Subject: [PATCH 05/25] fix(edit-profile): added password view/block
 functionality (#312)

---
 resources/assets/js/profile/profile.js        | 14 +++++++++++--
 resources/assets/style/sass/style.scss        |  8 +++++++-
 .../views/profile/edit_profile.blade.php      | 20 ++++++++++++++++---
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/profile/profile.js b/resources/assets/js/profile/profile.js
index a9d83f822..a01fd1513 100644
--- a/resources/assets/js/profile/profile.js
+++ b/resources/assets/js/profile/profile.js
@@ -4,7 +4,7 @@ $('#editProfileForm').submit(function (event) {
     if(!isValidate){
         return false;
     }
-    let loadingButton = jQuery(this).find("#btnEditSave");
+    let loadingButton = jQuery(this).find("#btnPrEditSave");
     loadingButton.button('loading');
     $.ajax({
         url: usersUrl + 'profile-update',
@@ -120,4 +120,14 @@ function validatePassword() {
         return false;
     }
     return true;
-}
\ No newline at end of file
+}
+
+$(".changeType").click(function () {
+    let inputField = $(this).parent().siblings();
+    let oldType = inputField.attr('type');
+    if(oldType == 'password') {
+        inputField.attr('type', 'text');
+    } else {
+        inputField.attr('type', 'password');
+    }
+});
diff --git a/resources/assets/style/sass/style.scss b/resources/assets/style/sass/style.scss
index b42637b49..25ef0ac9a 100644
--- a/resources/assets/style/sass/style.scss
+++ b/resources/assets/style/sass/style.scss
@@ -483,7 +483,7 @@ table.dataTable {
 }
 
 .edit-profile__file-upload {
-    padding: 10px;
+    padding: 7px 10px;
     background: #20a8d8;
     display: table;
     color: $white;
@@ -550,3 +550,9 @@ table.dataTable {
     overflow-y: auto;
     max-height: 750px;
 }
+
+.input-group__addon {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+}
+
diff --git a/resources/views/profile/edit_profile.blade.php b/resources/views/profile/edit_profile.blade.php
index e20f4c628..33e8696d0 100644
--- a/resources/views/profile/edit_profile.blade.php
+++ b/resources/views/profile/edit_profile.blade.php
@@ -43,15 +43,29 @@
                 <div class="row">
                     <div class="form-group col-sm-6">
                         {!! Form::label('password', 'New Password') !!}<span class="required confirm-pwd">*</span>
-                        {!! Form::text('password', null, ['class' => 'form-control', 'id' => 'pfNewPassword']) !!}
+                        <div class="input-group">
+                            <input class="form-control input-group__addon" id="pfNewPassword" type="password" name="password">
+                            <div class="input-group-append">
+                                <span class="input-group-text changeType">
+                                    <i class="icon-eye icons"></i>
+                                </span>
+                            </div>
+                        </div>
                     </div>
                     <div class="form-group col-sm-6">
                         {!! Form::label('password_confirmation', 'Confirm Password') !!}<span class="required confirm-pwd">*</span>
-                        {!! Form::text('password_confirmation', null, ['class' => 'form-control', 'id' => 'pfNewConfirmPassword']) !!}
+                        <div class="input-group">
+                            <input class="form-control input-group__addon" id="pfNewConfirmPassword" type="password" name="password_confirmation">
+                            <div class="input-group-append">
+                                <span class="input-group-text changeType">
+                                    <i class="icon-eye icons"></i>
+                                </span>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="text-right">
-                    {!! Form::button('Save', ['type'=>'submit','class' => 'btn btn-primary','id'=>'btnEditSave','data-loading-text'=>"<span class='spinner-border spinner-border-sm'></span> Processing..."]) !!}
+                    {!! Form::button('Save', ['type'=>'submit','class' => 'btn btn-primary','id'=>'btnPrEditSave','data-loading-text'=>"<span class='spinner-border spinner-border-sm'></span> Processing..."]) !!}
                     <button type="button" class="btn btn-light" data-dismiss="modal"
                             style="margin-left: 5px">Cancel
                     </button>

From 2445ca0c19917a0408350d46d0c983425c6d05e6 Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 12:49:35 +0530
Subject: [PATCH 06/25] eat(user): make role field of user add/edit form
 required (#302)

---
 app/Http/Requests/UpdateUserRequest.php            |  7 ++++---
 app/Models/User.php                                | 14 ++++++++------
 resources/views/users/modal.blade.php              |  4 ++--
 .../Validations/UserControllerValidationTest.php   | 10 ++++++----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/Http/Requests/UpdateUserRequest.php b/app/Http/Requests/UpdateUserRequest.php
index bc97f78cc..d95cba607 100644
--- a/app/Http/Requests/UpdateUserRequest.php
+++ b/app/Http/Requests/UpdateUserRequest.php
@@ -34,9 +34,10 @@ public function rules()
     {
         $id = $this->route('user')->id;
         $rules = [
-            'name'  => 'required|unique:users,name,'.$id,
-            'email' => 'required|email|unique:users,email,'.$id.'|regex:/^[\w\-\.\+]+\@[a-zA-Z0-9\.\-]+\.[a-zA-z0-9]{2,4}$/',
-            'phone' => 'nullable|numeric|digits:10',
+            'name'      => 'required|unique:users,name,'.$id,
+            'email'     => 'required|email|unique:users,email,'.$id.'|regex:/^[\w\-\.\+]+\@[a-zA-Z0-9\.\-]+\.[a-zA-z0-9]{2,4}$/',
+            'phone'     => 'nullable|numeric|digits:10',
+            'role_id'   => 'required',
         ];
 
         return $rules;
diff --git a/app/Models/User.php b/app/Models/User.php
index db381f64d..84bde1672 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -112,15 +112,17 @@ class User extends Authenticatable
      * @var array
      */
     public static $rules = [
-        'name'     => 'required|unique:users,name',
-        'email'    => 'required|email|unique:users,email|regex:/^[\w\-\.\+]+\@[a-zA-Z0-9\.\-]+\.[a-zA-z0-9]{2,4}$/',
-        'phone'    => 'nullable|numeric|digits:10',
+        'name'      => 'required|unique:users,name',
+        'email'     => 'required|email|unique:users,email|regex:/^[\w\-\.\+]+\@[a-zA-Z0-9\.\-]+\.[a-zA-z0-9]{2,4}$/',
+        'phone'     => 'nullable|numeric|digits:10',
+        'role_id'   => 'required',
     ];
 
     public static $messages = [
-        'phone.digits' => 'The phone number must be 10 digits long.',
-        'email.regex'  => 'Please enter valid email.',
-        'photo.mimes'  => 'The profile image must be a file of type: jpeg, jpg, png.',
+        'phone.digits'      => 'The phone number must be 10 digits long.',
+        'email.regex'       => 'Please enter valid email.',
+        'photo.mimes'       => 'The profile image must be a file of type: jpeg, jpg, png.',
+        'role_id.required'  => 'Please select user role.',
     ];
 
     public static $setPasswordRules = [
diff --git a/resources/views/users/modal.blade.php b/resources/views/users/modal.blade.php
index aeb3e4309..9f7ec7553 100644
--- a/resources/views/users/modal.blade.php
+++ b/resources/views/users/modal.blade.php
@@ -35,8 +35,8 @@
                 </div>
                 <div class="row">
                     <div class="form-group col-sm-12">
-                        {!! Form::label('role_id', 'Role') !!}
-                        {!! Form::select('role_id', $roles, null, ['class' => 'form-control', 'id' => 'roleId','placeholder'=>'Select Role']) !!}
+                        {!! Form::label('role_id', 'Role') !!}<span class="required">*</span>
+                        {!! Form::select('role_id', $roles, null, ['class' => 'form-control', 'id' => 'roleId','placeholder'=>'Select Role', 'required']) !!}
                     </div>
                 </div>
                 <div class="row">
diff --git a/tests/Controllers/Validations/UserControllerValidationTest.php b/tests/Controllers/Validations/UserControllerValidationTest.php
index 4bbfd3c93..967b870c3 100644
--- a/tests/Controllers/Validations/UserControllerValidationTest.php
+++ b/tests/Controllers/Validations/UserControllerValidationTest.php
@@ -59,8 +59,9 @@ public function test_create_user_fails_when_email_is_invalid()
     public function it_can_create_user()
     {
         $input = [
-            'name'  => 'random string',
-            'email' => 'dummy@gmail.com',
+            'name'    => 'random string',
+            'email'   => 'dummy@gmail.com',
+            'role_id' => 1,
         ];
         $this->post(route('users.store'), $input)->assertSessionHasNoErrors();
 
@@ -129,8 +130,9 @@ public function it_can_update_user_with_valid_input()
         /** @var User $user */
         $user = factory(User::class)->create();
         $input = [
-            'name'  => 'random string',
-            'email' => 'dummy@gmail.com',
+            'name'    => 'random string',
+            'email'   => 'dummy@gmail.com',
+            'role_id' => 1,
         ];
 
         $this->put(route('users.update', $user->id), $input)->assertSessionHasNoErrors();

From 5f9bdaf5abf5a51b59bc2607c6ef5527dc1a83e4 Mon Sep 17 00:00:00 2001
From: Monika vaghasiya <monika.vaghasiya@infyom.com>
Date: Tue, 3 Sep 2019 12:50:33 +0530
Subject: [PATCH 07/25] fix(role): added focus on first element in roles screen

---
 resources/views/roles/create.blade.php | 2 ++
 resources/views/roles/edit.blade.php   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/resources/views/roles/create.blade.php b/resources/views/roles/create.blade.php
index 9a25551f0..c23209f1b 100644
--- a/resources/views/roles/create.blade.php
+++ b/resources/views/roles/create.blade.php
@@ -36,6 +36,8 @@
                 checkboxClass: 'icheckbox_flat-blue',
                 increaseArea: '10%'
             });
+
+            $('form').find('input:text').filter(':input:visible:first').first().focus();
         });
     </script>
 @endsection
diff --git a/resources/views/roles/edit.blade.php b/resources/views/roles/edit.blade.php
index 7a15dda4a..1484b58d7 100644
--- a/resources/views/roles/edit.blade.php
+++ b/resources/views/roles/edit.blade.php
@@ -36,6 +36,8 @@
                 checkboxClass: 'icheckbox_flat-blue',
                 increaseArea: '10%'
             });
+
+            $('form').find('input:text').filter(':input:visible:first').first().focus();
         });
     </script>
 @endsection
\ No newline at end of file

From f538b2a670a2c29c704dd2c10cd8fff31c8dc112 Mon Sep 17 00:00:00 2001
From: Monika vaghasiya <monika.vaghasiya@infyom.com>
Date: Tue, 3 Sep 2019 12:56:43 +0530
Subject: [PATCH 08/25] fix(client): chnage cancel button id in edit pop up

---
 resources/views/clients/edit_modal.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/clients/edit_modal.blade.php b/resources/views/clients/edit_modal.blade.php
index bd16a2ac6..f8830c561 100644
--- a/resources/views/clients/edit_modal.blade.php
+++ b/resources/views/clients/edit_modal.blade.php
@@ -30,7 +30,7 @@
                 </div>
                 <div class="text-right">
                     {!! Form::button('Save', ['type'=>'submit','class' => 'btn btn-primary','id'=>'btnEditSave','data-loading-text'=>"<span class='spinner-border spinner-border-sm'></span> Processing..."]) !!}
-                    <button type="button" id="btnCancel" class="btn btn-light ml-1" data-dismiss="modal">Cancel</button>
+                    <button type="button" id="btnEditCancel" class="btn btn-light ml-1" data-dismiss="modal">Cancel</button>
                 </div>
             </div>
             {!! Form::close() !!}

From c34d78f69d919c547f08d3951d0b813513cbee4f Mon Sep 17 00:00:00 2001
From: Monika vaghasiya <monika.vaghasiya@infyom.com>
Date: Tue, 3 Sep 2019 12:57:55 +0530
Subject: [PATCH 09/25] Revert "fix(client): chnage cancel button id in edit
 pop up"

This reverts commit f538b2a670a2c29c704dd2c10cd8fff31c8dc112.
---
 resources/views/clients/edit_modal.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/clients/edit_modal.blade.php b/resources/views/clients/edit_modal.blade.php
index f8830c561..bd16a2ac6 100644
--- a/resources/views/clients/edit_modal.blade.php
+++ b/resources/views/clients/edit_modal.blade.php
@@ -30,7 +30,7 @@
                 </div>
                 <div class="text-right">
                     {!! Form::button('Save', ['type'=>'submit','class' => 'btn btn-primary','id'=>'btnEditSave','data-loading-text'=>"<span class='spinner-border spinner-border-sm'></span> Processing..."]) !!}
-                    <button type="button" id="btnEditCancel" class="btn btn-light ml-1" data-dismiss="modal">Cancel</button>
+                    <button type="button" id="btnCancel" class="btn btn-light ml-1" data-dismiss="modal">Cancel</button>
                 </div>
             </div>
             {!! Form::close() !!}

From 0b41507dea2bb7955fa70d62fd4757971ea3ff9f Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 14:09:39 +0530
Subject: [PATCH 10/25] =?UTF-8?q?fix(UI):=20remove=20pagination=20icons=20?=
 =?UTF-8?q?if=20there=20is=20only=20one=20page=20in=20datatab=E2=80=A6=20(?=
 =?UTF-8?q?#308)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/custom.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/resources/assets/js/custom.js b/resources/assets/js/custom.js
index 95754fb11..35922a485 100644
--- a/resources/assets/js/custom.js
+++ b/resources/assets/js/custom.js
@@ -166,6 +166,22 @@ window.displaySuccessMessage = function (message) {
     });
 };
 
+$(function () {
+    $(".dataTables_length").css('padding-top', '6px');
+    $(".dataTables_info").css('padding-top', '24px');
+});
+
+$.extend($.fn.dataTable.defaults, {
+    drawCallback: function (settings) {
+        let thisTableId = settings.sTableId;
+        if (settings.fnRecordsDisplay() > settings._iDisplayLength) {
+            $('#' + thisTableId + '_paginate').show();
+        } else {
+            $('#' + thisTableId + '_paginate').hide();
+        }
+    }
+});
+
 //focus on select2
 $(document).on('focus', '.select2-selection.select2-selection--single', function (e) {
     $(this).closest(".select2-container").siblings('select:enabled').select2('open');

From cb9af332ec3d90b5e48101abe7d2242b442eaa62 Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 14:20:04 +0530
Subject: [PATCH 11/25] feat(time-entry): if time entry geater than 12 hr then
 allow user to adjust start time and make time entry less than 12 hr (#307)

---
 .../assets/js/time_tracker/time_tracker.js    | 96 ++++++++++++++++++-
 resources/views/layouts/app.blade.php         |  6 ++
 resources/views/time_entries/index.blade.php  |  9 --
 .../time_tracker/adjust_time_entry.blade.php  | 40 ++++++++
 4 files changed, 140 insertions(+), 11 deletions(-)
 create mode 100644 resources/views/time_tracker/adjust_time_entry.blade.php

diff --git a/resources/assets/js/time_tracker/time_tracker.js b/resources/assets/js/time_tracker/time_tracker.js
index 05fe3b4eb..d676bb53e 100644
--- a/resources/assets/js/time_tracker/time_tracker.js
+++ b/resources/assets/js/time_tracker/time_tracker.js
@@ -191,7 +191,7 @@ $("#stopTimer").click(function (e) {
     enableTimerData();
 
     $('#loader').show();
-    storeTimeEntry();
+    checkTimeEntry();
 });
 
 function enableTimerData() {
@@ -215,10 +215,102 @@ function stopTime() {
     seconds = minutes = hours = 0;
 }
 
-function storeTimeEntry() {
+function diff_mins(dt2, dt1) {
+    dt2 = new Date(dt2);
+    dt1 = new Date(dt1);
+    var diff = (dt2.getTime() - dt1.getTime()) / 1000;
+    diff /= (60);
+    return Math.abs(Math.round(diff));
+}
+
+function adjustTimeEntry() {
+    let startDate = getItemFromLocalStorage('start_time');
+    $("#tmAdjustValidationErrorsBox").show();
+    $("#tmAdjustValidationErrorsBox").html("Time Entry must be less than 12 hours.");
+    $('#adjustStartTime').val(startDate);
+    $('#adjustStartTime').attr('disabled', 'true');
+    $("#timeEntryAdjustModal").modal();
+    $('#stopTimer').removeAttr('disabled');
+}
+
+$('#timeEntryAdjustModal').on('hidden.bs.modal', function () {
+    $('#adjustEndTime').prop('disabled', false);
+    $('#adjustStartTime').prop('disabled', false);
+    $("#adjustEndTime").data("DateTimePicker").date(null);
+    $("#adjustStartTime").data("DateTimePicker").date(null);
+    resetModalForm('#timeEntryAdjustForm');
+    $('#tmAdjustValidationErrorsBox').hide();
+});
+
+$('#adjustStartTime').datetimepicker({
+    format: 'YYYY-MM-DD HH:mm:ss',
+    useCurrent: true,
+    icons: {
+        up: "icon-arrow-up icons",
+        down: "icon-arrow-down icons",
+        previous: 'icon-arrow-left icons',
+        next: 'icon-arrow-right icons',
+    },
+    sideBySide: true,
+    maxDate: moment().endOf('day'),
+});
+$('#adjustEndTime').datetimepicker({
+    format: 'YYYY-MM-DD HH:mm:ss',
+    useCurrent: true,
+    icons: {
+        up: "icon-arrow-up icons",
+        down: "icon-arrow-down icons",
+        previous: 'icon-arrow-left icons',
+        next: 'icon-arrow-right icons',
+    },
+    sideBySide: true,
+    maxDate: moment().endOf('day'),
+});
+
+$('#adjustStartTime,#adjustEndTime').on('dp.change', function () {
+    const startTime = $('#adjustStartTime').val();
+    const endTime = $('#adjustEndTime').val();
+    let minutes = 0;
+    if (endTime) {
+        const diff = new Date(Date.parse(endTime) - Date.parse(startTime));
+        minutes = diff / (1000 * 60);
+        if (!Number.isInteger(minutes)) {
+            minutes = minutes.toFixed(2);
+        }
+    }
+    $('#adjustDuration').val(minutes).prop('disabled', true);
+    $('#adjustStartTime').data("DateTimePicker").maxDate(moment().endOf('now'));
+    $('#adjustEndTime').data("DateTimePicker").maxDate(moment().endOf('now'));
+    if(minutes < 720) {
+        $('#tmAdjustValidationErrorsBox').hide();
+    }
+});
+
+$('#adjustBtnSave').click(function () {
+    let startTime = $('#adjustStartTime').val();
+    let endTime = $('#adjustEndTime').val();
+    let totalMin = diff_mins(endTime, startTime);
+    if(totalMin > 720) {
+        $("#tmAdjustValidationErrorsBox").show();
+        $("#tmAdjustValidationErrorsBox").html("Time Entry must be less than 12 hours.");
+    } else {
+        $("#adjustBtnCancel").trigger('click');
+        storeTimeEntry(startTime, endTime);
+    }
+});
+
+function checkTimeEntry() {
     let startTime = getItemFromLocalStorage('start_time');
     let endTime = getCurrentTime();
+    let totalMin = diff_mins(endTime, startTime);
+    if(totalMin > 720) {
+        adjustTimeEntry();
+    } else {
+        storeTimeEntry(startTime, endTime);
+    }
+}
 
+function storeTimeEntry(startTime, endTime) {
     $.ajax({
         url: storeTimeEntriesUrl,
         type: 'POST',
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index c675b5982..115ba2719 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -18,6 +18,10 @@
     <link rel="stylesheet" href="https://rawgit.com/fronteed/iCheck/1.x/skins/all.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-toast-plugin/1.3.2/jquery.toast.min.css">
     <link href="https://fonts.googleapis.com/css?family=Lato&display=swap" rel="stylesheet">
+    <link rel="stylesheet"
+          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css">
+    <link rel="stylesheet"
+          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.css">
     @yield('page_css')
     <link href="{{mix('assets/style/css/style.css')}}" rel="stylesheet" type="text/css"/>
     @yield('css')
@@ -70,6 +74,7 @@
 </div>
 
 @include('time_tracker.index');
+@include('time_tracker.adjust_time_entry');
 
 <footer class="app-footer justify-content-between">
     <div>
@@ -91,6 +96,7 @@
 <script type="text/javascript" src="https://cdn.datatables.net/v/dt/dt-1.10.16/datatables.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/iCheck/1.0.2/icheck.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.20.1/moment.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script>
 @yield('page_js')
 <script src="{{mix('assets/js/custom.js')}}" type="text/javascript"></script>
 <script>
diff --git a/resources/views/time_entries/index.blade.php b/resources/views/time_entries/index.blade.php
index d0aca0b95..922d42bee 100644
--- a/resources/views/time_entries/index.blade.php
+++ b/resources/views/time_entries/index.blade.php
@@ -2,12 +2,6 @@
 @section('title')
     Time Entries
 @endsection
-@section('page_css')
-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css">
-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.css">
-@endsection
 
 @section('content')
     <div class="container-fluid">
@@ -51,9 +45,6 @@
         </div>
     </div>
 @endsection
-@section('page_js')
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script>
-@endsection
 
 @section('scripts')
     <script>
diff --git a/resources/views/time_tracker/adjust_time_entry.blade.php b/resources/views/time_tracker/adjust_time_entry.blade.php
new file mode 100644
index 000000000..70eac1332
--- /dev/null
+++ b/resources/views/time_tracker/adjust_time_entry.blade.php
@@ -0,0 +1,40 @@
+<div id="timeEntryAdjustModal" class="modal fade" role="dialog">
+    <div class="modal-dialog">
+        <!-- Modal content-->
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">New Time Entry</h5>
+                <button type="button" aria-label="Close" class="close" data-dismiss="modal">×</button>
+            </div>
+            {!! Form::open(['id'=>'timeEntryAdjustForm']) !!}
+            <div class="modal-body">
+                <div class="alert alert-warning" style="display: none" id="tmAdjustValidationErrorsBox"></div>
+                <div class="form-group row">
+                    <div class="form-group col-sm-12">
+                        {!! Form::label('start_time', 'Start Time') !!}<span class="required">*</span>
+                        <div id="dvAdjustStartTime">
+                            {!! Form::text('start_time', null, ['class' => 'form-control','id'=>'adjustStartTime', 'autocomplete' => 'off','required']) !!}
+                        </div>
+                    </div>
+                    <div class="form-group col-sm-12">
+                        {!! Form::label('end_time', 'End Time') !!}<span class="required">*</span>
+                        <div id="dvAdjustEndTime">
+                            {!! Form::text('end_time', null, ['class' => 'form-control','id'=>'adjustEndTime', 'autocomplete' => 'off', 'required']) !!}
+                        </div>
+                    </div>
+                    <div class="form-group col-sm-12">
+                        {!! Form::label('duration', 'Duration (minutes)') !!}
+                        <div id="dvAdjustDuration">
+                            {!! Form::number('duration', null, ['class' => 'form-control','id' => 'adjustDuration', 'readonly']) !!}
+                        </div>
+                    </div>
+                </div>
+                <div class="text-right">
+                    {!! Form::button('Save', ['type'=>'button','class' => 'btn btn-primary','id'=>'adjustBtnSave','data-loading-text'=>"<span class='spinner-border spinner-border-sm'></span> Processing..."]) !!}
+                    <button type="button" id="adjustBtnCancel" class="btn btn-light ml-1" data-dismiss="modal">Cancel</button>
+                </div>
+            </div>
+            {!! Form::close() !!}
+        </div>
+    </div>
+</div>

From 9c163c016ec306ff5414825a817b6caa546b6b41 Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 14:35:23 +0530
Subject: [PATCH 12/25] feat(dashboard): remove unused projects from custom
 report in dashboard (#320)

---
 resources/assets/js/dashboard/dashboard.js               | 8 +++++---
 resources/assets/js/dashboard/developers-daily-report.js | 2 +-
 resources/assets/js/time_entries/time_entry.js           | 2 +-
 resources/views/dashboard/index.blade.php                | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/dashboard/dashboard.js b/resources/assets/js/dashboard/dashboard.js
index 0ae2fd7a0..d5553e820 100644
--- a/resources/assets/js/dashboard/dashboard.js
+++ b/resources/assets/js/dashboard/dashboard.js
@@ -20,7 +20,7 @@ timeRange.on('apply.daterangepicker', function (ev, picker) {
 });
 
 window.cb = function (start, end) {
-    timeRange.find('span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
+    timeRange.find('span').html(start.format('MMM D, YYYY') + ' - ' + end.format('MMM D, YYYY'));
 };
 
 cb(start, end);
@@ -67,7 +67,6 @@ window.loadUserWorkReport = function (startDate, endDate, userId) {
 window.prepareUserWorkReport = function (result) {
     $('#daily-work-report').html('');
     let data = result.data;
-    console.log(result);
     if (data.totalRecords === 0) {
         $('#work-report-container').html('');
         $('#work-report-container').append('<div align="center" class="no-record">No Records Found</div>');
@@ -96,12 +95,15 @@ window.prepareUserWorkReport = function (result) {
                 mode: 'index',
                 callbacks: {
                     label: function (tooltipItem, data) {
+                        result = roundToQuarterHour(tooltipItem.yLabel);
+                        if(result == '0min') {
+                            return '';
+                        }
                         let label = data.datasets[tooltipItem.datasetIndex].label || '';
 
                         if (label) {
                             label += ': ';
                         }
-                        result = roundToQuarterHour(tooltipItem.yLabel);
                         return label + result;
                     }
                 }
diff --git a/resources/assets/js/dashboard/developers-daily-report.js b/resources/assets/js/dashboard/developers-daily-report.js
index cfd0d3719..a763e45cc 100644
--- a/resources/assets/js/dashboard/developers-daily-report.js
+++ b/resources/assets/js/dashboard/developers-daily-report.js
@@ -11,7 +11,7 @@ $datePicker.on('apply.daterangepicker', function (ev, picker) {
 });
 
 window.cb = function (start) {
-    $datePicker.find('span').html(start.format('MMMM D, YYYY'));
+    $datePicker.find('span').html(start.format('MMM D, YYYY'));
 };
 
 cb(start);
diff --git a/resources/assets/js/time_entries/time_entry.js b/resources/assets/js/time_entries/time_entry.js
index b93c9f762..66dfb0bf6 100644
--- a/resources/assets/js/time_entries/time_entry.js
+++ b/resources/assets/js/time_entries/time_entry.js
@@ -261,7 +261,7 @@ $('#startTime,#endTime').on('dp.change', function (selected) {
     $('#startTime').data("DateTimePicker").maxDate(moment().endOf('now'));
     $('#endTime').data("DateTimePicker").maxDate(moment().endOf('now'));
 });
-$('#endTime').val(format(Date(), 'YYYY-MM-DD HH:mm:ss'));
+$('#endTime').val(moment().format('YYYY-MM-DD HH:mm:ss'));
 
 $('#editTimeEntryForm').submit(function (event) {
     event.preventDefault();
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index 05427369b..f2771ac45 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -28,11 +28,11 @@
                                 <div class="col-4">
                                     <div class="row">
                                         @permission('manage_users')
-                                        <div class="col-5">
+                                        <div class="col-6">
                                             {!! Form::select('users', $users, Auth::id(), ['id' => 'userId','class'=>'user_filter_dropdown']) !!}
                                         </div>
                                         @endpermission
-                                        <div class="col-7">
+                                        <div class="col-6">
                                             <div id="time_range" class="time_range">
                                                 <i class="far fa-calendar-alt"
                                                    aria-hidden="true"></i>&nbsp;&nbsp;<span></span> <b

From 457007686434f6ede6264ee2968c15d607a989b7 Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Tue, 3 Sep 2019 15:00:55 +0530
Subject: [PATCH 13/25] test(tags): test cases for tag permission controller
 test (#310)

---
 .../TagControllerPermissionTest.php           | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 tests/Permissiion/TagControllerPermissionTest.php

diff --git a/tests/Permissiion/TagControllerPermissionTest.php b/tests/Permissiion/TagControllerPermissionTest.php
new file mode 100644
index 000000000..d9cfc6715
--- /dev/null
+++ b/tests/Permissiion/TagControllerPermissionTest.php
@@ -0,0 +1,126 @@
+<?php
+
+use App\Models\Tag;
+use App\Models\User;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class TagControllerPermissionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public $user;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->actingAs($this->user);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_tags_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_tags']);
+
+        $response = $this->getJson(route('tags.index'));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_tags_without_permission()
+    {
+        $response = $this->get(route('tags.index'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_create_tag_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_tags']);
+
+        $tag = factory(Tag::class)->raw();
+
+        $response = $this->postJson(route('tags.store'), $tag);
+
+        $this->assertSuccessMessageResponse($response, 'Tag created successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_create_tag_without_permission()
+    {
+        $tag = factory(Tag::class)->raw();
+
+        $response = $this->post(route('tags.store'), $tag);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_update_tag_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_tags']);
+
+        /** @var Tag $tag */
+        $tag = factory(Tag::class)->create();
+        $updateTag = factory(Tag::class)->raw(['id' => $tag->id]);
+
+        $response = $this->putJson(route('tags.update', $tag->id), $updateTag);
+
+        $this->assertSuccessMessageResponse($response, 'Tag updated successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_tag_without_permission()
+    {
+        /** @var Tag $tag */
+        $tag = factory(Tag::class)->create();
+        $updateTag = factory(Tag::class)->raw(['id' => $tag->id]);
+
+        $response = $this->put(route('tags.update', $tag->id), $updateTag);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_delete_tag_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_tags']);
+
+        /** @var Tag $tag */
+        $tag = factory(Tag::class)->create();
+
+        $response = $this->deleteJson(route('tags.destroy', $tag->id));
+
+        $this->assertSuccessMessageResponse($response, 'Tag deleted successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_delete_tag_without_permission()
+    {
+        /** @var Tag $tag */
+        $tag = factory(Tag::class)->create();
+
+        $response = $this->delete(route('tags.destroy', $tag->id));
+
+        $response->assertStatus(403);
+    }
+}

From e801a00b8781b602a5290fdaf1fb27e87d4b6cd3 Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Tue, 3 Sep 2019 16:16:35 +0530
Subject: [PATCH 14/25] test(clients): client permission tests added(#314)

---
 .../ClientControllerPermissionTest.php        | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 tests/Permissiion/ClientControllerPermissionTest.php

diff --git a/tests/Permissiion/ClientControllerPermissionTest.php b/tests/Permissiion/ClientControllerPermissionTest.php
new file mode 100644
index 000000000..d9ffc88e4
--- /dev/null
+++ b/tests/Permissiion/ClientControllerPermissionTest.php
@@ -0,0 +1,126 @@
+<?php
+
+use App\Models\Client;
+use App\Models\User;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class ClientControllerPermissionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public $user;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->actingAs($this->user);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_clients_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_clients']);
+
+        $response = $this->getJson(route('clients.index'));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_clients_without_permission()
+    {
+        $response = $this->get(route('clients.index'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_create_client_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_clients']);
+
+        $client = factory(Client::class)->raw();
+
+        $response = $this->postJson(route('clients.store'), $client);
+
+        $this->assertSuccessMessageResponse($response, 'Client created successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_create_client_without_permission()
+    {
+        $client = factory(Client::class)->raw();
+
+        $response = $this->post(route('clients.store'), $client);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_update_client_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_clients']);
+
+        /** @var Client $client */
+        $client = factory(Client::class)->create();
+        $updateClient = factory(Client::class)->raw(['id' => $client->id]);
+
+        $response = $this->putJson(route('clients.update', $client->id), $updateClient);
+
+        $this->assertSuccessMessageResponse($response, 'Client updated successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_client_without_permission()
+    {
+        /** @var Client $client */
+        $client = factory(Client::class)->create();
+        $updateClient = factory(Client::class)->raw(['id' => $client->id]);
+
+        $response = $this->put(route('clients.update', $client->id), $updateClient);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_delete_client_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_clients']);
+
+        /** @var Client $client */
+        $client = factory(Client::class)->create();
+
+        $response = $this->deleteJson(route('clients.destroy', $client->id));
+
+        $this->assertSuccessMessageResponse($response, 'Client deleted successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_delete_client_without_permission()
+    {
+        /** @var Client $client */
+        $client = factory(Client::class)->create();
+
+        $response = $this->delete(route('clients.destroy', $client->id));
+
+        $response->assertStatus(403);
+    }
+}

From a0cb29c7b488153d50ccf6f262ed4e8a037d807b Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Tue, 3 Sep 2019 16:22:48 +0530
Subject: [PATCH 15/25] test(projects): project permission test (#315)

---
 .../ProjectControllerPermissionTest.php       | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 tests/Permissiion/ProjectControllerPermissionTest.php

diff --git a/tests/Permissiion/ProjectControllerPermissionTest.php b/tests/Permissiion/ProjectControllerPermissionTest.php
new file mode 100644
index 000000000..020470756
--- /dev/null
+++ b/tests/Permissiion/ProjectControllerPermissionTest.php
@@ -0,0 +1,129 @@
+<?php
+
+use App\Models\Project;
+use App\Models\User;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class ProjectControllerPermissionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public $user;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->actingAs($this->user);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_projects_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_projects']);
+
+        $response = $this->getJson(route('projects.index'));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_projects_without_permission()
+    {
+        $response = $this->get(route('projects.index'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_create_project_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_projects']);
+
+        $project = factory(Project::class)->raw();
+
+        $response = $this->postJson(route('projects.store'), array_merge($project, ['user_ids' => []]));
+
+        $this->assertSuccessMessageResponse($response, 'Project created successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_create_project_without_permission()
+    {
+        $project = factory(Project::class)->raw();
+
+        $response = $this->post(route('projects.store'), $project);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_update_project_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_projects']);
+
+        /** @var Project $project */
+        $project = factory(Project::class)->create();
+        $updateProject = factory(Project::class)->raw(['id' => $project->id]);
+
+        $response = $this->putJson(route('projects.update', $project->id),
+            array_merge($updateProject, [
+                'user_ids' => [],
+            ]));
+
+        $this->assertSuccessMessageResponse($response, 'Project updated successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_project_without_permission()
+    {
+        /** @var Project $project */
+        $project = factory(Project::class)->create();
+        $updateProject = factory(Project::class)->raw(['id' => $project->id]);
+
+        $response = $this->put(route('projects.update', $project->id), $updateProject);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_delete_project_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_projects']);
+
+        /** @var Project $project */
+        $project = factory(Project::class)->create();
+
+        $response = $this->deleteJson(route('projects.destroy', $project->id));
+
+        $this->assertSuccessMessageResponse($response, 'Project deleted successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_delete_project_without_permission()
+    {
+        /** @var Project $project */
+        $project = factory(Project::class)->create();
+
+        $response = $this->delete(route('projects.destroy', $project->id));
+
+        $response->assertStatus(403);
+    }
+}

From 85d7a86474163ebcd89340722fa424c6fbda7dd5 Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Tue, 3 Sep 2019 16:41:28 +0530
Subject: [PATCH 16/25] test(activity-types): activity type controller
 permission (#316)

---
 .../ActivityTypeControllerPermissionTest.php  | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 tests/Permissiion/ActivityTypeControllerPermissionTest.php

diff --git a/tests/Permissiion/ActivityTypeControllerPermissionTest.php b/tests/Permissiion/ActivityTypeControllerPermissionTest.php
new file mode 100644
index 000000000..52837ed81
--- /dev/null
+++ b/tests/Permissiion/ActivityTypeControllerPermissionTest.php
@@ -0,0 +1,126 @@
+<?php
+
+use App\Models\ActivityType;
+use App\Models\User;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class ActivityTypeControllerPermissionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public $user;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->actingAs($this->user);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_activity_types_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_activities']);
+
+        $response = $this->getJson(route('activity-types.index'));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_activity_types_without_permission()
+    {
+        $response = $this->get(route('activity-types.index'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_create_activity_type_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_activities']);
+
+        $activityType = factory(ActivityType::class)->raw();
+
+        $response = $this->postJson(route('activity-types.store'), $activityType);
+
+        $this->assertSuccessMessageResponse($response, 'Activity Type created successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_create_activity_type_without_permission()
+    {
+        $activityType = factory(ActivityType::class)->raw();
+
+        $response = $this->post(route('activity-types.store'), $activityType);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_update_activity_type_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_activities']);
+
+        /** @var ActivityType $activityType */
+        $activityType = factory(ActivityType::class)->create();
+        $updateActivityType = factory(ActivityType::class)->raw(['id' => $activityType->id]);
+
+        $response = $this->putJson(route('activity-types.update', $activityType->id), $updateActivityType);
+
+        $this->assertSuccessMessageResponse($response, 'Activity Type updated successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_activity_type_without_permission()
+    {
+        /** @var ActivityType $activityType */
+        $activityType = factory(ActivityType::class)->create();
+        $updateActivityType = factory(ActivityType::class)->raw(['id' => $activityType->id]);
+
+        $response = $this->put(route('activity-types.update', $activityType->id), $updateActivityType);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_delete_activity_type_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_activities']);
+
+        /** @var ActivityType $activityType */
+        $activityType = factory(ActivityType::class)->create();
+
+        $response = $this->deleteJson(route('activity-types.destroy', $activityType->id));
+
+        $this->assertSuccessMessageResponse($response, 'Activity Type deleted successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_delete_activity_type_without_permission()
+    {
+        /** @var ActivityType $activityType */
+        $activityType = factory(ActivityType::class)->create();
+
+        $response = $this->delete(route('activity-types.destroy', $activityType->id));
+
+        $response->assertStatus(403);
+    }
+}

From 7573936e9aa4504cc74deffd9670e76943a6de53 Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Tue, 3 Sep 2019 16:44:43 +0530
Subject: [PATCH 17/25] test(users): user permissions tests added (#317)

---
 .../UserControllerPermissionTest.php          | 181 ++++++++++++++++++
 1 file changed, 181 insertions(+)
 create mode 100644 tests/Permissiion/UserControllerPermissionTest.php

diff --git a/tests/Permissiion/UserControllerPermissionTest.php b/tests/Permissiion/UserControllerPermissionTest.php
new file mode 100644
index 000000000..649d34ad5
--- /dev/null
+++ b/tests/Permissiion/UserControllerPermissionTest.php
@@ -0,0 +1,181 @@
+<?php
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class UserControllerPermissionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public $user;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->actingAs($this->user);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_users_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_users']);
+
+        $response = $this->getJson(route('users.index'));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_users_without_permission()
+    {
+        $response = $this->get(route('users.index'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_create_user_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_users']);
+
+        $user = factory(User::class)->raw();
+
+        $response = $this->postJson(route('users.store'), $user);
+
+        $this->assertSuccessMessageResponse($response, 'User created successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_create_user_without_permission()
+    {
+        $user = factory(User::class)->raw();
+
+        $response = $this->post(route('users.store'), $user);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_update_user_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_users']);
+
+        /** @var User $user */
+        $user = factory(User::class)->create();
+        $updateUser = factory(User::class)->raw(['id' => $user->id]);
+
+        $response = $this->putJson(route('users.update', $user->id), $updateUser);
+
+        $this->assertSuccessMessageResponse($response, 'User updated successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_user_without_permission()
+    {
+        /** @var User $user */
+        $user = factory(User::class)->create();
+        $updateUser = factory(User::class)->raw(['id' => $user->id]);
+
+        $response = $this->put(route('users.update', $user->id), $updateUser);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_delete_user_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_users']);
+
+        /** @var User $user */
+        $user = factory(User::class)->create();
+
+        $response = $this->deleteJson(route('users.destroy', $user->id));
+
+        $this->assertSuccessMessageResponse($response, 'User deleted successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_delete_user_without_permission()
+    {
+        /** @var User $user */
+        $user = factory(User::class)->create();
+
+        $response = $this->delete(route('users.destroy', $user->id));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_activate_user_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_users']);
+
+        /** @var User $user */
+        $user = factory(User::class)->create();
+
+        $response = $this->postJson(route('active-de-active-user', $user->id), []);
+
+        $this->assertSuccessMessageResponse($response, 'User updated successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_activate_user_without_permission()
+    {
+        /** @var User $user */
+        $user = factory(User::class)->create();
+
+        $response = $this->post(route('active-de-active-user', $user->id), []);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_resend_email_verification_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_users']);
+
+        /** @var User $user */
+        $user = factory(User::class)->create();
+
+        $response = $this->getJson(route('send-email', $user->id));
+
+        $this->assertSuccessMessageResponse($response, 'Verification email has been sent successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_resend_email_verification_without_permission()
+    {
+        /** @var User $user */
+        $user = factory(User::class)->create();
+
+        $response = $this->get(route('send-email', $user->id));
+
+        $response->assertStatus(403);
+    }
+}

From 395381d25fbbd016b9163d02a959bf21961cc208 Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Tue, 3 Sep 2019 16:47:24 +0530
Subject: [PATCH 18/25] test(tasks): task permissions tests added (#318)

---
 database/factories/TaskFactory.php            |   4 +-
 .../TaskControllerPermissionTest.php          | 154 ++++++++++++++++++
 2 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 tests/Permissiion/TaskControllerPermissionTest.php

diff --git a/database/factories/TaskFactory.php b/database/factories/TaskFactory.php
index 46a58a230..f7ced2d70 100644
--- a/database/factories/TaskFactory.php
+++ b/database/factories/TaskFactory.php
@@ -11,11 +11,13 @@
 $factory->define(Task::class, function (Faker $faker) {
     $project = factory(Project::class)->create();
 
+    $dueDate = date('Y-m-d H:i:s', strtotime('+ 4hours'));
+
     return [
         'title'       => $faker->sentence,
         'description' => $faker->text,
         'project_id'  => $project->id,
-        'due_date'    => $faker->dateTime,
+        'due_date'    => $dueDate,
         'status'      => Task::STATUS_ALL,
         'task_number' => $faker->unique()->randomDigitNotNull,
     ];
diff --git a/tests/Permissiion/TaskControllerPermissionTest.php b/tests/Permissiion/TaskControllerPermissionTest.php
new file mode 100644
index 000000000..e34440297
--- /dev/null
+++ b/tests/Permissiion/TaskControllerPermissionTest.php
@@ -0,0 +1,154 @@
+<?php
+
+use App\Models\Task;
+use App\Models\User;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class TaskControllerPermissionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public $user;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->actingAs($this->user);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_tasks_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        $response = $this->getJson(route('tasks.index'));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_tasks_without_permission()
+    {
+        $response = $this->get(route('tasks.index'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_create_task_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        $task = factory(Task::class)->raw();
+
+        $response = $this->postJson(route('tasks.store'), $task);
+
+        $this->assertSuccessMessageResponse($response, 'Task created successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_create_task_without_permission()
+    {
+        $task = factory(Task::class)->raw();
+
+        $response = $this->post(route('tasks.store'), $task);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_show_task_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        $response = $this->getJson(route('tasks.show', $task->id));
+
+        $response->assertStatus(302);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_show_task_without_permission()
+    {
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        $response = $this->get(route('tasks.show', $task->id));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_update_task_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+        $updateTask = factory(Task::class)->raw(['id' => $task->id]);
+
+        $response = $this->putJson(route('tasks.update', $task->id), $updateTask);
+
+        $this->assertSuccessMessageResponse($response, 'Task updated successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_task_without_permission()
+    {
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+        $updateTask = factory(Task::class)->raw(['id' => $task->id]);
+
+        $response = $this->put(route('tasks.update', $task->id), $updateTask);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_delete_task_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        $response = $this->deleteJson(route('tasks.destroy', $task->id));
+
+        $this->assertSuccessMessageResponse($response, 'Task deleted successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_delete_task_without_permission()
+    {
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        $response = $this->delete(route('tasks.destroy', $task->id));
+
+        $response->assertStatus(403);
+    }
+}

From e4c78c8e28ed774655e5ce780321e4cb3c094f1c Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Tue, 3 Sep 2019 17:01:22 +0530
Subject: [PATCH 19/25] test(tasks): tasks routes permissions tests added
 (#319)

---
 database/factories/TaskFactory.php            |   1 +
 tests/Controllers/TaskControllerTest.php      |   2 +-
 .../TaskControllerPermissionTest.php          | 205 ++++++++++++++++++
 3 files changed, 207 insertions(+), 1 deletion(-)

diff --git a/database/factories/TaskFactory.php b/database/factories/TaskFactory.php
index f7ced2d70..1fec508ac 100644
--- a/database/factories/TaskFactory.php
+++ b/database/factories/TaskFactory.php
@@ -10,6 +10,7 @@
 
 $factory->define(Task::class, function (Faker $faker) {
     $project = factory(Project::class)->create();
+    $dueDate = date('Y-m-d H:i:s', strtotime('+ 4hours'));
 
     $dueDate = date('Y-m-d H:i:s', strtotime('+ 4hours'));
 
diff --git a/tests/Controllers/TaskControllerTest.php b/tests/Controllers/TaskControllerTest.php
index 2a54055e8..b058070c5 100644
--- a/tests/Controllers/TaskControllerTest.php
+++ b/tests/Controllers/TaskControllerTest.php
@@ -285,7 +285,7 @@ public function test_can_get_assignee_of_given_task()
         $farhan = factory(User::class)->create();
         $task->taskAssignee()->sync([$farhan->id]);
 
-        $response = $this->getJson("tasks/{$task->id}/users");
+        $response = $this->getJson(route('task.users', $task->id));
 
         $response = $response->original;
         $this->assertContains($farhan->id, array_keys($response));
diff --git a/tests/Permissiion/TaskControllerPermissionTest.php b/tests/Permissiion/TaskControllerPermissionTest.php
index e34440297..b6a329274 100644
--- a/tests/Permissiion/TaskControllerPermissionTest.php
+++ b/tests/Permissiion/TaskControllerPermissionTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\Comment;
 use App\Models\Task;
 use App\Models\User;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -151,4 +152,208 @@ public function test_not_allow_to_delete_task_without_permission()
 
         $response->assertStatus(403);
     }
+
+    /**
+     * @test
+     */
+    public function test_can_update_task_status_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        $response = $this->postJson(route('task.update-status', $task->id), []);
+
+        $this->assertSuccessMessageResponse($response, 'Task status Update successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_task_status_without_permission()
+    {
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        $response = $this->post(route('task.update-status', $task->id), []);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_task_attachments_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        $response = $this->getJson(route('task.attachments', $task->id));
+
+        $this->assertSuccessMessageResponse($response, 'Task retrieved successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_task_attachments_without_permission()
+    {
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        $response = $this->get(route('task.attachments', $task->id));
+
+        $response->assertStatus(403);
+    }
+
+    /** @test */
+    public function test_can_add_task_comment_with_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        /** @var Comment $comment */
+        $comment = factory(Comment::class)->create();
+
+        $response = $this->postJson(route('task.comments', $comment->task_id), [
+            'comment' => $comment->comment,
+        ]);
+
+        $this->assertSuccessMessageResponse($response, 'Comment has been added successfully.');
+    }
+
+    /** @test */
+    public function test_not_allow_to_add_task_comment_without_permission()
+    {
+        /** @var Comment $comment */
+        $comment = factory(Comment::class)->create();
+
+        $response = $this->post(route('task.comments', $comment->task_id), [
+            'comment' => $comment->comment,
+        ]);
+
+        $response->assertStatus(403);
+    }
+
+    /** @test */
+    public function test_can_update_task_comment_with_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        /** @var Comment $comment */
+        $comment = factory(Comment::class)->create(['created_by' => $this->user->id]);
+        $newText = $this->faker->text;
+
+        $response = $this->postJson(route('task.update-comment', [$comment->task_id, $comment->id]), [
+            'comment' => $newText,
+        ]);
+
+        $this->assertSuccessMessageResponse($response, 'Comment has been updated successfully.');
+    }
+
+    /** @test */
+    public function test_not_allow_to_update_task_comment_without_permission()
+    {
+        /** @var Comment $comment */
+        $comment = factory(Comment::class)->create(['created_by' => $this->user->id]);
+        $newText = $this->faker->text;
+
+        $response = $this->post(route('task.update-comment', [$comment->task_id, $comment->id]), [
+            'comment' => $newText,
+        ]);
+
+        $response->assertStatus(403);
+    }
+
+    /** @test */
+    public function test_can_delete_task_comment_with_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        /** @var Comment $comment */
+        $comment = factory(Comment::class)->create(['created_by' => $this->user->id]);
+
+        $response = $this->deleteJson(route('task.delete-comment', [$comment->task_id, $comment->id]));
+
+        $this->assertSuccessMessageResponse($response, 'Comment has been deleted successfully.');
+    }
+
+    /** @test */
+    public function test_not_allow_to_delete_task_comment_without_permission()
+    {
+        /** @var Comment $comment */
+        $comment = factory(Comment::class)->create(['created_by' => $this->user->id]);
+
+        $response = $this->delete(route('task.delete-comment', [$comment->task_id, $comment->id]));
+
+        $response->assertStatus(403);
+    }
+
+    /** @test */
+    public function test_can_get_task_details_with_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        $task = factory(Task::class)->create();
+
+        $response = $this->getJson(route('task.get-details', $task->id));
+
+        $this->assertSuccessMessageResponse($response, 'Task retrieved successfully.');
+    }
+
+    /** @test */
+    public function test_not_allow_to_get_task_details_without_permission()
+    {
+        $task = factory(Task::class)->create();
+
+        $response = $this->get(route('task.get-details', $task->id));
+
+        $response->assertStatus(403);
+    }
+
+    /** @test */
+    public function test_can_get_task_comments_count_with_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        $task = factory(Task::class)->create();
+
+        $response = $this->getJson(route('task.comments-count', $task->id));
+
+        $this->assertSuccessMessageResponse($response, 'Comments count retrieved successfully.');
+    }
+
+    /** @test */
+    public function test_not_allow_to_get_task_comments_count_without_permission()
+    {
+        $task = factory(Task::class)->create();
+
+        $response = $this->get(route('task.comments-count', $task->id));
+
+        $response->assertStatus(403);
+    }
+
+    /** @test */
+    public function test_can_get_task_users_with_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_all_tasks']);
+
+        $task = factory(Task::class)->create();
+
+        $response = $this->getJson(route('task.users', $task->id));
+
+        $response->assertStatus(200);
+    }
+
+    /** @test */
+    public function test_not_allow_to_get_task_users_without_permission()
+    {
+        $task = factory(Task::class)->create();
+
+        $response = $this->get(route('task.users', $task->id));
+
+        $response->assertStatus(403);
+    }
 }

From f5f26867c78ed970e9cd697347f17581a357b417 Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Tue, 3 Sep 2019 17:02:42 +0530
Subject: [PATCH 20/25] test(reports): reports permissions tests added (#313)

---
 database/factories/ReportFactory.php          |   6 +-
 .../ReportControllerPermissionTest.php        | 200 ++++++++++++++++++
 2 files changed, 204 insertions(+), 2 deletions(-)
 create mode 100644 tests/Permissiion/ReportControllerPermissionTest.php

diff --git a/database/factories/ReportFactory.php b/database/factories/ReportFactory.php
index 89e0ffbd8..27b74f0b2 100644
--- a/database/factories/ReportFactory.php
+++ b/database/factories/ReportFactory.php
@@ -8,11 +8,13 @@
 
 $factory->define(Report::class, function (Faker $faker) {
     $user = factory(User::class)->create();
+    $startDate = date('Y-m-d H:i:s', strtotime('-1 day'));
+    $endDate = date('Y-m-d H:i:s');
 
     return [
         'name'       => $faker->word,
         'owner_id'   => $user->id,
-        'start_date' => $faker->dateTime,
-        'end_date'   => $faker->dateTime,
+        'start_date' => $startDate,
+        'end_date'   => $endDate,
     ];
 });
diff --git a/tests/Permissiion/ReportControllerPermissionTest.php b/tests/Permissiion/ReportControllerPermissionTest.php
new file mode 100644
index 000000000..3a63075f1
--- /dev/null
+++ b/tests/Permissiion/ReportControllerPermissionTest.php
@@ -0,0 +1,200 @@
+<?php
+
+use App\Models\Report;
+use App\Models\User;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class ReportControllerPermissionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public $user;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->actingAs($this->user);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_reports_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_reports']);
+
+        $response = $this->getJson(route('reports.index'));
+
+        $response->assertStatus(200);
+        $response->assertViewIs('reports.index');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_reports_without_permission()
+    {
+        $response = $this->get(route('reports.index'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_create_report_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_reports']);
+
+        $report = factory(Report::class)->raw();
+
+        $response = $this->postJson(route('reports.store'), $report);
+
+        $response->assertStatus(302);
+        $response->assertRedirect('reports');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_create_report_without_permission()
+    {
+        $report = factory(Report::class)->raw();
+
+        $response = $this->post(route('reports.store'), $report);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_update_report_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_reports']);
+
+        /** @var Report $report */
+        $report = factory(Report::class)->create();
+        $updateReport = factory(Report::class)->raw(['id' => $report->id]);
+
+        $response = $this->putJson(route('reports.update', $report->id), $updateReport);
+
+        $response->assertStatus(302);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_update_report_without_permission()
+    {
+        /** @var Report $report */
+        $report = factory(Report::class)->create();
+        $updateReport = factory(Report::class)->raw(['id' => $report->id]);
+
+        $response = $this->put(route('reports.update', $report->id), $updateReport);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_delete_report_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_reports']);
+
+        /** @var Report $report */
+        $report = factory(Report::class)->create();
+
+        $response = $this->deleteJson(route('reports.destroy', $report->id));
+
+        $response->assertStatus(302);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_delete_report_without_permission()
+    {
+        /** @var Report $report */
+        $report = factory(Report::class)->create();
+
+        $response = $this->delete(route('reports.destroy', $report->id));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_show_report_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_reports']);
+
+        /** @var Report $report */
+        $report = factory(Report::class)->create();
+
+        $response = $this->getJson(route('reports.show', $report->id));
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_show_report_without_permission()
+    {
+        /** @var Report $report */
+        $report = factory(Report::class)->create();
+
+        $response = $this->get(route('reports.show', $report->id));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_users_of_projects_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_reports']);
+
+        $response = $this->getJson(route('users-of-projects'));
+
+        $this->assertSuccessMessageResponse($response, 'Users Retrieved successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_users_of_projects_without_permission()
+    {
+        $response = $this->get(route('users-of-projects'));
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function test_can_get_projects_of_client_with_valid_permission()
+    {
+        $this->attachPermissions($this->user->id, ['manage_reports']);
+
+        $response = $this->getJson(route('projects-of-client'));
+
+        $this->assertSuccessMessageResponse($response, 'Projects retrieved successfully.');
+    }
+
+    /**
+     * @test
+     */
+    public function test_not_allow_to_get_projects_of_client_without_permission()
+    {
+        $response = $this->get(route('projects-of-client'));
+
+        $response->assertStatus(403);
+    }
+}

From 5666991e60f0f7c64d0646e7eb6b08faf3f9ec6e Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 17:20:25 +0530
Subject: [PATCH 21/25] feat(dashboard): chnage date formate (#321)

---
 app/Repositories/DashboardRepository.php       | 2 +-
 tests/Repositories/DashboardRepositoryTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Repositories/DashboardRepository.php b/app/Repositories/DashboardRepository.php
index f96150a04..334a28f64 100644
--- a/app/Repositories/DashboardRepository.php
+++ b/app/Repositories/DashboardRepository.php
@@ -66,7 +66,7 @@ public function getWorkReport($input)
         $result = [];
         // preparing a date array for displaying a labels
         foreach ($dates['dateArr'] as $date) {
-            $date = date('d-M', strtotime($date));
+            $date = date('jS M', strtotime($date));
             $result['date'][] = $date;
         }
         $result['projects'] = array_keys($projects);
diff --git a/tests/Repositories/DashboardRepositoryTest.php b/tests/Repositories/DashboardRepositoryTest.php
index 98dd9bb21..3ab7f3f12 100644
--- a/tests/Repositories/DashboardRepositoryTest.php
+++ b/tests/Repositories/DashboardRepositoryTest.php
@@ -60,7 +60,7 @@ public function test_can_get_work_report_of_user_between_given_date()
 
         $workReport = $this->dashboardRepo->getWorkReport($input);
 
-        $starDate = date('d-M', strtotime($input['start_date']));
+        $starDate = date('jS M', strtotime($input['start_date']));
         $this->assertEquals($starDate, $workReport['date'][0]);
 
         $projectName = $timeEntry->task->project->name;

From a2ea0be536109de157ed3ee8474993a27af39e7c Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 18:57:10 +0530
Subject: [PATCH 22/25] fix(task-detail): try to fix task-detail pop up collaps
 row issue (#322)

---
 resources/assets/js/task/task.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/task/task.js b/resources/assets/js/task/task.js
index c139adec1..187bb9a1f 100644
--- a/resources/assets/js/task/task.js
+++ b/resources/assets/js/task/task.js
@@ -318,9 +318,9 @@ $(document).on('change', '#task_users', function () {
         taskId = taskUserId[1];
         userId = taskUserId[0];
     }
-    let url =  taskDetailUrl + '/' + taskId
+    let url =  taskDetailUrl + '/' + taskId;
     if (userId !== 0) {
-        url = url + '?user_id=' + userId
+        url = url + '?user_id=' + userId;
     }
     $.ajax({
         url: url,
@@ -374,7 +374,8 @@ window.drawTaskDetailTable = function (data) {
     $('#no-record-info-msg').hide();
     stopLoader();
 
-    $('#taskDetailsTable tbody').on('click', 'td.details-control', function () {
+    $('#taskDetailsTable tbody').off('click', 'tr td.details-control');
+    $('#taskDetailsTable tbody').on('click', 'tr td.details-control', function () {
         var tr = $(this).closest('tr');
         var row = taskDetailsTable.row(tr);
 
@@ -384,7 +385,7 @@ window.drawTaskDetailTable = function (data) {
             tr.removeClass('shown');
         } else {
             // Open this row
-            row.child(formatCollapsableRow(row.data())).show();
+            row.child('<div style="padding-left:50px;">' + row.data().note + '</div>').show();
             tr.addClass('shown');
         }
     });

From 00d45cb5c141412e12b0bbd03e3b4d0a580d2f18 Mon Sep 17 00:00:00 2001
From: Monika Vaghasiya <51854283+MonikaInfyOm@users.noreply.github.com>
Date: Tue, 3 Sep 2019 19:07:33 +0530
Subject: [PATCH 23/25] feat(report): added task link in report view screen
 (#323)

---
 app/Repositories/ReportRepository.php           | 4 ++++
 resources/views/reports/report_format.blade.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Repositories/ReportRepository.php b/app/Repositories/ReportRepository.php
index a61abb802..a562ddff2 100644
--- a/app/Repositories/ReportRepository.php
+++ b/app/Repositories/ReportRepository.php
@@ -266,6 +266,8 @@ public function getReport($report)
             $project = $entry->task->project;
             $client = $project->client;
             $duration = $entry->duration;
+            $projectPrefix = $project->prefix;
+            $taskNumber = $entry->task->task_number;
 
             // prepare client and duration
             $result[$clientId]['name'] = $client->name;
@@ -306,6 +308,8 @@ public function getReport($report)
             $time = $result[$clientId]['projects'][$project->id]['users'][$entry->user_id]['tasks'][$entry->task_id]['duration'] + $entry->duration;
             $result[$clientId]['projects'][$project->id]['users'][$entry->user_id]['tasks'][$entry->task_id]['duration'] = $time;
             $result[$clientId]['projects'][$project->id]['users'][$entry->user_id]['tasks'][$entry->task_id]['time'] = $this->getDurationTime($time);
+            $result[$clientId]['projects'][$project->id]['users'][$entry->user_id]['tasks'][$entry->task_id]['project_prefix'] = $projectPrefix;
+            $result[$clientId]['projects'][$project->id]['users'][$entry->user_id]['tasks'][$entry->task_id]['task_number'] = $taskNumber;
         }
 
         return $result;
diff --git a/resources/views/reports/report_format.blade.php b/resources/views/reports/report_format.blade.php
index c25f0b7e3..5f5d1ec1c 100644
--- a/resources/views/reports/report_format.blade.php
+++ b/resources/views/reports/report_format.blade.php
@@ -49,7 +49,7 @@
                                 @foreach($user['tasks'] as $task)
                                     <div class="reports__task-row">
                                                         <span class="reports__task-header">
-                                                          {{$task['name']}}
+                                                          <a href="{{url('tasks') . '/' . $task['project_prefix'] . '-' . $task['task_number']}}">{{$task['name']}}</a>
                                                         </span>
                                         <span>{{$task['time']}}</span>
                                     </div>

From 46a0c17f0bdf90d72cb45ded48d70f60d48a6869 Mon Sep 17 00:00:00 2001
From: Farhan Kathawala <37834439+farhaninfyom@users.noreply.github.com>
Date: Wed, 4 Sep 2019 14:13:11 +0530
Subject: [PATCH 24/25] test(user): test cases for validate user (#325)

---
 .../UserControllerValidationTest.php           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/Controllers/Validations/UserControllerValidationTest.php b/tests/Controllers/Validations/UserControllerValidationTest.php
index 967b870c3..e72fbd26e 100644
--- a/tests/Controllers/Validations/UserControllerValidationTest.php
+++ b/tests/Controllers/Validations/UserControllerValidationTest.php
@@ -55,6 +55,14 @@ public function test_create_user_fails_when_email_is_invalid()
         ]);
     }
 
+    /** @test */
+    public function test_create_user_fails_when_role_id_is_not_passed()
+    {
+        $this->post(route('users.store'), ['role_id' => ''])->assertSessionHasErrors([
+            'role_id' => 'Please select user role.',
+        ]);
+    }
+
     /** @test */
     public function it_can_create_user()
     {
@@ -90,6 +98,16 @@ public function test_update_user_fails_when_email_is_not_passed()
             ->assertSessionHasErrors(['email' => 'The email field is required.']);
     }
 
+    /** @test */
+    public function test_update_user_fails_when_role_id_is_not_passed()
+    {
+        /** @var User $user */
+        $user = factory(User::class)->create();
+
+        $this->put(route('users.update', $user->id), ['role_id' => ''])
+            ->assertSessionHasErrors(['role_id' => 'Please select user role.']);
+    }
+
     /** @test */
     public function test_update_user_fails_when_phone_number_is_more_than_ten_digits()
     {

From 1a6fd4b4440dc6207728bcc92957aca191fac6ba Mon Sep 17 00:00:00 2001
From: Shailesh Ladumor <shailesh.infyom@gmail.com>
Date: Wed, 4 Sep 2019 18:09:05 +0530
Subject: [PATCH 25/25] bumping to version v1.8.2-alpha

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7e1a902ee..39e157dd9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "infyomlabs/infy-tracker",
   "type": "project",
-  "version": "1.8.1-alpha",
+  "version": "1.8.2-alpha",
   "description": "Create Projects / Tasks, Track Time, Show Daily Reports",
     "keywords": [
       "time",