Browse Source

Add task activity logs on the project activity tab

pull/72/head
Nafies Luthfi 5 years ago
parent
commit
6818d428e6
  1. 5
      app/Http/Controllers/Projects/ActivityController.php
  2. 4
      resources/lang/de/activity.php
  3. 1
      resources/lang/de/job.php
  4. 4
      resources/lang/en/activity.php
  5. 1
      resources/lang/en/job.php
  6. 4
      resources/lang/id/activity.php
  7. 1
      resources/lang/id/job.php
  8. 11
      resources/views/users/activities/tasks/task_created.blade.php
  9. 22
      resources/views/users/activities/tasks/task_updated.blade.php

5
app/Http/Controllers/Projects/ActivityController.php

@ -22,6 +22,11 @@ class ActivityController extends Controller
$query->where('object_type', 'jobs');
});
$activityQuery->orWhere(function ($query) use ($project) {
$query->whereIn('object_id', $project->tasks->pluck('id'));
$query->where('object_type', 'tasks');
});
$activities = $activityQuery->latest()->paginate(50);
return view('projects.activities.index', compact('project', 'activities'));

4
resources/lang/de/activity.php

@ -11,4 +11,8 @@ return [
'job_updated' => 'Job data <strong>:name</strong> updated by <strong>:user</strong>.',
'task_deleted' => 'Task deleted by <strong>:user</strong>.',
],
'tasks' => [
'task_created' => 'Task created: <strong>:name</strong> new <strong>:user</strong>.',
'task_updated' => 'Task data <strong>:name</strong> updated by <strong>:user</strong>.',
],
];

1
resources/lang/de/job.php

@ -48,6 +48,7 @@ return [
'actual_start_date' => 'Actual Start Date',
'actual_end_date' => 'Actual End Date',
'updated_at' => 'Last Update',
'position' => 'Priority',
// Types
'main' => 'Haupt',

4
resources/lang/en/activity.php

@ -11,4 +11,8 @@ return [
'job_updated' => 'Job data <strong>:name</strong> updated by <strong>:user</strong>.',
'task_deleted' => 'Task deleted by <strong>:user</strong>.',
],
'tasks' => [
'task_created' => 'Task created: <strong>:name</strong> new <strong>:user</strong>.',
'task_updated' => 'Task data <strong>:name</strong> updated by <strong>:user</strong>.',
],
];

1
resources/lang/en/job.php

@ -50,6 +50,7 @@ return [
'actual_start_date' => 'Actual Start Date',
'actual_end_date' => 'Actual End Date',
'updated_at' => 'Last Update',
'position' => 'Priority',
// Types
'main' => 'Main',

4
resources/lang/id/activity.php

@ -11,4 +11,8 @@ return [
'job_updated' => 'Data job <strong>:name</strong> diubah oleh <strong>:user</strong>.',
'task_deleted' => 'Task dihapus oleh <strong>:user</strong>.',
],
'tasks' => [
'task_created' => 'Input task baru: <strong>:name</strong> oleh <strong>:user</strong>.',
'task_updated' => 'Data task <strong>:name</strong> diubah oleh <strong>:user</strong>.',
],
];

1
resources/lang/id/job.php

@ -50,6 +50,7 @@ return [
'actual_start_date' => 'Tgl Mulai Aktual',
'actual_end_date' => 'Tgl Selesai Aktual',
'updated_at' => 'Waktu Update',
'position' => 'Prioritas',
// Types
'main' => 'Utama',

11
resources/views/users/activities/tasks/task_created.blade.php

@ -0,0 +1,11 @@
@component('users.activities.activity_list_item')
@slot('time')
{{ $activity->created_at }}
@endslot
@slot('body')
{!! __('activity.'.$activity->object_type.'.'.$activity->type, [
'user' => $activity->user->name,
'name' => $activity->object->name,
]) !!}
@endslot
@endcomponent

22
resources/views/users/activities/tasks/task_updated.blade.php

@ -0,0 +1,22 @@
@component('users.activities.activity_list_item')
@slot('time')
{{ $activity->created_at }}
@endslot
@slot('body')
<p>
{!! __('activity.'.$activity->object_type.'.'.$activity->type, [
'user' => $activity->user->name,
'name' => $activity->object->name,
]) !!}
</p>
@php
$data = $activity->data;
@endphp
@foreach ($data['before'] as $key => $value)
@php
$afterValue = $data['after'][$key] ?? null;
@endphp
<div>{{ __('job.'.$key) }}: {{ $value }} => {{ $afterValue }}</div>
@endforeach
@endslot
@endcomponent
Loading…
Cancel
Save