Merge pull request #344 from InfyOmLabs/develop

Release V1.8.3-alpha
InfyOmLabs · Sep 10, 2019 · 3f34648 · 3f34648
2 parents 9b78c57 + e5f4021
commit 3f34648
Show file tree

Hide file tree

Showing 72 changed files with 628 additions and 306 deletions.
diff --git a/app/Http/Controllers/ActivityTypeController.php b/app/Http/Controllers/ActivityTypeController.php
@@ -96,6 +96,11 @@ public function update(ActivityType $activityType, UpdateActivityTypeRequest $re
      */
     public function destroy(ActivityType $activityType)
     {
+        if ($activityType->timeEntries()->count() > 0) {
+            return $this->sendError('This activity has more than one time entry, so it can\'t be deleted.');
+        }
+
+        $activityType->update(['deleted_by' => getLoggedInUserId()]);
         $activityType->delete();
 
         return $this->sendSuccess('Activity Type deleted successfully.');

diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
@@ -121,7 +121,7 @@ public function update(Client $client, UpdateClientRequest $request)
      */
     public function destroy(Client $client)
     {
-        $client->delete();
+        $this->clientRepository->delete($client->id);
 
         return $this->sendSuccess('Client deleted successfully.');
     }

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
@@ -133,7 +133,7 @@ public function update(Project $project, UpdateProjectRequest $request)
      */
     public function destroy(Project $project)
     {
-        $project->delete();
+        $this->projectRepository->delete($project->id);
 
         return $this->sendSuccess('Project deleted successfully.');
     }

diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
@@ -98,6 +98,8 @@ public function update(Tag $tag, UpdateTagRequest $request)
      */
     public function destroy(Tag $tag)
     {
+        $tag->deleted_by = getLoggedInUserId();
+        $tag->save();
         $tag->delete();
 
         return $this->sendSuccess('Tag deleted successfully.');

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -177,6 +177,8 @@ public function update(User $user, UpdateUserRequest $request)
      */
     public function destroy(User $user)
     {
+        $user->deleted_by = getLoggedInUserId();
+        $user->save();
         $user->delete();
 
         return $this->sendSuccess('User deleted successfully.');

diff --git a/app/Models/ActivityType.php b/app/Models/ActivityType.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * App\Models\ActivityType.
@@ -26,10 +27,11 @@
  */
 class ActivityType extends Model
 {
+    use SoftDeletes;
     public $table = 'activity_types';
 
     public $fillable = [
-        'name',
+        'name', 'created_by', 'deleted_by',
     ];
 
     /**
@@ -38,8 +40,9 @@ class ActivityType extends Model
      * @var array
      */
     protected $casts = [
-        'id'   => 'integer',
-        'name' => 'string',
+        'id'         => 'integer',
+        'name'       => 'string',
+        'created_by' => 'integer',
     ];
 
     const ACTIVITY_TYPES = [
@@ -70,4 +73,9 @@ public function createdUser()
     {
         return $this->belongsTo(User::class, 'created_by');
     }
+
+    public function timeEntries()
+    {
+        return $this->hasMany(TimeEntry::class, 'activity_type_id');
+    }
 }
diff --git a/app/Models/Client.php b/app/Models/Client.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * App\Models\Client.
@@ -30,13 +31,15 @@
  */
 class Client extends Model
 {
+    use softDeletes;
     public $table = 'clients';
 
     public $fillable = [
         'name',
         'email',
         'website',
         'created_by',
+        'deleted_by',
     ];
 
     /**
@@ -79,4 +82,12 @@ public function createdUser()
     {
         return $this->belongsTo(User::class, 'created_by');
     }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function projects()
+    {
+        return $this->hasMany(Project::class);
+    }
 }
diff --git a/app/Models/Project.php b/app/Models/Project.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * App\Models\Project.
@@ -36,6 +37,7 @@
  */
 class Project extends Model
 {
+    use softDeletes;
     const TEAM_ARR = ['1' => 'Backend', '2' => 'Frontend', '3' => 'Mobile', '4' => 'QA'];
 
     public $table = 'projects';
@@ -46,6 +48,7 @@ class Project extends Model
         'description',
         'client_id',
         'created_by',
+        'deleted_by',
         'prefix',
     ];
 
@@ -111,4 +114,12 @@ public function createdUser()
     {
         return $this->belongsTo(User::class, 'created_by');
     }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function tasks()
+    {
+        return $this->hasMany(Task::class);
+    }
 }
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * App\Models\Tag.
@@ -26,11 +27,13 @@
  */
 class Tag extends Model
 {
+    use softDeletes;
     public $table = 'tags';
 
     public $fillable = [
         'name',
         'created_by',
+        'deleted_by',
     ];
 
     /**
@@ -42,6 +45,7 @@ class Tag extends Model
         'id'         => 'integer',
         'name'       => 'string',
         'created_by' => 'integer',
+        'deleted_by' => 'integer',
     ];
 
     /**

diff --git a/app/Models/Task.php b/app/Models/Task.php
@@ -131,7 +131,7 @@ public function tags()
      */
     public function project()
     {
-        return $this->belongsTo(Project::class, 'project_id');
+        return $this->belongsTo(Project::class, 'project_id')->withTrashed();
     }
 
     /**
@@ -162,6 +162,16 @@ public function timeEntries()
         return $this->hasMany(TimeEntry::class, 'task_id')->latest();
     }
 
+    public static function boot()
+    {
+        parent::boot();
+
+        static::deleting(function ($task) {
+            $task->timeEntries()->update(['deleted_by' => getLoggedInUserId()]);
+            $task->timeEntries()->delete();
+        });
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -4,6 +4,7 @@
 
 use App\Notifications\MailResetPasswordNotification;
 use App\Traits\ImageTrait;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Zizaco\Entrust\Traits\EntrustUserTrait;
@@ -60,10 +61,16 @@
  */
 class User extends Authenticatable
 {
-    use Notifiable, EntrustUserTrait, ImageTrait;
+    use Notifiable, ImageTrait, softDeletes, EntrustUserTrait {
+        SoftDeletes::restore insteadof EntrustUserTrait;
+        EntrustUserTrait::restore insteadof SoftDeletes;
+    }
     use ImageTrait {
         deleteImage as traitDeleteImage;
     }
+    use SoftDeletes {
+        restore as restoreSoftDeletes;
+    }
 
     public $table = 'users';
     const IMAGE_PATH = 'users';
@@ -84,6 +91,7 @@ class User extends Authenticatable
         'activation_code',
         'is_active',
         'image_path',
+        'deleted_by',
     ];
 
     /**
@@ -175,7 +183,7 @@ public function getImagePathAttribute($value)
             return $this->imageUrl(self::IMAGE_PATH.DIRECTORY_SEPARATOR.$value);
         }
 
-        return asset('assets/img/user-avatar.png');
+        return getUserImageInitial($this->id, $this->name);
     }
 
     /**

diff --git a/app/Queries/TimeEntryDataTable.php b/app/Queries/TimeEntryDataTable.php
@@ -31,15 +31,19 @@ function (Builder $q) use ($input) {
                 $q->where('activity_type_id', $input['filter_activity']);
             });
         $query->when(isset($input['filter_project']) && !empty($input['filter_project']),
-            function (Builder $q) use ($input) {
-                $filterUserId = (isset($input['filter_user']) && !empty($input['filter_user'])) ? $input['filter_user'] : getLoggedInUser()->id;
-                $taskIds = Task::whereProjectId($input['filter_project'])
-                    ->where(function ($q) use ($filterUserId) {
-                        $q->whereHas('taskAssignee', function ($q) use ($filterUserId) {
-                            $q->where('user_id', $filterUserId);
-                        });
-                    })->get()->pluck('id')->toArray();
-                $q->whereIn('task_id', $taskIds);
+            function (Builder $q) use ($input,$user) {
+                if ($user->can('manage_time_entries')) {
+                    $taskIds = Task::whereProjectId($input['filter_project'])->get()->pluck('id')->toArray();
+                    $q->whereIn('task_id', $taskIds);
+                } else {
+                    $taskIds = Task::whereProjectId($input['filter_project'])
+                        ->where(function ($q) {
+                            $q->whereHas('taskAssignee', function ($q) {
+                                $q->where('user_id', getLoggedInUserId());
+                            });
+                        })->get()->pluck('id')->toArray();
+                    $q->whereIn('task_id', $taskIds);
+                }
             });
         if (!$user->can('manage_time_entries')) {
             return $query->OfCurrentUser();

diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php
@@ -3,6 +3,9 @@
 namespace App\Repositories;
 
 use App\Models\Client;
+use App\Models\Project;
+use App\Models\Task;
+use App\Models\TimeEntry;
 
 /**
  * Class ClientRepository.
@@ -47,4 +50,31 @@ public function getClientList()
     {
         return Client::orderBy('name')->pluck('name', 'id');
     }
+
+    /**
+     * @param int $clientId
+     *
+     * @throws \Exception
+     *
+     * @return bool|mixed|void|null
+     */
+    public function delete($clientId)
+    {
+        $client = $this->find($clientId);
+
+        $projectIds = Project::where('client_id', '=', $client->id)->get()->pluck('id');
+        $taskIds = Task::whereIn('project_id', $projectIds)->get()->pluck('id');
+
+        TimeEntry::whereIn('task_id', $taskIds)->update(['deleted_by' => getLoggedInUserId()]);
+        TimeEntry::whereIn('task_id', $taskIds)->delete();
+
+        Task::whereIn('project_id', $projectIds)->update(['deleted_by' => getLoggedInUserId()]);
+        Task::whereIn('project_id', $projectIds)->delete();
+
+        $client->projects()->update(['deleted_by' => getLoggedInUserId()]);
+        $client->projects()->delete();
+
+        $client->update(['deleted_by' => getLoggedInUserId()]);
+        $client->delete();
+    }
 }
diff --git a/app/Repositories/ProjectRepository.php b/app/Repositories/ProjectRepository.php
@@ -3,6 +3,8 @@
 namespace App\Repositories;
 
 use App\Models\Project;
+use App\Models\Task;
+use App\Models\TimeEntry;
 use Auth;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
@@ -88,4 +90,26 @@ public function getProjectsList($clientId = null)
 
         return $query->pluck('name', 'id');
     }
+
+    /**
+     * @param int $id
+     *
+     * @throws \Exception
+     *
+     * @return bool|mixed|void|null
+     */
+    public function delete($id)
+    {
+        $project = $this->find($id);
+
+        $taskIds = Task::whereProjectId($project->id)->pluck('id')->toArray();
+        TimeEntry::whereIn('task_id', $taskIds)->update(['deleted_by' => getLoggedInUserId()]);
+        TimeEntry::whereIn('task_id', $taskIds)->delete();
+
+        $project->tasks()->update(['deleted_by' => getLoggedInUserId()]);
+        $project->tasks()->delete();
+
+        $project->update(['deleted_by' => getLoggedInUserId()]);
+        $project->delete();
+    }
 }
diff --git a/app/Repositories/ReportRepository.php b/app/Repositories/ReportRepository.php
@@ -266,8 +266,6 @@ 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;
@@ -308,8 +306,7 @@ 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;
+            $result[$clientId]['projects'][$project->id]['users'][$entry->user_id]['tasks'][$entry->task_id]['task_id'] = $entry->task->id;
         }
 
         return $result;

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