From 1d70e75152bcbaea6c3f736e8c02a32a5a420f5e Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Tue, 2 Mar 2021 22:49:42 -0500
Subject: [PATCH 01/47] feat: notion of groups

---
 app/Helpers/LogHelper.php                     |  7 ++
 app/Models/Company/Company.php                | 10 +++
 app/Models/Company/Employee.php               | 10 +++
 app/Models/Company/Group.php                  | 43 ++++++++++
 app/Services/Company/Group/CreateGroup.php    | 77 +++++++++++++++++
 database/factories/Company/GroupFactory.php   | 32 +++++++
 .../2021_03_03_031835_create_groups_table.php | 33 ++++++++
 resources/lang/en/account.php                 |  1 +
 tests/Unit/Models/Company/CompanyTest.php     | 12 +++
 tests/Unit/Models/Company/EmployeeTest.php    | 14 ++++
 tests/Unit/Models/Company/GroupTest.php       | 33 ++++++++
 .../Company/Group/CreateGroupTest.php         | 84 +++++++++++++++++++
 12 files changed, 356 insertions(+)
 create mode 100644 app/Models/Company/Group.php
 create mode 100644 app/Services/Company/Group/CreateGroup.php
 create mode 100644 database/factories/Company/GroupFactory.php
 create mode 100644 database/migrations/2021_03_03_031835_create_groups_table.php
 create mode 100644 tests/Unit/Models/Company/GroupTest.php
 create mode 100644 tests/Unit/Services/Company/Group/CreateGroupTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index 93f2e19d7..e2fb5d061 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1068,6 +1068,13 @@ public static function processAuditLog(AuditLog $log): string
                 $sentence = trans('account.log_toggle_e_coffee_process');
                 break;
 
+            case 'group_created':
+                $sentence = trans('account.log_group_created', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Models/Company/Company.php b/app/Models/Company/Company.php
index a40589e8e..cda37629b 100644
--- a/app/Models/Company/Company.php
+++ b/app/Models/Company/Company.php
@@ -238,6 +238,16 @@ public function importJobs()
         return $this->hasMany(ImportJob::class);
     }
 
+    /**
+     * Get all groups in the company.
+     *
+     * @return HasMany
+     */
+    public function groups()
+    {
+        return $this->hasMany(Group::class);
+    }
+
     /**
      * Return the PTO policy for the current year.
      *
diff --git a/app/Models/Company/Employee.php b/app/Models/Company/Employee.php
index cd8fb827d..29c68fd3d 100644
--- a/app/Models/Company/Employee.php
+++ b/app/Models/Company/Employee.php
@@ -538,6 +538,16 @@ public function timesheetsAsApprover()
         return $this->hasMany(Timesheet::class, 'approver_id', 'id');
     }
 
+    /**
+     * Get the group records associated with the employee.
+     *
+     * @return BelongsToMany
+     */
+    public function groups()
+    {
+        return $this->belongsToMany(Group::class);
+    }
+
     /**
      * Scope a query to only include unlocked users.
      *
diff --git a/app/Models/Company/Group.php b/app/Models/Company/Group.php
new file mode 100644
index 000000000..17f073142
--- /dev/null
+++ b/app/Models/Company/Group.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models\Company;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Group extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'company_id',
+        'name',
+    ];
+
+    /**
+     * Get the company record associated with the group.
+     *
+     * @return BelongsTo
+     */
+    public function company()
+    {
+        return $this->belongsTo(Company::class);
+    }
+
+    /**
+     * Get the employee records associated with the group.
+     *
+     * @return BelongsToMany
+     */
+    public function employees()
+    {
+        return $this->belongsToMany(Employee::class);
+    }
+}
diff --git a/app/Services/Company/Group/CreateGroup.php b/app/Services/Company/Group/CreateGroup.php
new file mode 100644
index 000000000..ebdda41da
--- /dev/null
+++ b/app/Services/Company/Group/CreateGroup.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+
+class CreateGroup extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'name' => 'required|string|max:255',
+        ];
+    }
+
+    /**
+     * Create a group.
+     *
+     * @param array $data
+     * @return Group
+     */
+    public function execute(array $data): Group
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->createGroup();
+        $this->log();
+
+        return $this->group;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+    }
+
+    private function createGroup(): void
+    {
+        $this->group = Group::create([
+            'company_id' => $this->data['company_id'],
+            'name' => $this->data['name'],
+        ]);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'group_created',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/database/factories/Company/GroupFactory.php b/database/factories/Company/GroupFactory.php
new file mode 100644
index 000000000..4966d6764
--- /dev/null
+++ b/database/factories/Company/GroupFactory.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Database\Factories\Company;
+
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class GroupFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = Group::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        $company = Company::factory()->create();
+
+        return [
+            'company_id' => $company->id,
+            'name' => 'Group name',
+        ];
+    }
+}
diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
new file mode 100644
index 000000000..0e7933ea7
--- /dev/null
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateGroupsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        // necessary for SQLlite
+        Schema::enableForeignKeyConstraints();
+
+        Schema::create('groups', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('company_id');
+            $table->string('name');
+            $table->timestamps();
+            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+        });
+
+        Schema::create('employee_group', function (Blueprint $table) {
+            $table->unsignedBigInteger('employee_id');
+            $table->unsignedBigInteger('group_id');
+            $table->timestamps();
+            $table->foreign('employee_id')->references('id')->on('employees')->onDelete('cascade');
+            $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
+        });
+    }
+}
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index fd08e8c0a..b9c7e4e06 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -290,6 +290,7 @@
     'log_consultant_rate_destroy' => 'Destroyed the consulting rate of :rate for :employee_name.',
     'log_e_coffee_match_session_as_happened' => 'Mark an eCoffee session as happened between :employee_name and :other_employee_name.',
     'log_toggle_e_coffee_process' => 'Toggle the eCoffee process in the company.',
+    'log_group_created' => 'Created the group called :group_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
diff --git a/tests/Unit/Models/Company/CompanyTest.php b/tests/Unit/Models/Company/CompanyTest.php
index 77593a4fa..1cd91096c 100644
--- a/tests/Unit/Models/Company/CompanyTest.php
+++ b/tests/Unit/Models/Company/CompanyTest.php
@@ -6,6 +6,7 @@
 use Tests\TestCase;
 use App\Models\Company\Flow;
 use App\Models\Company\Team;
+use App\Models\Company\Group;
 use App\Models\Company\Skill;
 use App\Models\Company\Company;
 use App\Models\Company\ECoffee;
@@ -239,6 +240,17 @@ public function it_has_many_import_jobs(): void
         $this->assertTrue($company->importJobs()->exists());
     }
 
+    /** @test */
+    public function it_has_many_groups(): void
+    {
+        $company = Company::factory()->create();
+        Group::factory()->create([
+            'company_id' => $company->id,
+        ]);
+
+        $this->assertTrue($company->groups()->exists());
+    }
+
     /** @test */
     public function it_returns_the_pto_policy_for_the_current_year(): void
     {
diff --git a/tests/Unit/Models/Company/EmployeeTest.php b/tests/Unit/Models/Company/EmployeeTest.php
index a4d02ce91..abb03d502 100644
--- a/tests/Unit/Models/Company/EmployeeTest.php
+++ b/tests/Unit/Models/Company/EmployeeTest.php
@@ -9,6 +9,7 @@
 use App\Models\Company\Task;
 use App\Models\Company\Team;
 use App\Models\User\Pronoun;
+use App\Models\Company\Group;
 use App\Models\Company\Place;
 use App\Models\Company\Skill;
 use App\Models\Company\Answer;
@@ -479,6 +480,19 @@ public function it_has_many_consultant_rates(): void
         $this->assertTrue($dwight->consultantRates()->exists());
     }
 
+    /** @test */
+    public function it_has_many_groups(): void
+    {
+        $dwight = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $dwight->company_id,
+        ]);
+
+        $dwight->groups()->sync([$group->id]);
+
+        $this->assertTrue($dwight->groups()->exists());
+    }
+
     /** @test */
     public function it_scopes_the_employees_by_the_locked_status(): void
     {
diff --git a/tests/Unit/Models/Company/GroupTest.php b/tests/Unit/Models/Company/GroupTest.php
new file mode 100644
index 000000000..8c3203467
--- /dev/null
+++ b/tests/Unit/Models/Company/GroupTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Unit\Models\Company;
+
+use Tests\TestCase;
+use App\Models\Company\Group;
+use App\Models\Company\Employee;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class GroupTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_belongs_to_a_company(): void
+    {
+        $group = Group::factory()->create([]);
+        $this->assertTrue($group->company()->exists());
+    }
+
+    /** @test */
+    public function it_has_many_employees(): void
+    {
+        $group = Group::factory()->create();
+        $dwight = factory(Employee::class)->create([
+            'company_id' => $group->company_id,
+        ]);
+
+        $group->employees()->syncWithoutDetaching([$dwight->id]);
+
+        $this->assertTrue($group->employees()->exists());
+    }
+}
diff --git a/tests/Unit/Services/Company/Group/CreateGroupTest.php b/tests/Unit/Services/Company/Group/CreateGroupTest.php
new file mode 100644
index 000000000..84102237a
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/CreateGroupTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Services\Company\Group\CreateGroup;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Project\CreateProject;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class CreateGroupTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_creates_a_group_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $this->executeService($michael);
+    }
+
+    /** @test */
+    public function it_creates_a_group_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $this->executeService($michael);
+    }
+
+    /** @test */
+    public function it_creates_a_group_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $this->executeService($michael);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new CreateProject)->execute($request);
+    }
+
+    private function executeService(Employee $michael): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'name' => 'Steering Commitee',
+        ];
+
+        $group = (new CreateGroup)->execute($request);
+
+        $this->assertDatabaseHas('groups', [
+            'id' => $group->id,
+            'name' => 'Steering Commitee',
+        ]);
+
+        $this->assertInstanceOf(
+            Group::class,
+            $group
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'group_created' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                ]);
+        });
+    }
+}

From 5bc523987e0fc27a752d80aaffaad062065eda87 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Thu, 4 Mar 2021 18:47:13 -0500
Subject: [PATCH 02/47] wip

---
 app/Helpers/LogHelper.php                     |  38 +++
 .../Company/Company/Group/GroupController.php | 146 +++++++++
 .../Company/Group/GroupMembersController.php  | 141 ++++++++
 .../Company/Project/ProjectController.php     |   3 +-
 .../Company/Team/TeamRecentShipController.php |   2 +-
 .../Company/Group/GroupMembersViewHelper.php  |  83 +++++
 .../Company/Group/GroupShowViewHelper.php     |  44 +++
 app/Jobs/AttachEmployeeToGroup.php            |  41 +++
 app/Models/Company/Employee.php               |   2 +-
 app/Models/Company/Group.php                  |   2 +-
 app/Models/Company/Meeting.php                |  52 +++
 .../Company/Group/AddEmployeeToGroup.php      | 105 ++++++
 app/Services/Company/Group/CreateGroup.php    |  19 ++
 app/Services/Company/Group/DestroyGroup.php   |  74 +++++
 .../Company/Group/RemoveEmployeeFromGroup.php |  97 ++++++
 .../2021_03_03_031835_create_groups_table.php |  30 ++
 .../Adminland/Employee/Archives/Show.vue      |  46 +--
 resources/js/Pages/Company/Group/Create.vue   | 241 ++++++++++++++
 .../js/Pages/Company/Group/Members/Index.vue  | 309 ++++++++++++++++++
 .../Company/Group/Partials/GroupMenu.vue      |  67 ++++
 resources/js/Pages/Company/Group/Show.vue     |  85 +++++
 resources/lang/en/account.php                 |  11 +
 resources/lang/en/app.php                     |   3 +
 resources/lang/en/group.php                   |  13 +
 routes/web.php                                |  16 +
 .../Company/Group/AddEmployeeToGroupTest.php  | 135 ++++++++
 .../Company/Group/CreateGroupTest.php         |  20 +-
 .../Company/Group/DestroyGroupTest.php        |  96 ++++++
 .../Group/RemoveEmployeeFromGroupTest.php     | 131 ++++++++
 .../Group/GroupMembersViewHelperTest.php      |  98 ++++++
 .../Company/Group/GroupShowViewHelperTest.php |  48 +++
 31 files changed, 2170 insertions(+), 28 deletions(-)
 create mode 100644 app/Http/Controllers/Company/Company/Group/GroupController.php
 create mode 100644 app/Http/Controllers/Company/Company/Group/GroupMembersController.php
 create mode 100644 app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
 create mode 100644 app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
 create mode 100644 app/Jobs/AttachEmployeeToGroup.php
 create mode 100644 app/Models/Company/Meeting.php
 create mode 100644 app/Services/Company/Group/AddEmployeeToGroup.php
 create mode 100644 app/Services/Company/Group/DestroyGroup.php
 create mode 100644 app/Services/Company/Group/RemoveEmployeeFromGroup.php
 create mode 100644 resources/js/Pages/Company/Group/Create.vue
 create mode 100644 resources/js/Pages/Company/Group/Members/Index.vue
 create mode 100644 resources/js/Pages/Company/Group/Partials/GroupMenu.vue
 create mode 100644 resources/js/Pages/Company/Group/Show.vue
 create mode 100644 resources/lang/en/group.php
 create mode 100644 tests/Unit/Services/Company/Group/AddEmployeeToGroupTest.php
 create mode 100644 tests/Unit/Services/Company/Group/DestroyGroupTest.php
 create mode 100644 tests/Unit/Services/Company/Group/RemoveEmployeeFromGroupTest.php
 create mode 100644 tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
 create mode 100644 tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index e2fb5d061..080badcb5 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1075,6 +1075,30 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'employee_added_to_group':
+                $sentence = trans('account.log_employee_added_to_group', [
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                ]);
+                break;
+
+            case 'employee_removed_from_group':
+                $sentence = trans('account.log_employee_removed_from_group', [
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                ]);
+                break;
+
+            case 'group_destroyed':
+                $sentence = trans('account.log_group_destroyed', [
+                    'group_name' => $log->object->{'group_name'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
@@ -1569,6 +1593,20 @@ public static function processEmployeeLog(EmployeeLog $log): string
                 ]);
                 break;
 
+            case 'employee_added_to_group':
+                $sentence = trans('account.employee_log_employee_added_to_group', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                ]);
+                break;
+
+            case 'employee_removed_from_group':
+                $sentence = trans('account.employee_log_employee_removed_from_group', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
new file mode 100644
index 000000000..105a98bff
--- /dev/null
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Http\Controllers\Company\Company\Group;
+
+use Inertia\Inertia;
+use Inertia\Response;
+use Illuminate\Http\Request;
+use App\Models\Company\Group;
+use App\Helpers\InstanceHelper;
+use App\Models\Company\Employee;
+use Illuminate\Http\JsonResponse;
+use App\Helpers\NotificationHelper;
+use App\Http\Controllers\Controller;
+use App\Services\Company\Group\CreateGroup;
+use App\Http\ViewHelpers\Company\CompanyViewHelper;
+use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
+use App\Http\ViewHelpers\Company\Project\ProjectViewHelper;
+
+class GroupController extends Controller
+{
+    /**
+     * Display the list of groups.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @return Response
+     */
+    public function index(Request $request, int $companyId): Response
+    {
+        $company = InstanceHelper::getLoggedCompany();
+        $statistics = CompanyViewHelper::statistics($company);
+
+        return Inertia::render('Company/Project/Index', [
+            'statistics' => $statistics,
+            'tab' => 'projects',
+            'projects' => ProjectViewHelper::index($company),
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Display the group.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @return Response
+     */
+    public function show(Request $request, int $companyId, int $groupId): Response
+    {
+        $company = InstanceHelper::getLoggedCompany();
+        $group = Group::where('company_id', $company->id)
+            ->findOrFail($groupId);
+
+        return Inertia::render('Company/Group/Show', [
+            'group' => GroupShowViewHelper::information($group, $company),
+            'tab' => 'info',
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Display the create new group form.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @return Response
+     */
+    public function create(Request $request, int $companyId): Response
+    {
+        return Inertia::render('Company/Group/Create', [
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Search an employee to add as a team lead.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @return JsonResponse
+     */
+    public function search(Request $request, int $companyId): JsonResponse
+    {
+        $potentialEmployees = Employee::search(
+            $request->input('searchTerm'),
+            $companyId,
+            10,
+            'created_at desc',
+            'and locked = false',
+        );
+
+        $employees = collect([]);
+        foreach ($potentialEmployees as $employee) {
+            $employees->push([
+                'id' => $employee->id,
+                'name' => $employee->name,
+                'avatar' => $employee->avatar,
+            ]);
+        }
+
+        return response()->json([
+            'data' => $employees,
+        ], 200);
+    }
+
+    /**
+     * Actually create the new group.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @return JsonResponse
+     */
+    public function store(Request $request, int $companyId): JsonResponse
+    {
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+
+        $employees = null;
+        if ($request->input('employees')) {
+            $employees = [];
+            foreach ($request->input('employees') as $employee) {
+                array_push($employees, $employee['id']);
+            }
+        }
+
+        $data = [
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'name' => $request->input('name'),
+            'employees' => $employees,
+        ];
+
+        $group = (new CreateGroup)->execute($data);
+
+        return response()->json([
+            'data' => [
+                'id' => $group->id,
+                'url' => route('groups.show', [
+                    'company' => $loggedCompany,
+                    'group' => $group,
+                ]),
+            ],
+        ], 201);
+    }
+}
diff --git a/app/Http/Controllers/Company/Company/Group/GroupMembersController.php b/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
new file mode 100644
index 000000000..8f1ef6847
--- /dev/null
+++ b/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Http\Controllers\Company\Company\Group;
+
+use Inertia\Inertia;
+use Inertia\Response;
+use Illuminate\Http\Request;
+use App\Models\Company\Group;
+use App\Helpers\InstanceHelper;
+use Illuminate\Http\JsonResponse;
+use App\Helpers\NotificationHelper;
+use App\Http\Controllers\Controller;
+use App\Services\Company\Group\AddEmployeeToGroup;
+use App\Services\Company\Group\RemoveEmployeeFromGroup;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
+use App\Http\ViewHelpers\Company\Group\GroupMembersViewHelper;
+
+class GroupMembersController extends Controller
+{
+    /**
+     * Display the list of members in the group.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @return Response
+     */
+    public function index(Request $request, int $companyId, int $groupId): Response
+    {
+        $company = InstanceHelper::getLoggedCompany();
+
+        try {
+            $group = Group::where('company_id', $company->id)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        $members = GroupMembersViewHelper::members($group);
+        $info = GroupShowViewHelper::information($group, $company);
+
+        return Inertia::render('Company/Group/Members/Index', [
+            'members' => $members,
+            'tab' => 'members',
+            'group' => $info,
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Get the list of potential new members for this group.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @return JsonResponse
+     */
+    public function search(Request $request, int $companyId, int $groupId): JsonResponse
+    {
+        $company = InstanceHelper::getLoggedCompany();
+
+        try {
+            $group = Group::where('company_id', $company->id)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        $potentialMembers = GroupMembersViewHelper::potentialMembers(
+            $request->input('searchTerm'),
+            $group,
+            $company
+        );
+
+        return response()->json([
+            'data' => $potentialMembers,
+        ]);
+    }
+
+    /**
+     * Add the member to the group.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @return JsonResponse
+     */
+    public function store(Request $request, int $companyId, int $groupId): JsonResponse
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        $group = Group::where('company_id', $loggedCompany->id)
+            ->findOrFail($groupId);
+
+        $employee = (new AddEmployeeToGroup)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $group->id,
+            'employee_id' => $request->input('employee'),
+            'role' => null,
+        ]);
+
+        return response()->json([
+            'data' => [
+                'id' => $employee->id,
+                'name' => $employee->name,
+                'avatar' => $employee->avatar,
+            ],
+        ]);
+    }
+
+    /**
+     * Remove the member from the group.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @return JsonResponse
+     */
+    public function remove(Request $request, int $companyId, int $groupId): JsonResponse
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        $group = Group::where('company_id', $loggedCompany->id)
+            ->findOrFail($groupId);
+
+        (new RemoveEmployeeFromGroup)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'employee_id' => $request->input('employee'),
+            'group_id' => $group->id,
+        ]);
+
+        return response()->json([
+            'data' => true,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Company/Company/Project/ProjectController.php b/app/Http/Controllers/Company/Company/Project/ProjectController.php
index eca8d1909..376b6ed33 100644
--- a/app/Http/Controllers/Company/Company/Project/ProjectController.php
+++ b/app/Http/Controllers/Company/Company/Project/ProjectController.php
@@ -63,7 +63,8 @@ public function show(Request $request, int $companyId, int $projectId): Response
     {
         $company = InstanceHelper::getLoggedCompany();
         $employee = InstanceHelper::getLoggedEmployee();
-        $project = Project::findOrFail($projectId);
+        $project = Project::where('company_id', $company->id)
+            ->findOrFail($projectId);
 
         return Inertia::render('Company/Project/Show', [
             'project' => ProjectViewHelper::info($project),
diff --git a/app/Http/Controllers/Company/Team/TeamRecentShipController.php b/app/Http/Controllers/Company/Team/TeamRecentShipController.php
index 174f4adcc..3bdd63057 100644
--- a/app/Http/Controllers/Company/Team/TeamRecentShipController.php
+++ b/app/Http/Controllers/Company/Team/TeamRecentShipController.php
@@ -56,7 +56,7 @@ public function index(Request $request, int $companyId, int $teamId)
     }
 
     /**
-     * Search an employee to add as a team lead.
+     * Search an employee to add to the recent ship entry.
      *
      * @param Request $request
      * @param int $companyId
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
new file mode 100644
index 000000000..610475d9d
--- /dev/null
+++ b/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Http\ViewHelpers\Company\Group;
+
+use App\Helpers\DateHelper;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use App\Models\Company\Employee;
+use Illuminate\Support\Collection;
+
+class GroupMembersViewHelper
+{
+    /**
+     * Array containing the information all the members in the group.
+     *
+     * @param Group $group
+     * @return Collection
+     */
+    public static function members(Group $group): Collection
+    {
+        $members = $group->employees()
+            ->where('locked', false)
+            ->with('position')
+            ->orderBy('pivot_created_at', 'desc')
+            ->get();
+
+        $membersCollection = collect([]);
+        foreach ($members as $member) {
+            $membersCollection->push([
+                'id' => $member->id,
+                'name' => $member->name,
+                'avatar' => $member->avatar,
+                'added_at' => DateHelper::formatDate($member->pivot->created_at),
+                'position' => (! $member->position) ? null : [
+                    'id' => $member->position->id,
+                    'title' => $member->position->title,
+                ],
+                'url' => route('employees.show', [
+                    'company' => $group->company_id,
+                    'employee' => $member,
+                ]),
+            ]);
+        }
+
+        return $membersCollection;
+    }
+
+    /**
+     * Returns the potential employees that can be assigned as members of the
+     * group, matching the name.
+     * This filters out the current members of the group (doh).
+     *
+     * @param string $employeeName
+     * @param Group $group
+     * @param Company $company
+     * @return Collection
+     */
+    public static function potentialMembers(string $employeeName, Group $group, Company $company): Collection
+    {
+        $potentialEmployees = Employee::search(
+            $employeeName,
+            $company->id,
+            10,
+            'created_at desc',
+            'and locked = false',
+        );
+
+        $currentMembers = $group->employees;
+
+        $potentialMembers = $potentialEmployees->diff($currentMembers);
+
+        $potentialMembersCollection = collect([]);
+        foreach ($potentialMembers as $potential) {
+            $potentialMembersCollection->push([
+                'id' => $potential->id,
+                'name' => $potential->name,
+                'avatar' => $potential->avatar,
+            ]);
+        }
+
+        return $potentialMembersCollection;
+    }
+}
diff --git a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
new file mode 100644
index 000000000..0def6b9d0
--- /dev/null
+++ b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\ViewHelpers\Company\Group;
+
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+
+class GroupShowViewHelper
+{
+    /**
+     * Get all the information about a group.
+     *
+     * @param Group $group
+     * @param Company $company
+     * @return array
+     */
+    public static function information(Group $group, Company $company): array
+    {
+        $groupMembers = $group->employees;
+
+        $membersCollection = collect([]);
+        foreach ($groupMembers as $employee) {
+            $membersCollection->push([
+                'id' => $employee->id,
+                'name' => $employee->name,
+                'avatar' => $employee->avatar,
+                'position' => (! $employee->position) ? null : [
+                    'id' => $employee->position->id,
+                    'title' => $employee->position->title,
+                ],
+                'url' => route('employees.show', [
+                    'company' => $company,
+                    'employee' => $employee,
+                ]),
+            ]);
+        }
+
+        return [
+            'id' => $group->id,
+            'name' => $group->name,
+            'members' => $membersCollection,
+        ];
+    }
+}
diff --git a/app/Jobs/AttachEmployeeToGroup.php b/app/Jobs/AttachEmployeeToGroup.php
new file mode 100644
index 000000000..85351d50b
--- /dev/null
+++ b/app/Jobs/AttachEmployeeToGroup.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use App\Services\Company\Group\AddEmployeeToGroup;
+
+class AttachEmployeeToGroup implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * @var array
+     */
+    public array $data;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        (new AddEmployeeToGroup)->execute([
+            'company_id' => $this->data['company_id'],
+            'author_id' => $this->data['author_id'],
+            'employee_id' => $this->data['employee_id'],
+            'group_id' => $this->data['group_id'],
+        ]);
+    }
+}
diff --git a/app/Models/Company/Employee.php b/app/Models/Company/Employee.php
index 29c68fd3d..5f666439a 100644
--- a/app/Models/Company/Employee.php
+++ b/app/Models/Company/Employee.php
@@ -545,7 +545,7 @@ public function timesheetsAsApprover()
      */
     public function groups()
     {
-        return $this->belongsToMany(Group::class);
+        return $this->belongsToMany(Group::class)->withTimestamps();
     }
 
     /**
diff --git a/app/Models/Company/Group.php b/app/Models/Company/Group.php
index 17f073142..cd30153e9 100644
--- a/app/Models/Company/Group.php
+++ b/app/Models/Company/Group.php
@@ -38,6 +38,6 @@ public function company()
      */
     public function employees()
     {
-        return $this->belongsToMany(Employee::class);
+        return $this->belongsToMany(Employee::class)->withTimestamps();
     }
 }
diff --git a/app/Models/Company/Meeting.php b/app/Models/Company/Meeting.php
new file mode 100644
index 000000000..37999fbbc
--- /dev/null
+++ b/app/Models/Company/Meeting.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Models\Company;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Meeting extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'company_id',
+        'happened_at',
+    ];
+
+    /**
+     * The attributes that should be mutated to dates.
+     *
+     * @var array
+     */
+    protected $dates = [
+        'happened_at',
+    ];
+
+    /**
+     * Get the company record associated with the group.
+     *
+     * @return BelongsTo
+     */
+    public function company()
+    {
+        return $this->belongsTo(Company::class);
+    }
+
+    /**
+     * Get the employee records associated with the group.
+     *
+     * @return BelongsToMany
+     */
+    public function employees()
+    {
+        return $this->belongsToMany(Employee::class)->withTimestamps();
+    }
+}
diff --git a/app/Services/Company/Group/AddEmployeeToGroup.php b/app/Services/Company/Group/AddEmployeeToGroup.php
new file mode 100644
index 000000000..24debbada
--- /dev/null
+++ b/app/Services/Company/Group/AddEmployeeToGroup.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Employee;
+
+class AddEmployeeToGroup extends BaseService
+{
+    private array $data;
+
+    private Employee $employee;
+
+    private Group $group;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'employee_id' => 'required|integer|exists:employees,id',
+            'role' => 'nullable|string',
+        ];
+    }
+
+    /**
+     * Add an employee to a group.
+     *
+     * @param array $data
+     * @return Employee
+     */
+    public function execute(array $data): Employee
+    {
+        $this->data = $data;
+        $this->validate();
+
+        $this->attachEmployee();
+        $this->log();
+
+        return $this->employee;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->employee = $this->validateEmployeeBelongsToCompany($this->data);
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+    }
+
+    private function attachEmployee(): void
+    {
+        $this->group->employees()->syncWithoutDetaching([
+            $this->data['employee_id'] => [
+                'role' => $this->valueOrNull($this->data, 'role'),
+            ],
+        ]);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'employee_added_to_group',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'employee_id' => $this->employee->id,
+                'employee_name' => $this->employee->name,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->employee->id,
+            'action' => 'employee_added_to_group',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Group/CreateGroup.php b/app/Services/Company/Group/CreateGroup.php
index ebdda41da..1b3defeb6 100644
--- a/app/Services/Company/Group/CreateGroup.php
+++ b/app/Services/Company/Group/CreateGroup.php
@@ -6,6 +6,7 @@
 use App\Jobs\LogAccountAudit;
 use App\Models\Company\Group;
 use App\Services\BaseService;
+use App\Jobs\AttachEmployeeToGroup;
 
 class CreateGroup extends BaseService
 {
@@ -23,6 +24,7 @@ public function rules(): array
             'company_id' => 'required|integer|exists:companies,id',
             'author_id' => 'required|integer|exists:employees,id',
             'name' => 'required|string|max:255',
+            'employees' => 'nullable|array',
         ];
     }
 
@@ -37,6 +39,7 @@ public function execute(array $data): Group
         $this->data = $data;
         $this->validate();
         $this->createGroup();
+        $this->attachEmployees();
         $this->log();
 
         return $this->group;
@@ -60,6 +63,22 @@ private function createGroup(): void
         ]);
     }
 
+    private function attachEmployees(): void
+    {
+        if (! $this->data['employees']) {
+            return;
+        }
+
+        foreach ($this->data['employees'] as $key => $employeeId) {
+            AttachEmployeeToGroup::dispatch([
+                'company_id' => $this->data['company_id'],
+                'author_id' => $this->data['author_id'],
+                'employee_id' => $employeeId,
+                'group_id' => $this->group->id,
+            ])->onQueue('low');
+        }
+    }
+
     private function log(): void
     {
         LogAccountAudit::dispatch([
diff --git a/app/Services/Company/Group/DestroyGroup.php b/app/Services/Company/Group/DestroyGroup.php
new file mode 100644
index 000000000..fcc58763e
--- /dev/null
+++ b/app/Services/Company/Group/DestroyGroup.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+
+class DestroyGroup extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'nullable|integer|exists:groups,id',
+        ];
+    }
+
+    /**
+     * Delete a group.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->destroy();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        // make sure the group belongs to the company
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+    }
+
+    private function destroy(): void
+    {
+        $this->group->delete();
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'group_destroyed',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_name' => $this->group->name,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Group/RemoveEmployeeFromGroup.php b/app/Services/Company/Group/RemoveEmployeeFromGroup.php
new file mode 100644
index 000000000..9415eaeae
--- /dev/null
+++ b/app/Services/Company/Group/RemoveEmployeeFromGroup.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Employee;
+
+class RemoveEmployeeFromGroup extends BaseService
+{
+    private array $data;
+
+    private Employee $employee;
+
+    private Group $group;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'employee_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+        ];
+    }
+
+    /**
+     * Detach an employee from a group.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->detachEmployee();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asAtLeastHR()
+            ->canBypassPermissionLevelIfEmployee($this->data['employee_id'])
+            ->canExecuteService();
+
+        $this->employee = $this->validateEmployeeBelongsToCompany($this->data);
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+    }
+
+    private function detachEmployee(): void
+    {
+        $this->group->employees()->detach($this->data['employee_id']);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'employee_removed_from_group',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'employee_id' => $this->employee->id,
+                'employee_name' => $this->employee->name,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->employee->id,
+            'action' => 'employee_removed_from_group',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
index 0e7933ea7..5a23a1319 100644
--- a/database/migrations/2021_03_03_031835_create_groups_table.php
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -25,9 +25,39 @@ public function up()
         Schema::create('employee_group', function (Blueprint $table) {
             $table->unsignedBigInteger('employee_id');
             $table->unsignedBigInteger('group_id');
+            $table->string('role')->nullable();
             $table->timestamps();
             $table->foreign('employee_id')->references('id')->on('employees')->onDelete('cascade');
             $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
         });
+
+        Schema::create('group_meetings', function (Blueprint $table) {
+            $table->unsignedBigInteger('group_id');
+            $table->unsignedBigInteger('meeting_id');
+            $table->timestamps();
+            $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
+            $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade');
+        });
+
+        Schema::create('meetings', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('company_id');
+            $table->datetime('happened_at');
+            $table->timestamps();
+            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+        });
+
+        Schema::create('agenda_items', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('group_meeting_id');
+            $table->boolean('checked')->default(false);
+            $table->string('summary');
+            $table->text('description')->nullable();
+            $table->boolean('follow_up_next_time')->default(false);
+            $table->unsignedBigInteger('presented_by_id')->nullable();
+            $table->timestamps();
+            $table->foreign('group_meeting_id')->references('id')->on('group_meetings')->onDelete('cascade');
+            $table->foreign('presented_by_id')->references('id')->on('employees')->onDelete('set null');
+        });
     }
 }
diff --git a/resources/js/Pages/Adminland/Employee/Archives/Show.vue b/resources/js/Pages/Adminland/Employee/Archives/Show.vue
index 62fea4177..d5cdf7a40 100644
--- a/resources/js/Pages/Adminland/Employee/Archives/Show.vue
+++ b/resources/js/Pages/Adminland/Employee/Archives/Show.vue
@@ -122,35 +122,35 @@
 
           <div class="pa3">
             <!-- LIST OF THE FIRST FIVE ENTRIES IN THE REPORT -->
-            <p class="f6 mb1">First five of the {{ report.number_of_entries }} entries of the file </p>
+            <p class="f6 mb1">{{ $t('account.import_employees_show_first_five_entries', {count: report.number_of_entries }) }}</p>
             <div v-if="report.first_five_entries.length > 0" class="center bt br bl br2 bb-gray dt w-100 mb5">
               <div class="dt-row">
                 <div class="dtc pv2 ph2 f6 bb bb-gray bg-gray fw5">
-                  Email
+                  {{ $t('account.import_employees_show_email') }}
                 </div>
                 <div class="dtc pv2 ph2 f6 bb bb-gray bg-gray fw5">
-                  First name
+                  {{ $t('account.import_employees_show_firstname') }}
                 </div>
                 <div class="dtc pv2 ph2 f6 bb bb-gray bg-gray fw5">
-                  Last name
+                  {{ $t('account.import_employees_show_lastname') }}
                 </div>
                 <div class="dtc pv2 ph2 f6 bb bb-gray bg-gray fw5">
-                  Status
+                  {{ $t('account.import_employees_show_status') }}
                 </div>
               </div>
-              <div v-for="report in report.first_five_entries" :key="report.id" class="dt-row pv3 ph2 bb bb-gray bb-gray-hover pa3">
+              <div v-for="entry in report.first_five_entries" :key="entry.id" class="dt-row pv3 ph2 bb bb-gray bb-gray-hover pa3">
                 <div class="dtc pv3 ph2 bb bb-gray">
-                  {{ report.employee_email }}
+                  {{ entry.employee_email }}
                 </div>
                 <div class="dtc pv3 ph2 bb bb-gray">
-                  {{ report.employee_first_name }}
+                  {{ entry.employee_first_name }}
                 </div>
                 <div class="dtc pv3 ph2 bb bb-gray">
-                  {{ report.employee_last_name }}
+                  {{ entry.employee_last_name }}
                 </div>
-                <div v-if="report.skipped_during_upload" class="dtc bb bb-gray">
+                <div v-if="entry.skipped_during_upload" class="dtc bb bb-gray">
                   <span class="type failed">
-                    {{ report.skipped_during_upload_reason }}
+                    {{ entry.skipped_during_upload_reason }}
                   </span>
                 </div>
                 <div v-else class="dtc bb bb-gray">
@@ -162,26 +162,26 @@
             </div>
 
             <!-- LIST OF THE ALL ENTRIES IN ERROR -->
-            <p class="f6 mb1">All {{ report.failed_entries.length }} entries in error in the file</p>
+            <p class="f6 mb1">{{ $t('account.import_employees_show_entries_errors', { count: report.failed_entries.length }) }}</p>
             <div v-if="report.failed_entries.length > 0" class="center bt br bl br2 bb-gray dt w-100">
               <div class="dt-row">
                 <div class="dtc pv2 ph2 f6 bb bb-gray bg-gray fw5">
-                  Email
+                  {{ $t('account.import_employees_show_email') }}
                 </div>
                 <div class="dtc pv2 ph2 f6 bb bb-gray bg-gray fw5">
-                  First name
+                  {{ $t('account.import_employees_show_firstname') }}
                 </div>
                 <div class="dtc pv2 ph2 f6 bb bb-gray bg-gray fw5">
-                  Last name
+                  {{ $t('account.import_employees_show_lastname') }}
                 </div>
                 <div class="dtc pv2 ph2 f6 bb bb-gray bg-gray fw5">
-                  Status
+                  {{ $t('account.import_employees_show_status') }}
                 </div>
               </div>
-              <div v-for="report in report.failed_entries" :key="report.id" class="dt-row pv3 ph2 bb bb-gray bb-gray-hover pa3">
+              <div v-for="entry in report.failed_entries" :key="entry.id" class="dt-row pv3 ph2 bb bb-gray bb-gray-hover pa3">
                 <!-- email -->
-                <div v-if="report.employee_email" class="dtc pv3 ph2 bb bb-gray">
-                  {{ report.employee_email }}
+                <div v-if="entry.employee_email" class="dtc pv3 ph2 bb bb-gray">
+                  {{ entry.employee_email }}
                 </div>
                 <div v-else class="dtc pv3 ph2 bb bb-gray f6 gray">
                   ({{ $t('account.import_employees_archives_finalize_email_missing') }})
@@ -189,18 +189,18 @@
 
                 <!-- first name -->
                 <div class="dtc pv3 ph2 bb bb-gray">
-                  {{ report.employee_first_name }}
+                  {{ entry.employee_first_name }}
                 </div>
 
                 <!-- last name -->
                 <div class="dtc pv3 ph2 bb bb-gray">
-                  {{ report.employee_last_name }}
+                  {{ entry.employee_last_name }}
                 </div>
 
                 <!-- skipped during upload -->
-                <div v-if="report.skipped_during_upload" class="dtc bb bb-gray">
+                <div v-if="entry.skipped_during_upload" class="dtc bb bb-gray">
                   <span class="type failed">
-                    {{ report.skipped_during_upload_reason }}
+                    {{ entry.skipped_during_upload_reason }}
                   </span>
                 </div>
                 <div v-else class="dtc bb bb-gray">
diff --git a/resources/js/Pages/Company/Group/Create.vue b/resources/js/Pages/Company/Group/Create.vue
new file mode 100644
index 000000000..2db170e44
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Create.vue
@@ -0,0 +1,241 @@
+<style lang="scss" scoped>
+.avatar {
+  left: 1px;
+  top: 5px;
+  width: 23px;
+}
+
+.team-member {
+  padding-left: 34px;
+
+  .avatar {
+    top: -2px;
+    left: 2px;
+  }
+}
+
+.ball-pulse {
+  right: 8px;
+  top: 37px;
+  position: absolute;
+}
+
+.plus-button {
+  padding: 2px 7px 4px;
+  margin-right: 4px;
+  border-color: #60995c;
+  color: #60995c;
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph0-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mw6 br3 bg-white box center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company'">{{ $t('app.breadcrumb_company') }}</inertia-link>
+          </li>
+          <li class="di">
+            ...
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups/'">{{ $t('app.breadcrumb_group_list') }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_group_create') }}
+          </li>
+        </ul>
+      </div>
+
+      <!-- BODY -->
+      <div class="mw7 center br3 mb5 bg-white box relative z-1">
+        <div class="pa3 measure center">
+          <h2 class="tc normal mb4 lh-copy">
+            {{ $t('group.create_title') }}
+
+            <help :url="$page.props.help_links.team_recent_ship_create" :top="'1px'" />
+          </h2>
+
+          <form @submit.prevent="submit">
+            <errors :errors="form.errors" />
+
+            <!-- Name -->
+            <text-input :id="'name'"
+                        v-model="form.name"
+                        :name="'name'"
+                        :datacy="'project-name-input'"
+                        :errors="$page.props.errors.title"
+                        :label="$t('group.create_input_name')"
+                        :help="$t('group.create_input_name_help')"
+                        :required="true"
+                        :autofocus="true"
+            />
+
+            <!-- list of people who are part of this group -->
+            <p v-if="!showGroupMembers && form.employees.length == 0" class="bt bb-gray pt3 pointer" data-cy="group-add-employees" @click.prevent="showGroupMembers = true"><span class="ba br-100 plus-button">+</span> Add members to the group</p>
+            <p v-if="!showGroupMembers && form.employees.length > 0" class="bt bb-gray pt3 pointer" data-cy="group-add-employees" @click.prevent="showGroupMembers = true"><span class="ba br-100 plus-button">+</span> Add additional members</p>
+
+            <div v-if="showGroupMembers == true" class="bb bb-gray bt pt3">
+              <form class="relative" @submit.prevent="search">
+                <text-input :id="'name'"
+                            v-model="form.searchTerm"
+                            :name="'name'"
+                            :datacy="'group-employees'"
+                            :errors="$page.props.errors.name"
+                            :label="$t('group.create_members')"
+                            :placeholder="$t('group.create_members_help')"
+                            :required="false"
+                            @keyup="search"
+                            @input="search"
+                            @esc-key-pressed="showGroupMembers = false"
+                />
+                <ball-pulse-loader v-if="processingSearch" color="#5c7575" size="7px" />
+              </form>
+
+              <!-- search results -->
+              <ul v-show="potentialMembers.length > 0" class="list pl0 ba bb-gray bb-gray-hover">
+                <li v-for="employee in potentialMembers" :key="employee.id" class="relative pa2 bb bb-gray">
+                  {{ employee.name }}
+                  <a href="" class="fr f6" :data-cy="'employee-id-' + employee.id" @click.prevent="add(employee)">{{ $t('app.add') }}</a>
+                </li>
+              </ul>
+
+              <!-- no results found -->
+              <ul v-show="potentialMembers.length == 0 && form.searchTerm" class="list pl0 ba bb-gray bb-gray-hover">
+                <li class="relative pa2 bb bb-gray">
+                  {{ $t('team.members_no_results') }}
+                </li>
+              </ul>
+            </div>
+
+            <div v-show="form.employees.length > 0" class="ba bb-gray mb3 mt3">
+              <div v-for="employee in form.employees" :key="employee.id" class="pa2 db bb-gray bb" data-cy="members-list">
+                <span class="pl3 db relative team-member">
+                  <img loading="lazy" :src="employee.avatar" class="br-100 absolute avatar" alt="avatar" />
+
+                  {{ employee.name }}
+
+                  <!-- remove -->
+                  <a href="#" class="db f7 mt1 c-delete dib fr" :data-cy="'remove-employee-' + employee.id" @click.prevent="detach(employee)">
+                    {{ $t('app.remove') }}
+                  </a>
+                </span>
+              </div>
+            </div>
+
+            <!-- Actions -->
+            <div class="mb4 mt5">
+              <div class="flex-ns justify-between">
+                <div>
+                  <inertia-link :href="'/' + $page.props.auth.company.id + '/company/projects/'" class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3">
+                    {{ $t('app.cancel') }}
+                  </inertia-link>
+                </div>
+                <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.create')" :cypress-selector="'submit-create-project-button'" />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import TextInput from '@/Shared/TextInput';
+import Errors from '@/Shared/Errors';
+import LoadingButton from '@/Shared/LoadingButton';
+import Layout from '@/Shared/Layout';
+import 'vue-loaders/dist/vue-loaders.css';
+import BallPulseLoader from 'vue-loaders/dist/loaders/ball-pulse';
+import Help from '@/Shared/Help';
+
+export default {
+  components: {
+    Layout,
+    TextInput,
+    Errors,
+    LoadingButton,
+    'ball-pulse-loader': BallPulseLoader.component,
+    Help
+  },
+
+  props: {
+    notifications: {
+      type: Array,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      showGroupMembers: false,
+      form: {
+        name: null,
+        searchTerm: null,
+        employees: [],
+        errors: [],
+      },
+      processingSearch: false,
+      loadingState: '',
+      potentialMembers: [],
+      errorTemplate: Error,
+    };
+  },
+
+  methods: {
+    submit() {
+      this.loadingState = 'loading';
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups`, this.form)
+        .then(response => {
+          this.$inertia.visit(response.data.data.url);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+
+    search: _.debounce(
+      function() {
+
+        if (this.form.searchTerm != '') {
+          this.processingSearch = true;
+
+          axios.post(`/${this.$page.props.auth.company.id}/company/groups/search`, this.form)
+            .then(response => {
+              this.potentialMembers = _.filter(response.data.data, employee => _.every(this.form.employees, e => employee.id !== e.id));
+              this.processingSearch = false;
+            })
+            .catch(error => {
+              console.log(error);
+              this.form.errors = error.response.data;
+              this.processingSearch = false;
+            });
+        } else {
+          this.potentialMembers = [];
+        }
+      }, 500),
+
+    add(employee) {
+      var id = this.form.employees.findIndex(x => x.id === employee.id);
+
+      if (id == -1) {
+        this.form.employees.push(employee);
+        this.potentialMembers = [];
+        this.showGroupMembers = false;
+        this.form.searchTerm = null;
+      }
+    },
+
+    detach(employee) {
+      var id = this.form.employees.findIndex(member => member.id === employee.id);
+      this.form.employees.splice(id, 1);
+    }
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Members/Index.vue b/resources/js/Pages/Company/Group/Members/Index.vue
new file mode 100644
index 000000000..bec9a6bc2
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Members/Index.vue
@@ -0,0 +1,309 @@
+<style lang="scss" scoped>
+.avatar {
+  left: 1px;
+  top: 2px;
+  width: 35px;
+}
+
+.team-member {
+  padding-left: 44px;
+}
+
+.project-code {
+  padding-bottom: 2px;
+  top: -2px;
+  color: #737e91;
+  border: 1px solid #b3d4ff;
+}
+
+.icon-date {
+  width: 15px;
+  top: 2px;
+}
+
+.icon-role {
+  width: 15px;
+  top: 2px;
+}
+
+.information {
+  flex: 1 0 128px;
+}
+
+.list-no-line-bottom {
+  li:last-child {
+    border-bottom: 0;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+  }
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph5-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mb4 mw6 br3 center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company'">{{ $t('app.breadcrumb_company') }}</inertia-link>
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups'">{{ $t('app.breadcrumb_group_list') }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_group_detail') }}
+          </li>
+        </ul>
+      </div>
+
+      <div class="mw7 center br3 mb5 relative z-1">
+        <!-- Menu -->
+        <group-menu :group="group" :tab="tab" />
+      </div>
+
+      <div class="mw6 center br3 mb5 relative z-1">
+        <!-- members list -->
+        <div v-if="!showModal" class="tr mb2">
+          <a href="#" class="btn dib-l db mb3 mb0-ns" data-cy="member-add-button" @click.prevent="displayAddModal()">{{ $t('project.members_index_add_cta') }}</a>
+        </div>
+
+        <!-- add a new member -->
+        <div v-if="showModal" class="bg-white box mb3 pa3">
+          <form @submit.prevent="search">
+            <!-- errors -->
+            <template v-if="form.errors.length > 0">
+              <div class="cf pb1 w-100 mb2">
+                <errors :errors="form.errors" />
+              </div>
+            </template>
+
+            <!-- search form -->
+            <div class="mb3 relative">
+              <p class="mt0 relative">{{ $t('group.members_add_cta') }} <a href="#" class="absolute right-0 f6" @click.prevent="showModal = false">{{ $t('app.cancel') }}</a></p>
+              <div class="relative">
+                <input id="search" ref="search" v-model="form.searchTerm" type="text" name="search"
+                       :placeholder="$t('group.members_add_placeholder')" class="br2 f5 w-100 ba b--black-40 pa2 outline-0" required
+                       @keyup="search()" @keydown.esc="showModal = false"
+                />
+                <ball-pulse-loader v-if="processingSearch" color="#5c7575" size="7px" />
+              </div>
+            </div>
+          </form>
+
+          <!-- RESULTS -->
+          <div class="pl0 list ma0">
+            <ul v-if="potentialMembers.length > 0" class="list ma0 pl0">
+              <li v-for="member in potentialMembers" :key="member.id" class="bb relative pv2 ph1 bb-gray bb-gray-hover">
+                {{ member.name }}
+                <a class="absolute right-1 pointer" :data-cy="'potential-group-member-' + member.id" @click.prevent="store(member)">
+                  {{ $t('app.add') }}
+                </a>
+              </li>
+            </ul>
+          </div>
+          <div v-if="potentialMembers.length == 0" class="silver">
+            {{ $t('app.no_results') }}
+          </div>
+        </div>
+
+        <!-- members list -->
+        <div v-if="localMembers.length > 0" class="bg-white box">
+          <ul class="list pl0 ma0 list-no-line-bottom">
+            <li v-for="member in localMembers" :key="member.id" :data-cy="'member-' + member.id" class="pa3 bb bb-gray flex items-center">
+              <!-- avatar -->
+              <div class="mr3">
+                <img :src="member.avatar" alt="avatar" height="64" width="64" class="br-100" />
+              </div>
+
+              <!-- name + information -->
+              <div class="information">
+                <inertia-link :href="member.url" class="mb2 dib">{{ member.name }}</inertia-link>
+
+                <span v-if="member.role" class="db f7 mb2 relative">
+                  <!-- icon role -->
+                  <svg class="relative icon-role gray" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M10 2a1 1 0 00-1 1v1a1 1 0 002 0V3a1 1 0 00-1-1zM4 4h3a3 3 0 006 0h3a2 2 0 012 2v9a2 2 0 01-2 2H4a2 2 0 01-2-2V6a2 2 0 012-2zm2.5 7a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm2.45 4a2.5 2.5 0 10-4.9 0h4.9zM12 9a1 1 0 100 2h3a1 1 0 100-2h-3zm-1 4a1 1 0 011-1h2a1 1 0 110 2h-2a1 1 0 01-1-1z" clip-rule="evenodd" />
+                  </svg>
+                  <span class="mr2">
+                    {{ member.role }}
+                  </span>
+
+                  <!-- icon date -->
+                  <span>
+                    <svg class="relative icon-date gray" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                      <path fill-rule="evenodd" d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z" clip-rule="evenodd" />
+                    </svg>
+                  </span>
+                  <span class="gray">
+                    {{ $t('project.members_index_role', { date: member.added_at }) }}
+                  </span>
+                </span>
+                <span v-if="member.position && member.role" class="db f7 gray">{{ $t('project.members_index_position_with_role', { role: member.position.title }) }}</span>
+                <span v-if="member.position && !member.role" class="db f7 gray">{{ $t('project.members_index_position', { role: member.position.title }) }}</span>
+              </div>
+
+              <!-- actions -->
+              <div>
+                <a v-if="idToDelete != member.id" :data-cy="'member-delete-' + member.id" class="c-delete f6" href="#" @click.prevent="showDeleteModal(member)">{{ $t('app.remove') }}</a>
+
+                <div v-if="removeMode && idToDelete == member.id">
+                  {{ $t('app.sure') }}
+                  <a class="c-delete mr1 pointer" :data-cy="'list-delete-confirm-button-' + member.id" @click.prevent="remove(member)">
+                    {{ $t('app.yes') }}
+                  </a>
+                  <a class="pointer" :data-cy="'list-delete-cancel-button-' + member.id" @click.prevent="idToDelete = 0">
+                    {{ $t('app.no') }}
+                  </a>
+                </div>
+              </div>
+            </li>
+          </ul>
+        </div>
+
+        <!-- blank member lists -->
+        <div v-if="localMembers.length == 0" class="bg-white box pa3 tc" data-cy="members-blank-state">
+          <h3 class="fw4 f5">
+            {{ $t('group.members_index_blank') }}
+          </h3>
+          <img loading="lazy" src="/img/streamline-icon-cyclist-1-4@140x140.png" width="140" height="140" alt="people hanging out"
+               class="di-ns dn top-1 left-1"
+          />
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import Layout from '@/Shared/Layout';
+import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
+import 'vue-loaders/dist/vue-loaders.css';
+import BallPulseLoader from 'vue-loaders/dist/loaders/ball-pulse';
+
+export default {
+  components: {
+    Layout,
+    GroupMenu,
+    'ball-pulse-loader': BallPulseLoader.component,
+  },
+
+  props: {
+    notifications: {
+      type: Array,
+      default: null,
+    },
+    group: {
+      type: Object,
+      default: null,
+    },
+    members: {
+      type: Array,
+      default: null,
+    },
+    tab: {
+      type: String,
+      default: 'summary',
+    },
+  },
+
+  data() {
+    return {
+      processingSearch: false,
+      localMembers: null,
+      showModal: false,
+      removeMode: false,
+      idToDelete: 0,
+      potentialMembers: [],
+      loadingState: '',
+      form: {
+        searchTerm: null,
+        employee: null,
+        role: null,
+        errors: [],
+      },
+    };
+  },
+
+  created() {
+    this.localMembers = this.members;
+  },
+
+  mounted() {
+    if (localStorage.success) {
+      flash(localStorage.success, 'success');
+      localStorage.removeItem('success');
+    }
+  },
+
+  methods: {
+    displayAddModal() {
+      this.showModal = true;
+
+      this.$nextTick(() => {
+        this.$refs['search'].focus();
+      });
+    },
+
+    showDeleteModal(member) {
+      this.removeMode = true;
+      this.idToDelete = member.id;
+    },
+
+    search: _.debounce(
+      function() {
+
+        if (this.form.searchTerm != '') {
+          this.processingSearch = true;
+
+          axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/search`, this.form)
+            .then(response => {
+              this.potentialMembers = _.filter(response.data.data, employee => _.every(this.form.employees, e => employee.id !== e.id));
+              this.processingSearch = false;
+            })
+            .catch(error => {
+              this.form.errors = error.response.data;
+              this.processingSearch = false;
+            });
+        }
+      }, 500),
+
+    store(employee) {
+      this.loadingState = 'loading';
+      this.form.employee = employee.id;
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/store`, this.form)
+        .then(response => {
+          flash(this.$t('project.members_index_add_success'), 'success');
+          this.loadingState = null;
+          this.form.employee = null;
+          this.showModal = false;
+          this.localMembers.unshift(response.data.data);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+
+    remove(employee) {
+      this.form.employee = employee.id;
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/remove`, this.form)
+        .then(response => {
+          flash(this.$t('project.members_index_remove_success'), 'success');
+
+          var id = this.localMembers.findIndex(x => x.id == employee.id);
+          this.localMembers.splice(id, 1);
+
+          this.form.employee = null;
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
new file mode 100644
index 000000000..d2b2c8cff
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
@@ -0,0 +1,67 @@
+<style lang="scss" scoped>
+.small-avatar {
+  margin-left: -8px;
+  box-shadow: 0 0 0 2px #fff;
+}
+
+.more-members {
+  height: 32px;
+  top: 8px;
+}
+
+.project-code {
+  padding-bottom: 2px;
+  top: -2px;
+  color: #737e91;
+  border: 1px solid #b3d4ff;
+}
+</style>
+
+<template>
+  <div>
+    <h2 class="tc normal mb2 lh-copy">
+      {{ group.name }}
+    </h2>
+
+    <div class="relative tc w-100 mb4">
+      <div class="flex items-center justify-center">
+        <img v-for="member in group.members" :key="member.id" :src="member.avatar" alt="avatar" class="br-100 small-avatar"
+             width="32" height="32"
+        />
+        <!-- <div v-if="group.other_members_counter > 0" class="pl2 f7 more-members relative gray">
+          {{ $t('project.menu_other_member', { count: project.other_members_counter }) }}
+        </div> -->
+      </div>
+    </div>
+
+    <div class="center br3 mb5 tc">
+      <div class="cf dib btn-group">
+        <inertia-link :class="{'selected':(tab == 'info')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + ''" class="f6 fl ph3 pv2 dib pointer no-underline">
+          Summary
+        </inertia-link>
+        <inertia-link :class="{'selected':(tab == 'members')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + '/members'" class="f6 fl ph3 pv2 dib pointer">
+          Members
+        </inertia-link>
+        <inertia-link :class="{'selected':(tab == 'members')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + '/members'" class="f6 fl ph3 pv2 dib pointer">
+          {{ $t('project.menu_files') }}
+        </inertia-link>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    group: {
+      type: Object,
+      default: null,
+    },
+    tab: {
+      type: String,
+      default: 'info',
+    },
+  },
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Show.vue b/resources/js/Pages/Company/Group/Show.vue
new file mode 100644
index 000000000..b54f33087
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Show.vue
@@ -0,0 +1,85 @@
+<style lang="scss" scoped>
+.small-avatar {
+  margin-left: -8px;
+  box-shadow: 0 0 0 2px #fff;
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph5-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mb4 mw6 br3 center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company'">{{ $t('app.breadcrumb_company') }}</inertia-link>
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups'">{{ $t('app.breadcrumb_group_list') }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_group_detail') }}
+          </li>
+        </ul>
+      </div>
+
+      <!-- BODY -->
+      <div class="mw7 center br3 mb5 relative z-1">
+        <group-menu :group="group" :tab="info" />
+
+        <div class="cf center">
+          <!-- LEFT COLUMN -->
+          <div class="fl w-70-l w-100">
+            test
+          </div>
+
+          <!-- RIGHT COLUMN -->
+          <div class="fl w-30-l w-100 pl4-l">
+            <div class="bg-white box mb4">
+              test
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import Layout from '@/Shared/Layout';
+import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
+
+export default {
+  components: {
+    Layout,
+    GroupMenu,
+  },
+
+  props: {
+    notifications: {
+      type: Array,
+      default: null,
+    },
+    group: {
+      type: Object,
+      default: null,
+    },
+    tab: {
+      type: String,
+      default: null,
+    },
+  },
+
+  created() {
+    this.localGroup = this.group;
+  },
+
+  mounted() {
+    if (localStorage.success) {
+      flash(localStorage.success, 'success');
+      localStorage.removeItem('success');
+    }
+  },
+};
+
+</script>
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index b9c7e4e06..84af2ca34 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -291,6 +291,9 @@
     'log_e_coffee_match_session_as_happened' => 'Mark an eCoffee session as happened between :employee_name and :other_employee_name.',
     'log_toggle_e_coffee_process' => 'Toggle the eCoffee process in the company.',
     'log_group_created' => 'Created the group called :group_name.',
+    'log_employee_added_to_group' => 'Added :employee_name to the group called :group_name.',
+    'log_employee_removed_from_group' => 'Removed :employee_name from the group called :group_name.',
+    'log_group_destroyed' => 'Deleted the group called :group_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
@@ -364,6 +367,8 @@
     'employee_log_employee_avatar_set' => 'Set a new avatar.',
     'employee_log_consultant_rate_set' => 'Set the consulting rate to :rate.',
     'employee_log_consultant_rate_destroyed' => 'Destroyed the rate of :rate.',
+    'employee_log_employee_added_to_group' => 'Has been added to the group called :group_name.',
+    'employee_log_employee_removed_from_group' => 'Has been remove from the group called :group_name.',
 
     // team logs
     'team_log_team_created' => 'Created the team.',
@@ -557,6 +562,12 @@
     'import_employees_show_title_number_entries_errors' => 'Entries in errors',
     'import_employees_show_title_number_entries_import' => 'Entries we can import',
     'import_employees_import_success' => 'Employees have been imported',
+    'import_employees_show_email' => 'Email',
+    'import_employees_show_firstname' => 'First name',
+    'import_employees_show_lastname' => 'Last name',
+    'import_employees_show_status' => 'Status',
+    'import_employees_show_first_five_entries' => 'First five of the {count} entries of the file',
+    'import_employees_show_entries_errors' => 'All {count} entries in error in the file',
 
     'cancel_account_title' => 'Are you sure you want to cancel your account?',
     'cancel_account_thanks' => 'Thanks for giving OfficeLife a try!',
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
index 7b0db3d98..34a323bee 100644
--- a/resources/lang/en/app.php
+++ b/resources/lang/en/app.php
@@ -130,6 +130,9 @@
     'breadcrumb_account_manage_past_archives' => 'Past imports',
     'breadcrumb_account_manage_past_archives_detail' => 'Detail of a past import',
     'breadcrumb_account_manage_cancel_account' => 'Cancel the account',
+    'breadcrumb_group_list' => 'Group list',
+    'breadcrumb_group_create' => 'Create a group',
+    'breadcrumb_group_detail' => 'Detail of a group',
 
     'header_welcome' => 'Welcome',
     'header_home' => 'Home',
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
new file mode 100644
index 000000000..b53c8e49f
--- /dev/null
+++ b/resources/lang/en/group.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'create_title' => 'Create a group',
+    'create_input_name' => 'Give the group a name',
+    'create_input_name_help' => 'A group can be a commitee, a chapter/guild (agile) or anything else.',
+    'create_members' => 'Who should be part of this group?',
+    'create_members_help' => 'Type the first letters of the employee',
+
+    'members_add_cta' => 'Add a new member',
+    'members_add_placeholder' => 'Enter the first letters of a name',
+    'members_index_blank' => ' Groups are more fun with employees. Add an employee now.',
+];
diff --git a/routes/web.php b/routes/web.php
index 5b0922c6c..56a8fada8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -318,6 +318,22 @@
                 Route::post('{project}/tasks/{task}/log', 'Company\\Company\\Project\\ProjectTasksController@logTime');
             });
 
+            Route::prefix('groups')->group(function () {
+                Route::get('', 'Company\\Company\\Group\\GroupController@index');
+                Route::get('create', 'Company\\Company\\Group\\GroupController@create');
+                Route::post('', 'Company\\Company\\Group\\GroupController@store');
+                Route::post('search', 'Company\\Company\\Group\\GroupController@search');
+
+                // group detail
+                Route::get('{group}', 'Company\\Company\\Group\\GroupController@show')->name('groups.show');
+
+                // members
+                Route::get('{group}/members', 'Company\\Company\\Group\\GroupMembersController@index')->name('groups.members.index');
+                Route::post('{group}/members/search', 'Company\\Company\\Group\\GroupMembersController@search');
+                Route::post('{group}/members/store', 'Company\\Company\\Group\\GroupMembersController@store');
+                Route::post('{group}/members/remove', 'Company\\Company\\Group\\GroupMembersController@remove');
+            });
+
             Route::prefix('hr')->group(function () {
                 Route::get('', 'Company\\Company\\HR\\CompanyHRController@index');
             });
diff --git a/tests/Unit/Services/Company/Group/AddEmployeeToGroupTest.php b/tests/Unit/Services/Company/Group/AddEmployeeToGroupTest.php
new file mode 100644
index 000000000..2b8b5e421
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/AddEmployeeToGroupTest.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\AddEmployeeToGroup;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class AddEmployeeToGroupTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_adds_an_employee_to_a_group_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_adds_an_employee_to_a_group_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_adds_an_employee_to_a_group_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $michael, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new AddEmployeeToGroup)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_employee_is_not_in_the_authors_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_the_project_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create();
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    private function executeService(Employee $michael, Employee $dwight, Group $group): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'employee_id' => $dwight->id,
+        ];
+
+        $employee = (new AddEmployeeToGroup)->execute($request);
+
+        $this->assertDatabaseHas('groups', [
+            'id' => $group->id,
+            'company_id' => $dwight->company_id,
+        ]);
+
+        $this->assertDatabaseHas('employee_group', [
+            'group_id' => $group->id,
+            'employee_id' => $dwight->id,
+        ]);
+
+        $this->assertInstanceOf(
+            Employee::class,
+            $employee
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $dwight) {
+            return $job->auditLog['action'] === 'employee_added_to_group' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'employee_id' => $dwight->id,
+                    'employee_name' => $dwight->name,
+                ]);
+        });
+
+        Queue::assertPushed(LogEmployeeAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'employee_added_to_group' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Group/CreateGroupTest.php b/tests/Unit/Services/Company/Group/CreateGroupTest.php
index 84102237a..d9e232f04 100644
--- a/tests/Unit/Services/Company/Group/CreateGroupTest.php
+++ b/tests/Unit/Services/Company/Group/CreateGroupTest.php
@@ -6,6 +6,7 @@
 use App\Jobs\LogAccountAudit;
 use App\Models\Company\Group;
 use App\Models\Company\Employee;
+use App\Jobs\AttachEmployeeToGroup;
 use Illuminate\Support\Facades\Queue;
 use App\Services\Company\Group\CreateGroup;
 use Illuminate\Validation\ValidationException;
@@ -23,6 +24,18 @@ public function it_creates_a_group_as_administrator(): void
         $this->executeService($michael);
     }
 
+    /** @test */
+    public function it_creates_a_group_as_administrator_and_associate_employees(): void
+    {
+        $michael = $this->createAdministrator();
+        $andrew = $this->createAnotherEmployee($michael);
+        $john = $this->createAnotherEmployee($michael);
+
+        $employees = [$andrew->id, $john->id];
+
+        $this->executeService($michael, $employees);
+    }
+
     /** @test */
     public function it_creates_a_group_as_hr(): void
     {
@@ -50,7 +63,7 @@ public function it_fails_if_wrong_parameters_are_given(): void
         (new CreateProject)->execute($request);
     }
 
-    private function executeService(Employee $michael): void
+    private function executeService(Employee $michael, array $employees = null): void
     {
         Queue::fake();
 
@@ -58,6 +71,7 @@ private function executeService(Employee $michael): void
             'company_id' => $michael->company_id,
             'author_id' => $michael->id,
             'name' => 'Steering Commitee',
+            'employees' => $employees,
         ];
 
         $group = (new CreateGroup)->execute($request);
@@ -80,5 +94,9 @@ private function executeService(Employee $michael): void
                     'group_name' => $group->name,
                 ]);
         });
+
+        if ($employees) {
+            Queue::assertPushed(AttachEmployeeToGroup::class, 2);
+        }
     }
 }
diff --git a/tests/Unit/Services/Company/Group/DestroyGroupTest.php b/tests/Unit/Services/Company/Group/DestroyGroupTest.php
new file mode 100644
index 000000000..4bb7fb831
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/DestroyGroupTest.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Services\Company\Group\DestroyGroup;
+use Illuminate\Validation\ValidationException;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class DestroyGroupTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_destroys_a_group_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $group);
+    }
+
+    /** @test */
+    public function it_destroys_a_group_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $group);
+    }
+
+    /** @test */
+    public function it_destroys_a_group_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_project_is_not_part_of_the_company(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+        $group = Group::factory()->create();
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new DestroyGroup)->execute($request);
+    }
+
+    private function executeService(Employee $michael, Group $group = null): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+        ];
+
+        (new DestroyGroup)->execute($request);
+
+        $this->assertDatabaseMissing('groups', [
+            'id' => $group->id,
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'group_destroyed' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_name' => $group->name,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Group/RemoveEmployeeFromGroupTest.php b/tests/Unit/Services/Company/Group/RemoveEmployeeFromGroupTest.php
new file mode 100644
index 000000000..a8e80fa2e
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/RemoveEmployeeFromGroupTest.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\RemoveEmployeeFromGroup;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class RemoveEmployeeFromGroupTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_removes_an_employee_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $group->employees()->attach([$dwight->id]);
+
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_removes_an_employee_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $group->employees()->attach([$dwight->id]);
+
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_removes_a_project_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $group->employees()->attach([$michael->id]);
+
+        $this->executeService($michael, $michael, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new RemoveEmployeeFromGroup)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_employee_is_not_in_the_authors_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_the_project_is_not_in_the_authors_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create();
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    private function executeService(Employee $michael, Employee $dwight, Group $group): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'employee_id' => $dwight->id,
+            'group_id' => $group->id,
+        ];
+
+        (new RemoveEmployeeFromGroup)->execute($request);
+
+        $this->assertDatabaseMissing('employee_group', [
+            'group_id' => $group->id,
+            'employee_id' => $dwight->id,
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $dwight) {
+            return $job->auditLog['action'] === 'employee_removed_from_group' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'employee_id' => $dwight->id,
+                    'employee_name' => $dwight->name,
+                ]);
+        });
+
+        Queue::assertPushed(LogEmployeeAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'employee_removed_from_group' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
new file mode 100644
index 000000000..3b56d84b0
--- /dev/null
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Tests\Unit\ViewHelpers\Company\Group;
+
+use Tests\TestCase;
+use App\Helpers\DateHelper;
+use App\Models\Company\Group;
+use App\Models\Company\Employee;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Http\ViewHelpers\Company\Group\GroupMembersViewHelper;
+
+class GroupMembersViewHelperTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_gets_a_collection_of_employees(): void
+    {
+        $michael = $this->createAdministrator();
+        $jim = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $group->employees()->attach([
+            $michael->id,
+        ]);
+        $group->employees()->attach([
+            $jim->id,
+        ]);
+
+        $collection = GroupMembersViewHelper::members($group);
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $michael->id,
+                    'name' => $michael->name,
+                    'avatar' => $michael->avatar,
+                    'added_at' => DateHelper::formatDate($michael->created_at),
+                    'position' => [
+                        'id' => $michael->position->id,
+                        'title' => $michael->position->title,
+                    ],
+                    'url' => env('APP_URL').'/'.$michael->company_id.'/employees/'.$michael->id,
+                ],
+                1 => [
+                    'id' => $jim->id,
+                    'name' => $jim->name,
+                    'avatar' => $jim->avatar,
+                    'added_at' => DateHelper::formatDate($jim->created_at),
+                    'position' => [
+                        'id' => $jim->position->id,
+                        'title' => $jim->position->title,
+                    ],
+                    'url' => env('APP_URL').'/'.$jim->company_id.'/employees/'.$jim->id,
+                ],
+            ],
+            $collection->toArray()
+        );
+    }
+
+    /** @test */
+    public function it_gets_a_collection_of_potential_new_members(): void
+    {
+        $michael = $this->createAdministrator();
+        $jim = $this->createAnotherEmployee($michael);
+        $jean = Employee::factory()->create([
+            'first_name' => 'jean',
+            'company_id' => $michael->company_id,
+        ]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $group->employees()->attach([
+            $michael->id,
+        ]);
+        $group->employees()->attach([
+            $jim->id,
+        ]);
+
+        $collection = GroupMembersViewHelper::potentialMembers('je', $group, $michael->company);
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $jean->id,
+                    'name' => $jean->name,
+                    'avatar' => $jean->avatar,
+                ],
+            ],
+            $collection->toArray()
+        );
+
+        $collection = GroupMembersViewHelper::potentialMembers('roger', $group, $michael->company);
+        $this->assertEquals(
+            [],
+            $collection->toArray()
+        );
+    }
+}
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
new file mode 100644
index 000000000..b03102e17
--- /dev/null
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Tests\Unit\ViewHelpers\Company\Group;
+
+use Tests\TestCase;
+use App\Models\Company\Group;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
+
+class GroupShowViewHelperTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_gets_information_about_the_group(): void
+    {
+        $michael = $this->createAdministrator();
+        $jim = $this->createAnotherEmployee($michael);
+        $tom = $this->createAnotherEmployee($michael);
+        $pam = $this->createAnotherEmployee($michael);
+        $jenny = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $group->employees()->attach([$michael->id]);
+        $group->employees()->attach([$jim->id]);
+        $group->employees()->attach([$tom->id]);
+        $group->employees()->attach([$pam->id]);
+        $group->employees()->attach([$jenny->id]);
+
+        $array = GroupShowViewHelper::information($group, $group->company);
+
+        $this->assertEquals(
+            $group->id,
+            $array['id']
+        );
+
+        $this->assertEquals(
+            $group->name,
+            $array['name']
+        );
+
+        $this->assertEquals(
+            5,
+            count($array['members']->toArray())
+        );
+    }
+}

From c78d1b0b0f86da256bed92a8956f7935fde7e7b6 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Thu, 4 Mar 2021 21:16:29 -0500
Subject: [PATCH 03/47] Update 2021_03_03_031835_create_groups_table.php

---
 .../2021_03_03_031835_create_groups_table.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
index 5a23a1319..01b6f7754 100644
--- a/database/migrations/2021_03_03_031835_create_groups_table.php
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -31,14 +31,6 @@ public function up()
             $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
         });
 
-        Schema::create('group_meetings', function (Blueprint $table) {
-            $table->unsignedBigInteger('group_id');
-            $table->unsignedBigInteger('meeting_id');
-            $table->timestamps();
-            $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
-            $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade');
-        });
-
         Schema::create('meetings', function (Blueprint $table) {
             $table->id();
             $table->unsignedBigInteger('company_id');
@@ -47,6 +39,14 @@ public function up()
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
         });
 
+        Schema::create('group_meetings', function (Blueprint $table) {
+            $table->unsignedBigInteger('group_id');
+            $table->unsignedBigInteger('meeting_id');
+            $table->timestamps();
+            $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
+            $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade');
+        });
+
         Schema::create('agenda_items', function (Blueprint $table) {
             $table->id();
             $table->unsignedBigInteger('group_meeting_id');
@@ -56,7 +56,7 @@ public function up()
             $table->boolean('follow_up_next_time')->default(false);
             $table->unsignedBigInteger('presented_by_id')->nullable();
             $table->timestamps();
-            $table->foreign('group_meeting_id')->references('id')->on('group_meetings')->onDelete('cascade');
+            $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade');
             $table->foreign('presented_by_id')->references('id')->on('employees')->onDelete('set null');
         });
     }

From 5bf570cbd902252df42fdb699da99f3057ade7fa Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Thu, 4 Mar 2021 21:22:16 -0500
Subject: [PATCH 04/47] Update 2021_03_03_031835_create_groups_table.php

---
 database/migrations/2021_03_03_031835_create_groups_table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
index 01b6f7754..8c5b1a924 100644
--- a/database/migrations/2021_03_03_031835_create_groups_table.php
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -49,7 +49,7 @@ public function up()
 
         Schema::create('agenda_items', function (Blueprint $table) {
             $table->id();
-            $table->unsignedBigInteger('group_meeting_id');
+            $table->unsignedBigInteger('meeting_id');
             $table->boolean('checked')->default(false);
             $table->string('summary');
             $table->text('description')->nullable();

From 29ab0b8519e4861d9622a12fbeeb0b80f3d46977 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Fri, 5 Mar 2021 07:52:06 -0500
Subject: [PATCH 05/47] fixes

---
 .../Company/Company/Group/GroupMembersController.php           | 3 +--
 app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php  | 2 +-
 phpstan.neon                                                   | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMembersController.php b/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
index 8f1ef6847..ea7dff5a1 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
@@ -24,9 +24,8 @@ class GroupMembersController extends Controller
      * @param Request $request
      * @param int $companyId
      * @param int $groupId
-     * @return Response
      */
-    public function index(Request $request, int $companyId, int $groupId): Response
+    public function index(Request $request, int $companyId, int $groupId)
     {
         $company = InstanceHelper::getLoggedCompany();
 
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
index 610475d9d..02c9218e0 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
@@ -62,7 +62,7 @@ public static function potentialMembers(string $employeeName, Group $group, Comp
             $company->id,
             10,
             'created_at desc',
-            'and locked = false',
+            'and locked = 0',
         );
 
         $currentMembers = $group->employees;
diff --git a/phpstan.neon b/phpstan.neon
index 2ab26c6ae..6f38fa1bc 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -11,6 +11,7 @@ parameters:
     excludePaths:
         - app/Http/ViewHelpers/Employee/EmployeeShowViewHelper.php
         - app/Http/ViewHelpers/Company/HR/CompanyHRViewHelper.php
+        - app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
     inferPrivatePropertyTypeFromConstructor: true
     checkMissingIterableValueType: false
     level: 5

From a53cd60b901a8584b1d6acffbfb62d5ed85becca Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Fri, 5 Mar 2021 22:45:46 -0500
Subject: [PATCH 06/47] wip

---
 .../Company/Company/Group/GroupController.php |  40 +++++++
 app/Models/Company/Meeting.php                |  14 ++-
 .../2021_03_03_031835_create_groups_table.php |  29 +++--
 resources/js/Pages/Company/Group/Delete.vue   | 103 ++++++++++++++++++
 routes/web.php                                |   1 +
 5 files changed, 176 insertions(+), 11 deletions(-)
 create mode 100644 resources/js/Pages/Company/Group/Delete.vue

diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index 105a98bff..27a7ac225 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -143,4 +143,44 @@ public function store(Request $request, int $companyId): JsonResponse
             ],
         ], 201);
     }
+
+    /**
+     * Destroy the group.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @return JsonResponse
+     */
+    public function destroy(Request $request, int $companyId): JsonResponse
+    {
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+
+        $employees = null;
+        if ($request->input('employees')) {
+            $employees = [];
+            foreach ($request->input('employees') as $employee) {
+                array_push($employees, $employee['id']);
+            }
+        }
+
+        $data = [
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'name' => $request->input('name'),
+            'employees' => $employees,
+        ];
+
+        $group = (new CreateGroup)->execute($data);
+
+        return response()->json([
+            'data' => [
+                'id' => $group->id,
+                'url' => route('groups.show', [
+                    'company' => $loggedCompany,
+                    'group' => $group,
+                ]),
+            ],
+        ], 201);
+    }
 }
diff --git a/app/Models/Company/Meeting.php b/app/Models/Company/Meeting.php
index 37999fbbc..69a43c13c 100644
--- a/app/Models/Company/Meeting.php
+++ b/app/Models/Company/Meeting.php
@@ -18,6 +18,7 @@ class Meeting extends Model
      */
     protected $fillable = [
         'company_id',
+        'happened',
         'happened_at',
     ];
 
@@ -31,7 +32,16 @@ class Meeting extends Model
     ];
 
     /**
-     * Get the company record associated with the group.
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'happened' => 'boolean',
+    ];
+
+    /**
+     * Get the company record associated with the meeting.
      *
      * @return BelongsTo
      */
@@ -41,7 +51,7 @@ public function company()
     }
 
     /**
-     * Get the employee records associated with the group.
+     * Get the employee records associated with the meeting.
      *
      * @return BelongsToMany
      */
diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
index 8c5b1a924..764412179 100644
--- a/database/migrations/2021_03_03_031835_create_groups_table.php
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -34,30 +34,41 @@ public function up()
         Schema::create('meetings', function (Blueprint $table) {
             $table->id();
             $table->unsignedBigInteger('company_id');
+            $table->integer('meetingable_id')->nullable();
+            $table->string('meetingable_type')->nullable();
+            $table->boolean('happened')->default(false);
             $table->datetime('happened_at');
             $table->timestamps();
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
         });
 
-        Schema::create('group_meetings', function (Blueprint $table) {
-            $table->unsignedBigInteger('group_id');
-            $table->unsignedBigInteger('meeting_id');
-            $table->timestamps();
-            $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
-            $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade');
-        });
-
         Schema::create('agenda_items', function (Blueprint $table) {
             $table->id();
             $table->unsignedBigInteger('meeting_id');
             $table->boolean('checked')->default(false);
             $table->string('summary');
             $table->text('description')->nullable();
-            $table->boolean('follow_up_next_time')->default(false);
             $table->unsignedBigInteger('presented_by_id')->nullable();
             $table->timestamps();
             $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade');
             $table->foreign('presented_by_id')->references('id')->on('employees')->onDelete('set null');
         });
+
+        Schema::create('meeting_decisions', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('agenda_item_id');
+            $table->text('description');
+            $table->timestamps();
+            $table->foreign('agenda_item_id')->references('id')->on('agenda_items')->onDelete('cascade');
+        });
+
+        Schema::create('employee_meeting', function (Blueprint $table) {
+            $table->unsignedBigInteger('employee_id');
+            $table->unsignedBigInteger('meeting_id');
+            $table->boolean('was_a_guest')->default(false);
+            $table->timestamps();
+            $table->foreign('employee_id')->references('id')->on('employees')->onDelete('cascade');
+            $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade');
+        });
     }
 }
diff --git a/resources/js/Pages/Company/Group/Delete.vue b/resources/js/Pages/Company/Group/Delete.vue
new file mode 100644
index 000000000..f38686164
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Delete.vue
@@ -0,0 +1,103 @@
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph0-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mw6 br3 bg-white box center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company'">{{ $t('app.breadcrumb_company') }}</inertia-link>
+          </li>
+          <li class="di">
+            ...
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id">{{ $t('app.breadcrumb_group_detail') }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_group_delete') }}
+          </li>
+        </ul>
+      </div>
+
+      <!-- BODY -->
+      <div class="mw7 center br3 mb5 bg-white box relative z-1">
+        <div class="mt5">
+          <h2 class="pa3 tc normal mb0">
+            {{ $t('group.delete_title') }}
+          </h2>
+
+          <form @submit.prevent="submit">
+            <errors :errors="form.errors" />
+
+            <div class="cf pa3 bb-gray bb">
+              <p class="lh-copy">{{ $t('group.delete_description') }}</p>
+            </div>
+
+            <!-- Actions -->
+            <div class="cf pa3 bb-gray bb">
+              <div class="flex-ns justify-between">
+                <div>
+                  <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id" class="btn dib tc w-auto-ns w-100 pv2 ph3 mb0-ns mb2" data-cy="cancel-button">
+                    {{ $t('app.cancel') }}
+                  </inertia-link>
+                </div>
+                <loading-button :classes="'btn destroy w-auto-ns w-100 pv2 ph3'" :state="loadingState" :text="$t('app.delete')" :cypress-selector="'submit-delete-project-button'" />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import Layout from '@/Shared/Layout';
+import Errors from '@/Shared/Errors';
+import LoadingButton from '@/Shared/LoadingButton';
+
+export default {
+  components: {
+    Layout,
+    Errors,
+    LoadingButton,
+  },
+
+  props: {
+    notifications: {
+      type: Array,
+      default: null,
+    },
+    group: {
+      type: Object,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      form: {
+        errors: [],
+      },
+      loadingState: '',
+    };
+  },
+
+  methods: {
+    submit() {
+      this.loadingState = 'loading';
+
+      axios.delete(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}`)
+        .then(response => {
+          localStorage.success = this.$t('project.delete_success');
+          this.$inertia.visit(`${this.$page.props.auth.company.id}/company/projects`);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+  }
+};
+
+</script>
diff --git a/routes/web.php b/routes/web.php
index 56a8fada8..0b2a4868b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -326,6 +326,7 @@
 
                 // group detail
                 Route::get('{group}', 'Company\\Company\\Group\\GroupController@show')->name('groups.show');
+                Route::delete('{group}', 'Company\\Company\\Group\\GroupController@destroy');
 
                 // members
                 Route::get('{group}/members', 'Company\\Company\\Group\\GroupMembersController@index')->name('groups.members.index');

From b6b1e186c9e5044bd63fae4f81a7a03ee2a3050d Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sat, 6 Mar 2021 16:50:10 -0500
Subject: [PATCH 07/47] wip

---
 app/Models/Company/AgendaItem.php             | 66 +++++++++++++++++++
 app/Models/Company/Employee.php               | 20 ++++++
 app/Models/Company/Group.php                  | 10 +++
 app/Models/Company/Meeting.php                | 20 ++++--
 app/Models/Company/MeetingDecision.php        | 34 ++++++++++
 .../factories/Company/AgendaItemFactory.php   | 33 ++++++++++
 .../Company/MeetingDecisionFactory.php        | 32 +++++++++
 database/factories/Company/MeetingFactory.php | 47 +++++++++++++
 .../2021_03_03_031835_create_groups_table.php |  8 +--
 tests/Unit/Models/Company/AgendaItemTest.php  | 31 +++++++++
 tests/Unit/Models/Company/EmployeeTest.php    | 24 +++++++
 tests/Unit/Models/Company/GroupTest.php       |  2 +-
 .../Models/Company/MeetingDecisionTest.php    | 19 ++++++
 tests/Unit/Models/Company/MeetingTest.php     | 45 +++++++++++++
 14 files changed, 380 insertions(+), 11 deletions(-)
 create mode 100644 app/Models/Company/AgendaItem.php
 create mode 100644 app/Models/Company/MeetingDecision.php
 create mode 100644 database/factories/Company/AgendaItemFactory.php
 create mode 100644 database/factories/Company/MeetingDecisionFactory.php
 create mode 100644 database/factories/Company/MeetingFactory.php
 create mode 100644 tests/Unit/Models/Company/AgendaItemTest.php
 create mode 100644 tests/Unit/Models/Company/MeetingDecisionTest.php
 create mode 100644 tests/Unit/Models/Company/MeetingTest.php

diff --git a/app/Models/Company/AgendaItem.php b/app/Models/Company/AgendaItem.php
new file mode 100644
index 000000000..15f850aa6
--- /dev/null
+++ b/app/Models/Company/AgendaItem.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Models\Company;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class AgendaItem extends Model
+{
+    use HasFactory;
+
+    protected $table = 'agenda_items';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'meeting_id',
+        'checked',
+        'summary',
+        'description',
+        'presented_by_id',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'checked' => 'boolean',
+    ];
+
+    /**
+     * Get the meeting record associated with the agenda item.
+     *
+     * @return BelongsTo
+     */
+    public function meeting()
+    {
+        return $this->belongsTo(Meeting::class);
+    }
+
+    /**
+     * Get the employee record associated with the agenda item.
+     *
+     * @return HasOne
+     */
+    public function presenter()
+    {
+        return $this->hasOne(Employee::class, 'id', 'presented_by_id');
+    }
+
+    /**
+     * Get the decisions associated with the agenda item.
+     *
+     * @return HasMany
+     */
+    public function decisions()
+    {
+        return $this->hasMany(MeetingDecision::class);
+    }
+}
diff --git a/app/Models/Company/Employee.php b/app/Models/Company/Employee.php
index 5f666439a..06010a0c1 100644
--- a/app/Models/Company/Employee.php
+++ b/app/Models/Company/Employee.php
@@ -548,6 +548,26 @@ public function groups()
         return $this->belongsToMany(Group::class)->withTimestamps();
     }
 
+    /**
+     * Get the meeting objects the employee has participated.
+     *
+     * @return belongsToMany
+     */
+    public function meetings()
+    {
+        return $this->belongsToMany(Meeting::class)->withTimestamps()->withPivot('was_a_guest');
+    }
+
+    /**
+     * Get the agenda item objects presented by the employee.
+     *
+     * @return HasMany
+     */
+    public function agendaItems()
+    {
+        return $this->hasMany(AgendaItem::class, 'presented_by_id');
+    }
+
     /**
      * Scope a query to only include unlocked users.
      *
diff --git a/app/Models/Company/Group.php b/app/Models/Company/Group.php
index cd30153e9..b690f5d86 100644
--- a/app/Models/Company/Group.php
+++ b/app/Models/Company/Group.php
@@ -40,4 +40,14 @@ public function employees()
     {
         return $this->belongsToMany(Employee::class)->withTimestamps();
     }
+
+    /**
+     * Get the meeting records associated with the group.
+     *
+     * @return BelongsToMany
+     */
+    public function meetings()
+    {
+        return $this->belongsToMany(Employee::class)->withTimestamps();
+    }
 }
diff --git a/app/Models/Company/Meeting.php b/app/Models/Company/Meeting.php
index 69a43c13c..91bba4c49 100644
--- a/app/Models/Company/Meeting.php
+++ b/app/Models/Company/Meeting.php
@@ -17,7 +17,7 @@ class Meeting extends Model
      * @var array
      */
     protected $fillable = [
-        'company_id',
+        'group_id',
         'happened',
         'happened_at',
     ];
@@ -41,13 +41,13 @@ class Meeting extends Model
     ];
 
     /**
-     * Get the company record associated with the meeting.
+     * Get the group record associated with the meeting.
      *
      * @return BelongsTo
      */
-    public function company()
+    public function group()
     {
-        return $this->belongsTo(Company::class);
+        return $this->belongsTo(Group::class);
     }
 
     /**
@@ -57,6 +57,16 @@ public function company()
      */
     public function employees()
     {
-        return $this->belongsToMany(Employee::class)->withTimestamps();
+        return $this->belongsToMany(Employee::class)->withTimestamps()->withPivot('was_a_guest');
+    }
+
+    /**
+     * Get the agenda item records associated with the meeting.
+     *
+     * @return hasMany
+     */
+    public function agendaItems()
+    {
+        return $this->hasMany(AgendaItem::class);
     }
 }
diff --git a/app/Models/Company/MeetingDecision.php b/app/Models/Company/MeetingDecision.php
new file mode 100644
index 000000000..bdcaf70c0
--- /dev/null
+++ b/app/Models/Company/MeetingDecision.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models\Company;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class MeetingDecision extends Model
+{
+    use HasFactory;
+
+    protected $table = 'meeting_decisions';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'agenda_item_id',
+        'description',
+    ];
+
+    /**
+     * Get the agenda item record associated with the decision.
+     *
+     * @return BelongsTo
+     */
+    public function agendaItem()
+    {
+        return $this->belongsTo(AgendaItem::class);
+    }
+}
diff --git a/database/factories/Company/AgendaItemFactory.php b/database/factories/Company/AgendaItemFactory.php
new file mode 100644
index 000000000..0e0b68974
--- /dev/null
+++ b/database/factories/Company/AgendaItemFactory.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Database\Factories\Company;
+
+use App\Models\Company\Meeting;
+use App\Models\Company\AgendaItem;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class AgendaItemFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = AgendaItem::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        $meeting = Meeting::factory()->create();
+
+        return [
+            'meeting_id' => $meeting->id,
+            'summary' => 'This is the summary',
+            'description' => 'This is the description',
+        ];
+    }
+}
diff --git a/database/factories/Company/MeetingDecisionFactory.php b/database/factories/Company/MeetingDecisionFactory.php
new file mode 100644
index 000000000..aa7c5b046
--- /dev/null
+++ b/database/factories/Company/MeetingDecisionFactory.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Database\Factories\Company;
+
+use App\Models\Company\AgendaItem;
+use App\Models\Company\MeetingDecision;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class MeetingDecisionFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = MeetingDecision::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        $agenda = AgendaItem::factory()->create([]);
+
+        return [
+            'agenda_item_id' => $agenda->id,
+            'description' => 'This is a description',
+        ];
+    }
+}
diff --git a/database/factories/Company/MeetingFactory.php b/database/factories/Company/MeetingFactory.php
new file mode 100644
index 000000000..790e37a26
--- /dev/null
+++ b/database/factories/Company/MeetingFactory.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Database\Factories\Company;
+
+use Carbon\Carbon;
+use App\Models\Company\Group;
+use App\Models\Company\Meeting;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class MeetingFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = Meeting::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        $group = Group::factory()->create();
+
+        return [
+            'group_id' => $group->id,
+        ];
+    }
+
+    /**
+     * Indicate that the meeting has happened.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    public function happened()
+    {
+        return $this->state(function (array $attributes) {
+            return [
+                'happened' => true,
+                'happened_at' => Carbon::now(),
+            ];
+        });
+    }
+}
diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
index 764412179..0c8d6bf22 100644
--- a/database/migrations/2021_03_03_031835_create_groups_table.php
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -33,13 +33,11 @@ public function up()
 
         Schema::create('meetings', function (Blueprint $table) {
             $table->id();
-            $table->unsignedBigInteger('company_id');
-            $table->integer('meetingable_id')->nullable();
-            $table->string('meetingable_type')->nullable();
+            $table->unsignedBigInteger('group_id');
             $table->boolean('happened')->default(false);
-            $table->datetime('happened_at');
+            $table->datetime('happened_at')->nullable();
             $table->timestamps();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+            $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
         });
 
         Schema::create('agenda_items', function (Blueprint $table) {
diff --git a/tests/Unit/Models/Company/AgendaItemTest.php b/tests/Unit/Models/Company/AgendaItemTest.php
new file mode 100644
index 000000000..97408c2b6
--- /dev/null
+++ b/tests/Unit/Models/Company/AgendaItemTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Unit\Models\Company;
+
+use Tests\TestCase;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class AgendaItemTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_belongs_to_a_meeting(): void
+    {
+        $agendaItem = AgendaItem::factory()->create([]);
+        $this->assertTrue($agendaItem->meeting()->exists());
+    }
+
+    /** @test */
+    public function it_has_one_presenter(): void
+    {
+        $dwight = Employee::factory()->create();
+        $agendaItem = AgendaItem::factory()->create([
+            'presented_by_id' => $dwight->id,
+        ]);
+
+        $this->assertTrue($agendaItem->presenter()->exists());
+    }
+}
diff --git a/tests/Unit/Models/Company/EmployeeTest.php b/tests/Unit/Models/Company/EmployeeTest.php
index abb03d502..3a7e8faf1 100644
--- a/tests/Unit/Models/Company/EmployeeTest.php
+++ b/tests/Unit/Models/Company/EmployeeTest.php
@@ -16,6 +16,7 @@
 use App\Models\Company\Morale;
 use App\Models\Company\Company;
 use App\Models\Company\Expense;
+use App\Models\Company\Meeting;
 use App\Models\Company\Project;
 use App\Models\Company\Worklog;
 use App\Models\Company\Employee;
@@ -23,6 +24,7 @@
 use App\Models\Company\Position;
 use App\Models\Company\TeamNews;
 use App\Models\Company\Timesheet;
+use App\Models\Company\AgendaItem;
 use App\Models\Company\CompanyNews;
 use App\Models\Company\EmployeeLog;
 use App\Models\Company\ProjectTask;
@@ -493,6 +495,28 @@ public function it_has_many_groups(): void
         $this->assertTrue($dwight->groups()->exists());
     }
 
+    /** @test */
+    public function it_belongs_to_many_meetings(): void
+    {
+        $dwight = Employee::factory()->create([]);
+        $meeting = Meeting::factory()->create();
+
+        $dwight->meetings()->sync([$meeting->id]);
+
+        $this->assertTrue($dwight->meetings()->exists());
+    }
+
+    /** @test */
+    public function it_has_many_agenda_items(): void
+    {
+        $dwight = Employee::factory()->create([]);
+        AgendaItem::factory()->count(2)->create([
+            'presented_by_id' => $dwight->id,
+        ]);
+
+        $this->assertTrue($dwight->agendaItems()->exists());
+    }
+
     /** @test */
     public function it_scopes_the_employees_by_the_locked_status(): void
     {
diff --git a/tests/Unit/Models/Company/GroupTest.php b/tests/Unit/Models/Company/GroupTest.php
index 8c3203467..1a2aaf87f 100644
--- a/tests/Unit/Models/Company/GroupTest.php
+++ b/tests/Unit/Models/Company/GroupTest.php
@@ -22,7 +22,7 @@ public function it_belongs_to_a_company(): void
     public function it_has_many_employees(): void
     {
         $group = Group::factory()->create();
-        $dwight = factory(Employee::class)->create([
+        $dwight = Employee::factory()->create([
             'company_id' => $group->company_id,
         ]);
 
diff --git a/tests/Unit/Models/Company/MeetingDecisionTest.php b/tests/Unit/Models/Company/MeetingDecisionTest.php
new file mode 100644
index 000000000..9dc05f412
--- /dev/null
+++ b/tests/Unit/Models/Company/MeetingDecisionTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Unit\Models\Company;
+
+use Tests\TestCase;
+use App\Models\Company\MeetingDecision;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class MeetingDecisionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_belongs_to_an_agenda_item(): void
+    {
+        $meetingDecision = MeetingDecision::factory()->create([]);
+        $this->assertTrue($meetingDecision->agendaItem()->exists());
+    }
+}
diff --git a/tests/Unit/Models/Company/MeetingTest.php b/tests/Unit/Models/Company/MeetingTest.php
new file mode 100644
index 000000000..c92c6a778
--- /dev/null
+++ b/tests/Unit/Models/Company/MeetingTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Unit\Models\Company;
+
+use Tests\TestCase;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class MeetingTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_belongs_to_a_group(): void
+    {
+        $meeting = Meeting::factory()->create([]);
+        $this->assertTrue($meeting->group()->exists());
+    }
+
+    /** @test */
+    public function it_has_many_employees(): void
+    {
+        $meeting = Meeting::factory()->create();
+        $dwight = Employee::factory()->create([
+            'company_id' => $meeting->group->company_id,
+        ]);
+
+        $meeting->employees()->syncWithoutDetaching([$dwight->id]);
+
+        $this->assertTrue($meeting->employees()->exists());
+    }
+
+    /** @test */
+    public function it_has_many_agenda_items(): void
+    {
+        $meeting = Meeting::factory()->create();
+        AgendaItem::factory()->count(2)->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->assertTrue($meeting->agendaItems()->exists());
+    }
+}

From e865455b08e1a005a44dbcce4d9e00f8484b456d Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sat, 6 Mar 2021 18:38:19 -0500
Subject: [PATCH 08/47] new services

---
 app/Helpers/LogHelper.php                     |  16 +++
 app/Services/Company/Group/CreateMeeting.php  |  82 +++++++++++++
 app/Services/Company/Group/DestroyMeeting.php |  77 +++++++++++++
 resources/lang/en/account.php                 |   2 +
 .../Company/Group/CreateGroupTest.php         |   1 +
 .../Company/Group/CreateMeetingTest.php       | 106 +++++++++++++++++
 .../Company/Group/DestroyMeetingTest.php      | 109 ++++++++++++++++++
 7 files changed, 393 insertions(+)
 create mode 100644 app/Services/Company/Group/CreateMeeting.php
 create mode 100644 app/Services/Company/Group/DestroyMeeting.php
 create mode 100644 tests/Unit/Services/Company/Group/CreateMeetingTest.php
 create mode 100644 tests/Unit/Services/Company/Group/DestroyMeetingTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index 080badcb5..de8327d52 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1099,6 +1099,22 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'meeting_created':
+                $sentence = trans('account.log_meeting_created', [
+                    'meeting_id' => $log->object->{'meeting_id'},
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                ]);
+                break;
+
+            case 'meeting_destroyed':
+                $sentence = trans('account.log_meeting_destroyed', [
+                    'meeting_id' => $log->object->{'meeting_id'},
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Services/Company/Group/CreateMeeting.php b/app/Services/Company/Group/CreateMeeting.php
new file mode 100644
index 000000000..97a95ae45
--- /dev/null
+++ b/app/Services/Company/Group/CreateMeeting.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Models\Company\Meeting;
+
+class CreateMeeting extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+    protected Meeting $meeting;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+        ];
+    }
+
+    /**
+     * Create a meeting.
+     *
+     * @param array $data
+     * @return Meeting
+     */
+    public function execute(array $data): Meeting
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->createMeeting();
+        $this->log();
+
+        return $this->meeting;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+    }
+
+    private function createMeeting(): void
+    {
+        $this->meeting = Meeting::create([
+            'group_id' => $this->data['group_id'],
+        ]);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'meeting_created',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Group/DestroyMeeting.php b/app/Services/Company/Group/DestroyMeeting.php
new file mode 100644
index 000000000..4eb7b4a7e
--- /dev/null
+++ b/app/Services/Company/Group/DestroyMeeting.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Models\Company\Meeting;
+
+class DestroyMeeting extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+    protected Meeting $meeting;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'meeting_id' => 'nullable|integer|exists:meetings,id',
+        ];
+    }
+
+    /**
+     * Delete a meeting.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->destroy();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->meeting = Meeting::findOrFail($this->data['meeting_id']);
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->meeting->group_id);
+    }
+
+    private function destroy(): void
+    {
+        $this->meeting->delete();
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'meeting_destroyed',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_name' => $this->group->name,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index 84af2ca34..a5ed895ae 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -294,6 +294,8 @@
     'log_employee_added_to_group' => 'Added :employee_name to the group called :group_name.',
     'log_employee_removed_from_group' => 'Removed :employee_name from the group called :group_name.',
     'log_group_destroyed' => 'Deleted the group called :group_name.',
+    'log_meeting_created' => 'Created a meeting in the group called :group_name.',
+    'log_meeting_destroyed' => 'Deleted a meeting in the group called :group_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
diff --git a/tests/Unit/Services/Company/Group/CreateGroupTest.php b/tests/Unit/Services/Company/Group/CreateGroupTest.php
index d9e232f04..d9891715e 100644
--- a/tests/Unit/Services/Company/Group/CreateGroupTest.php
+++ b/tests/Unit/Services/Company/Group/CreateGroupTest.php
@@ -78,6 +78,7 @@ private function executeService(Employee $michael, array $employees = null): voi
 
         $this->assertDatabaseHas('groups', [
             'id' => $group->id,
+            'company_id' => $group->company_id,
             'name' => 'Steering Commitee',
         ]);
 
diff --git a/tests/Unit/Services/Company/Group/CreateMeetingTest.php b/tests/Unit/Services/Company/Group/CreateMeetingTest.php
new file mode 100644
index 000000000..bd5246c63
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/CreateMeetingTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Services\Company\Group\CreateMeeting;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Project\CreateProject;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class CreateMeetingTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_creates_a_meeting_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $michael->company, $group);
+    }
+
+    /** @test */
+    public function it_creates_a_meeting_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $michael->company, $group);
+    }
+
+    /** @test */
+    public function it_creates_a_meeting_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $michael->company, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new CreateProject)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_doesnt_belong_to_the_company(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+        $group = Group::factory()->create([]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group);
+    }
+
+    private function executeService(Employee $michael, Company $company, Group $group): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $company->id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+        ];
+
+        $meeting = (new CreateMeeting)->execute($request);
+
+        $this->assertDatabaseHas('meetings', [
+            'id' => $meeting->id,
+            'group_id' => $group->id,
+        ]);
+
+        $this->assertInstanceOf(
+            Group::class,
+            $group
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'meeting_created' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'meeting_id' => $meeting->id,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Group/DestroyMeetingTest.php b/tests/Unit/Services/Company/Group/DestroyMeetingTest.php
new file mode 100644
index 000000000..5ec46aec0
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/DestroyMeetingTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Services\Company\Group\DestroyMeeting;
+use Illuminate\Validation\ValidationException;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class DestroyMeetingTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_destroys_a_meeting_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_destroys_a_meeting_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_destroys_a_meeting_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_fails_if_meeting_is_not_part_of_the_group(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = factory(Employee::class)->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new DestroyMeeting)->execute($request);
+    }
+
+    private function executeService(Employee $michael, Group $group, Meeting $meeting): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'meeting_id' => $meeting->id,
+        ];
+
+        (new DestroyMeeting)->execute($request);
+
+        $this->assertDatabaseMissing('meetings', [
+            'id' => $group->id,
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'meeting_destroyed' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_name' => $group->name,
+                ]);
+        });
+    }
+}

From 946da0dc219145d042360f2f1ff10bcee1f72a5d Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sun, 7 Mar 2021 08:40:57 -0500
Subject: [PATCH 09/47] wip

---
 app/Helpers/LogHelper.php                     |  18 +++
 .../MarkEmployeeAsParticipantOfMeeting.php    | 121 ++++++++++++++++
 resources/lang/en/account.php                 |   2 +
 ...MarkEmployeeAsParticipantOfMeetingTest.php | 135 ++++++++++++++++++
 4 files changed, 276 insertions(+)
 create mode 100644 app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php
 create mode 100644 tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index de8327d52..4d9a30c72 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1115,6 +1115,16 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'employee_marked_as_participant_in_meeting':
+                $sentence = trans('account.log_employee_marked_as_participant_in_meeting', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
@@ -1623,6 +1633,14 @@ public static function processEmployeeLog(EmployeeLog $log): string
                 ]);
                 break;
 
+            case 'employee_marked_as_participant_in_meeting':
+                $sentence = trans('account.employee_log_employee_marked_as_participant_in_meeting', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php b/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php
new file mode 100644
index 000000000..eb6053fe3
--- /dev/null
+++ b/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\DB;
+
+class MarkEmployeeAsParticipantOfMeeting extends BaseService
+{
+    private array $data;
+    private Employee $employee;
+    private Group $group;
+    private Meeting $meeting;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'meeting_id' => 'required|integer|exists:meetings,id',
+            'employee_id' => 'required|integer|exists:employees,id',
+        ];
+    }
+
+    /**
+     * Mark an employee as participant of a meeting.
+     * When marking an employee, we should check if the employee is part of the
+     * group the meeting belongs to or not.
+     * If the employee is not part of the group, we should mark it as guest.
+     *
+     * @param array $data
+     * @return Employee
+     */
+    public function execute(array $data): Employee
+    {
+        $this->data = $data;
+        $this->validate();
+
+        $this->attachEmployee();
+        $this->log();
+
+        return $this->employee;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->employee = $this->validateEmployeeBelongsToCompany($this->data);
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+    }
+
+    private function attachEmployee(): void
+    {
+        $this->meeting->employees()->syncWithoutDetaching([
+            $this->data['employee_id'] => [
+                'was_a_guest' => $this->isEmployeePartOfGroup(),
+            ],
+        ]);
+    }
+
+    private function isEmployeePartOfGroup(): bool
+    {
+        return DB::table('employee_group')
+            ->where('employee_id', $this->data['employee_id'])
+            ->where('group_id', $this->group->id)
+            ->count() == 1;
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'employee_marked_as_participant_in_meeting',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'employee_id' => $this->employee->id,
+                'employee_name' => $this->employee->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->employee->id,
+            'action' => 'employee_marked_as_participant_in_meeting',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index a5ed895ae..8dd4a58b1 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -296,6 +296,7 @@
     'log_group_destroyed' => 'Deleted the group called :group_name.',
     'log_meeting_created' => 'Created a meeting in the group called :group_name.',
     'log_meeting_destroyed' => 'Deleted a meeting in the group called :group_name.',
+    'log_employee_marked_as_participant_in_meeting' => 'Indicated that :employee_name participated in a meeting in the group called :group_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
@@ -371,6 +372,7 @@
     'employee_log_consultant_rate_destroyed' => 'Destroyed the rate of :rate.',
     'employee_log_employee_added_to_group' => 'Has been added to the group called :group_name.',
     'employee_log_employee_removed_from_group' => 'Has been remove from the group called :group_name.',
+    'employee_log_employee_marked_as_participant_in_meeting' => 'Has been added in a meeting in the group called :group_name.',
 
     // team logs
     'team_log_team_created' => 'Created the team.',
diff --git a/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php b/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php
new file mode 100644
index 000000000..2ade7f267
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Validation\ValidationException;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use App\Services\Company\Group\MarkEmployeeAsParticipantOfMeeting;
+
+class MarkEmployeeAsParticipantOfMeetingTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_adds_an_employee_to_a_meeting_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_adds_an_employee_to_a_meeting_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_adds_an_employee_to_a_meeting_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $michael, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new MarkEmployeeAsParticipantOfMeeting)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_employee_is_not_in_the_authors_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_the_project_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create();
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group);
+    }
+
+    private function executeService(Employee $michael, Employee $dwight, Group $group): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'employee_id' => $dwight->id,
+        ];
+
+        $employee = (new MarkEmployeeAsParticipantOfMeeting)->execute($request);
+
+        $this->assertDatabaseHas('groups', [
+            'id' => $group->id,
+            'company_id' => $dwight->company_id,
+        ]);
+
+        $this->assertDatabaseHas('employee_group', [
+            'group_id' => $group->id,
+            'employee_id' => $dwight->id,
+        ]);
+
+        $this->assertInstanceOf(
+            Employee::class,
+            $employee
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $dwight) {
+            return $job->auditLog['action'] === 'employee_added_to_group' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'employee_id' => $dwight->id,
+                    'employee_name' => $dwight->name,
+                ]);
+        });
+
+        Queue::assertPushed(LogEmployeeAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'employee_added_to_group' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                ]);
+        });
+    }
+}

From 7a8c98e082d621effca9ecf8759ee21f89753c01 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Fri, 12 Mar 2021 16:05:11 -0500
Subject: [PATCH 10/47] wip

---
 app/Models/Company/Meeting.php                |   1 +
 ...treamline-icon-meeting-table-3@140x140.png | Bin 0 -> 12211 bytes
 resources/js/Pages/Company/Group/Show.vue     | 122 +++++++++++++++++-
 .../Company/Project/Partials/ProjectMenu.vue  |   2 +-
 resources/lang/en/project.php                 |   1 +
 5 files changed, 123 insertions(+), 3 deletions(-)
 create mode 100644 public/img/streamline-icon-meeting-table-3@140x140.png

diff --git a/app/Models/Company/Meeting.php b/app/Models/Company/Meeting.php
index 91bba4c49..3038a99d2 100644
--- a/app/Models/Company/Meeting.php
+++ b/app/Models/Company/Meeting.php
@@ -3,6 +3,7 @@
 namespace App\Models\Company;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
diff --git a/public/img/streamline-icon-meeting-table-3@140x140.png b/public/img/streamline-icon-meeting-table-3@140x140.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9607684cbb967abf2265b0f69c10e3e2c7ed654
GIT binary patch
literal 12211
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
LD1NUIGXnk(RiGcr

literal 0
HcmV?d00001

diff --git a/resources/js/Pages/Company/Group/Show.vue b/resources/js/Pages/Company/Group/Show.vue
index b54f33087..e1c56459a 100644
--- a/resources/js/Pages/Company/Group/Show.vue
+++ b/resources/js/Pages/Company/Group/Show.vue
@@ -3,6 +3,20 @@
   margin-left: -8px;
   box-shadow: 0 0 0 2px #fff;
 }
+
+.meeting-item:first-child:hover {
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+
+.meeting-item:last-child {
+  border-bottom: 0;
+
+  &:hover {
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px;
+  }
+}
 </style>
 
 <template>
@@ -30,13 +44,117 @@
         <div class="cf center">
           <!-- LEFT COLUMN -->
           <div class="fl w-70-l w-100">
-            test
+            <!-- list of meetings -->
+            <div class="br3 bg-white box z-1">
+              <ul data-cy="e-coffee-list" class="list pl0 ma0">
+                <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+                  <div class="mb1 relative">
+                    <span class="employee-name db">
+                      Meeting du 20 janvier
+                    </span>
+                  </div>
+                  <span class="ma0 mb0 f7 grey">
+                    <div class="flex items-center relative tr">
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <div class="pl2 f7 more-members relative gray">
+                        {{ $t('project.menu_other_member', { count: 3 }) }}
+                      </div>
+                    </div>
+                  </span>
+                </li>
+                <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+                  <div class="mb1 relative">
+                    <span class="employee-name db">
+                      Meeting du 20 janvier
+                    </span>
+                  </div>
+                  <span class="ma0 mb0 f7 grey">
+                    <div class="flex items-center relative tr">
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                    </div>
+                  </span>
+                </li>
+                <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+                  <div class="mb1 relative">
+                    <span class="employee-name db">
+                      Meeting du 20 janvier
+                    </span>
+                  </div>
+                  <span class="ma0 mb0 f7 grey">
+                    <div class="flex items-center relative tr">
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                    </div>
+                  </span>
+                </li>
+                <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+                  <div class="mb1 relative">
+                    <span class="employee-name db">
+                      Meeting du 20 janvier
+                    </span>
+                  </div>
+                  <span class="ma0 mb0 f7 grey">
+                    <div class="flex items-center relative tr">
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                           width="32" height="32"
+                      />
+                    </div>
+                  </span>
+                </li>
+                <li class="ph3 pv2 tc f6">
+                  <inertia-link href="ecoffees.view_all_url" data-cy="view-all-ecoffees">{{ $t('employee.e_coffee_view_all') }}</inertia-link>
+                </li>
+              </ul>
+            </div>
+
+            <!-- blank -->
+            <div class="br3 bg-white box z-1 tc pa3">
+              <h3 class="fw4 f5 lh-copy">
+                Meeting notes are great to prepare meetings, and record what was said.
+              </h3>
+              <img loading="lazy" src="/img/streamline-icon-meeting-table-3@140x140.png" width="140" height="140" alt="people hanging out"
+                   class="di-ns dn top-1 left-1"
+              />
+            </div>
           </div>
 
           <!-- RIGHT COLUMN -->
           <div class="fl w-30-l w-100 pl4-l">
+            <inertia-link class="w-100 btn dib-l db mb3" data-cy="add-position-button" @click.prevent="displayAddModal">
+              Add a meeting note
+            </inertia-link>
+
             <div class="bg-white box mb4">
-              test
+              <p>sdfsd</p>
             </div>
           </div>
         </div>
diff --git a/resources/js/Pages/Company/Project/Partials/ProjectMenu.vue b/resources/js/Pages/Company/Project/Partials/ProjectMenu.vue
index 7914dd373..589258eb2 100644
--- a/resources/js/Pages/Company/Project/Partials/ProjectMenu.vue
+++ b/resources/js/Pages/Company/Project/Partials/ProjectMenu.vue
@@ -33,7 +33,7 @@
 
       <!-- avatars -->
       <div v-if="project.members.length > 0">
-        <p class="mt0 mb2 f7 gray">Project members</p>
+        <p class="mt0 mb2 f7 gray">{{ $t('project.menu_members_icons') }}</p>
         <div class="flex items-center relative tr">
           <img v-for="member in project.members" :key="member.id" :src="member.avatar" alt="avatar" class="br-100 small-avatar"
                width="32" height="32"
diff --git a/resources/lang/en/project.php b/resources/lang/en/project.php
index c4b3fd009..c4eede9fd 100644
--- a/resources/lang/en/project.php
+++ b/resources/lang/en/project.php
@@ -16,6 +16,7 @@
     'menu_members' => 'Members',
     'menu_finance' => 'Finance',
     'menu_files' => 'Files',
+    'menu_members_icons' => 'Project members',
 
     'summary_cta_start_project' => 'Start project',
     'summary_cta_pause_project' => 'Pause',

From f6ff8c5b14d19cd8f834f95de3f071b7d47a52d3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Mar 2021 22:14:28 +0000
Subject: [PATCH 11/47] Optimised images with calibre/image-actions

---
 ...treamline-icon-meeting-table-3@140x140.png | Bin 12211 -> 8144 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/img/streamline-icon-meeting-table-3@140x140.png b/public/img/streamline-icon-meeting-table-3@140x140.png
index b9607684cbb967abf2265b0f69c10e3e2c7ed654..4afae7aa05cc5b41473bf4d6392cc124e55edd90 100644
GIT binary patch
literal 8144
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

literal 12211
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
LD1NUIGXnk(RiGcr


From 2c746ff66326b55d163ad6fa35f033fb85044239 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 21:32:11 -0400
Subject: [PATCH 12/47] wip

---
 .../MarkEmployeeAsParticipantOfMeeting.php    |  1 +
 phpunit.xml                                   |  2 +-
 tests/Unit/Models/Company/CompanyTest.php     |  6 +--
 .../Company/Group/CreateGroupTest.php         |  2 +-
 .../Company/Group/CreateMeetingTest.php       |  4 +-
 .../Company/Group/DestroyGroupTest.php        |  4 +-
 .../Company/Group/DestroyMeetingTest.php      |  2 +-
 ...MarkEmployeeAsParticipantOfMeetingTest.php | 50 ++++++++++++-------
 8 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php b/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php
index eb6053fe3..79ed471c5 100644
--- a/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php
+++ b/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php
@@ -28,6 +28,7 @@ public function rules(): array
         return [
             'company_id' => 'required|integer|exists:companies,id',
             'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
             'meeting_id' => 'required|integer|exists:meetings,id',
             'employee_id' => 'required|integer|exists:employees,id',
         ];
diff --git a/phpunit.xml b/phpunit.xml
index 91cd68ab0..90ad2f001 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -8,7 +8,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="false"
+    stopOnFailure="true"
 >
   <coverage processUncoveredFiles="true">
     <include>
diff --git a/tests/Unit/Models/Company/CompanyTest.php b/tests/Unit/Models/Company/CompanyTest.php
index 8746d0249..0fc546cf4 100644
--- a/tests/Unit/Models/Company/CompanyTest.php
+++ b/tests/Unit/Models/Company/CompanyTest.php
@@ -242,7 +242,6 @@ public function it_has_many_import_jobs(): void
     }
 
     /** @test */
-<<<<<<< HEAD
     public function it_has_many_groups(): void
     {
         $company = Company::factory()->create();
@@ -251,7 +250,9 @@ public function it_has_many_groups(): void
         ]);
 
         $this->assertTrue($company->groups()->exists());
-=======
+    }
+
+    /** @test */
     public function it_has_one_logo(): void
     {
         $file = File::factory()->create([]);
@@ -260,7 +261,6 @@ public function it_has_one_logo(): void
         ]);
 
         $this->assertTrue($company->logo()->exists());
->>>>>>> main
     }
 
     /** @test */
diff --git a/tests/Unit/Services/Company/Group/CreateGroupTest.php b/tests/Unit/Services/Company/Group/CreateGroupTest.php
index d9891715e..a6a775f4b 100644
--- a/tests/Unit/Services/Company/Group/CreateGroupTest.php
+++ b/tests/Unit/Services/Company/Group/CreateGroupTest.php
@@ -53,7 +53,7 @@ public function it_creates_a_group_as_normal_user(): void
     /** @test */
     public function it_fails_if_wrong_parameters_are_given(): void
     {
-        $michael = factory(Employee::class)->create([]);
+        $michael = Employee::factory()->create([]);
 
         $request = [
             'company_id' => $michael->company_id,
diff --git a/tests/Unit/Services/Company/Group/CreateMeetingTest.php b/tests/Unit/Services/Company/Group/CreateMeetingTest.php
index bd5246c63..6b3e4a0d2 100644
--- a/tests/Unit/Services/Company/Group/CreateMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/CreateMeetingTest.php
@@ -51,7 +51,7 @@ public function it_creates_a_meeting_as_normal_user(): void
     /** @test */
     public function it_fails_if_wrong_parameters_are_given(): void
     {
-        $michael = factory(Employee::class)->create([]);
+        $michael = Employee::factory()->create([]);
 
         $request = [
             'company_id' => $michael->company_id,
@@ -64,7 +64,7 @@ public function it_fails_if_wrong_parameters_are_given(): void
     /** @test */
     public function it_fails_if_the_group_doesnt_belong_to_the_company(): void
     {
-        $michael = factory(Employee::class)->create([]);
+        $michael = Employee::factory()->create([]);
         $group = Group::factory()->create([]);
 
         $this->expectException(ModelNotFoundException::class);
diff --git a/tests/Unit/Services/Company/Group/DestroyGroupTest.php b/tests/Unit/Services/Company/Group/DestroyGroupTest.php
index 4bb7fb831..dd70f7029 100644
--- a/tests/Unit/Services/Company/Group/DestroyGroupTest.php
+++ b/tests/Unit/Services/Company/Group/DestroyGroupTest.php
@@ -49,7 +49,7 @@ public function it_destroys_a_group_as_normal_user(): void
     /** @test */
     public function it_fails_if_project_is_not_part_of_the_company(): void
     {
-        $michael = factory(Employee::class)->create([]);
+        $michael = Employee::factory()->create([]);
         $group = Group::factory()->create();
 
         $this->expectException(ModelNotFoundException::class);
@@ -59,7 +59,7 @@ public function it_fails_if_project_is_not_part_of_the_company(): void
     /** @test */
     public function it_fails_if_wrong_parameters_are_given(): void
     {
-        $michael = factory(Employee::class)->create([]);
+        $michael = Employee::factory()->create([]);
 
         $request = [
             'company_id' => $michael->company_id,
diff --git a/tests/Unit/Services/Company/Group/DestroyMeetingTest.php b/tests/Unit/Services/Company/Group/DestroyMeetingTest.php
index 5ec46aec0..bd6cfd1a7 100644
--- a/tests/Unit/Services/Company/Group/DestroyMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/DestroyMeetingTest.php
@@ -72,7 +72,7 @@ public function it_fails_if_meeting_is_not_part_of_the_group(): void
     /** @test */
     public function it_fails_if_wrong_parameters_are_given(): void
     {
-        $michael = factory(Employee::class)->create([]);
+        $michael = Employee::factory()->create([]);
 
         $request = [
             'company_id' => $michael->company_id,
diff --git a/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php b/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php
index 2ade7f267..38be6f2ee 100644
--- a/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php
@@ -6,6 +6,7 @@
 use App\Jobs\LogAccountAudit;
 use App\Models\Company\Group;
 use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
 use App\Models\Company\Employee;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Validation\ValidationException;
@@ -25,7 +26,10 @@ public function it_adds_an_employee_to_a_meeting_as_administrator(): void
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
-        $this->executeService($michael, $dwight, $group);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $dwight, $group, $meeting);
     }
 
     /** @test */
@@ -36,7 +40,10 @@ public function it_adds_an_employee_to_a_meeting_as_hr(): void
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
-        $this->executeService($michael, $dwight, $group);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $dwight, $group, $meeting);
     }
 
     /** @test */
@@ -46,7 +53,10 @@ public function it_adds_an_employee_to_a_meeting_as_normal_user(): void
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
-        $this->executeService($michael, $michael, $group);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $michael, $group, $meeting);
     }
 
     /** @test */
@@ -68,23 +78,29 @@ public function it_fails_if_the_employee_is_not_in_the_authors_company(): void
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
 
         $this->expectException(ModelNotFoundException::class);
-        $this->executeService($michael, $dwight, $group);
+        $this->executeService($michael, $dwight, $group, $meeting);
     }
 
     /** @test */
-    public function it_fails_if_the_project_is_not_in_the_company(): void
+    public function it_fails_if_the_group_is_not_in_the_company(): void
     {
         $michael = $this->createAdministrator();
         $dwight = $this->createEmployee();
         $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
 
         $this->expectException(ModelNotFoundException::class);
-        $this->executeService($michael, $dwight, $group);
+        $this->executeService($michael, $dwight, $group, $meeting);
     }
 
-    private function executeService(Employee $michael, Employee $dwight, Group $group): void
+    private function executeService(Employee $michael, Employee $dwight, Group $group, Meeting $meeting): void
     {
         Queue::fake();
 
@@ -92,18 +108,14 @@ private function executeService(Employee $michael, Employee $dwight, Group $grou
             'company_id' => $michael->company_id,
             'author_id' => $michael->id,
             'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
             'employee_id' => $dwight->id,
         ];
 
         $employee = (new MarkEmployeeAsParticipantOfMeeting)->execute($request);
 
-        $this->assertDatabaseHas('groups', [
-            'id' => $group->id,
-            'company_id' => $dwight->company_id,
-        ]);
-
-        $this->assertDatabaseHas('employee_group', [
-            'group_id' => $group->id,
+        $this->assertDatabaseHas('employee_meeting', [
+            'meeting_id' => $meeting->id,
             'employee_id' => $dwight->id,
         ]);
 
@@ -112,23 +124,25 @@ private function executeService(Employee $michael, Employee $dwight, Group $grou
             $employee
         );
 
-        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $dwight) {
-            return $job->auditLog['action'] === 'employee_added_to_group' &&
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $dwight, $meeting) {
+            return $job->auditLog['action'] === 'employee_marked_as_participant_in_meeting' &&
                 $job->auditLog['author_id'] === $michael->id &&
                 $job->auditLog['objects'] === json_encode([
                     'group_id' => $group->id,
                     'group_name' => $group->name,
                     'employee_id' => $dwight->id,
                     'employee_name' => $dwight->name,
+                    'meeting_id' => $meeting->id,
                 ]);
         });
 
-        Queue::assertPushed(LogEmployeeAudit::class, function ($job) use ($michael, $group) {
-            return $job->auditLog['action'] === 'employee_added_to_group' &&
+        Queue::assertPushed(LogEmployeeAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'employee_marked_as_participant_in_meeting' &&
                 $job->auditLog['author_id'] === $michael->id &&
                 $job->auditLog['objects'] === json_encode([
                     'group_id' => $group->id,
                     'group_name' => $group->name,
+                'meeting_id' => $meeting->id,
                 ]);
         });
     }

From 1012d4b3a08da88502b2e5dbfe7f5543af657ed6 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 21:40:45 -0400
Subject: [PATCH 13/47] wip

---
 app/Http/Controllers/Company/Company/Group/GroupController.php | 2 +-
 app/Models/Company/AgendaItem.php                              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index 27a7ac225..4991a38e1 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -28,7 +28,7 @@ class GroupController extends Controller
     public function index(Request $request, int $companyId): Response
     {
         $company = InstanceHelper::getLoggedCompany();
-        $statistics = CompanyViewHelper::statistics($company);
+        $statistics = CompanyViewHelper::information($company);
 
         return Inertia::render('Company/Project/Index', [
             'statistics' => $statistics,
diff --git a/app/Models/Company/AgendaItem.php b/app/Models/Company/AgendaItem.php
index 15f850aa6..7ff134930 100644
--- a/app/Models/Company/AgendaItem.php
+++ b/app/Models/Company/AgendaItem.php
@@ -3,6 +3,8 @@
 namespace App\Models\Company;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 

From 2d6fb547875f6e64aedeebc214fa85e424b28150 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 22:02:21 -0400
Subject: [PATCH 14/47] wip

---
 app/Helpers/LogHelper.php                     |  18 +++
 .../Company/Group/GroupMembersViewHelper.php  |   5 +-
 app/Models/Company/Employee.php               |   1 +
 ... => AddEmployeeAsParticipantOfMeeting.php} |   2 +-
 .../RemoveEmployeeAsParticipantOfMeeting.php  | 103 ++++++++++++
 resources/js/Pages/Company/Group/Create.vue   |   4 +-
 resources/lang/en/account.php                 |   2 +
 ...AddEmployeeAsParticipantOfMeetingTest.php} |   8 +-
 ...moveEmployeeAsParticipantOfMeetingTest.php | 150 ++++++++++++++++++
 .../Group/GroupMembersViewHelperTest.php      |   7 +-
 10 files changed, 289 insertions(+), 11 deletions(-)
 rename app/Services/Company/Group/{MarkEmployeeAsParticipantOfMeeting.php => AddEmployeeAsParticipantOfMeeting.php} (98%)
 create mode 100644 app/Services/Company/Group/RemoveEmployeeAsParticipantOfMeeting.php
 rename tests/Unit/Services/Company/Group/{MarkEmployeeAsParticipantOfMeetingTest.php => AddEmployeeAsParticipantOfMeetingTest.php} (94%)
 create mode 100644 tests/Unit/Services/Company/Group/RemoveEmployeeAsParticipantOfMeetingTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index 3ab08bf49..3b2d80ca6 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1125,6 +1125,16 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'employee_removed_from_meeting':
+                $sentence = trans('account.log_employee_removed_from_meeting', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             case 'company_logo_changed':
                 $sentence = trans('account.log_company_logo_changed');
                 break;
@@ -1645,6 +1655,14 @@ public static function processEmployeeLog(EmployeeLog $log): string
                 ]);
                 break;
 
+            case 'employee_removed_from_meeting':
+                $sentence = trans('account.employee_log_employee_removed_from_meeting', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
index 02c9218e0..a82e14288 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
@@ -3,6 +3,7 @@
 namespace App\Http\ViewHelpers\Company\Group;
 
 use App\Helpers\DateHelper;
+use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
 use App\Models\Company\Company;
 use App\Models\Company\Employee;
@@ -29,7 +30,7 @@ public static function members(Group $group): Collection
             $membersCollection->push([
                 'id' => $member->id,
                 'name' => $member->name,
-                'avatar' => $member->avatar,
+                'avatar' => ImageHelper::getAvatar($member),
                 'added_at' => DateHelper::formatDate($member->pivot->created_at),
                 'position' => (! $member->position) ? null : [
                     'id' => $member->position->id,
@@ -74,7 +75,7 @@ public static function potentialMembers(string $employeeName, Group $group, Comp
             $potentialMembersCollection->push([
                 'id' => $potential->id,
                 'name' => $potential->name,
-                'avatar' => $potential->avatar,
+                'avatar' => ImageHelper::getAvatar($potential, 23),
             ]);
         }
 
diff --git a/app/Models/Company/Employee.php b/app/Models/Company/Employee.php
index 9a04756f0..301891506 100644
--- a/app/Models/Company/Employee.php
+++ b/app/Models/Company/Employee.php
@@ -85,6 +85,7 @@ class Employee extends Model
         'last_name',
         'email',
         'company_id',
+        'avatar_file_id',
     ];
 
     /**
diff --git a/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php b/app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php
similarity index 98%
rename from app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php
rename to app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php
index 79ed471c5..189c8bfc6 100644
--- a/app/Services/Company/Group/MarkEmployeeAsParticipantOfMeeting.php
+++ b/app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php
@@ -11,7 +11,7 @@
 use App\Models\Company\Employee;
 use Illuminate\Support\Facades\DB;
 
-class MarkEmployeeAsParticipantOfMeeting extends BaseService
+class AddEmployeeAsParticipantOfMeeting extends BaseService
 {
     private array $data;
     private Employee $employee;
diff --git a/app/Services/Company/Group/RemoveEmployeeAsParticipantOfMeeting.php b/app/Services/Company/Group/RemoveEmployeeAsParticipantOfMeeting.php
new file mode 100644
index 000000000..ea1994dd1
--- /dev/null
+++ b/app/Services/Company/Group/RemoveEmployeeAsParticipantOfMeeting.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+
+class RemoveEmployeeAsParticipantOfMeeting extends BaseService
+{
+    private array $data;
+    private Employee $employee;
+    private Group $group;
+    private Meeting $meeting;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'meeting_id' => 'required|integer|exists:meetings,id',
+            'employee_id' => 'required|integer|exists:employees,id',
+        ];
+    }
+
+    /**
+     * Remove an employee as participant from a meeting.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+
+        $this->detachEmployee();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->employee = $this->validateEmployeeBelongsToCompany($this->data);
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+    }
+
+    private function detachEmployee(): void
+    {
+        $this->meeting->employees()->detach($this->data['employee_id']);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'employee_removed_from_meeting',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'employee_id' => $this->employee->id,
+                'employee_name' => $this->employee->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->employee->id,
+            'action' => 'employee_removed_from_meeting',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/resources/js/Pages/Company/Group/Create.vue b/resources/js/Pages/Company/Group/Create.vue
index 2db170e44..586a8aab1 100644
--- a/resources/js/Pages/Company/Group/Create.vue
+++ b/resources/js/Pages/Company/Group/Create.vue
@@ -113,7 +113,7 @@
             <div v-show="form.employees.length > 0" class="ba bb-gray mb3 mt3">
               <div v-for="employee in form.employees" :key="employee.id" class="pa2 db bb-gray bb" data-cy="members-list">
                 <span class="pl3 db relative team-member">
-                  <img loading="lazy" :src="employee.avatar" class="br-100 absolute avatar" alt="avatar" />
+                  <avatar :avatar="employee.avatar" :size="23" :classes="'avatar absolute br-100'" />
 
                   {{ employee.name }}
 
@@ -151,10 +151,12 @@ import Layout from '@/Shared/Layout';
 import 'vue-loaders/dist/vue-loaders.css';
 import BallPulseLoader from 'vue-loaders/dist/loaders/ball-pulse';
 import Help from '@/Shared/Help';
+import Avatar from '@/Shared/Avatar';
 
 export default {
   components: {
     Layout,
+    Avatar,
     TextInput,
     Errors,
     LoadingButton,
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index 13a89c116..b92bd97b9 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -297,6 +297,7 @@
     'log_meeting_created' => 'Created a meeting in the group called :group_name.',
     'log_meeting_destroyed' => 'Deleted a meeting in the group called :group_name.',
     'log_employee_marked_as_participant_in_meeting' => 'Indicated that :employee_name participated in a meeting in the group called :group_name.',
+    'log_employee_removed_from_meeting' => 'Indicated that :employee_name was not in a meeting in the group called :group_name.',
     'log_toggle_e_coffee_process' => 'Toggled the eCoffee process in the company.',
     'log_company_logo_changed' => 'Changed the company logo.',
 
@@ -375,6 +376,7 @@
     'employee_log_employee_added_to_group' => 'Has been added to the group called :group_name.',
     'employee_log_employee_removed_from_group' => 'Has been remove from the group called :group_name.',
     'employee_log_employee_marked_as_participant_in_meeting' => 'Has been added in a meeting in the group called :group_name.',
+    'employee_log_employee_removed_from_meeting' => 'Has been removed from a meeting in the group called :group_name.',
 
     // team logs
     'team_log_team_created' => 'Created the team.',
diff --git a/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php b/tests/Unit/Services/Company/Group/AddEmployeeAsParticipantOfMeetingTest.php
similarity index 94%
rename from tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php
rename to tests/Unit/Services/Company/Group/AddEmployeeAsParticipantOfMeetingTest.php
index 38be6f2ee..0418ebc9f 100644
--- a/tests/Unit/Services/Company/Group/MarkEmployeeAsParticipantOfMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/AddEmployeeAsParticipantOfMeetingTest.php
@@ -12,9 +12,9 @@
 use Illuminate\Validation\ValidationException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use App\Services\Company\Group\MarkEmployeeAsParticipantOfMeeting;
+use App\Services\Company\Group\AddEmployeeAsParticipantOfMeeting;
 
-class MarkEmployeeAsParticipantOfMeetingTest extends TestCase
+class AddEmployeeAsParticipantOfMeetingTest extends TestCase
 {
     use DatabaseTransactions;
 
@@ -67,7 +67,7 @@ public function it_fails_if_wrong_parameters_are_given(): void
         ];
 
         $this->expectException(ValidationException::class);
-        (new MarkEmployeeAsParticipantOfMeeting)->execute($request);
+        (new AddEmployeeAsParticipantOfMeeting)->execute($request);
     }
 
     /** @test */
@@ -112,7 +112,7 @@ private function executeService(Employee $michael, Employee $dwight, Group $grou
             'employee_id' => $dwight->id,
         ];
 
-        $employee = (new MarkEmployeeAsParticipantOfMeeting)->execute($request);
+        $employee = (new AddEmployeeAsParticipantOfMeeting)->execute($request);
 
         $this->assertDatabaseHas('employee_meeting', [
             'meeting_id' => $meeting->id,
diff --git a/tests/Unit/Services/Company/Group/RemoveEmployeeAsParticipantOfMeetingTest.php b/tests/Unit/Services/Company/Group/RemoveEmployeeAsParticipantOfMeetingTest.php
new file mode 100644
index 000000000..7750d5083
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/RemoveEmployeeAsParticipantOfMeetingTest.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Validation\ValidationException;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use App\Services\Company\Group\RemoveEmployeeAsParticipantOfMeeting;
+
+class RemoveEmployeeAsParticipantOfMeetingTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_removes_an_employee_from_a_meeting_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $dwight, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_removes_an_employee_from_a_meeting_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $dwight, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_removes_an_employee_from_a_meeting_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $michael, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new RemoveEmployeeAsParticipantOfMeeting)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_employee_is_not_in_the_authors_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group, $meeting);
+    }
+
+    private function executeService(Employee $michael, Employee $dwight, Group $group, Meeting $meeting): void
+    {
+        Queue::fake();
+
+        DB::table('employee_meeting')->insert([
+            'meeting_id' => $meeting->id,
+            'employee_id' => $dwight->id,
+        ]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'employee_id' => $dwight->id,
+        ];
+
+        (new RemoveEmployeeAsParticipantOfMeeting)->execute($request);
+
+        $this->assertDatabaseMissing('employee_meeting', [
+            'meeting_id' => $meeting->id,
+            'employee_id' => $dwight->id,
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $dwight, $meeting) {
+            return $job->auditLog['action'] === 'employee_removed_from_meeting' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'employee_id' => $dwight->id,
+                    'employee_name' => $dwight->name,
+                    'meeting_id' => $meeting->id,
+                ]);
+        });
+
+        Queue::assertPushed(LogEmployeeAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'employee_removed_from_meeting' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                'meeting_id' => $meeting->id,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
index 3b56d84b0..91dce3c80 100644
--- a/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
@@ -4,6 +4,7 @@
 
 use Tests\TestCase;
 use App\Helpers\DateHelper;
+use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
 use App\Models\Company\Employee;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -34,7 +35,7 @@ public function it_gets_a_collection_of_employees(): void
                 0 => [
                     'id' => $michael->id,
                     'name' => $michael->name,
-                    'avatar' => $michael->avatar,
+                    'avatar' => ImageHelper::getAvatar($michael),
                     'added_at' => DateHelper::formatDate($michael->created_at),
                     'position' => [
                         'id' => $michael->position->id,
@@ -45,7 +46,7 @@ public function it_gets_a_collection_of_employees(): void
                 1 => [
                     'id' => $jim->id,
                     'name' => $jim->name,
-                    'avatar' => $jim->avatar,
+                    'avatar' => ImageHelper::getAvatar($jim),
                     'added_at' => DateHelper::formatDate($jim->created_at),
                     'position' => [
                         'id' => $jim->position->id,
@@ -83,7 +84,7 @@ public function it_gets_a_collection_of_potential_new_members(): void
                 0 => [
                     'id' => $jean->id,
                     'name' => $jean->name,
-                    'avatar' => $jean->avatar,
+                    'avatar' => ImageHelper::getAvatar($jean, 23),
                 ],
             ],
             $collection->toArray()

From 90cd1317f43f5231636084e8d51f681459a6276b Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 22:24:20 -0400
Subject: [PATCH 15/47] wip

---
 .../Company/Company/Group/GroupController.php | 19 +-----
 .../Company/Group/GroupMembersController.php  |  7 +-
 .../Company/Group/GroupCreateViewHelper.php   | 44 +++++++++++++
 .../Company/Group/GroupMembersViewHelper.php  | 39 ++++++-----
 .../js/Pages/Company/Group/Members/Index.vue  |  4 +-
 .../Group/GroupCreateViewHelperTest.php       | 64 +++++++++++++++++++
 .../Group/GroupMembersViewHelperTest.php      |  6 +-
 7 files changed, 143 insertions(+), 40 deletions(-)
 create mode 100644 app/Http/ViewHelpers/Company/Group/GroupCreateViewHelper.php
 create mode 100644 tests/Unit/ViewHelpers/Company/Group/GroupCreateViewHelperTest.php

diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index 4991a38e1..e19b617b7 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -15,6 +15,7 @@
 use App\Http\ViewHelpers\Company\CompanyViewHelper;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
 use App\Http\ViewHelpers\Company\Project\ProjectViewHelper;
+use App\Http\ViewHelpers\Company\Group\GroupCreateViewHelper;
 
 class GroupController extends Controller
 {
@@ -82,22 +83,8 @@ public function create(Request $request, int $companyId): Response
      */
     public function search(Request $request, int $companyId): JsonResponse
     {
-        $potentialEmployees = Employee::search(
-            $request->input('searchTerm'),
-            $companyId,
-            10,
-            'created_at desc',
-            'and locked = false',
-        );
-
-        $employees = collect([]);
-        foreach ($potentialEmployees as $employee) {
-            $employees->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-                'avatar' => $employee->avatar,
-            ]);
-        }
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $employees = GroupCreateViewHelper::search($loggedCompany, $request->input('searchTerm'));
 
         return response()->json([
             'data' => $employees,
diff --git a/app/Http/Controllers/Company/Company/Group/GroupMembersController.php b/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
index ea7dff5a1..e311676e7 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
@@ -4,6 +4,7 @@
 
 use Inertia\Inertia;
 use Inertia\Response;
+use App\Helpers\ImageHelper;
 use Illuminate\Http\Request;
 use App\Models\Company\Group;
 use App\Helpers\InstanceHelper;
@@ -67,9 +68,9 @@ public function search(Request $request, int $companyId, int $groupId): JsonResp
         }
 
         $potentialMembers = GroupMembersViewHelper::potentialMembers(
-            $request->input('searchTerm'),
+            $company,
             $group,
-            $company
+            $request->input('searchTerm')
         );
 
         return response()->json([
@@ -105,7 +106,7 @@ public function store(Request $request, int $companyId, int $groupId): JsonRespo
             'data' => [
                 'id' => $employee->id,
                 'name' => $employee->name,
-                'avatar' => $employee->avatar,
+                'avatar' => ImageHelper::getAvatar($employee, 64),
             ],
         ]);
     }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupCreateViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupCreateViewHelper.php
new file mode 100644
index 000000000..de5f191a0
--- /dev/null
+++ b/app/Http/ViewHelpers/Company/Group/GroupCreateViewHelper.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\ViewHelpers\Company\Group;
+
+use App\Helpers\ImageHelper;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use Illuminate\Support\Collection;
+
+class GroupCreateViewHelper
+{
+    /**
+     * Search all potential members for the group.
+     *
+     * @param Company $company
+     * @param string $criteria
+     * @return Collection
+     */
+    public static function search(Company $company, string $criteria): Collection
+    {
+        $potentialEmployees = $company->employees()
+            ->select('id', 'first_name', 'last_name', 'avatar_file_id')
+            ->notLocked()
+            ->where(function ($query) use ($criteria) {
+                $query->where('first_name', 'LIKE', '%'.$criteria.'%')
+                    ->orWhere('last_name', 'LIKE', '%'.$criteria.'%')
+                    ->orWhere('email', 'LIKE', '%'.$criteria.'%');
+            })
+            ->orderBy('last_name', 'asc')
+            ->take(10)
+            ->get();
+
+        $employeesCollection = collect([]);
+        foreach ($potentialEmployees as $employee) {
+            $employeesCollection->push([
+                'id' => $employee->id,
+                'name' => $employee->name,
+                'avatar' => ImageHelper::getAvatar($employee, 23),
+            ]);
+        }
+
+        return $employeesCollection;
+    }
+}
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
index a82e14288..276f33261 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
@@ -6,7 +6,6 @@
 use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
 use App\Models\Company\Company;
-use App\Models\Company\Employee;
 use Illuminate\Support\Collection;
 
 class GroupMembersViewHelper
@@ -51,34 +50,40 @@ public static function members(Group $group): Collection
      * group, matching the name.
      * This filters out the current members of the group (doh).
      *
-     * @param string $employeeName
      * @param Group $group
      * @param Company $company
+     * @param string $criteria
      * @return Collection
      */
-    public static function potentialMembers(string $employeeName, Group $group, Company $company): Collection
+    public static function potentialMembers(Company $company, Group $group, string $criteria): Collection
     {
-        $potentialEmployees = Employee::search(
-            $employeeName,
-            $company->id,
-            10,
-            'created_at desc',
-            'and locked = 0',
-        );
+        $potentialEmployees = $company->employees()
+            ->select('id', 'first_name', 'last_name', 'avatar_file_id')
+            ->notLocked()
+            ->where(function ($query) use ($criteria) {
+                $query->where('first_name', 'LIKE', '%'.$criteria.'%')
+                    ->orWhere('last_name', 'LIKE', '%'.$criteria.'%')
+                    ->orWhere('email', 'LIKE', '%'.$criteria.'%');
+            })
+            ->orderBy('last_name', 'asc')
+            ->take(10)
+            ->get();
 
-        $currentMembers = $group->employees;
+        $currentMembers = $group->employees()
+            ->select('id', 'first_name', 'last_name', 'avatar_file_id')
+            ->get();
 
-        $potentialMembers = $potentialEmployees->diff($currentMembers);
+        $potentialEmployees = $potentialEmployees->diff($currentMembers);
 
-        $potentialMembersCollection = collect([]);
-        foreach ($potentialMembers as $potential) {
-            $potentialMembersCollection->push([
+        $potentialEmployeesCollection = collect([]);
+        foreach ($potentialEmployees as $potential) {
+            $potentialEmployeesCollection->push([
                 'id' => $potential->id,
                 'name' => $potential->name,
-                'avatar' => ImageHelper::getAvatar($potential, 23),
+                'avatar' => ImageHelper::getAvatar($potential, 64),
             ]);
         }
 
-        return $potentialMembersCollection;
+        return $potentialEmployeesCollection;
     }
 }
diff --git a/resources/js/Pages/Company/Group/Members/Index.vue b/resources/js/Pages/Company/Group/Members/Index.vue
index bec9a6bc2..df8199166 100644
--- a/resources/js/Pages/Company/Group/Members/Index.vue
+++ b/resources/js/Pages/Company/Group/Members/Index.vue
@@ -113,7 +113,7 @@
             <li v-for="member in localMembers" :key="member.id" :data-cy="'member-' + member.id" class="pa3 bb bb-gray flex items-center">
               <!-- avatar -->
               <div class="mr3">
-                <img :src="member.avatar" alt="avatar" height="64" width="64" class="br-100" />
+                <avatar :avatar="member.avatar" :size="64" :classes="'br-100'" />
               </div>
 
               <!-- name + information -->
@@ -177,6 +177,7 @@
 
 <script>
 import Layout from '@/Shared/Layout';
+import Avatar from '@/Shared/Avatar';
 import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
 import 'vue-loaders/dist/vue-loaders.css';
 import BallPulseLoader from 'vue-loaders/dist/loaders/ball-pulse';
@@ -184,6 +185,7 @@ import BallPulseLoader from 'vue-loaders/dist/loaders/ball-pulse';
 export default {
   components: {
     Layout,
+    Avatar,
     GroupMenu,
     'ball-pulse-loader': BallPulseLoader.component,
   },
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupCreateViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupCreateViewHelperTest.php
new file mode 100644
index 000000000..c244881b2
--- /dev/null
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupCreateViewHelperTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\Unit\ViewHelpers\Company\Group;
+
+use Tests\TestCase;
+use App\Helpers\ImageHelper;
+use App\Models\Company\Employee;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Http\ViewHelpers\Company\Group\GroupCreateViewHelper;
+
+class GroupCreateViewHelperTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_searches_employees_to_assign_to_a_group(): void
+    {
+        $michael = Employee::factory()->create([
+            'first_name' => 'ale',
+            'last_name' => 'ble',
+            'email' => 'ale@ble',
+        ]);
+        $dwight = Employee::factory()->create([
+            'first_name' => 'alb',
+            'last_name' => 'bli',
+            'email' => 'alb@bli',
+            'company_id' => $michael->company_id,
+        ]);
+        // the following should not be included in the search results
+        Employee::factory()->create([
+            'first_name' => 'ale',
+            'last_name' => 'ble',
+            'email' => 'ale@ble',
+            'locked' => true,
+            'company_id' => $michael->company_id,
+        ]);
+
+        $collection = GroupCreateViewHelper::search($michael->company, 'e');
+        $this->assertEquals(1, $collection->count());
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $michael->id,
+                    'name' => $michael->name,
+                    'avatar' => ImageHelper::getAvatar($michael, 23),
+                ],
+            ],
+            $collection->toArray()
+        );
+
+        $collection = GroupCreateViewHelper::search($michael->company, 'bli');
+        $this->assertEquals(1, $collection->count());
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $dwight->id,
+                    'name' => $dwight->name,
+                    'avatar' => ImageHelper::getAvatar($dwight, 23),
+                ],
+            ],
+            $collection->toArray()
+        );
+    }
+}
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
index 91dce3c80..1c12dbf98 100644
--- a/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupMembersViewHelperTest.php
@@ -78,19 +78,19 @@ public function it_gets_a_collection_of_potential_new_members(): void
             $jim->id,
         ]);
 
-        $collection = GroupMembersViewHelper::potentialMembers('je', $group, $michael->company);
+        $collection = GroupMembersViewHelper::potentialMembers($michael->company, $group, 'je');
         $this->assertEquals(
             [
                 0 => [
                     'id' => $jean->id,
                     'name' => $jean->name,
-                    'avatar' => ImageHelper::getAvatar($jean, 23),
+                    'avatar' => ImageHelper::getAvatar($jean, 64),
                 ],
             ],
             $collection->toArray()
         );
 
-        $collection = GroupMembersViewHelper::potentialMembers('roger', $group, $michael->company);
+        $collection = GroupMembersViewHelper::potentialMembers($michael->company, $group, 'roger');
         $this->assertEquals(
             [],
             $collection->toArray()

From 15dba2c69308c38e670423344104666147306b59 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 22:32:44 -0400
Subject: [PATCH 16/47] wip

---
 .../Company/Company/Group/GroupMembersController.php   |  2 +-
 .../ViewHelpers/Company/Group/GroupShowViewHelper.php  |  3 ++-
 .../js/Pages/Company/Group/Partials/GroupMenu.vue      | 10 +++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMembersController.php b/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
index e311676e7..c257f18b0 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMembersController.php
@@ -106,7 +106,7 @@ public function store(Request $request, int $companyId, int $groupId): JsonRespo
             'data' => [
                 'id' => $employee->id,
                 'name' => $employee->name,
-                'avatar' => ImageHelper::getAvatar($employee, 64),
+                'avatar' => ImageHelper::getAvatar($employee, 32),
             ],
         ]);
     }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
index 0def6b9d0..d578e65dc 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\ViewHelpers\Company\Group;
 
+use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
 use App\Models\Company\Company;
 
@@ -23,7 +24,7 @@ public static function information(Group $group, Company $company): array
             $membersCollection->push([
                 'id' => $employee->id,
                 'name' => $employee->name,
-                'avatar' => $employee->avatar,
+                'avatar' => ImageHelper::getAvatar($employee, 32),
                 'position' => (! $employee->position) ? null : [
                     'id' => $employee->position->id,
                     'title' => $employee->position->title,
diff --git a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
index d2b2c8cff..b3fea4c7c 100644
--- a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
+++ b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
@@ -25,9 +25,7 @@
 
     <div class="relative tc w-100 mb4">
       <div class="flex items-center justify-center">
-        <img v-for="member in group.members" :key="member.id" :src="member.avatar" alt="avatar" class="br-100 small-avatar"
-             width="32" height="32"
-        />
+        <avatar v-for="member in group.members" :key="member.id" :avatar="member.avatar" :size="32" :classes="'br-100 small-avatar'" />
         <!-- <div v-if="group.other_members_counter > 0" class="pl2 f7 more-members relative gray">
           {{ $t('project.menu_other_member', { count: project.other_members_counter }) }}
         </div> -->
@@ -51,7 +49,13 @@
 </template>
 
 <script>
+import Avatar from '@/Shared/Avatar';
+
 export default {
+  components: {
+    Avatar,
+  },
+
   props: {
     group: {
       type: Object,

From d92b451d62a05082f52d11115f96800e9be97fcc Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Thu, 25 Mar 2021 12:19:22 -0400
Subject: [PATCH 17/47] wip

---
 app/Helpers/LogHelper.php                     |  18 ++
 .../Company/Group/CreateAgendaItem.php        | 121 +++++++++++
 database/factories/Company/MeetingFactory.php |   4 +-
 resources/lang/en/account.php                 |   2 +
 .../Company/Group/CreateAgendaItemTest.php    | 195 ++++++++++++++++++
 5 files changed, 337 insertions(+), 3 deletions(-)
 create mode 100644 app/Services/Company/Group/CreateAgendaItem.php
 create mode 100644 tests/Unit/Services/Company/Group/CreateAgendaItemTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index 3b2d80ca6..b8bc576df 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1135,6 +1135,16 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'agenda_item_created':
+                $sentence = trans('account.log_agenda_item_created', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             case 'company_logo_changed':
                 $sentence = trans('account.log_company_logo_changed');
                 break;
@@ -1663,6 +1673,14 @@ public static function processEmployeeLog(EmployeeLog $log): string
                 ]);
                 break;
 
+            case 'agenda_item_created':
+                $sentence = trans('account.employee_log_agenda_item_created', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Services/Company/Group/CreateAgendaItem.php b/app/Services/Company/Group/CreateAgendaItem.php
new file mode 100644
index 000000000..60da6cd29
--- /dev/null
+++ b/app/Services/Company/Group/CreateAgendaItem.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+
+class CreateAgendaItem extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+    protected Meeting $meeting;
+    protected AgendaItem $agendaItem;
+    protected Employee $presenter;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'meeting_id' => 'required|integer|exists:meetings,id',
+            'summary' => 'required|string|max:255',
+            'description' => 'nullable|string|max:65535',
+            'presented_by_id' => 'nullable|integer|exists:employees,id',
+        ];
+    }
+
+    /**
+     * Create an agenda item in a meeting.
+     *
+     * @param array $data
+     * @return AgendaItem
+     */
+    public function execute(array $data): AgendaItem
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->createAgendaItem();
+        $this->log();
+
+        return $this->agendaItem;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+
+        if ($this->data['presented_by_id']) {
+            $this->presenter = Employee::where('company_id', $this->data['company_id'])
+                ->findOrFail($this->data['presented_by_id']);
+        }
+    }
+
+    private function createAgendaItem(): void
+    {
+        $this->agendaItem = AgendaItem::create([
+            'meeting_id' => $this->data['meeting_id'],
+            'summary' => $this->data['summary'],
+            'description' => $this->data['description'],
+            'presented_by_id' => $this->data['presented_by_id'] ? $this->data['presented_by_id'] : null,
+        ]);
+
+        if ($this->presenter) {
+            $this->meeting->employees()->syncWithoutDetaching([
+                $this->presenter->id,
+            ]);
+        }
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'agenda_item_created',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->author->id,
+            'action' => 'agenda_item_created',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/database/factories/Company/MeetingFactory.php b/database/factories/Company/MeetingFactory.php
index 790e37a26..9cf47f6cd 100644
--- a/database/factories/Company/MeetingFactory.php
+++ b/database/factories/Company/MeetingFactory.php
@@ -23,10 +23,8 @@ class MeetingFactory extends Factory
      */
     public function definition()
     {
-        $group = Group::factory()->create();
-
         return [
-            'group_id' => $group->id,
+            'group_id' => Group::factory(),
         ];
     }
 
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index b92bd97b9..ead6c353d 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -300,6 +300,7 @@
     'log_employee_removed_from_meeting' => 'Indicated that :employee_name was not in a meeting in the group called :group_name.',
     'log_toggle_e_coffee_process' => 'Toggled the eCoffee process in the company.',
     'log_company_logo_changed' => 'Changed the company logo.',
+    'log_agenda_item_created' => 'Added an agenda item in a meeting in the group called :group_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
@@ -377,6 +378,7 @@
     'employee_log_employee_removed_from_group' => 'Has been remove from the group called :group_name.',
     'employee_log_employee_marked_as_participant_in_meeting' => 'Has been added in a meeting in the group called :group_name.',
     'employee_log_employee_removed_from_meeting' => 'Has been removed from a meeting in the group called :group_name.',
+    'employee_log_agenda_item_created' => 'Has created an agenda item in a meeting in the group called :group_name.',
 
     // team logs
     'team_log_team_created' => 'Created the team.',
diff --git a/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php b/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php
new file mode 100644
index 000000000..a5bb998ae
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php
@@ -0,0 +1,195 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\CreateAgendaItem;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class CreateAgendaItemTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_creates_an_agenda_item_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([
+            $dwight->id,
+        ]);
+
+        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_creates_an_agenda_item_as_administrator_and_assigns_a_presenter_who_is_not_part_of_the_group(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+
+        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_creates_an_agenda_item_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([
+            $dwight->id,
+        ]);
+
+        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_creates_an_agenda_item_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([
+            $dwight->id,
+        ]);
+
+        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = Employee::factory()->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new CreateAgendaItem)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_doesnt_belong_to_the_company(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([
+            $dwight->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_fails_if_the_meeting_doesnt_belong_to_the_group(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create();
+        $meeting->employees()->syncWithoutDetaching([
+            $dwight->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_fails_if_the_presenter_is_not_in_the_company(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $dwight = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([
+            $dwight->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+    }
+
+    private function executeService(Employee $michael, Employee $presenter, Company $company, Group $group, Meeting $meeting): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $company->id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'summary' => 'Super agenda item',
+            'description' => null,
+            'presented_by_id' => $presenter->id,
+        ];
+
+        $agendaItem = (new CreateAgendaItem)->execute($request);
+
+        $this->assertDatabaseHas('agenda_items', [
+            'id' => $agendaItem->id,
+            'meeting_id' => $meeting->id,
+            'summary' => 'Super agenda item',
+            'presented_by_id' => $presenter->id,
+        ]);
+
+        $this->assertInstanceOf(
+            AgendaItem::class,
+            $agendaItem
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'agenda_item_created' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'meeting_id' => $meeting->id,
+                ]);
+        });
+    }
+}

From f9aa5bad46a7b8526c45ef896435f5848310ecec Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Thu, 25 Mar 2021 19:52:04 -0400
Subject: [PATCH 18/47] wip

---
 app/Helpers/LogHelper.php                     |  82 +++++++
 .../AddEmployeeAsParticipantOfMeeting.php     |   2 +-
 .../Company/Group/CreateAgendaItem.php        |   6 -
 .../Company/Group/CreateMeetingDecision.php   | 110 +++++++++
 .../Company/Group/DestroyAgendaItem.php       |  85 +++++++
 app/Services/Company/Group/DestroyMeeting.php |   8 +-
 .../Company/Group/DestroyMeetingDecision.php  |  91 ++++++++
 .../Company/Group/UpdateAgendaItem.php        | 120 ++++++++++
 .../Company/Group/UpdateMeetingDecision.php   | 115 ++++++++++
 .../Pages/Company/Group/Meetings/Create.vue   |   0
 resources/lang/en/account.php                 |   9 +
 .../Company/Group/CreateAgendaItemTest.php    |  43 +---
 .../Group/CreateMeetingDecisionTest.php       | 171 ++++++++++++++
 .../Company/Group/DestroyAgendaItemTest.php   | 126 +++++++++++
 .../Group/DestroyMeetingDecisionTest.php      | 156 +++++++++++++
 .../Company/Group/DestroyMeetingTest.php      |   1 +
 .../Company/Group/UpdateAgendaItemTest.php    | 208 ++++++++++++++++++
 .../Group/UpdateMeetingDecisionTest.php       | 188 ++++++++++++++++
 18 files changed, 1478 insertions(+), 43 deletions(-)
 create mode 100644 app/Services/Company/Group/CreateMeetingDecision.php
 create mode 100644 app/Services/Company/Group/DestroyAgendaItem.php
 create mode 100644 app/Services/Company/Group/DestroyMeetingDecision.php
 create mode 100644 app/Services/Company/Group/UpdateAgendaItem.php
 create mode 100644 app/Services/Company/Group/UpdateMeetingDecision.php
 create mode 100644 resources/js/Pages/Company/Group/Meetings/Create.vue
 create mode 100644 tests/Unit/Services/Company/Group/CreateMeetingDecisionTest.php
 create mode 100644 tests/Unit/Services/Company/Group/DestroyAgendaItemTest.php
 create mode 100644 tests/Unit/Services/Company/Group/DestroyMeetingDecisionTest.php
 create mode 100644 tests/Unit/Services/Company/Group/UpdateAgendaItemTest.php
 create mode 100644 tests/Unit/Services/Company/Group/UpdateMeetingDecisionTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index b8bc576df..78a8a2587 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1145,6 +1145,56 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'agenda_item_updated':
+                $sentence = trans('account.log_agenda_item_updated', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
+            case 'agenda_item_destroyed':
+                $sentence = trans('account.log_agenda_item_destroyed', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
+            case 'meeting_decision_created':
+                $sentence = trans('account.log_meeting_decision_created', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
+            case 'meeting_decision_destroyed':
+                $sentence = trans('account.log_meeting_decision_destroyed', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
+            case 'meeting_decision_updated':
+                $sentence = trans('account.log_meeting_decision_updated', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             case 'company_logo_changed':
                 $sentence = trans('account.log_company_logo_changed');
                 break;
@@ -1681,6 +1731,38 @@ public static function processEmployeeLog(EmployeeLog $log): string
                 ]);
                 break;
 
+            case 'agenda_item_updated':
+                $sentence = trans('account.employee_log_agenda_item_updated', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
+            case 'meeting_decision_created':
+                $sentence = trans('account.employee_log_meeting_decision_created', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
+            case 'meeting_decision_destroyed':
+                $sentence = trans('account.employee_log_meeting_decision_destroyed', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
+            case 'meeting_decision_updated':
+                $sentence = trans('account.employee_log_log_meeting_decision_updated', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php b/app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php
index 189c8bfc6..ef205fea9 100644
--- a/app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php
+++ b/app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php
@@ -76,7 +76,7 @@ private function attachEmployee(): void
     {
         $this->meeting->employees()->syncWithoutDetaching([
             $this->data['employee_id'] => [
-                'was_a_guest' => $this->isEmployeePartOfGroup(),
+                'was_a_guest' => ! $this->isEmployeePartOfGroup(),
             ],
         ]);
     }
diff --git a/app/Services/Company/Group/CreateAgendaItem.php b/app/Services/Company/Group/CreateAgendaItem.php
index 60da6cd29..6fb151598 100644
--- a/app/Services/Company/Group/CreateAgendaItem.php
+++ b/app/Services/Company/Group/CreateAgendaItem.php
@@ -82,12 +82,6 @@ private function createAgendaItem(): void
             'description' => $this->data['description'],
             'presented_by_id' => $this->data['presented_by_id'] ? $this->data['presented_by_id'] : null,
         ]);
-
-        if ($this->presenter) {
-            $this->meeting->employees()->syncWithoutDetaching([
-                $this->presenter->id,
-            ]);
-        }
     }
 
     private function log(): void
diff --git a/app/Services/Company/Group/CreateMeetingDecision.php b/app/Services/Company/Group/CreateMeetingDecision.php
new file mode 100644
index 000000000..d146c4a60
--- /dev/null
+++ b/app/Services/Company/Group/CreateMeetingDecision.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\AgendaItem;
+use App\Models\Company\MeetingDecision;
+
+class CreateMeetingDecision extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+    protected Meeting $meeting;
+    protected AgendaItem $agendaItem;
+    protected MeetingDecision $meetingDecision;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'meeting_id' => 'required|integer|exists:meetings,id',
+            'agenda_item_id' => 'required|integer|exists:agenda_items,id',
+            'description' => 'required|string|max:65535',
+        ];
+    }
+
+    /**
+     * Create a decision about an agenda item in a meeting.
+     *
+     * @param array $data
+     * @return MeetingDecision
+     */
+    public function execute(array $data): MeetingDecision
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->createDecision();
+        $this->log();
+
+        return $this->meetingDecision;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+
+        $this->agendaItem = AgendaItem::where('meeting_id', $this->data['meeting_id'])
+            ->findOrFail($this->data['agenda_item_id']);
+    }
+
+    private function createDecision(): void
+    {
+        $this->meetingDecision = MeetingDecision::create([
+            'agenda_item_id' => $this->data['agenda_item_id'],
+            'description' => $this->data['description'],
+        ]);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'meeting_decision_created',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->author->id,
+            'action' => 'meeting_decision_created',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Group/DestroyAgendaItem.php b/app/Services/Company/Group/DestroyAgendaItem.php
new file mode 100644
index 000000000..fb912bc96
--- /dev/null
+++ b/app/Services/Company/Group/DestroyAgendaItem.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Models\Company\Meeting;
+use App\Models\Company\AgendaItem;
+
+class DestroyAgendaItem extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+    protected Meeting $meeting;
+    protected AgendaItem $agendaItem;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'nullable|integer|exists:groups,id',
+            'meeting_id' => 'nullable|integer|exists:meetings,id',
+            'agenda_item_id' => 'nullable|integer|exists:agenda_items,id',
+        ];
+    }
+
+    /**
+     * Delete an agenda item.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->destroy();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+
+        $this->agendaItem = AgendaItem::where('meeting_id', $this->data['meeting_id'])
+            ->findOrFail($this->data['agenda_item_id']);
+    }
+
+    private function destroy(): void
+    {
+        $this->agendaItem->delete();
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'agenda_item_destroyed',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_name' => $this->group->name,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Group/DestroyMeeting.php b/app/Services/Company/Group/DestroyMeeting.php
index 4eb7b4a7e..05c06e81d 100644
--- a/app/Services/Company/Group/DestroyMeeting.php
+++ b/app/Services/Company/Group/DestroyMeeting.php
@@ -24,6 +24,7 @@ public function rules(): array
         return [
             'company_id' => 'required|integer|exists:companies,id',
             'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'nullable|integer|exists:groups,id',
             'meeting_id' => 'nullable|integer|exists:meetings,id',
         ];
     }
@@ -50,10 +51,11 @@ private function validate(): void
             ->asNormalUser()
             ->canExecuteService();
 
-        $this->meeting = Meeting::findOrFail($this->data['meeting_id']);
-
         $this->group = Group::where('company_id', $this->data['company_id'])
-            ->findOrFail($this->meeting->group_id);
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
     }
 
     private function destroy(): void
diff --git a/app/Services/Company/Group/DestroyMeetingDecision.php b/app/Services/Company/Group/DestroyMeetingDecision.php
new file mode 100644
index 000000000..f1b896990
--- /dev/null
+++ b/app/Services/Company/Group/DestroyMeetingDecision.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Models\Company\Meeting;
+use App\Models\Company\AgendaItem;
+use App\Models\Company\MeetingDecision;
+
+class DestroyMeetingDecision extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+    protected Meeting $meeting;
+    protected AgendaItem $agendaItem;
+    protected MeetingDecision $meetingDecision;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'nullable|integer|exists:groups,id',
+            'meeting_id' => 'nullable|integer|exists:meetings,id',
+            'agenda_item_id' => 'nullable|integer|exists:agenda_items,id',
+            'meeting_decision_id' => 'nullable|integer|exists:meeting_decisions,id',
+        ];
+    }
+
+    /**
+     * Delete a meeting decision.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->destroy();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+
+        $this->agendaItem = AgendaItem::where('meeting_id', $this->data['meeting_id'])
+            ->findOrFail($this->data['agenda_item_id']);
+
+        $this->meetingDecision = MeetingDecision::where('agenda_item_id', $this->data['agenda_item_id'])
+            ->findOrFail($this->data['meeting_decision_id']);
+    }
+
+    private function destroy(): void
+    {
+        $this->meetingDecision->delete();
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'meeting_decision_destroyed',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_name' => $this->group->name,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Group/UpdateAgendaItem.php b/app/Services/Company/Group/UpdateAgendaItem.php
new file mode 100644
index 000000000..c9074cbef
--- /dev/null
+++ b/app/Services/Company/Group/UpdateAgendaItem.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+
+class UpdateAgendaItem extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+    protected Meeting $meeting;
+    protected AgendaItem $agendaItem;
+    protected Employee $presenter;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'meeting_id' => 'required|integer|exists:meetings,id',
+            'agenda_item_id' => 'required|integer|exists:agenda_items,id',
+            'summary' => 'required|string|max:255',
+            'description' => 'nullable|string|max:65535',
+            'presented_by_id' => 'nullable|integer|exists:employees,id',
+        ];
+    }
+
+    /**
+     * Update an existing agenda item in a meeting.
+     *
+     * @param array $data
+     * @return AgendaItem
+     */
+    public function execute(array $data): AgendaItem
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->updateAgendaItem();
+        $this->log();
+
+        $this->agendaItem->refresh();
+
+        return $this->agendaItem;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+
+        $this->agendaItem = AgendaItem::where('meeting_id', $this->data['meeting_id'])
+            ->findOrFail($this->data['agenda_item_id']);
+
+        if ($this->data['presented_by_id']) {
+            $this->presenter = Employee::where('company_id', $this->data['company_id'])
+                ->findOrFail($this->data['presented_by_id']);
+        }
+    }
+
+    private function updateAgendaItem(): void
+    {
+        AgendaItem::where('id', $this->agendaItem->id)->update([
+            'summary' => $this->data['summary'],
+            'description' => $this->data['description'],
+            'presented_by_id' => $this->data['presented_by_id'] ? $this->data['presented_by_id'] : null,
+        ]);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'agenda_item_updated',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->author->id,
+            'action' => 'agenda_item_updated',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Group/UpdateMeetingDecision.php b/app/Services/Company/Group/UpdateMeetingDecision.php
new file mode 100644
index 000000000..d47adea80
--- /dev/null
+++ b/app/Services/Company/Group/UpdateMeetingDecision.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\AgendaItem;
+use App\Models\Company\MeetingDecision;
+
+class UpdateMeetingDecision extends BaseService
+{
+    protected array $data;
+    protected Group $group;
+    protected Meeting $meeting;
+    protected AgendaItem $agendaItem;
+    protected MeetingDecision $meetingDecision;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'meeting_id' => 'required|integer|exists:meetings,id',
+            'agenda_item_id' => 'required|integer|exists:agenda_items,id',
+            'meeting_decision_id' => 'required|integer|exists:meeting_decisions,id',
+            'description' => 'required|string|max:65535',
+        ];
+    }
+
+    /**
+     * Destroy an existing meeting decision.
+     *
+     * @param array $data
+     * @return MeetingDecision
+     */
+    public function execute(array $data): MeetingDecision
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->updateMeetingDecision();
+        $this->log();
+
+        $this->meetingDecision->refresh();
+
+        return $this->meetingDecision;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+
+        $this->agendaItem = AgendaItem::where('meeting_id', $this->data['meeting_id'])
+            ->findOrFail($this->data['agenda_item_id']);
+
+        $this->meetingDecision = MeetingDecision::where('agenda_item_id', $this->data['agenda_item_id'])
+            ->findOrFail($this->data['meeting_decision_id']);
+    }
+
+    private function updateMeetingDecision(): void
+    {
+        MeetingDecision::where('id', $this->meetingDecision->id)->update([
+            'description' => $this->data['description'],
+        ]);
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'meeting_decision_updated',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->author->id,
+            'action' => 'meeting_decision_updated',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/resources/js/Pages/Company/Group/Meetings/Create.vue b/resources/js/Pages/Company/Group/Meetings/Create.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index ead6c353d..ffe2fe817 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -301,6 +301,11 @@
     'log_toggle_e_coffee_process' => 'Toggled the eCoffee process in the company.',
     'log_company_logo_changed' => 'Changed the company logo.',
     'log_agenda_item_created' => 'Added an agenda item in a meeting in the group called :group_name.',
+    'log_agenda_item_updated' => 'Updated an agenda item in a meeting in the group called :group_name.',
+    'log_agenda_item_destroyed' => 'Destroyed an agenda item in a meeting in the group called :group_name.',
+    'log_meeting_decision_created' => 'Created a meeting decision about an agenda item in a meeting in the group called :group_name.',
+    'log_meeting_decision_destroyed' => 'Deleted a meeting decision about an agenda item in a meeting in the group called :group_name.',
+    'log_meeting_decision_updated' => 'Updated a meeting decision about an agenda item in a meeting in the group called :group_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
@@ -379,6 +384,10 @@
     'employee_log_employee_marked_as_participant_in_meeting' => 'Has been added in a meeting in the group called :group_name.',
     'employee_log_employee_removed_from_meeting' => 'Has been removed from a meeting in the group called :group_name.',
     'employee_log_agenda_item_created' => 'Has created an agenda item in a meeting in the group called :group_name.',
+    'employee_log_agenda_item_updated' => 'Has updated an agenda item in a meeting in the group called :group_name.',
+    'employee_log_meeting_decision_created' => 'Created a meeting decision about an agenda item in a meeting in the group called :group_name.',
+    'employee_log_meeting_decision_destroyed' => 'Deleted a meeting decision about an agenda item in a meeting in the group called :group_name.',
+    'employee_log_meeting_decision_updated' => 'Updated a meeting decision about an agenda item in a meeting in the group called :group_name.',
 
     // team logs
     'team_log_team_created' => 'Created the team.',
diff --git a/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php b/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php
index a5bb998ae..f865e377a 100644
--- a/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php
+++ b/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php
@@ -23,18 +23,14 @@ class CreateAgendaItemTest extends TestCase
     public function it_creates_an_agenda_item_as_administrator(): void
     {
         $michael = $this->createAdministrator();
-        $dwight = $this->createAnotherEmployee($michael);
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
         $meeting = Meeting::factory()->create([
             'group_id' => $group->id,
         ]);
-        $meeting->employees()->syncWithoutDetaching([
-            $dwight->id,
-        ]);
 
-        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+        $this->executeService($michael, $michael->company, $group, $meeting);
     }
 
     /** @test */
@@ -49,43 +45,35 @@ public function it_creates_an_agenda_item_as_administrator_and_assigns_a_present
             'group_id' => $group->id,
         ]);
 
-        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+        $this->executeService($michael, $michael->company, $group, $meeting, $dwight);
     }
 
     /** @test */
     public function it_creates_an_agenda_item_as_hr(): void
     {
         $michael = $this->createHR();
-        $dwight = $this->createAnotherEmployee($michael);
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
         $meeting = Meeting::factory()->create([
             'group_id' => $group->id,
         ]);
-        $meeting->employees()->syncWithoutDetaching([
-            $dwight->id,
-        ]);
 
-        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+        $this->executeService($michael, $michael->company, $group, $meeting);
     }
 
     /** @test */
     public function it_creates_an_agenda_item_as_normal_user(): void
     {
         $michael = $this->createEmployee();
-        $dwight = $this->createAnotherEmployee($michael);
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
         $meeting = Meeting::factory()->create([
             'group_id' => $group->id,
         ]);
-        $meeting->employees()->syncWithoutDetaching([
-            $dwight->id,
-        ]);
 
-        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+        $this->executeService($michael, $michael->company, $group, $meeting);
     }
 
     /** @test */
@@ -105,34 +93,26 @@ public function it_fails_if_wrong_parameters_are_given(): void
     public function it_fails_if_the_group_doesnt_belong_to_the_company(): void
     {
         $michael = Employee::factory()->create([]);
-        $dwight = $this->createAnotherEmployee($michael);
         $group = Group::factory()->create();
         $meeting = Meeting::factory()->create([
             'group_id' => $group->id,
         ]);
-        $meeting->employees()->syncWithoutDetaching([
-            $dwight->id,
-        ]);
 
         $this->expectException(ModelNotFoundException::class);
-        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+        $this->executeService($michael, $michael->company, $group, $meeting);
     }
 
     /** @test */
     public function it_fails_if_the_meeting_doesnt_belong_to_the_group(): void
     {
         $michael = Employee::factory()->create([]);
-        $dwight = $this->createAnotherEmployee($michael);
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
         $meeting = Meeting::factory()->create();
-        $meeting->employees()->syncWithoutDetaching([
-            $dwight->id,
-        ]);
 
         $this->expectException(ModelNotFoundException::class);
-        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+        $this->executeService($michael, $michael->company, $group, $meeting);
     }
 
     /** @test */
@@ -146,15 +126,12 @@ public function it_fails_if_the_presenter_is_not_in_the_company(): void
         $meeting = Meeting::factory()->create([
             'group_id' => $group->id,
         ]);
-        $meeting->employees()->syncWithoutDetaching([
-            $dwight->id,
-        ]);
 
         $this->expectException(ModelNotFoundException::class);
-        $this->executeService($michael, $dwight, $michael->company, $group, $meeting);
+        $this->executeService($michael, $michael->company, $group, $meeting, $dwight);
     }
 
-    private function executeService(Employee $michael, Employee $presenter, Company $company, Group $group, Meeting $meeting): void
+    private function executeService(Employee $michael, Company $company, Group $group, Meeting $meeting, Employee $presenter = null): void
     {
         Queue::fake();
 
@@ -165,7 +142,7 @@ private function executeService(Employee $michael, Employee $presenter, Company
             'meeting_id' => $meeting->id,
             'summary' => 'Super agenda item',
             'description' => null,
-            'presented_by_id' => $presenter->id,
+            'presented_by_id' => $presenter ? $presenter->id : null,
         ];
 
         $agendaItem = (new CreateAgendaItem)->execute($request);
@@ -174,7 +151,7 @@ private function executeService(Employee $michael, Employee $presenter, Company
             'id' => $agendaItem->id,
             'meeting_id' => $meeting->id,
             'summary' => 'Super agenda item',
-            'presented_by_id' => $presenter->id,
+            'presented_by_id' => $presenter ? $presenter->id : null,
         ]);
 
         $this->assertInstanceOf(
diff --git a/tests/Unit/Services/Company/Group/CreateMeetingDecisionTest.php b/tests/Unit/Services/Company/Group/CreateMeetingDecisionTest.php
new file mode 100644
index 000000000..5a2c4b746
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/CreateMeetingDecisionTest.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+use Illuminate\Support\Facades\Queue;
+use App\Models\Company\MeetingDecision;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\CreateMeetingDecision;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class CreateMeetingDecisionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_creates_a_meeting_decision_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_creates_a_meeting_decision_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_creates_a_meeting_decision_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = Employee::factory()->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new CreateMeetingDecision)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_doesnt_belong_to_the_company(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_the_meeting_doesnt_belong_to_the_group(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create();
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_the_agenda_item_doesnt_belong_to_the_meeting(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create();
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    private function executeService(Employee $michael, Company $company, Group $group, Meeting $meeting, AgendaItem $agendaItem): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $company->id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'agenda_item_id' => $agendaItem->id,
+            'description' => 'Description',
+        ];
+
+        $meetingDecision = (new CreateMeetingDecision)->execute($request);
+
+        $this->assertDatabaseHas('meeting_decisions', [
+            'id' => $meetingDecision->id,
+            'agenda_item_id' => $agendaItem->id,
+            'description' => 'Description',
+        ]);
+
+        $this->assertInstanceOf(
+            MeetingDecision::class,
+            $meetingDecision
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'meeting_decision_created' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'meeting_id' => $meeting->id,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Group/DestroyAgendaItemTest.php b/tests/Unit/Services/Company/Group/DestroyAgendaItemTest.php
new file mode 100644
index 000000000..043aa3926
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/DestroyAgendaItemTest.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+use Illuminate\Support\Facades\Queue;
+use App\Services\Company\Group\DestroyMeeting;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\DestroyAgendaItem;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class DestroyAgendaItemTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_destroys_an_agenda_item_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $this->executeService($michael, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_destroys_an_agenda_item_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $this->executeService($michael, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_destroys_an_agenda_item_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $this->executeService($michael, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_meeting_is_not_part_of_the_group(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([]);
+
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = Employee::factory()->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new DestroyMeeting)->execute($request);
+    }
+
+    private function executeService(Employee $michael, Group $group, Meeting $meeting, AgendaItem $agendaItem): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'agenda_item_id' => $agendaItem->id,
+        ];
+
+        (new DestroyAgendaItem)->execute($request);
+
+        $this->assertDatabaseMissing('agenda_items', [
+            'id' => $agendaItem->id,
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'agenda_item_destroyed' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_name' => $group->name,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Group/DestroyMeetingDecisionTest.php b/tests/Unit/Services/Company/Group/DestroyMeetingDecisionTest.php
new file mode 100644
index 000000000..743faff16
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/DestroyMeetingDecisionTest.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+use Illuminate\Support\Facades\Queue;
+use App\Models\Company\MeetingDecision;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\DestroyMeetingDecision;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class DestroyMeetingDecisionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_destroys_a_meeting_decision_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+        $this->executeService($michael, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_destroys_a_meeting_decision_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+        $this->executeService($michael, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_destroys_a_meeting_decision_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+        $this->executeService($michael, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_fails_if_meeting_is_not_part_of_the_group(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_fails_if_agenda_item_is_not_part_of_the_meeting(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create();
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = Employee::factory()->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new DestroyMeetingDecision)->execute($request);
+    }
+
+    private function executeService(Employee $michael, Group $group, Meeting $meeting, AgendaItem $agendaItem, MeetingDecision $meetingDecision): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'agenda_item_id' => $agendaItem->id,
+            'meeting_decision_id' => $meetingDecision->id,
+        ];
+
+        (new DestroyMeetingDecision)->execute($request);
+
+        $this->assertDatabaseMissing('meeting_decisions', [
+            'id' => $meetingDecision->id,
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'meeting_decision_destroyed' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_name' => $group->name,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Group/DestroyMeetingTest.php b/tests/Unit/Services/Company/Group/DestroyMeetingTest.php
index bd6cfd1a7..eee2ff9c2 100644
--- a/tests/Unit/Services/Company/Group/DestroyMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/DestroyMeetingTest.php
@@ -89,6 +89,7 @@ private function executeService(Employee $michael, Group $group, Meeting $meetin
         $request = [
             'company_id' => $michael->company_id,
             'author_id' => $michael->id,
+            'group_id' => $group->id,
             'meeting_id' => $meeting->id,
         ];
 
diff --git a/tests/Unit/Services/Company/Group/UpdateAgendaItemTest.php b/tests/Unit/Services/Company/Group/UpdateAgendaItemTest.php
new file mode 100644
index 000000000..c1184c52d
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/UpdateAgendaItemTest.php
@@ -0,0 +1,208 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\UpdateAgendaItem;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class UpdateAgendaItemTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_updates_an_agenda_item_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_updates_an_agenda_item_as_administrator_and_assigns_a_presenter_who_is_not_part_of_the_group(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem, $dwight);
+    }
+
+    /** @test */
+    public function it_updates_an_agenda_item_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_updates_an_agenda_item_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = Employee::factory()->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new UpdateAgendaItem)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_doesnt_belong_to_the_company(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_the_meeting_doesnt_belong_to_the_group(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create();
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_the_agenda_item_does_not_belong_to_the_meeting(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create();
+        $agendaItem = AgendaItem::factory()->create();
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem);
+    }
+
+    /** @test */
+    public function it_fails_if_the_presenter_is_not_in_the_company(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $dwight = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem, $dwight);
+    }
+
+    private function executeService(Employee $michael, Company $company, Group $group, Meeting $meeting, AgendaItem $agendaItem, Employee $presenter = null): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $company->id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'agenda_item_id' => $agendaItem->id,
+            'summary' => 'Super agenda item',
+            'description' => null,
+            'presented_by_id' => $presenter ? $presenter->id : null,
+        ];
+
+        $agendaItem = (new UpdateAgendaItem)->execute($request);
+
+        $this->assertDatabaseHas('agenda_items', [
+            'id' => $agendaItem->id,
+            'meeting_id' => $meeting->id,
+            'summary' => 'Super agenda item',
+            'presented_by_id' => $presenter ? $presenter->id : null,
+        ]);
+
+        $this->assertInstanceOf(
+            AgendaItem::class,
+            $agendaItem
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'agenda_item_updated' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'meeting_id' => $meeting->id,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/Services/Company/Group/UpdateMeetingDecisionTest.php b/tests/Unit/Services/Company/Group/UpdateMeetingDecisionTest.php
new file mode 100644
index 000000000..8f5d46395
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/UpdateMeetingDecisionTest.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use App\Models\Company\AgendaItem;
+use Illuminate\Support\Facades\Queue;
+use App\Models\Company\MeetingDecision;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\UpdateAgendaItem;
+use App\Services\Company\Group\UpdateMeetingDecision;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class UpdateMeetingDecisionTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_updates_a_meeting_decision_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_updates_a_meeting_decision_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_updates_a_meeting_decision_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $michael = Employee::factory()->create([]);
+
+        $request = [
+            'company_id' => $michael->company_id,
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new UpdateAgendaItem)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_doesnt_belong_to_the_company(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_fails_if_the_meeting_doesnt_belong_to_the_group(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create();
+        $agendaItem = AgendaItem::factory()->create([
+            'meeting_id' => $meeting->id,
+        ]);
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    /** @test */
+    public function it_fails_if_the_agenda_item_does_not_belong_to_the_meeting(): void
+    {
+        $michael = Employee::factory()->create([]);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create();
+        $agendaItem = AgendaItem::factory()->create();
+        $meetingDecision = MeetingDecision::factory()->create([
+            'agenda_item_id' => $agendaItem->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $michael->company, $group, $meeting, $agendaItem, $meetingDecision);
+    }
+
+    private function executeService(Employee $michael, Company $company, Group $group, Meeting $meeting, AgendaItem $agendaItem, MeetingDecision $meetingDecision): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $company->id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'agenda_item_id' => $agendaItem->id,
+            'meeting_decision_id' => $meetingDecision->id,
+            'description' => 'description',
+        ];
+
+        $meetingDecision = (new UpdateMeetingDecision)->execute($request);
+
+        $this->assertDatabaseHas('meeting_decisions', [
+            'id' => $meetingDecision->id,
+            'description' => 'description',
+        ]);
+
+        $this->assertInstanceOf(
+            MeetingDecision::class,
+            $meetingDecision
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'meeting_decision_updated' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'meeting_id' => $meeting->id,
+                ]);
+        });
+    }
+}

From 551090c055c4fcbc814f39c1a5126aad35320d62 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Fri, 26 Mar 2021 08:11:41 -0400
Subject: [PATCH 19/47] wip

---
 .../Company/Group/GroupMeetingsController.php |  68 +++++
 .../js/Pages/Company/Group/Meetings/Index.vue | 272 ++++++++++++++++++
 .../js/Pages/Company/Group/Members/Index.vue  |   2 +-
 .../Company/Group/Partials/GroupMenu.vue      |   3 +
 routes/web.php                                |   4 +
 5 files changed, 348 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
 create mode 100644 resources/js/Pages/Company/Group/Meetings/Index.vue

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
new file mode 100644
index 000000000..e99f9820c
--- /dev/null
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Http\Controllers\Company\Company\Group;
+
+use Inertia\Inertia;
+use Illuminate\Http\Request;
+use App\Models\Company\Group;
+use App\Helpers\InstanceHelper;
+use App\Helpers\NotificationHelper;
+use App\Http\Controllers\Controller;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
+
+class GroupMeetingsController extends Controller
+{
+    /**
+     * Display the Meetings page.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     */
+    public function index(Request $request, int $companyId, int $groupId)
+    {
+        $company = InstanceHelper::getLoggedCompany();
+
+        try {
+            $group = Group::where('company_id', $company->id)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        $info = GroupShowViewHelper::information($group, $company);
+
+        return Inertia::render('Company/Group/Meetings/Index', [
+            'group' => $info,
+            'tab' => 'meetings',
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Show the Create meeting page.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     */
+    public function create(Request $request, int $companyId, int $groupId)
+    {
+        $company = InstanceHelper::getLoggedCompany();
+
+        try {
+            $group = Group::where('company_id', $company->id)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        $info = GroupShowViewHelper::information($group, $company);
+
+        return Inertia::render('Company/Group/Meetings/Create', [
+            'group' => $info,
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+}
diff --git a/resources/js/Pages/Company/Group/Meetings/Index.vue b/resources/js/Pages/Company/Group/Meetings/Index.vue
new file mode 100644
index 000000000..ec3bcb7ea
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Meetings/Index.vue
@@ -0,0 +1,272 @@
+<style lang="scss" scoped>
+.small-avatar {
+  margin-left: -8px;
+  box-shadow: 0 0 0 2px #fff;
+}
+
+.meeting-item:first-child:hover {
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+
+.meeting-item:last-child {
+  border-bottom: 0;
+
+  &:hover {
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px;
+  }
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph5-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mb4 mw6 br3 center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company'">{{ $t('app.breadcrumb_company') }}</inertia-link>
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups'">{{ $t('app.breadcrumb_group_list') }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_group_detail') }}
+          </li>
+        </ul>
+      </div>
+
+      <div class="mw7 center br3 mb5 relative z-1">
+        <!-- Menu -->
+        <group-menu :group="group" :tab="tab" />
+      </div>
+
+      <div class="mw6 center br3 mb5 relative z-1">
+        <!-- add a new meeting -->
+        <div class="tr mb2">
+          <inertia-link :href="'#'" class="btn dib-l db mb3 mb0-ns" data-cy="member-add-button">Create new meeting</inertia-link>
+        </div>
+
+        <!-- list of meetings -->
+        <div class="br3 bg-white box z-1">
+          <ul class="list pl0 ma0">
+            <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+              <div class="mb1 relative">
+                <span class="employee-name db">
+                  Meeting du 20 janvier
+                </span>
+              </div>
+              <span class="ma0 mb0 f7 grey">
+                <div class="flex items-center relative tr">
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <div class="pl2 f7 more-members relative gray">
+                    {{ $t('project.menu_other_member', { count: 3 }) }}
+                  </div>
+                </div>
+              </span>
+            </li>
+            <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+              <div class="mb1 relative">
+                <span class="employee-name db">
+                  Meeting du 20 janvier
+                </span>
+              </div>
+              <span class="ma0 mb0 f7 grey">
+                <div class="flex items-center relative tr">
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                </div>
+              </span>
+            </li>
+            <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+              <div class="mb1 relative">
+                <span class="employee-name db">
+                  Meeting du 20 janvier
+                </span>
+              </div>
+              <span class="ma0 mb0 f7 grey">
+                <div class="flex items-center relative tr">
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                </div>
+              </span>
+            </li>
+            <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+              <div class="mb1 relative">
+                <span class="employee-name db">
+                  Meeting du 20 janvier
+                </span>
+              </div>
+              <span class="ma0 mb0 f7 grey">
+                <div class="flex items-center relative tr">
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
+                       width="32" height="32"
+                  />
+                </div>
+              </span>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import Layout from '@/Shared/Layout';
+import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
+
+export default {
+  components: {
+    Layout,
+    GroupMenu,
+  },
+
+  props: {
+    notifications: {
+      type: Array,
+      default: null,
+    },
+    group: {
+      type: Object,
+      default: null,
+    },
+    members: {
+      type: Array,
+      default: null,
+    },
+    tab: {
+      type: String,
+      default: 'summary',
+    },
+  },
+
+  data() {
+    return {
+      processingSearch: false,
+      localMembers: null,
+      showModal: false,
+      removeMode: false,
+      idToDelete: 0,
+      potentialMembers: [],
+      loadingState: '',
+      form: {
+        searchTerm: null,
+        employee: null,
+        role: null,
+        errors: [],
+      },
+    };
+  },
+
+  created() {
+    this.localMembers = this.members;
+  },
+
+  mounted() {
+    if (localStorage.success) {
+      flash(localStorage.success, 'success');
+      localStorage.removeItem('success');
+    }
+  },
+
+  methods: {
+    displayAddModal() {
+      this.showModal = true;
+
+      this.$nextTick(() => {
+        this.$refs['search'].focus();
+      });
+    },
+
+    showDeleteModal(member) {
+      this.removeMode = true;
+      this.idToDelete = member.id;
+    },
+
+    search: _.debounce(
+      function() {
+
+        if (this.form.searchTerm != '') {
+          this.processingSearch = true;
+
+          axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/search`, this.form)
+            .then(response => {
+              this.potentialMembers = _.filter(response.data.data, employee => _.every(this.form.employees, e => employee.id !== e.id));
+              this.processingSearch = false;
+            })
+            .catch(error => {
+              this.form.errors = error.response.data;
+              this.processingSearch = false;
+            });
+        }
+      }, 500),
+
+    store(employee) {
+      this.loadingState = 'loading';
+      this.form.employee = employee.id;
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/store`, this.form)
+        .then(response => {
+          flash(this.$t('project.members_index_add_success'), 'success');
+          this.loadingState = null;
+          this.form.employee = null;
+          this.showModal = false;
+          this.localMembers.unshift(response.data.data);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+
+    remove(employee) {
+      this.form.employee = employee.id;
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/remove`, this.form)
+        .then(response => {
+          flash(this.$t('project.members_index_remove_success'), 'success');
+
+          var id = this.localMembers.findIndex(x => x.id == employee.id);
+          this.localMembers.splice(id, 1);
+
+          this.form.employee = null;
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Members/Index.vue b/resources/js/Pages/Company/Group/Members/Index.vue
index df8199166..0a813cebd 100644
--- a/resources/js/Pages/Company/Group/Members/Index.vue
+++ b/resources/js/Pages/Company/Group/Members/Index.vue
@@ -63,7 +63,7 @@
       </div>
 
       <div class="mw6 center br3 mb5 relative z-1">
-        <!-- members list -->
+        <!-- add a new member -->
         <div v-if="!showModal" class="tr mb2">
           <a href="#" class="btn dib-l db mb3 mb0-ns" data-cy="member-add-button" @click.prevent="displayAddModal()">{{ $t('project.members_index_add_cta') }}</a>
         </div>
diff --git a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
index b3fea4c7c..8218c796a 100644
--- a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
+++ b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
@@ -37,6 +37,9 @@
         <inertia-link :class="{'selected':(tab == 'info')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + ''" class="f6 fl ph3 pv2 dib pointer no-underline">
           Summary
         </inertia-link>
+        <inertia-link :class="{'selected':(tab == 'meetings')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + '/meetings'" class="f6 fl ph3 pv2 dib pointer">
+          Meetings
+        </inertia-link>
         <inertia-link :class="{'selected':(tab == 'members')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + '/members'" class="f6 fl ph3 pv2 dib pointer">
           Members
         </inertia-link>
diff --git a/routes/web.php b/routes/web.php
index 9dc9a6d12..812c3aa65 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -340,6 +340,10 @@
                 Route::post('{group}/members/search', 'Company\\Company\\Group\\GroupMembersController@search');
                 Route::post('{group}/members/store', 'Company\\Company\\Group\\GroupMembersController@store');
                 Route::post('{group}/members/remove', 'Company\\Company\\Group\\GroupMembersController@remove');
+
+                // meetings
+                Route::get('{group}/meetings', 'Company\\Company\\Group\\GroupMeetingsController@index')->name('groups.meetings.index');
+                Route::get('{group}/meetings/create', 'Company\\Company\\Group\\GroupMeetingsController@create')->name('groups.meetings.new');
             });
 
             Route::prefix('hr')->group(function () {

From e4b80b6846970eb8bebbddd1f4f1b365bc8a6878 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 29 Mar 2021 21:05:31 -0400
Subject: [PATCH 20/47] wip

---
 app/Helpers/LogHelper.php                     |  18 ++
 .../Company/Group/GroupMeetingsController.php |  88 +++++++++-
 .../Company/Group/GroupMeetingsViewHelper.php |  61 +++++++
 .../Company/Group/GroupShowViewHelper.php     |   5 +-
 app/Models/Company/Employee.php               |   2 +-
 app/Models/Company/Meeting.php                |   2 +-
 .../Company/Group/AddGuestToMeeting.php       | 119 +++++++++++++
 app/Services/Company/Group/CreateMeeting.php  |  12 ++
 ... ToggleEmployeeParticipationInMeeting.php} |  25 ++-
 .../2021_03_03_031835_create_groups_table.php |   1 +
 .../Pages/Company/Group/Meetings/Create.vue   |   0
 .../js/Pages/Company/Group/Meetings/Index.vue |   4 +-
 .../Group/Meetings/Partials/Participants.vue  | 104 ++++++++++++
 .../js/Pages/Company/Group/Meetings/Show.vue  | 126 ++++++++++++++
 resources/js/Shared/Avatar.vue                |  14 +-
 resources/lang/en/account.php                 |   4 +-
 resources/lang/en/app.php                     |   1 +
 routes/web.php                                |   2 +
 ...tingTest.php => AddGuestToMeetingTest.php} |  15 +-
 .../Company/Group/CreateMeetingTest.php       |  16 +-
 ...ggleEmployeeParticipationInMeetingTest.php | 158 ++++++++++++++++++
 .../Group/GroupMeetingsViewHelperTest.php     |  54 ++++++
 22 files changed, 800 insertions(+), 31 deletions(-)
 create mode 100644 app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
 create mode 100644 app/Services/Company/Group/AddGuestToMeeting.php
 rename app/Services/Company/Group/{AddEmployeeAsParticipantOfMeeting.php => ToggleEmployeeParticipationInMeeting.php} (84%)
 delete mode 100644 resources/js/Pages/Company/Group/Meetings/Create.vue
 create mode 100644 resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
 create mode 100644 resources/js/Pages/Company/Group/Meetings/Show.vue
 rename tests/Unit/Services/Company/Group/{AddEmployeeAsParticipantOfMeetingTest.php => AddGuestToMeetingTest.php} (89%)
 create mode 100644 tests/Unit/Services/Company/Group/ToggleEmployeeParticipationInMeetingTest.php
 create mode 100644 tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index 23274baa9..a98bada69 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1211,6 +1211,16 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'add_guest_to_meeting':
+                $sentence = trans('account.log_add_guest_to_meeting', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'employee_id' => $log->object->{'employee_id'},
+                    'employee_name' => $log->object->{'employee_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             case 'company_logo_changed':
                 $sentence = trans('account.log_company_logo_changed');
                 break;
@@ -1779,6 +1789,14 @@ public static function processEmployeeLog(EmployeeLog $log): string
                 ]);
                 break;
 
+            case 'add_guest_to_meeting':
+                $sentence = trans('account.employee_log_log_add_guest_to_meeting', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index e99f9820c..2c0fa8c4d 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -6,10 +6,14 @@
 use Illuminate\Http\Request;
 use App\Models\Company\Group;
 use App\Helpers\InstanceHelper;
+use App\Models\Company\Meeting;
 use App\Helpers\NotificationHelper;
 use App\Http\Controllers\Controller;
+use App\Services\Company\Group\CreateMeeting;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
+use App\Http\ViewHelpers\Company\Group\GroupMeetingsViewHelper;
+use App\Services\Company\Group\ToggleEmployeeParticipationInMeeting;
 
 class GroupMeetingsController extends Controller
 {
@@ -32,16 +36,20 @@ public function index(Request $request, int $companyId, int $groupId)
         }
 
         $info = GroupShowViewHelper::information($group, $company);
+        $meetings = GroupMeetingsViewHelper::index($group);
 
         return Inertia::render('Company/Group/Meetings/Index', [
             'group' => $info,
             'tab' => 'meetings',
+            'meetings' => $meetings,
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
         ]);
     }
 
     /**
-     * Show the Create meeting page.
+     * Create the meeting page and redirects to it.
+     * A meeting doesn't have a dedicated Create screen - viewing, creating
+     * and editing is done on the same page.
      *
      * @param Request $request
      * @param int $companyId
@@ -49,20 +57,88 @@ public function index(Request $request, int $companyId, int $groupId)
      */
     public function create(Request $request, int $companyId, int $groupId)
     {
-        $company = InstanceHelper::getLoggedCompany();
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
 
         try {
-            $group = Group::where('company_id', $company->id)
+            $group = Group::where('company_id', $loggedCompany->id)
                 ->findOrFail($groupId);
         } catch (ModelNotFoundException $e) {
             return redirect('home');
         }
 
-        $info = GroupShowViewHelper::information($group, $company);
+        $meeting = (new CreateMeeting)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $group->id,
+        ]);
 
-        return Inertia::render('Company/Group/Meetings/Create', [
-            'group' => $info,
+        return redirect()->route('groups.meetings.show', [
+            'company' => $loggedCompany->id,
+            'group' => $group->id,
+            'meeting' => $meeting->id,
+        ]);
+    }
+
+    /**
+     * Show the meeting page.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     */
+    public function show(Request $request, int $companyId, int $groupId, int $meetingId)
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+
+        try {
+            $group = Group::where('company_id', $loggedCompany->id)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        try {
+            $meeting = Meeting::where('group_id', $group->id)
+                ->findOrFail($meetingId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        $groupInfo = GroupShowViewHelper::information($group, $loggedCompany);
+        $meetingInfo = GroupMeetingsViewHelper::show($meeting, $loggedCompany);
+
+        return Inertia::render('Company/Group/Meetings/Show', [
+            'group' => $groupInfo,
+            'meeting' => $meetingInfo,
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
         ]);
     }
+
+    /**
+     * Toggle the participation for a person in the meeting.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     */
+    public function toggleParticipant(Request $request, int $companyId, int $groupId, int $meetingId)
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        (new ToggleEmployeeParticipationInMeeting)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'employee_id' => $request->input('id'),
+        ]);
+
+        return response()->json([
+            'data' => true,
+        ]);
+    }
 }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
new file mode 100644
index 000000000..49ddef51a
--- /dev/null
+++ b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\ViewHelpers\Company\Group;
+
+use App\Helpers\ImageHelper;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use App\Models\Company\Meeting;
+
+class GroupMeetingsViewHelper
+{
+    /**
+     * Get all the meetings in the group.
+     *
+     * @param Group $group
+     * @return array
+     */
+    public static function index(Group $group): array
+    {
+        return [
+            'url_new' => route('groups.meetings.new', [
+                'company' => $group->company_id,
+                'group' => $group,
+            ]),
+        ];
+    }
+
+    /**
+     * Get information of a specific meeting.
+     *
+     * @param Meeting $meeting
+     * @param Company $company
+     * @return array
+     */
+    public static function show(Meeting $meeting, Company $company): array
+    {
+        $participants = $meeting->employees()
+            ->orderBy('last_name', 'asc')
+            ->get();
+
+        $membersCollection = collect([]);
+        foreach ($participants as $employee) {
+            $membersCollection->push([
+                'id' => $employee->id,
+                'name' => $employee->name,
+                'avatar' => ImageHelper::getAvatar($employee, 23),
+                'attended' => (bool) $employee->pivot->attended,
+                'was_a_guest' => (bool) $employee->pivot->was_a_guest,
+                'url' => route('employees.show', [
+                    'company' => $company,
+                    'employee' => $employee,
+                ]),
+            ]);
+        }
+
+        return [
+            'id' => $meeting->id,
+            'participants' => $membersCollection,
+        ];
+    }
+}
diff --git a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
index d578e65dc..71c0873e2 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
@@ -17,7 +17,10 @@ class GroupShowViewHelper
      */
     public static function information(Group $group, Company $company): array
     {
-        $groupMembers = $group->employees;
+        $groupMembers = $group->employees()
+            ->notLocked()
+            ->orderBy('last_name', 'asc')
+            ->get();
 
         $membersCollection = collect([]);
         foreach ($groupMembers as $employee) {
diff --git a/app/Models/Company/Employee.php b/app/Models/Company/Employee.php
index 717b923f9..d629698a8 100644
--- a/app/Models/Company/Employee.php
+++ b/app/Models/Company/Employee.php
@@ -525,7 +525,7 @@ public function groups()
      */
     public function meetings()
     {
-        return $this->belongsToMany(Meeting::class)->withTimestamps()->withPivot('was_a_guest');
+        return $this->belongsToMany(Meeting::class)->withTimestamps()->withPivot('was_a_guest', 'attended');
     }
 
     /**
diff --git a/app/Models/Company/Meeting.php b/app/Models/Company/Meeting.php
index 3038a99d2..8e7b9efc2 100644
--- a/app/Models/Company/Meeting.php
+++ b/app/Models/Company/Meeting.php
@@ -58,7 +58,7 @@ public function group()
      */
     public function employees()
     {
-        return $this->belongsToMany(Employee::class)->withTimestamps()->withPivot('was_a_guest');
+        return $this->belongsToMany(Employee::class)->withTimestamps()->withPivot('was_a_guest', 'attended');
     }
 
     /**
diff --git a/app/Services/Company/Group/AddGuestToMeeting.php b/app/Services/Company/Group/AddGuestToMeeting.php
new file mode 100644
index 000000000..8b4524782
--- /dev/null
+++ b/app/Services/Company/Group/AddGuestToMeeting.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\DB;
+
+class AddGuestToMeeting extends BaseService
+{
+    private array $data;
+    private Employee $employee;
+    private Group $group;
+    private Meeting $meeting;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'meeting_id' => 'required|integer|exists:meetings,id',
+            'employee_id' => 'required|integer|exists:employees,id',
+        ];
+    }
+
+    /**
+     * Add an employee as guest in the meeting.
+     *
+     * @param array $data
+     * @return Employee
+     */
+    public function execute(array $data): Employee
+    {
+        $this->data = $data;
+        $this->validate();
+        $this->attachEmployee();
+
+        return $this->employee;
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->employee = $this->validateEmployeeBelongsToCompany($this->data);
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+    }
+
+    private function attachEmployee(): void
+    {
+        if (! $this->isEmployeePartOfGroup()) {
+            $this->meeting->employees()->syncWithoutDetaching([
+                $this->data['employee_id'],
+            ]);
+
+            $this->log();
+        }
+    }
+
+    private function isEmployeePartOfGroup(): bool
+    {
+        return DB::table('employee_group')
+            ->where('employee_id', $this->data['employee_id'])
+            ->where('group_id', $this->group->id)
+            ->count() == 1;
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'add_guest_to_meeting',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'employee_id' => $this->employee->id,
+                'employee_name' => $this->employee->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+
+        LogEmployeeAudit::dispatch([
+            'employee_id' => $this->employee->id,
+            'action' => 'add_guest_to_meeting',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/app/Services/Company/Group/CreateMeeting.php b/app/Services/Company/Group/CreateMeeting.php
index 97a95ae45..5dc2246ed 100644
--- a/app/Services/Company/Group/CreateMeeting.php
+++ b/app/Services/Company/Group/CreateMeeting.php
@@ -39,6 +39,7 @@ public function execute(array $data): Meeting
         $this->data = $data;
         $this->validate();
         $this->createMeeting();
+        $this->addParticipants();
         $this->log();
 
         return $this->meeting;
@@ -64,6 +65,17 @@ private function createMeeting(): void
         ]);
     }
 
+    private function addParticipants(): void
+    {
+        $members = $this->group->employees()
+            ->select('id')
+            ->get()
+            ->pluck('id')
+            ->toArray();
+
+        $this->meeting->employees()->syncWithoutDetaching($members);
+    }
+
     private function log(): void
     {
         LogAccountAudit::dispatch([
diff --git a/app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php b/app/Services/Company/Group/ToggleEmployeeParticipationInMeeting.php
similarity index 84%
rename from app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php
rename to app/Services/Company/Group/ToggleEmployeeParticipationInMeeting.php
index ef205fea9..f2b96517e 100644
--- a/app/Services/Company/Group/AddEmployeeAsParticipantOfMeeting.php
+++ b/app/Services/Company/Group/ToggleEmployeeParticipationInMeeting.php
@@ -10,8 +10,9 @@
 use App\Models\Company\Meeting;
 use App\Models\Company\Employee;
 use Illuminate\Support\Facades\DB;
+use App\Exceptions\NotEnoughPermissionException;
 
-class AddEmployeeAsParticipantOfMeeting extends BaseService
+class ToggleEmployeeParticipationInMeeting extends BaseService
 {
     private array $data;
     private Employee $employee;
@@ -35,10 +36,10 @@ public function rules(): array
     }
 
     /**
-     * Mark an employee as participant of a meeting.
+     * Toggle the participation of an employee in a meeting.
      * When marking an employee, we should check if the employee is part of the
-     * group the meeting belongs to or not.
-     * If the employee is not part of the group, we should mark it as guest.
+     * meeting.
+     * If the employee is not part of the meeting, this process fails.
      *
      * @param array $data
      * @return Employee
@@ -74,19 +75,25 @@ private function validate(): void
 
     private function attachEmployee(): void
     {
+        $object = $this->employeeMeeting();
+
+        if (! $object) {
+            throw new NotEnoughPermissionException();
+        }
+
         $this->meeting->employees()->syncWithoutDetaching([
             $this->data['employee_id'] => [
-                'was_a_guest' => ! $this->isEmployeePartOfGroup(),
+                'attended' => ! $object->attended,
             ],
         ]);
     }
 
-    private function isEmployeePartOfGroup(): bool
+    private function employeeMeeting()
     {
-        return DB::table('employee_group')
+        return DB::table('employee_meeting')
             ->where('employee_id', $this->data['employee_id'])
-            ->where('group_id', $this->group->id)
-            ->count() == 1;
+            ->where('meeting_id', $this->meeting->id)
+            ->first();
     }
 
     private function log(): void
diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
index 0c8d6bf22..1538cd57a 100644
--- a/database/migrations/2021_03_03_031835_create_groups_table.php
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -63,6 +63,7 @@ public function up()
         Schema::create('employee_meeting', function (Blueprint $table) {
             $table->unsignedBigInteger('employee_id');
             $table->unsignedBigInteger('meeting_id');
+            $table->boolean('attended')->default(false);
             $table->boolean('was_a_guest')->default(false);
             $table->timestamps();
             $table->foreign('employee_id')->references('id')->on('employees')->onDelete('cascade');
diff --git a/resources/js/Pages/Company/Group/Meetings/Create.vue b/resources/js/Pages/Company/Group/Meetings/Create.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/resources/js/Pages/Company/Group/Meetings/Index.vue b/resources/js/Pages/Company/Group/Meetings/Index.vue
index ec3bcb7ea..7c3aee911 100644
--- a/resources/js/Pages/Company/Group/Meetings/Index.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Index.vue
@@ -45,7 +45,7 @@
       <div class="mw6 center br3 mb5 relative z-1">
         <!-- add a new meeting -->
         <div class="tr mb2">
-          <inertia-link :href="'#'" class="btn dib-l db mb3 mb0-ns" data-cy="member-add-button">Create new meeting</inertia-link>
+          <inertia-link :href="meetings.url_new" class="btn dib-l db mb3 mb0-ns" data-cy="member-add-button">Create new meeting</inertia-link>
         </div>
 
         <!-- list of meetings -->
@@ -160,7 +160,7 @@ export default {
       type: Object,
       default: null,
     },
-    members: {
+    meetings: {
       type: Array,
       default: null,
     },
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
new file mode 100644
index 000000000..469312889
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
@@ -0,0 +1,104 @@
+<style lang="scss" scoped>
+.present {
+  svg {
+    color: #78b382;
+  }
+
+  .name {
+    color: #4d4d4f;
+  }
+}
+
+.absent {
+  svg {
+    color: #cecfce;
+  }
+
+  .name {
+    color: #a4a4a8;
+  }
+}
+
+.check-icon {
+  width: 20px;
+}
+</style>
+
+<template>
+  <div class="bg-white box mb4 pa3">
+    <p class="silver f6 ma0 mb1">Participants</p>
+    <p class="f7 gray mb4">Click on the names of the people who were present in the meeting.</p>
+
+    <ul class="ma0 pa0 list">
+      <li v-for="participant in localParticipants" :key="participant.id" :class="participant.attended ? 'present' : 'absent'" class="relative flex items-center mb3 pointer" @click="toggle(participant)">
+        <svg class="check-icon mr2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+          <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
+        </svg>
+        <avatar :avatar="participant.avatar" :size="23" :classes="'br-100 mr2'" />
+        <span class="name f5">{{ participant.name }}</span>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import Avatar from '@/Shared/Avatar';
+
+export default {
+  components: {
+    Avatar,
+  },
+
+  props: {
+    groupId: {
+      type: Number,
+      default: null,
+    },
+    meeting: {
+      type: Object,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      localParticipants: null,
+      form: {
+        searchTerm: null,
+        id: null,
+        role: null,
+        errors: [],
+      },
+    };
+  },
+
+  created() {
+    this.localParticipants = this.meeting.participants;
+  },
+
+  mounted() {
+    if (localStorage.success) {
+      flash(localStorage.success, 'success');
+      localStorage.removeItem('success');
+    }
+  },
+
+  methods: {
+    toggle(member) {
+      this.form.id = member.id;
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.id}/toggle`, this.form)
+        .then(response => {
+          flash(this.$t('app.saved'), 'success');
+          this.form.id = null;
+          var id = this.localParticipants.findIndex(x => x.id === member.id);
+          this.localParticipants[id].attended = ! this.localParticipants[id].attended;
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Meetings/Show.vue b/resources/js/Pages/Company/Group/Meetings/Show.vue
new file mode 100644
index 000000000..9639ee8fb
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Meetings/Show.vue
@@ -0,0 +1,126 @@
+<style lang="scss" scoped>
+.small-avatar {
+  margin-left: -8px;
+  box-shadow: 0 0 0 2px #fff;
+}
+
+.meeting-item:first-child:hover {
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+
+.meeting-item:last-child {
+  border-bottom: 0;
+
+  &:hover {
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px;
+  }
+}
+</style>
+
+<template>
+  <layout title="Home" :notifications="notifications">
+    <div class="ph2 ph5-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mb4 mw6 br3 center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company'">{{ $t('app.breadcrumb_company') }}</inertia-link>
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups'">{{ $t('app.breadcrumb_group_list') }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_group_detail') }}
+          </li>
+        </ul>
+      </div>
+
+      <div class="mw7 center br3 mb5 relative z-1">
+        <!-- Menu -->
+        <group-menu :group="group" :tab="tab" />
+      </div>
+
+      <div class="mw8 center br3 mb5 relative z-1">
+        <p>Meeting</p>
+
+        <div class="cf center">
+          <!-- LEFT COLUMN -->
+          <div class="fl w-70-l w-100">
+            <p>left</p>
+          </div>
+
+          <!-- RIGHT COLUMN -->
+          <div class="fl w-30-l w-100 pl4-l">
+            <!-- participants -->
+            <participants :group-id="group.id" :meeting="meeting" />
+          </div>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import Layout from '@/Shared/Layout';
+import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
+import Participants from '@/Pages/Company/Group/Meetings/Partials/Participants';
+
+export default {
+  components: {
+    Layout,
+    GroupMenu,
+    Participants,
+  },
+
+  props: {
+    notifications: {
+      type: Array,
+      default: null,
+    },
+    group: {
+      type: Object,
+      default: null,
+    },
+    meeting: {
+      type: Object,
+      default: null,
+    },
+    tab: {
+      type: String,
+      default: 'summary',
+    },
+  },
+
+  data() {
+    return {
+      processingSearch: false,
+      localMembers: null,
+      showModal: false,
+      removeMode: false,
+      idToDelete: 0,
+      potentialMembers: [],
+      loadingState: '',
+      form: {
+        searchTerm: null,
+        employee: null,
+        role: null,
+        errors: [],
+      },
+    };
+  },
+
+  created() {
+    this.localMembers = this.members;
+  },
+
+  mounted() {
+    if (localStorage.success) {
+      flash(localStorage.success, 'success');
+      localStorage.removeItem('success');
+    }
+  },
+};
+
+</script>
diff --git a/resources/js/Shared/Avatar.vue b/resources/js/Shared/Avatar.vue
index 67e9f2101..6fc5f5b35 100644
--- a/resources/js/Shared/Avatar.vue
+++ b/resources/js/Shared/Avatar.vue
@@ -5,7 +5,7 @@ span {
 </style>
 
 <template>
-  <img :loading="loading" :class="classes" class="pointer" :src="avatar.normal" :width="size"
+  <img :loading="loading" :class="localClasses" :src="avatar.normal" :width="size"
        :height="size"
        :srcset="avatar.normal + ' 1x,' + avatar.retina + ' 2x'" :alt="alt"
        @click="navigateTo()"
@@ -41,6 +41,18 @@ export default {
     }
   },
 
+  data() {
+    return {
+      localClasses: null,
+    };
+  },
+
+  mounted() {
+    if (this.url) {
+      this.localClasses = this.classes + ' pointer';
+    }
+  },
+
   methods: {
     navigateTo() {
       if (this.url) {
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index 86d5e0aa9..971ba930e 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -308,6 +308,7 @@
     'log_meeting_decision_updated' => 'Updated a meeting decision about an agenda item in a meeting in the group called :group_name.',
     'log_file_added_to_project' => 'Added a file called :name in the project called :project_name.',
     'log_project_file_destroyed' => 'Deleted a file called :name in the project called :project_name.',
+    'log_add_guest_to_meeting' => 'Added :employee_name in a meeting of the project called :project_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
@@ -382,7 +383,7 @@
     'employee_log_consultant_rate_set' => 'Set the consulting rate to :rate.',
     'employee_log_consultant_rate_destroyed' => 'Destroyed the rate of :rate.',
     'employee_log_employee_added_to_group' => 'Has been added to the group called :group_name.',
-    'employee_log_employee_removed_from_group' => 'Has been remove from the group called :group_name.',
+    'employee_log_employee_removed_from_group' => 'Has been removed from the group called :group_name.',
     'employee_log_employee_marked_as_participant_in_meeting' => 'Has been added in a meeting in the group called :group_name.',
     'employee_log_employee_removed_from_meeting' => 'Has been removed from a meeting in the group called :group_name.',
     'employee_log_agenda_item_created' => 'Has created an agenda item in a meeting in the group called :group_name.',
@@ -390,6 +391,7 @@
     'employee_log_meeting_decision_created' => 'Created a meeting decision about an agenda item in a meeting in the group called :group_name.',
     'employee_log_meeting_decision_destroyed' => 'Deleted a meeting decision about an agenda item in a meeting in the group called :group_name.',
     'employee_log_meeting_decision_updated' => 'Updated a meeting decision about an agenda item in a meeting in the group called :group_name.',
+    'employee_log_add_guest_to_meeting' => 'Has been added in a meeting of the project called :project_name.',
 
     // team logs
     'team_log_team_created' => 'Created the team.',
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
index 3bb7cedde..36ffec2e2 100644
--- a/resources/lang/en/app.php
+++ b/resources/lang/en/app.php
@@ -35,6 +35,7 @@
     'hide' => 'Hide',
     'enable' => 'Enable',
     'disable' => 'Disable',
+    'saved' => 'Saved',
     'import_review' => 'Import and review',
 
     'error_title' => '👇 Oops. An error occured.',
diff --git a/routes/web.php b/routes/web.php
index 9b885000e..7d7d78695 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -350,6 +350,8 @@
                 // meetings
                 Route::get('{group}/meetings', 'Company\\Company\\Group\\GroupMeetingsController@index')->name('groups.meetings.index');
                 Route::get('{group}/meetings/create', 'Company\\Company\\Group\\GroupMeetingsController@create')->name('groups.meetings.new');
+                Route::get('{group}/meetings/{meeting}', 'Company\\Company\\Group\\GroupMeetingsController@show')->name('groups.meetings.show');
+                Route::post('{group}/meetings/{meeting}/toggle', 'Company\\Company\\Group\\GroupMeetingsController@toggleParticipant');
             });
 
             Route::prefix('hr')->group(function () {
diff --git a/tests/Unit/Services/Company/Group/AddEmployeeAsParticipantOfMeetingTest.php b/tests/Unit/Services/Company/Group/AddGuestToMeetingTest.php
similarity index 89%
rename from tests/Unit/Services/Company/Group/AddEmployeeAsParticipantOfMeetingTest.php
rename to tests/Unit/Services/Company/Group/AddGuestToMeetingTest.php
index 0418ebc9f..b0109b881 100644
--- a/tests/Unit/Services/Company/Group/AddEmployeeAsParticipantOfMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/AddGuestToMeetingTest.php
@@ -10,16 +10,17 @@
 use App\Models\Company\Employee;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\AddGuestToMeeting;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Services\Company\Group\AddEmployeeAsParticipantOfMeeting;
 
-class AddEmployeeAsParticipantOfMeetingTest extends TestCase
+class AddGuestToMeetingTest extends TestCase
 {
     use DatabaseTransactions;
 
     /** @test */
-    public function it_adds_an_employee_to_a_meeting_as_administrator(): void
+    public function it_adds_an_employee_to_a_meeting_as_guest_as_administrator(): void
     {
         $michael = $this->createAdministrator();
         $dwight = $this->createAnotherEmployee($michael);
@@ -33,7 +34,7 @@ public function it_adds_an_employee_to_a_meeting_as_administrator(): void
     }
 
     /** @test */
-    public function it_adds_an_employee_to_a_meeting_as_hr(): void
+    public function it_adds_an_employee_to_a_meeting_as_guest_as_hr(): void
     {
         $michael = $this->createHR();
         $dwight = $this->createAnotherEmployee($michael);
@@ -47,7 +48,7 @@ public function it_adds_an_employee_to_a_meeting_as_hr(): void
     }
 
     /** @test */
-    public function it_adds_an_employee_to_a_meeting_as_normal_user(): void
+    public function it_adds_an_employee_to_a_meeting_as_guest_as_normal_user(): void
     {
         $michael = $this->createEmployee();
         $group = Group::factory()->create([
@@ -112,7 +113,7 @@ private function executeService(Employee $michael, Employee $dwight, Group $grou
             'employee_id' => $dwight->id,
         ];
 
-        $employee = (new AddEmployeeAsParticipantOfMeeting)->execute($request);
+        $employee = (new AddGuestToMeeting)->execute($request);
 
         $this->assertDatabaseHas('employee_meeting', [
             'meeting_id' => $meeting->id,
@@ -125,7 +126,7 @@ private function executeService(Employee $michael, Employee $dwight, Group $grou
         );
 
         Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $dwight, $meeting) {
-            return $job->auditLog['action'] === 'employee_marked_as_participant_in_meeting' &&
+            return $job->auditLog['action'] === 'add_guest_to_meeting' &&
                 $job->auditLog['author_id'] === $michael->id &&
                 $job->auditLog['objects'] === json_encode([
                     'group_id' => $group->id,
@@ -137,7 +138,7 @@ private function executeService(Employee $michael, Employee $dwight, Group $grou
         });
 
         Queue::assertPushed(LogEmployeeAudit::class, function ($job) use ($michael, $group, $meeting) {
-            return $job->auditLog['action'] === 'employee_marked_as_participant_in_meeting' &&
+            return $job->auditLog['action'] === 'add_guest_to_meeting' &&
                 $job->auditLog['author_id'] === $michael->id &&
                 $job->auditLog['objects'] === json_encode([
                     'group_id' => $group->id,
diff --git a/tests/Unit/Services/Company/Group/CreateMeetingTest.php b/tests/Unit/Services/Company/Group/CreateMeetingTest.php
index 6b3e4a0d2..45fe37609 100644
--- a/tests/Unit/Services/Company/Group/CreateMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/CreateMeetingTest.php
@@ -6,6 +6,7 @@
 use App\Jobs\LogAccountAudit;
 use App\Models\Company\Group;
 use App\Models\Company\Company;
+use App\Models\Company\Meeting;
 use App\Models\Company\Employee;
 use Illuminate\Support\Facades\Queue;
 use App\Services\Company\Group\CreateMeeting;
@@ -75,6 +76,12 @@ private function executeService(Employee $michael, Company $company, Group $grou
     {
         Queue::fake();
 
+        // add members in the group
+        $employee = Employee::factory()->create([
+            'company_id' => $company->id,
+        ]);
+        $group->employees()->syncWithoutDetaching([$employee->id]);
+
         $request = [
             'company_id' => $company->id,
             'author_id' => $michael->id,
@@ -89,10 +96,15 @@ private function executeService(Employee $michael, Company $company, Group $grou
         ]);
 
         $this->assertInstanceOf(
-            Group::class,
-            $group
+            Meeting::class,
+            $meeting
         );
 
+        $this->assertDatabaseHas('employee_meeting', [
+            'meeting_id' => $meeting->id,
+            'employee_id' => $employee->id,
+        ]);
+
         Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $meeting) {
             return $job->auditLog['action'] === 'meeting_created' &&
                 $job->auditLog['author_id'] === $michael->id &&
diff --git a/tests/Unit/Services/Company/Group/ToggleEmployeeParticipationInMeetingTest.php b/tests/Unit/Services/Company/Group/ToggleEmployeeParticipationInMeetingTest.php
new file mode 100644
index 000000000..20a4b9d53
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/ToggleEmployeeParticipationInMeetingTest.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Jobs\LogEmployeeAudit;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Validation\ValidationException;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use App\Services\Company\Group\ToggleEmployeeParticipationInMeeting;
+
+class ToggleEmployeeParticipationInMeetingTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_toggles_a_participation_to_a_meeting_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([$dwight->id]);
+        $this->executeService($michael, $dwight, $group, $meeting, true);
+        $this->executeService($michael, $dwight, $group, $meeting, false);
+    }
+
+    /** @test */
+    public function it_toggles_a_participation_to_a_meeting_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $dwight = $this->createAnotherEmployee($michael);
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([$dwight->id]);
+        $this->executeService($michael, $dwight, $group, $meeting, true);
+        $this->executeService($michael, $dwight, $group, $meeting, false);
+    }
+
+    /** @test */
+    public function it_toggles_a_participation_to_a_meeting_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([$michael->id]);
+        $this->executeService($michael, $michael, $group, $meeting, true);
+        $this->executeService($michael, $michael, $group, $meeting, false);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new ToggleEmployeeParticipationInMeeting)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_employee_is_not_in_the_authors_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([$dwight->id]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group, $meeting, true);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $dwight = $this->createEmployee();
+        $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->syncWithoutDetaching([$dwight->id]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $dwight, $group, $meeting, true);
+    }
+
+    private function executeService(Employee $michael, Employee $dwight, Group $group, Meeting $meeting, bool $attended): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'employee_id' => $dwight->id,
+        ];
+
+        $employee = (new ToggleEmployeeParticipationInMeeting)->execute($request);
+
+        $this->assertDatabaseHas('employee_meeting', [
+            'meeting_id' => $meeting->id,
+            'employee_id' => $dwight->id,
+            'attended' => $attended,
+        ]);
+
+        $this->assertInstanceOf(
+            Employee::class,
+            $employee
+        );
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $dwight, $meeting) {
+            return $job->auditLog['action'] === 'employee_marked_as_participant_in_meeting' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'employee_id' => $dwight->id,
+                    'employee_name' => $dwight->name,
+                    'meeting_id' => $meeting->id,
+                ]);
+        });
+
+        Queue::assertPushed(LogEmployeeAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'employee_marked_as_participant_in_meeting' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                'meeting_id' => $meeting->id,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php
new file mode 100644
index 000000000..ffa18d396
--- /dev/null
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Tests\Unit\ViewHelpers\Company\Group;
+
+use Tests\TestCase;
+use App\Helpers\ImageHelper;
+use App\Models\Company\Group;
+use App\Models\Company\Meeting;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Http\ViewHelpers\Company\Group\GroupMeetingsViewHelper;
+
+class GroupMeetingsViewHelperTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_gets_information_about_a_specific_meeting(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $meeting->employees()->attach([$michael->id]);
+
+        $array = GroupMeetingsViewHelper::show($meeting, $group->company);
+
+        $this->assertEquals(
+            $meeting->id,
+            $array['id']
+        );
+
+        $this->assertEquals(
+            1,
+            count($array['participants']->toArray())
+        );
+
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $michael->id,
+                    'name' => $michael->name,
+                    'avatar' => ImageHelper::getAvatar($michael, 23),
+                    'attended' => false,
+                    'was_a_guest' => false,
+                    'url' => env('APP_URL').'/'.$michael->company_id.'/employees/'.$michael->id,
+                ],
+            ],
+            $array['participants']->toArray()
+        );
+    }
+}

From c0054ee8a784eb3f1f9810c638f4be3b32c040ef Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 29 Mar 2021 21:24:25 -0400
Subject: [PATCH 21/47] fixes

---
 phpstan.neon                                    |  2 ++
 .../Group/Meetings/Partials/Participants.vue    | 17 +++++++++++++++--
 resources/js/Shared/Avatar.vue                  |  6 ++++--
 resources/lang/en/group.php                     |  3 +++
 .../Company/Group/AddGuestToMeetingTest.php     |  3 +--
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/phpstan.neon b/phpstan.neon
index a8ec2492e..fed46c34a 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -12,6 +12,8 @@ parameters:
         - app/Http/ViewHelpers/Employee/EmployeeShowViewHelper.php
         - app/Http/ViewHelpers/Company/HR/CompanyHRViewHelper.php
         - app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
+        - app/Services/Company/Group/CreateMeeting.php
+        - app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
     inferPrivatePropertyTypeFromConstructor: true
     checkMissingIterableValueType: false
     reportUnmatchedIgnoredErrors: false
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
index 469312889..c848b292f 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
@@ -7,6 +7,10 @@
   .name {
     color: #4d4d4f;
   }
+
+   img {
+     filter: grayscale(0%);
+   }
 }
 
 .absent {
@@ -17,6 +21,10 @@
   .name {
     color: #a4a4a8;
   }
+
+  img {
+     filter: grayscale(100%);
+   }
 }
 
 .check-icon {
@@ -26,8 +34,8 @@
 
 <template>
   <div class="bg-white box mb4 pa3">
-    <p class="silver f6 ma0 mb1">Participants</p>
-    <p class="f7 gray mb4">Click on the names of the people who were present in the meeting.</p>
+    <p class="silver f6 ma0 mb1">{{ $t('group.meeting_show_participants') }}</p>
+    <p class="f7 gray mb4">{{ $t('group.meeting_show_participants_help') }}</p>
 
     <ul class="ma0 pa0 list">
       <li v-for="participant in localParticipants" :key="participant.id" :class="participant.attended ? 'present' : 'absent'" class="relative flex items-center mb3 pointer" @click="toggle(participant)">
@@ -37,6 +45,11 @@
         <avatar :avatar="participant.avatar" :size="23" :classes="'br-100 mr2'" />
         <span class="name f5">{{ participant.name }}</span>
       </li>
+
+      <!-- add guest cta -->
+      <li><a class="bb b--dotted bt-0 bl-0 br-0 pointer f6">+ Add guest</a></li>
+
+      <!-- search form -->
     </ul>
   </div>
 </template>
diff --git a/resources/js/Shared/Avatar.vue b/resources/js/Shared/Avatar.vue
index 6fc5f5b35..71d51bd3d 100644
--- a/resources/js/Shared/Avatar.vue
+++ b/resources/js/Shared/Avatar.vue
@@ -43,13 +43,15 @@ export default {
 
   data() {
     return {
-      localClasses: null,
+      localClasses: '',
     };
   },
 
   mounted() {
+    this.localClasses = this.classes;
+
     if (this.url) {
-      this.localClasses = this.classes + ' pointer';
+      this.localClasses = this.localClasses + ' pointer';
     }
   },
 
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index b53c8e49f..fa8ac9b18 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -10,4 +10,7 @@
     'members_add_cta' => 'Add a new member',
     'members_add_placeholder' => 'Enter the first letters of a name',
     'members_index_blank' => ' Groups are more fun with employees. Add an employee now.',
+
+    'meeting_show_participants' => 'Participants',
+    'meeting_show_participants_help' => 'Click on the names of the people who were present in the meeting.',
 ];
diff --git a/tests/Unit/Services/Company/Group/AddGuestToMeetingTest.php b/tests/Unit/Services/Company/Group/AddGuestToMeetingTest.php
index b0109b881..83b9b4eea 100644
--- a/tests/Unit/Services/Company/Group/AddGuestToMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/AddGuestToMeetingTest.php
@@ -13,7 +13,6 @@
 use App\Services\Company\Group\AddGuestToMeeting;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use App\Services\Company\Group\AddEmployeeAsParticipantOfMeeting;
 
 class AddGuestToMeetingTest extends TestCase
 {
@@ -68,7 +67,7 @@ public function it_fails_if_wrong_parameters_are_given(): void
         ];
 
         $this->expectException(ValidationException::class);
-        (new AddEmployeeAsParticipantOfMeeting)->execute($request);
+        (new AddGuestToMeeting)->execute($request);
     }
 
     /** @test */

From 1939e2d5bb71fcccec44fec0918abc4f81de8b70 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 29 Mar 2021 22:23:52 -0400
Subject: [PATCH 22/47] wip

---
 .../Company/Group/GroupMeetingsViewHelper.php | 41 +++++++++++++++++++
 .../Group/Meetings/Partials/Participants.vue  | 14 +++++++
 .../Group/GroupMeetingsViewHelperTest.php     | 31 ++++++++++++++
 3 files changed, 86 insertions(+)

diff --git a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
index 49ddef51a..73cc93a3d 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
@@ -6,6 +6,7 @@
 use App\Models\Company\Group;
 use App\Models\Company\Company;
 use App\Models\Company\Meeting;
+use Illuminate\Support\Collection;
 
 class GroupMeetingsViewHelper
 {
@@ -58,4 +59,44 @@ public static function show(Meeting $meeting, Company $company): array
             'participants' => $membersCollection,
         ];
     }
+
+    /**
+     * Get potential guests of this meeting.
+     *
+     * @param Meeting $meeting
+     * @param Company $company
+     * @param string $criteria
+     * @return Collection
+     */
+    public static function potentialGuests(Meeting $meeting, Company $company, string $criteria): Collection
+    {
+        $members = $meeting->employees()
+            ->select('id', 'first_name', 'last_name')
+            ->orderBy('last_name', 'asc')
+            ->get();
+
+        $potentialGuests = $company->employees()
+            ->select('id', 'first_name', 'last_name')
+            ->notLocked()
+            ->where(function ($query) use ($criteria) {
+                $query->where('first_name', 'LIKE', '%'.$criteria.'%')
+                    ->orWhere('last_name', 'LIKE', '%'.$criteria.'%')
+                    ->orWhere('email', 'LIKE', '%'.$criteria.'%');
+            })
+            ->orderBy('last_name', 'asc')
+            ->take(10)
+            ->get();
+
+        $potentialGuests->diff($members);
+
+        $employeesCollection = collect([]);
+        foreach ($potentialGuests as $employee) {
+            $employeesCollection->push([
+                'id' => $employee->id,
+                'name' => $employee->name,
+            ]);
+        }
+
+        return $employeesCollection;
+    }
 }
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
index c848b292f..ac41a972c 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
@@ -50,6 +50,20 @@
       <li><a class="bb b--dotted bt-0 bl-0 br-0 pointer f6">+ Add guest</a></li>
 
       <!-- search form -->
+      <form class="relative" @submit.prevent="search">
+        <text-input :id="'name'"
+                    v-model="form.searchTerm"
+                    :name="'name'"
+                    :datacy="'project-lead-search'"
+                    :errors="$page.props.errors.name"
+                    :label="$t('project.create_input_project_lead')"
+                    :required="false"
+                    @keyup="search"
+                    @input="search"
+                    @esc-key-pressed="showAssignProjectLead = false"
+        />
+        <ball-pulse-loader v-if="processingSearch" color="#5c7575" size="7px" />
+      </form>
     </ul>
   </div>
 </template>
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php
index ffa18d396..b785df498 100644
--- a/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php
@@ -6,6 +6,7 @@
 use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
 use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use App\Http\ViewHelpers\Company\Group\GroupMeetingsViewHelper;
 
@@ -51,4 +52,34 @@ public function it_gets_information_about_a_specific_meeting(): void
             $array['participants']->toArray()
         );
     }
+
+    /** @test */
+    public function it_gets_a_collection_of_potential_team_members(): void
+    {
+        $michael = Employee::factory()->create([
+            'first_name' => 'ale',
+            'last_name' => 'ble',
+            'email' => 'ale@ble',
+            'permission_level' => 100,
+        ]);
+        $dwight = Employee::factory()->create([
+            'first_name' => 'alb',
+            'last_name' => 'bli',
+            'email' => 'alb@bli',
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([]);
+        $meeting->employees()->attach([$michael->id]);
+
+        $collection = GroupMeetingsViewHelper::potentialGuests($meeting, $michael->company, 'alb');
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $dwight->id,
+                    'name' => $dwight->name,
+                ],
+            ],
+            $collection->toArray()
+        );
+    }
 }

From a91fda7ec1bcfae1858927a71c1cf7b6c47d99d9 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Thu, 1 Apr 2021 12:45:51 -0400
Subject: [PATCH 23/47] wip

---
 app/Helpers/LogHelper.php                     |   8 +
 .../Company/Group/GroupMeetingsController.php | 133 ++++++++++-
 .../Employee/EmployeeEditController.php       |   2 -
 .../Company/Group/GroupMeetingsViewHelper.php |  98 ++++++--
 app/Models/Company/Group.php                  |   4 +-
 .../Company/Group/AddGuestToMeeting.php       |   4 +-
 app/Services/Company/Group/CreateMeeting.php  |   1 +
 ...Meeting.php => RemoveGuestFromMeeting.php} |   4 +-
 .../Company/Group/UpdateMeetingDate.php       |  86 +++++++
 public/img/favicon.png                        | Bin 0 -> 1836 bytes
 ...reamline-icon-coffee-break-2-1@140x140.png | Bin 0 -> 11224 bytes
 .../js/Pages/Company/Group/Meetings/Index.vue | 109 ++-------
 .../Company/Group/Meetings/Partials/Date.vue  | 147 ++++++++++++
 .../Group/Meetings/Partials/Participants.vue  | 214 +++++++++++++++---
 .../js/Pages/Company/Group/Meetings/Show.vue  |  22 +-
 resources/lang/en/account.php                 |   1 +
 resources/lang/en/group.php                   |  13 ++
 resources/views/app.blade.php                 |   1 +
 routes/web.php                                |   4 +
 tests/Unit/Models/Company/GroupTest.php       |  12 +
 ...est.php => RemoveGuestFromMeetingTest.php} |   8 +-
 .../Company/Group/UpdateMeetingDateTest.php   | 113 +++++++++
 .../Group/GroupMeetingsViewHelperTest.php     |  69 +++++-
 23 files changed, 885 insertions(+), 168 deletions(-)
 rename app/Services/Company/Group/{RemoveEmployeeAsParticipantOfMeeting.php => RemoveGuestFromMeeting.php} (96%)
 create mode 100644 app/Services/Company/Group/UpdateMeetingDate.php
 create mode 100644 public/img/favicon.png
 create mode 100644 public/img/streamline-icon-coffee-break-2-1@140x140.png
 create mode 100644 resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
 rename tests/Unit/Services/Company/Group/{RemoveEmployeeAsParticipantOfMeetingTest.php => RemoveGuestFromMeetingTest.php} (94%)
 create mode 100644 tests/Unit/Services/Company/Group/UpdateMeetingDateTest.php

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index a98bada69..cfd6aa620 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1221,6 +1221,14 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'meeting_date_set':
+                $sentence = trans('account.log_meeting_date_set', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'meeting_id' => $log->object->{'meeting_id'},
+                ]);
+                break;
+
             case 'company_logo_changed':
                 $sentence = trans('account.log_company_logo_changed');
                 break;
diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index 2c0fa8c4d..7e98dfa52 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -2,14 +2,21 @@
 
 namespace App\Http\Controllers\Company\Company\Group;
 
+use Carbon\Carbon;
 use Inertia\Inertia;
+use App\Helpers\DateHelper;
+use App\Helpers\ImageHelper;
 use Illuminate\Http\Request;
 use App\Models\Company\Group;
 use App\Helpers\InstanceHelper;
 use App\Models\Company\Meeting;
+use Illuminate\Http\JsonResponse;
 use App\Helpers\NotificationHelper;
 use App\Http\Controllers\Controller;
 use App\Services\Company\Group\CreateMeeting;
+use App\Services\Company\Group\AddGuestToMeeting;
+use App\Services\Company\Group\UpdateMeetingDate;
+use App\Services\Company\Group\RemoveGuestFromMeeting;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
 use App\Http\ViewHelpers\Company\Group\GroupMeetingsViewHelper;
@@ -41,7 +48,7 @@ public function index(Request $request, int $companyId, int $groupId)
         return Inertia::render('Company/Group/Meetings/Index', [
             'group' => $info,
             'tab' => 'meetings',
-            'meetings' => $meetings,
+            'data' => $meetings,
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
         ]);
     }
@@ -141,4 +148,128 @@ public function toggleParticipant(Request $request, int $companyId, int $groupId
             'data' => true,
         ]);
     }
+
+    /**
+     * Get the list of potential participants for this meeting.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     * @return JsonResponse
+     */
+    public function search(Request $request, int $companyId, int $groupId, int $meetingId): JsonResponse
+    {
+        $company = InstanceHelper::getLoggedCompany();
+
+        try {
+            $group = Group::where('company_id', $company->id)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        try {
+            $meeting = Meeting::where('group_id', $group->id)
+                ->findOrFail($meetingId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        $potentialMembers = GroupMeetingsViewHelper::potentialGuests(
+            $meeting,
+            $company,
+            $request->input('searchTerm')
+        );
+
+        return response()->json([
+            'data' => $potentialMembers,
+        ]);
+    }
+
+    /**
+     * Add participant to the meeting.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     */
+    public function addParticipant(Request $request, int $companyId, int $groupId, int $meetingId)
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        $employee = (new AddGuestToMeeting)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'employee_id' => $request->input('id'),
+        ]);
+
+        return response()->json([
+            'data' => [
+                'id' => $employee->id,
+                'name' => $employee->name,
+                'avatar' => ImageHelper::getAvatar($employee, 23),
+                'was_a_guest' => true,
+                'attended' => false,
+            ],
+        ]);
+    }
+
+    /**
+     * Remove participant from the meeting.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     */
+    public function removeParticipant(Request $request, int $companyId, int $groupId, int $meetingId)
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        (new RemoveGuestFromMeeting)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'employee_id' => $request->input('id'),
+        ]);
+
+        return response()->json([
+            'data' => true,
+        ]);
+    }
+
+    /**
+     * Set the meeting date.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     */
+    public function setDate(Request $request, int $companyId, int $groupId, int $meetingId)
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        $date = Carbon::createFromDate($request->input('year'), $request->input('month'), $request->input('day'));
+
+        (new UpdateMeetingDate)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'date' => $date->format('Y-m-d'),
+        ]);
+
+        return response()->json([
+            'data' => DateHelper::formatDate($date),
+        ]);
+    }
 }
diff --git a/app/Http/Controllers/Company/Employee/EmployeeEditController.php b/app/Http/Controllers/Company/Employee/EmployeeEditController.php
index 43176b488..873049acc 100644
--- a/app/Http/Controllers/Company/Employee/EmployeeEditController.php
+++ b/app/Http/Controllers/Company/Employee/EmployeeEditController.php
@@ -115,7 +115,6 @@ public function update(Request $request, int $companyId, int $employeeId): JsonR
             'company_id' => $companyId,
             'author_id' => $loggedEmployee->id,
             'employee_id' => $employeeId,
-            'date' => $date->format('Y-m-d'),
             'year' => intval($request->input('year')),
             'month' => intval($request->input('month')),
             'day' => intval($request->input('day')),
@@ -128,7 +127,6 @@ public function update(Request $request, int $companyId, int $employeeId): JsonR
                 'company_id' => $companyId,
                 'author_id' => $loggedEmployee->id,
                 'employee_id' => $employeeId,
-                'date' => $date->format('Y-m-d'),
                 'year' => intval($request->input('hired_year')),
                 'month' => intval($request->input('hired_month')),
                 'day' => intval($request->input('hired_day')),
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
index 73cc93a3d..6910ac7b7 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
@@ -2,6 +2,8 @@
 
 namespace App\Http\ViewHelpers\Company\Group;
 
+use Carbon\Carbon;
+use App\Helpers\DateHelper;
 use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
 use App\Models\Company\Company;
@@ -18,7 +20,45 @@ class GroupMeetingsViewHelper
      */
     public static function index(Group $group): array
     {
+        $meetings = $group->meetings()->orderBy('happened_at', 'desc')->with('employees')->get();
+
+        $meetingsCollection = collect([]);
+        foreach ($meetings as $meeting) {
+            $members = $meeting->employees()
+                ->inRandomOrder()
+                ->take(3)
+                ->get();
+
+            $totalMembersCount = $meeting->employees()->count();
+            $totalMembersCount = $totalMembersCount - $members->count();
+
+            $membersCollection = collect([]);
+            foreach ($members as $member) {
+                $membersCollection->push([
+                    'id' => $member->id,
+                    'avatar' => ImageHelper::getAvatar($member, 25),
+                    'url' => route('employees.show', [
+                        'company' => $group->company_id,
+                        'employee' => $member,
+                    ]),
+                ]);
+            }
+
+            $meetingsCollection->push([
+                'id' => $meeting->id,
+                'happened_at' => trans('group.meeting_index_item_title', ['date' => DateHelper::formatDate($meeting->happened_at)]),
+                'url' => route('groups.meetings.show', [
+                    'company' => $group->company_id,
+                    'group' => $group,
+                    'meeting' => $meeting,
+                ]),
+                'preview_members' => $membersCollection,
+                'remaining_members_count' => $totalMembersCount,
+            ]);
+        }
+
         return [
+            'meetings' => $meetingsCollection,
             'url_new' => route('groups.meetings.new', [
                 'company' => $group->company_id,
                 'group' => $group,
@@ -39,24 +79,47 @@ public static function show(Meeting $meeting, Company $company): array
             ->orderBy('last_name', 'asc')
             ->get();
 
-        $membersCollection = collect([]);
+        $participantsCollection = collect([]);
+        $guestsCollection = collect([]);
         foreach ($participants as $employee) {
-            $membersCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-                'avatar' => ImageHelper::getAvatar($employee, 23),
-                'attended' => (bool) $employee->pivot->attended,
-                'was_a_guest' => (bool) $employee->pivot->was_a_guest,
-                'url' => route('employees.show', [
-                    'company' => $company,
-                    'employee' => $employee,
-                ]),
-            ]);
+            if ((bool) $employee->pivot->was_a_guest) {
+                $guestsCollection->push([
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                    'avatar' => ImageHelper::getAvatar($employee, 23),
+                    'attended' => (bool) $employee->pivot->attended,
+                    'was_a_guest' => true,
+                    'url' => route('employees.show', [
+                        'company' => $company,
+                        'employee' => $employee,
+                    ]),
+                ]);
+            } else {
+                $participantsCollection->push([
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                    'avatar' => ImageHelper::getAvatar($employee, 23),
+                    'attended' => (bool) $employee->pivot->attended,
+                    'was_a_guest' => false,
+                    'url' => route('employees.show', [
+                        'company' => $company,
+                        'employee' => $employee,
+                    ]),
+                ]);
+            }
         }
 
         return [
-            'id' => $meeting->id,
-            'participants' => $membersCollection,
+            'meeting' => [
+                'id' => $meeting->id,
+                'happened_at' => DateHelper::formatDate($meeting->happened_at),
+                'happened_at_max_year' => Carbon::now()->addYear()->year,
+                'happened_at_year' => $meeting->happened_at->year,
+                'happened_at_month' => $meeting->happened_at->month,
+                'happened_at_day' => $meeting->happened_at->day,
+            ],
+            'participants' => $participantsCollection,
+            'guests' => $guestsCollection,
         ];
     }
 
@@ -72,12 +135,13 @@ public static function potentialGuests(Meeting $meeting, Company $company, strin
     {
         $members = $meeting->employees()
             ->select('id', 'first_name', 'last_name')
-            ->orderBy('last_name', 'asc')
-            ->get();
+            ->pluck('id')
+            ->toArray();
 
         $potentialGuests = $company->employees()
             ->select('id', 'first_name', 'last_name')
             ->notLocked()
+            ->whereNotIn('id', $members)
             ->where(function ($query) use ($criteria) {
                 $query->where('first_name', 'LIKE', '%'.$criteria.'%')
                     ->orWhere('last_name', 'LIKE', '%'.$criteria.'%')
@@ -87,8 +151,6 @@ public static function potentialGuests(Meeting $meeting, Company $company, strin
             ->take(10)
             ->get();
 
-        $potentialGuests->diff($members);
-
         $employeesCollection = collect([]);
         foreach ($potentialGuests as $employee) {
             $employeesCollection->push([
diff --git a/app/Models/Company/Group.php b/app/Models/Company/Group.php
index b690f5d86..8dc200722 100644
--- a/app/Models/Company/Group.php
+++ b/app/Models/Company/Group.php
@@ -44,10 +44,10 @@ public function employees()
     /**
      * Get the meeting records associated with the group.
      *
-     * @return BelongsToMany
+     * @return hasMany
      */
     public function meetings()
     {
-        return $this->belongsToMany(Employee::class)->withTimestamps();
+        return $this->hasMany(Meeting::class);
     }
 }
diff --git a/app/Services/Company/Group/AddGuestToMeeting.php b/app/Services/Company/Group/AddGuestToMeeting.php
index 8b4524782..88d44ff06 100644
--- a/app/Services/Company/Group/AddGuestToMeeting.php
+++ b/app/Services/Company/Group/AddGuestToMeeting.php
@@ -71,7 +71,9 @@ private function attachEmployee(): void
     {
         if (! $this->isEmployeePartOfGroup()) {
             $this->meeting->employees()->syncWithoutDetaching([
-                $this->data['employee_id'],
+                $this->data['employee_id'] => [
+                    'was_a_guest' => true,
+                ],
             ]);
 
             $this->log();
diff --git a/app/Services/Company/Group/CreateMeeting.php b/app/Services/Company/Group/CreateMeeting.php
index 5dc2246ed..7f1e0d4c2 100644
--- a/app/Services/Company/Group/CreateMeeting.php
+++ b/app/Services/Company/Group/CreateMeeting.php
@@ -62,6 +62,7 @@ private function createMeeting(): void
     {
         $this->meeting = Meeting::create([
             'group_id' => $this->data['group_id'],
+            'happened_at' => Carbon::now()->format('Y-m-d'),
         ]);
     }
 
diff --git a/app/Services/Company/Group/RemoveEmployeeAsParticipantOfMeeting.php b/app/Services/Company/Group/RemoveGuestFromMeeting.php
similarity index 96%
rename from app/Services/Company/Group/RemoveEmployeeAsParticipantOfMeeting.php
rename to app/Services/Company/Group/RemoveGuestFromMeeting.php
index ea1994dd1..fda124a14 100644
--- a/app/Services/Company/Group/RemoveEmployeeAsParticipantOfMeeting.php
+++ b/app/Services/Company/Group/RemoveGuestFromMeeting.php
@@ -10,7 +10,7 @@
 use App\Models\Company\Meeting;
 use App\Models\Company\Employee;
 
-class RemoveEmployeeAsParticipantOfMeeting extends BaseService
+class RemoveGuestFromMeeting extends BaseService
 {
     private array $data;
     private Employee $employee;
@@ -34,7 +34,7 @@ public function rules(): array
     }
 
     /**
-     * Remove an employee as participant from a meeting.
+     * Remove an employee as guest from a meeting.
      *
      * @param array $data
      */
diff --git a/app/Services/Company/Group/UpdateMeetingDate.php b/app/Services/Company/Group/UpdateMeetingDate.php
new file mode 100644
index 000000000..e7973b227
--- /dev/null
+++ b/app/Services/Company/Group/UpdateMeetingDate.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+
+class UpdateMeetingDate extends BaseService
+{
+    private array $data;
+    private Employee $employee;
+    private Group $group;
+    private Meeting $meeting;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'meeting_id' => 'required|integer|exists:meetings,id',
+            'date' => 'required|date_format:Y-m-d',
+        ];
+    }
+
+    /**
+     * Set the meeting date.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+
+        $this->setDate();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+
+        $this->meeting = Meeting::where('group_id', $this->data['group_id'])
+            ->findOrFail($this->data['meeting_id']);
+    }
+
+    private function setDate(): void
+    {
+        $this->meeting->happened_at = $this->data['date'];
+        $this->meeting->save();
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'meeting_date_set',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/public/img/favicon.png b/public/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5de2664445a53b260147464e89016ddd86fc30f
GIT binary patch
literal 1836
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
a{a*l;kWgEQ_lHUV0000<MNUMnLSTZ>!)ufP

literal 0
HcmV?d00001

diff --git a/public/img/streamline-icon-coffee-break-2-1@140x140.png b/public/img/streamline-icon-coffee-break-2-1@140x140.png
new file mode 100644
index 0000000000000000000000000000000000000000..095a134f067108687b0f66fc6f9d157741acb740
GIT binary patch
literal 11224
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
Kc&(^m(Ek9t#qS^h

literal 0
HcmV?d00001

diff --git a/resources/js/Pages/Company/Group/Meetings/Index.vue b/resources/js/Pages/Company/Group/Meetings/Index.vue
index 7c3aee911..abfd25c0a 100644
--- a/resources/js/Pages/Company/Group/Meetings/Index.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Index.vue
@@ -45,97 +45,41 @@
       <div class="mw6 center br3 mb5 relative z-1">
         <!-- add a new meeting -->
         <div class="tr mb2">
-          <inertia-link :href="meetings.url_new" class="btn dib-l db mb3 mb0-ns" data-cy="member-add-button">Create new meeting</inertia-link>
+          <inertia-link :href="data.url_new" class="btn dib-l db mb3 mb0-ns" data-cy="member-add-button">{{ $t('group.meeting_index_cta') }}</inertia-link>
         </div>
 
         <!-- list of meetings -->
-        <div class="br3 bg-white box z-1">
+        <div v-if="data.meetings.length > 0" class="br3 bg-white box z-1">
           <ul class="list pl0 ma0">
-            <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+            <li v-for="meeting in data.meetings" :key="meeting.id" class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
               <div class="mb1 relative">
-                <span class="employee-name db">
-                  Meeting du 20 janvier
-                </span>
+                <inertia-link :href="meeting.url" class="employee-name db">
+                  {{ meeting.happened_at }}
+                </inertia-link>
               </div>
-              <span class="ma0 mb0 f7 grey">
+              <span v-if="meeting.preview_members" class="ma0 mb0 f7 grey">
                 <div class="flex items-center relative tr">
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
+                  <avatar v-for="member in meeting.preview_members" :key="member.id" :avatar="member.avatar" :url="member.url" :size="25"
+                          :classes="'br-100 small-avatar'"
                   />
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                  <div class="pl2 f7 more-members relative gray">
-                    {{ $t('project.menu_other_member', { count: 3 }) }}
+                  <div v-if="meeting.remaining_members_count > 0" class="pl2 f7 more-members relative gray">
+                    + {{ meeting.remaining_members_count }}
                   </div>
                 </div>
               </span>
             </li>
-            <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
-              <div class="mb1 relative">
-                <span class="employee-name db">
-                  Meeting du 20 janvier
-                </span>
-              </div>
-              <span class="ma0 mb0 f7 grey">
-                <div class="flex items-center relative tr">
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                </div>
-              </span>
-            </li>
-            <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
-              <div class="mb1 relative">
-                <span class="employee-name db">
-                  Meeting du 20 janvier
-                </span>
-              </div>
-              <span class="ma0 mb0 f7 grey">
-                <div class="flex items-center relative tr">
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                </div>
-              </span>
-            </li>
-            <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
-              <div class="mb1 relative">
-                <span class="employee-name db">
-                  Meeting du 20 janvier
-                </span>
-              </div>
-              <span class="ma0 mb0 f7 grey">
-                <div class="flex items-center relative tr">
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                  <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                       width="32" height="32"
-                  />
-                </div>
-              </span>
-            </li>
           </ul>
         </div>
+
+        <!-- blank state -->
+        <div v-else class="br3 bg-white box z-1 pa3 tc">
+          <img loading="lazy" src="/img/streamline-icon-factory-engineer-3@140x140.png" width="140" height="140" alt="meeting"
+               class=""
+          />
+          <h3 class="fw4 f5 lh-copy">
+            {{ $t('group.meeting_index_blank') }}
+          </h3>
+        </div>
       </div>
     </div>
   </layout>
@@ -143,11 +87,13 @@
 
 <script>
 import Layout from '@/Shared/Layout';
+import Avatar from '@/Shared/Avatar';
 import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
 
 export default {
   components: {
     Layout,
+    Avatar,
     GroupMenu,
   },
 
@@ -160,8 +106,8 @@ export default {
       type: Object,
       default: null,
     },
-    meetings: {
-      type: Array,
+    data: {
+      type: Object,
       default: null,
     },
     tab: {
@@ -173,7 +119,6 @@ export default {
   data() {
     return {
       processingSearch: false,
-      localMembers: null,
       showModal: false,
       removeMode: false,
       idToDelete: 0,
@@ -188,10 +133,6 @@ export default {
     };
   },
 
-  created() {
-    this.localMembers = this.members;
-  },
-
   mounted() {
     if (localStorage.success) {
       flash(localStorage.success, 'success');
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
new file mode 100644
index 000000000..7cc1ef8a2
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
@@ -0,0 +1,147 @@
+<style lang="scss" scoped>
+</style>
+
+<template>
+  <div class="bg-white box mb4">
+    <!-- date -->
+    <div class="pt3 pr3 pl3">
+      <p class="silver f6 ma0 mb1">Date the meeting occurs</p>
+
+      <p v-if="!editMode">{{ localMeeting.happened_at }} <a class="ml2 bb b--dotted bt-0 bl-0 br-0 pointer f6" @click.prevent="showEditMode()">Edit</a></p>
+    </div>
+
+    <!-- edit date -->
+    <form v-if="editMode" class="pa3" @submit.prevent="set()">
+      <div class="dt-ns dt--fixed di">
+        <div class="dtc-ns pr2-ns pb0-ns w-100">
+          <!-- year -->
+          <text-input :id="'year'"
+                      :ref="'year'"
+                      v-model="form.year"
+                      :name="'year'"
+                      :errors="$page.props.errors.year"
+                      :label="$t('employee.edit_information_year')"
+                      :required="true"
+                      :type="'number'"
+                      :min="1900"
+                      :max="localMeeting.happened_at_max_year"
+                      :help="$t('employee.edit_information_year_help')"
+                      @esc-key-pressed="editMode = false"
+          />
+        </div>
+        <div class="dtc-ns pr2-ns pb0-ns w-100">
+          <!-- month -->
+          <text-input :id="'month'"
+                      v-model="form.month"
+                      :name="'month'"
+                      :errors="$page.props.errors.month"
+                      :label="$t('employee.edit_information_month')"
+                      :required="true"
+                      :type="'number'"
+                      :min="1"
+                      :max="12"
+                      :help="$t('employee.edit_information_month_help')"
+                      @esc-key-pressed="editMode = false"
+          />
+        </div>
+        <div class="dtc-ns pr2-ns pb0-ns w-100">
+          <!-- day -->
+          <text-input :id="'day'"
+                      v-model="form.day"
+                      :name="'day'"
+                      :errors="$page.props.errors.day"
+                      :label="$t('employee.edit_information_day')"
+                      :required="true"
+                      :type="'number'"
+                      :min="1"
+                      :max="31"
+                      :help="$t('employee.edit_information_day_help')"
+                      @esc-key-pressed="editMode = false"
+          />
+        </div>
+      </div>
+
+      <!-- actions -->
+      <div class="mb0">
+        <div class="flex-ns justify-between">
+          <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" @click.prevent="editMode = false">
+            {{ $t('app.cancel') }}
+          </a>
+          <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.save')" />
+        </div>
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+import TextInput from '@/Shared/TextInput';
+import 'vue-loaders/dist/vue-loaders.css';
+import LoadingButton from '@/Shared/LoadingButton';
+
+export default {
+  components: {
+    TextInput,
+    LoadingButton,
+  },
+
+  props: {
+    groupId: {
+      type: Number,
+      default: null,
+    },
+    meeting: {
+      type: Object,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      editMode: false,
+      form: {
+        year: null,
+        month: null,
+        day: null,
+        errors: [],
+      },
+      loadingState: '',
+    };
+  },
+
+  created() {
+    this.localMeeting = this.meeting.meeting;
+    this.form.year = this.localMeeting.happened_at_year;
+    this.form.month = this.localMeeting.happened_at_month;
+    this.form.day = this.localMeeting.happened_at_day;
+  },
+
+  methods: {
+    showEditMode() {
+      this.editMode = true;
+
+      this.$nextTick(() => {
+        this.$refs['year'].$refs['input'].focus();
+      });
+    },
+
+    set() {
+      this.loadingState = 'loading';
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.localMeeting.id}/setDate`, this.form)
+        .then(response => {
+          flash(this.$t('group.meeting_show_date_updated'), 'success');
+
+          this.localMeeting.happened_at = response.data.data;
+          this.editMode = false;
+          this.loadingState = null;
+        })
+        .catch(error => {
+          this.form.errors = error.response.data;
+          this.loadingState = null;
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
index ac41a972c..2da5c4480 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
@@ -33,47 +33,105 @@
 </style>
 
 <template>
-  <div class="bg-white box mb4 pa3">
-    <p class="silver f6 ma0 mb1">{{ $t('group.meeting_show_participants') }}</p>
-    <p class="f7 gray mb4">{{ $t('group.meeting_show_participants_help') }}</p>
-
-    <ul class="ma0 pa0 list">
-      <li v-for="participant in localParticipants" :key="participant.id" :class="participant.attended ? 'present' : 'absent'" class="relative flex items-center mb3 pointer" @click="toggle(participant)">
-        <svg class="check-icon mr2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-          <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
-        </svg>
-        <avatar :avatar="participant.avatar" :size="23" :classes="'br-100 mr2'" />
-        <span class="name f5">{{ participant.name }}</span>
-      </li>
-
-      <!-- add guest cta -->
-      <li><a class="bb b--dotted bt-0 bl-0 br-0 pointer f6">+ Add guest</a></li>
-
-      <!-- search form -->
-      <form class="relative" @submit.prevent="search">
-        <text-input :id="'name'"
-                    v-model="form.searchTerm"
-                    :name="'name'"
-                    :datacy="'project-lead-search'"
-                    :errors="$page.props.errors.name"
-                    :label="$t('project.create_input_project_lead')"
-                    :required="false"
-                    @keyup="search"
-                    @input="search"
-                    @esc-key-pressed="showAssignProjectLead = false"
-        />
-        <ball-pulse-loader v-if="processingSearch" color="#5c7575" size="7px" />
-      </form>
-    </ul>
+  <div class="bg-white box mb4">
+    <!-- participants -->
+    <div class="pt3 pr3 pl3 bb-gray bb">
+      <p class="silver f6 ma0 mb1">{{ $t('group.meeting_show_participants') }}</p>
+      <p class="f7 gray mb3 lh-copy">{{ $t('group.meeting_show_participants_help') }}</p>
+
+      <ul class="ma0 pa0 list">
+        <li v-for="participant in localParticipants" :key="participant.id" :class="participant.attended ? 'present' : 'absent'" class="relative flex items-center mb3 pointer" @click="toggle(participant)">
+          <svg class="check-icon mr2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
+          </svg>
+          <avatar :avatar="participant.avatar" :size="23" :classes="'br-100 mr2'" />
+          <span class="name f5 lh-copy">{{ participant.name }}</span>
+        </li>
+      </ul>
+    </div>
+
+    <!-- guests -->
+    <div class="pa3">
+      <p class="silver f6 ma0 mb1">{{ $t('group.meeting_show_guests') }}</p>
+      <p class="f7 gray mb3 lh-copy">{{ $t('group.meeting_show_guests_help') }}</p>
+
+      <ul class="ma0 pa0 list">
+        <li v-for="guest in localGuests" :key="guest.id" :class="guest.attended ? 'present' : 'absent'" class="relative mb3 pointer flex items-center">
+          <div class="flex items-center" @click="toggle(guest)">
+            <svg v-if="!editMode" class="check-icon mr2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+              <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
+            </svg>
+            <avatar :avatar="guest.avatar" :size="23" :classes="'br-100 mr2'" />
+            <span class="name f5 lh-copy mr2">{{ guest.name }}</span>
+          </div>
+
+          <!-- delete guest -->
+          <a v-if="editMode" class="bb b--dotted bt-0 bl-0 f7 br-0 pointer c-delete" @click.prevent="removeGuest(guest)">
+            {{ $t('app.delete') }}
+          </a>
+        </li>
+
+        <!-- add guest cta -->
+        <li v-if="!addMode">
+          <ul class="list pl0 ma0">
+            <!-- Add guest link -->
+            <li v-if="!editMode" class="di mr2"><a class="bb b--dotted bt-0 bl-0 br-0 pointer f6" @click="showAddMode()">+ {{ $t('group.meeting_show_participants_add_guest') }}</a></li>
+
+            <!-- Edit guest link -->
+            <li v-if="localGuests.length > 0 && !editMode" class="di mr2"><a class="bb b--dotted bt-0 bl-0 br-0 pointer f6" @click.prevent="showEditMode()">{{ $t('group.meeting_show_participants_edit_guests') }}</a></li>
+
+            <!-- Exit edit guest mode -->
+            <li v-if="editMode" class="di mr2" @click="editMode = false"><a class="bb b--dotted bt-0 bl-0 br-0 pointer f6">{{ $t('group.meeting_show_participants_exit_edit_guests') }}</a></li>
+          </ul>
+        </li>
+
+        <!-- search -->
+        <div v-if="addMode">
+          <!-- search form -->
+          <form class="relative" @submit.prevent="search">
+            <text-input :id="'name'"
+                        :ref="'search'"
+                        v-model="form.searchTerm"
+                        :name="'name'"
+                        :errors="$page.props.errors.name"
+                        :label="$t('group.meeting_show_participants_add_guest_input')"
+                        :required="true"
+                        @keyup="search"
+                        @input="search"
+                        @esc-key-pressed="addMode = false"
+            />
+            <ball-pulse-loader v-if="processingSearch" color="#5c7575" size="7px" />
+          </form>
+
+          <!-- search results -->
+          <div class="pl0 list ma0">
+            <ul v-if="potentialParticipants.length > 0" class="list ma0 pl0">
+              <li v-for="participant in potentialParticipants" :key="participant.id" class="bb relative pv2 ph1 bb-gray bb-gray-hover">
+                {{ participant.name }}
+
+                <a class="absolute right-1 pointer" @click.prevent="assign(participant)">
+                  {{ $t('app.choose') }}
+                </a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </ul>
+    </div>
   </div>
 </template>
 
 <script>
 import Avatar from '@/Shared/Avatar';
+import TextInput from '@/Shared/TextInput';
+import 'vue-loaders/dist/vue-loaders.css';
+import BallPulseLoader from 'vue-loaders/dist/loaders/ball-pulse';
 
 export default {
   components: {
     Avatar,
+    TextInput,
+    'ball-pulse-loader': BallPulseLoader.component,
   },
 
   props: {
@@ -89,7 +147,14 @@ export default {
 
   data() {
     return {
+      addMode: false,
+      editMode: false,
+      idToDelete: false,
+      processingSearch: false,
+      hasMadeASearch: false,
+      potentialParticipants: [],
       localParticipants: null,
+      localGuests: null,
       form: {
         searchTerm: null,
         id: null,
@@ -101,6 +166,7 @@ export default {
 
   created() {
     this.localParticipants = this.meeting.participants;
+    this.localGuests = this.meeting.guests;
   },
 
   mounted() {
@@ -111,20 +177,98 @@ export default {
   },
 
   methods: {
+    showAddMode() {
+      this.addMode = true;
+
+      this.$nextTick(() => {
+        this.$refs['search'].$refs['input'].focus();
+      });
+    },
+
+    showEditMode() {
+      this.editMode = true;
+    },
+
     toggle(member) {
       this.form.id = member.id;
 
-      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.id}/toggle`, this.form)
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/toggle`, this.form)
         .then(response => {
+          if (! member.was_a_guest) {
+            var id = this.localParticipants.findIndex(x => x.id === member.id);
+            this.localParticipants[id].attended = ! this.localParticipants[id].attended;
+          } else {
+            var id = this.localGuests.findIndex(x => x.id === member.id);
+            this.localGuests[id].attended = ! this.localGuests[id].attended;
+          }
+
           flash(this.$t('app.saved'), 'success');
           this.form.id = null;
-          var id = this.localParticipants.findIndex(x => x.id === member.id);
-          this.localParticipants[id].attended = ! this.localParticipants[id].attended;
         })
         .catch(error => {
           console.log(error);
         });
     },
+
+    search: _.debounce(
+      function() {
+
+        if (this.form.searchTerm != '') {
+          this.hasMadeASearch = false;
+          this.processingSearch = true;
+
+          axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/search`, this.form)
+            .then(response => {
+              this.potentialParticipants = response.data.data;
+              this.processingSearch = false;
+              this.hasMadeASearch = true;
+            })
+            .catch(error => {
+              this.form.errors = error.response.data;
+              this.processingSearch = false;
+              this.hasMadeASearch = false;
+            });
+        }
+      },
+      500),
+
+    assign(participant) {
+      this.form.id = participant.id;
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/add`, this.form)
+        .then(response => {
+          flash(this.$t('group.meeting_show_add_guest_success'), 'success');
+
+          this.localGuests.push(response.data.data);
+          this.addMode = false;
+          this.potentialParticipants = [];
+          this.form.searchTerm = '';
+        })
+        .catch(error => {
+          this.form.errors = error.response.data;
+        });
+    },
+
+    removeGuest(guest) {
+      this.form.id = guest.id;
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/remove`, this.form)
+        .then(response => {
+          flash(this.$t('group.meeting_show_remove_guest_success'), 'success');
+
+          var removedGuestId = this.localGuests.findIndex(x => x.id === guest.id);
+          this.localGuests.splice(removedGuestId, 1);
+          this.form.id = null;
+
+          // also, exit Edit mode if there are no guests anymore
+          if (this.localGuests.length == 0) {
+            this.editMode = false;
+          }
+        })
+        .catch(error => {
+          this.form.errors = error.response.data;
+        });
+    },
   }
 };
 
diff --git a/resources/js/Pages/Company/Group/Meetings/Show.vue b/resources/js/Pages/Company/Group/Meetings/Show.vue
index 9639ee8fb..715d59ba0 100644
--- a/resources/js/Pages/Company/Group/Meetings/Show.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Show.vue
@@ -53,6 +53,9 @@
 
           <!-- RIGHT COLUMN -->
           <div class="fl w-30-l w-100 pl4-l">
+            <!-- date -->
+            <date :group-id="group.id" :meeting="meeting" />
+
             <!-- participants -->
             <participants :group-id="group.id" :meeting="meeting" />
           </div>
@@ -66,12 +69,14 @@
 import Layout from '@/Shared/Layout';
 import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
 import Participants from '@/Pages/Company/Group/Meetings/Partials/Participants';
+import Date from '@/Pages/Company/Group/Meetings/Partials/Date';
 
 export default {
   components: {
     Layout,
     GroupMenu,
     Participants,
+    Date,
   },
 
   props: {
@@ -95,26 +100,9 @@ export default {
 
   data() {
     return {
-      processingSearch: false,
-      localMembers: null,
-      showModal: false,
-      removeMode: false,
-      idToDelete: 0,
-      potentialMembers: [],
-      loadingState: '',
-      form: {
-        searchTerm: null,
-        employee: null,
-        role: null,
-        errors: [],
-      },
     };
   },
 
-  created() {
-    this.localMembers = this.members;
-  },
-
   mounted() {
     if (localStorage.success) {
       flash(localStorage.success, 'success');
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index 971ba930e..119d3c297 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -309,6 +309,7 @@
     'log_file_added_to_project' => 'Added a file called :name in the project called :project_name.',
     'log_project_file_destroyed' => 'Deleted a file called :name in the project called :project_name.',
     'log_add_guest_to_meeting' => 'Added :employee_name in a meeting of the project called :project_name.',
+    'log_meeting_date_set' => 'Set the meeting date in a meeting of the project called :project_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index fa8ac9b18..8cc95b525 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -11,6 +11,19 @@
     'members_add_placeholder' => 'Enter the first letters of a name',
     'members_index_blank' => ' Groups are more fun with employees. Add an employee now.',
 
+    'meeting_index_item_title' => 'Meeting of :date',
+    'meeting_index_cta' => 'Create new meeting',
+    'meeting_index_blank' => 'Document every meeting here - to have an agenda and keep track of what was said and decided.',
+
     'meeting_show_participants' => 'Participants',
+    'meeting_show_guests' => 'Guests',
+    'meeting_show_guests_help' => 'Guests are not part of the group.',
+    'meeting_show_participants_add_guest' => 'Add guest',
+    'meeting_show_participants_add_guest_input' => 'Who should be added as guest?',
+    'meeting_show_participants_edit_guests' => 'Edit guests',
+    'meeting_show_add_guest_success' => 'The guest has been added.',
+    'meeting_show_remove_guest_success' => 'The guest has been removed.',
     'meeting_show_participants_help' => 'Click on the names of the people who were present in the meeting.',
+    'meeting_show_participants_exit_edit_guests' => 'Exit edit mode',
+    'meeting_show_date_updated' => 'The date has been updated.',
 ];
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index 26b9570ba..24bfc95eb 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -8,6 +8,7 @@
   <base href="{{ url('/') }}/" />
   <link rel="stylesheet" href="{{ asset(mix('css/app.css')) }}">
   <script src="{{ asset(mix('js/app.js')) }}" defer></script>
+  <link rel="icon" type="image/png" sizes="32x32" href="{{ asset('img/favicon.png') }}" />
   <title>@yield('title', config('app.name'))</title>
 
   @routes
diff --git a/routes/web.php b/routes/web.php
index 7d7d78695..cfa860f32 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -352,6 +352,10 @@
                 Route::get('{group}/meetings/create', 'Company\\Company\\Group\\GroupMeetingsController@create')->name('groups.meetings.new');
                 Route::get('{group}/meetings/{meeting}', 'Company\\Company\\Group\\GroupMeetingsController@show')->name('groups.meetings.show');
                 Route::post('{group}/meetings/{meeting}/toggle', 'Company\\Company\\Group\\GroupMeetingsController@toggleParticipant');
+                Route::post('{group}/meetings/{meeting}/search', 'Company\\Company\\Group\\GroupMeetingsController@search');
+                Route::post('{group}/meetings/{meeting}/add', 'Company\\Company\\Group\\GroupMeetingsController@addParticipant');
+                Route::post('{group}/meetings/{meeting}/remove', 'Company\\Company\\Group\\GroupMeetingsController@removeParticipant');
+                Route::post('{group}/meetings/{meeting}/setDate', 'Company\\Company\\Group\\GroupMeetingsController@setDate');
             });
 
             Route::prefix('hr')->group(function () {
diff --git a/tests/Unit/Models/Company/GroupTest.php b/tests/Unit/Models/Company/GroupTest.php
index 1a2aaf87f..d559ce840 100644
--- a/tests/Unit/Models/Company/GroupTest.php
+++ b/tests/Unit/Models/Company/GroupTest.php
@@ -4,6 +4,7 @@
 
 use Tests\TestCase;
 use App\Models\Company\Group;
+use App\Models\Company\Meeting;
 use App\Models\Company\Employee;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
@@ -30,4 +31,15 @@ public function it_has_many_employees(): void
 
         $this->assertTrue($group->employees()->exists());
     }
+
+    /** @test */
+    public function it_has_many_meetings(): void
+    {
+        $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+
+        $this->assertTrue($group->meetings()->exists());
+    }
 }
diff --git a/tests/Unit/Services/Company/Group/RemoveEmployeeAsParticipantOfMeetingTest.php b/tests/Unit/Services/Company/Group/RemoveGuestFromMeetingTest.php
similarity index 94%
rename from tests/Unit/Services/Company/Group/RemoveEmployeeAsParticipantOfMeetingTest.php
rename to tests/Unit/Services/Company/Group/RemoveGuestFromMeetingTest.php
index 7750d5083..179e643eb 100644
--- a/tests/Unit/Services/Company/Group/RemoveEmployeeAsParticipantOfMeetingTest.php
+++ b/tests/Unit/Services/Company/Group/RemoveGuestFromMeetingTest.php
@@ -11,11 +11,11 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\RemoveGuestFromMeeting;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use App\Services\Company\Group\RemoveEmployeeAsParticipantOfMeeting;
 
-class RemoveEmployeeAsParticipantOfMeetingTest extends TestCase
+class RemoveGuestFromMeetingTest extends TestCase
 {
     use DatabaseTransactions;
 
@@ -68,7 +68,7 @@ public function it_fails_if_wrong_parameters_are_given(): void
         ];
 
         $this->expectException(ValidationException::class);
-        (new RemoveEmployeeAsParticipantOfMeeting)->execute($request);
+        (new RemoveGuestFromMeeting)->execute($request);
     }
 
     /** @test */
@@ -118,7 +118,7 @@ private function executeService(Employee $michael, Employee $dwight, Group $grou
             'employee_id' => $dwight->id,
         ];
 
-        (new RemoveEmployeeAsParticipantOfMeeting)->execute($request);
+        (new RemoveGuestFromMeeting)->execute($request);
 
         $this->assertDatabaseMissing('employee_meeting', [
             'meeting_id' => $meeting->id,
diff --git a/tests/Unit/Services/Company/Group/UpdateMeetingDateTest.php b/tests/Unit/Services/Company/Group/UpdateMeetingDateTest.php
new file mode 100644
index 000000000..5b2b21517
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/UpdateMeetingDateTest.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Meeting;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\UpdateMeetingDate;
+use App\Services\Company\Group\RemoveGuestFromMeeting;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class UpdateMeetingDateTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_updates_the_date_of_a_meeting_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_updates_the_date_of_a_meeting_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_updates_the_date_of_a_meeting_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+        $this->executeService($michael, $group, $meeting);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new RemoveGuestFromMeeting)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create();
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+        ]);
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $group, $meeting);
+    }
+
+    private function executeService(Employee $michael, Group $group, Meeting $meeting): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'meeting_id' => $meeting->id,
+            'date' => '2020-10-30',
+        ];
+
+        (new UpdateMeetingDate)->execute($request);
+
+        $this->assertDatabaseHas('meetings', [
+            'id' => $meeting->id,
+            'happened_at' => '2020-10-30 00:00:00',
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $meeting) {
+            return $job->auditLog['action'] === 'meeting_date_set' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => $group->name,
+                    'meeting_id' => $meeting->id,
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php
index b785df498..6b483c645 100644
--- a/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupMeetingsViewHelperTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\ViewHelpers\Company\Group;
 
+use Carbon\Carbon;
 use Tests\TestCase;
 use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
@@ -14,23 +15,87 @@ class GroupMeetingsViewHelperTest extends TestCase
 {
     use DatabaseTransactions;
 
+    /** @test */
+    public function it_gets_a_list_of_meetings(): void
+    {
+        Carbon::setTestNow(Carbon::create(2019, 1, 1, 7, 0, 0));
+
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+            'happened_at' => Carbon::now(),
+        ]);
+        $meeting->employees()->attach([$michael->id]);
+
+        $array = GroupMeetingsViewHelper::index($group);
+
+        $this->assertEquals(
+            env('APP_URL').'/'.$michael->company_id.'/company/groups/'.$group->id.'/meetings/create',
+            $array['url_new']
+        );
+
+        $this->assertEquals(
+            $meeting->id,
+            $array['meetings']->toArray()[0]['id']
+        );
+
+        $this->assertEquals(
+            'Meeting of Jan 01, 2019',
+            $array['meetings']->toArray()[0]['happened_at']
+        );
+
+        $this->assertEquals(
+            env('APP_URL').'/'.$michael->company_id.'/company/groups/'.$group->id.'/meetings/'.$meeting->id,
+            $array['meetings']->toArray()[0]['url']
+        );
+
+        $this->assertEquals(
+            0,
+            $array['meetings']->toArray()[0]['remaining_members_count']
+        );
+
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $michael->id,
+                    'avatar' => ImageHelper::getAvatar($michael, 25),
+                    'url' => env('APP_URL').'/'.$michael->company_id.'/employees/'.$michael->id,
+                ],
+            ],
+            $array['meetings']->toArray()[0]['preview_members']->toArray()
+        );
+    }
+
     /** @test */
     public function it_gets_information_about_a_specific_meeting(): void
     {
+        Carbon::setTestNow(Carbon::create(2019, 1, 1, 7, 0, 0));
+
         $michael = $this->createAdministrator();
         $group = Group::factory()->create([
             'company_id' => $michael->company_id,
         ]);
         $meeting = Meeting::factory()->create([
             'group_id' => $group->id,
+            'happened_at' => Carbon::now(),
         ]);
         $meeting->employees()->attach([$michael->id]);
 
         $array = GroupMeetingsViewHelper::show($meeting, $group->company);
 
         $this->assertEquals(
-            $meeting->id,
-            $array['id']
+            [
+                'id' => $meeting->id,
+                'happened_at' => 'Jan 01, 2019',
+                'happened_at_max_year' => '2020',
+                'happened_at_year' => '2019',
+                'happened_at_month' => '1',
+                'happened_at_day' => '1',
+            ],
+            $array['meeting']
         );
 
         $this->assertEquals(

From 38235856b18e38e155975ce46c81342e115fc917 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Apr 2021 16:46:58 +0000
Subject: [PATCH 24/47] Optimised images with calibre/image-actions

---
 public/img/favicon.png                        | Bin 1836 -> 1701 bytes
 ...reamline-icon-coffee-break-2-1@140x140.png | Bin 11224 -> 7739 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/img/favicon.png b/public/img/favicon.png
index b5de2664445a53b260147464e89016ddd86fc30f..4b5bed27a37ff924ea9a24e1f40637a1d7fd70a7 100644
GIT binary patch
delta 1664
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
KMNUMnLSTY#svgJy

delta 1801
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

diff --git a/public/img/streamline-icon-coffee-break-2-1@140x140.png b/public/img/streamline-icon-coffee-break-2-1@140x140.png
index 095a134f067108687b0f66fc6f9d157741acb740..5f6b8dcae25756626e7374213ed6c1fdf454a202 100644
GIT binary patch
literal 7739
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
Y2bY4SKDt5wzQGu3N?MAw^6-fN12TY@7ytkO

literal 11224
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
Kc&(^m(Ek9t#qS^h


From eefaca06d98fe3bf702e1c4a260c68abd5837f88 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Thu, 1 Apr 2021 13:00:57 -0400
Subject: [PATCH 25/47] meeting deletion

---
 .../Company/Group/GroupMeetingsController.php | 26 ++++++++++++++
 .../js/Pages/Company/Group/Meetings/Show.vue  | 34 +++++++++++++++----
 resources/js/Pages/Company/Project/Delete.vue |  2 +-
 .../Pages/Company/Project/Messages/Show.vue   |  2 +-
 resources/js/Pages/Company/Project/Show.vue   |  2 +-
 .../js/Pages/Company/Project/Tasks/Show.vue   |  2 +-
 resources/lang/en/group.php                   |  2 ++
 routes/web.php                                |  1 +
 8 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index 7e98dfa52..1c84fabef 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -14,6 +14,7 @@
 use App\Helpers\NotificationHelper;
 use App\Http\Controllers\Controller;
 use App\Services\Company\Group\CreateMeeting;
+use App\Services\Company\Group\DestroyMeeting;
 use App\Services\Company\Group\AddGuestToMeeting;
 use App\Services\Company\Group\UpdateMeetingDate;
 use App\Services\Company\Group\RemoveGuestFromMeeting;
@@ -272,4 +273,29 @@ public function setDate(Request $request, int $companyId, int $groupId, int $mee
             'data' => DateHelper::formatDate($date),
         ]);
     }
+
+    /**
+     * Destroy the meeting.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     */
+    public function destroy(Request $request, int $companyId, int $groupId, int $meetingId)
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        (new DestroyMeeting)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+        ]);
+
+        return response()->json([
+            'data' => true,
+        ]);
+    }
 }
diff --git a/resources/js/Pages/Company/Group/Meetings/Show.vue b/resources/js/Pages/Company/Group/Meetings/Show.vue
index 715d59ba0..efc083227 100644
--- a/resources/js/Pages/Company/Group/Meetings/Show.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Show.vue
@@ -58,6 +58,20 @@
 
             <!-- participants -->
             <participants :group-id="group.id" :meeting="meeting" />
+
+            <ul class="list pl0">
+              <li v-if="!deleteMode" class="pl2"><a data-cy="project-delete" class="f6 gray bb b--dotted bt-0 bl-0 br-0 pointer di c-delete" @click.prevent="deleteMode = true">{{ $t('group.meeting_show_delete') }}</a></li>
+
+              <li v-if="deleteMode" class="f6">
+                {{ $t('app.sure') }}
+                <a class="c-delete mr1 pointer" @click.prevent="destroy()">
+                  {{ $t('app.yes') }}
+                </a>
+                <a class="pointer" @click.prevent="deleteMode = false">
+                  {{ $t('app.no') }}
+                </a>
+              </li>
+            </ul>
           </div>
         </div>
       </div>
@@ -100,15 +114,23 @@ export default {
 
   data() {
     return {
+      deleteMode: false,
     };
   },
 
-  mounted() {
-    if (localStorage.success) {
-      flash(localStorage.success, 'success');
-      localStorage.removeItem('success');
-    }
-  },
+  methods: {
+    destroy() {
+      axios.delete(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/meetings/${this.meeting.meeting.id}`)
+        .then(response => {
+          localStorage.success = this.$t('group.meeting_show_delete_success');
+
+          this.$inertia.visit(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/meetings`);
+        })
+        .catch(error => {
+          this.form.errors = error.response.data;
+        });
+    },
+  }
 };
 
 </script>
diff --git a/resources/js/Pages/Company/Project/Delete.vue b/resources/js/Pages/Company/Project/Delete.vue
index ded5a1ce1..f06a65cb1 100644
--- a/resources/js/Pages/Company/Project/Delete.vue
+++ b/resources/js/Pages/Company/Project/Delete.vue
@@ -34,7 +34,7 @@
             </div>
 
             <!-- Actions -->
-            <div class="cf pa3 bb-gray bb">
+            <div class="cf pa3">
               <div class="flex-ns justify-between">
                 <div>
                   <inertia-link :href="'/' + $page.props.auth.company.id + '/company/projects/' + project.id" class="btn dib tc w-auto-ns w-100 pv2 ph3 mb0-ns mb2" data-cy="cancel-button">
diff --git a/resources/js/Pages/Company/Project/Messages/Show.vue b/resources/js/Pages/Company/Project/Messages/Show.vue
index 2a5b43235..bd69d50b7 100644
--- a/resources/js/Pages/Company/Project/Messages/Show.vue
+++ b/resources/js/Pages/Company/Project/Messages/Show.vue
@@ -122,7 +122,7 @@
             <li class="mb2"><inertia-link :href="message.url_edit" data-cy="project-edit" class="f6 gray">{{ $t('project.message_show_edit') }}</inertia-link></li>
 
             <!-- delete -->
-            <li v-if="!removalConfirmation"><a href="#" data-cy="project-delete" class="f6 gray" @click.prevent="removalConfirmation = true">{{ $t('project.message_show_destroy') }}</a></li>
+            <li v-if="!removalConfirmation"><a href="#" data-cy="project-delete" class="f6 gray bb b--dotted bt-0 bl-0 br-0 pointer di c-delete" @click.prevent="removalConfirmation = true">{{ $t('project.message_show_destroy') }}</a></li>
             <li v-if="removalConfirmation" class="pv2 f6">
               {{ $t('app.sure') }}
               <a data-cy="confirm-project-deletion" class="c-delete mr1 pointer" @click.prevent="destroy()">
diff --git a/resources/js/Pages/Company/Project/Show.vue b/resources/js/Pages/Company/Project/Show.vue
index ce7e2a962..b3098b10e 100644
--- a/resources/js/Pages/Company/Project/Show.vue
+++ b/resources/js/Pages/Company/Project/Show.vue
@@ -58,7 +58,7 @@
 
             <ul class="list pl0">
               <li class="mb2 pl2"><inertia-link :href="localProject.url_edit" data-cy="project-edit" class="f6 gray">{{ $t('project.summary_edit') }}</inertia-link></li>
-              <li class="pl2"><inertia-link :href="localProject.url_delete" data-cy="project-delete" class="f6 gray">{{ $t('project.summary_delete') }}</inertia-link></li>
+              <li class="pl2"><inertia-link :href="localProject.url_delete" data-cy="project-delete" class="f6 gray c-delete">{{ $t('project.summary_delete') }}</inertia-link></li>
             </ul>
           </div>
         </div>
diff --git a/resources/js/Pages/Company/Project/Tasks/Show.vue b/resources/js/Pages/Company/Project/Tasks/Show.vue
index c13f8a8ba..57b1f50bd 100644
--- a/resources/js/Pages/Company/Project/Tasks/Show.vue
+++ b/resources/js/Pages/Company/Project/Tasks/Show.vue
@@ -301,7 +301,7 @@ input[type=checkbox] {
             </div>
 
             <!-- delete -->
-            <li v-if="!deleteMode" class="mb2" @click="deleteMode = true"><span class="bb b--dotted bt-0 bl-0 br-0 pointer di f7">{{ $t('app.delete') }}</span></li>
+            <li v-if="!deleteMode" class="mb2" @click="deleteMode = true"><span class="bb b--dotted bt-0 bl-0 br-0 pointer di f7 c-delete">{{ $t('app.delete') }}</span></li>
             <li v-if="deleteMode" class="mb2">
               {{ $t('app.sure') }}
               <a class="c-delete mr1 pointer" @click.prevent="destroy">
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index 8cc95b525..66e4cc06b 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -26,4 +26,6 @@
     'meeting_show_participants_help' => 'Click on the names of the people who were present in the meeting.',
     'meeting_show_participants_exit_edit_guests' => 'Exit edit mode',
     'meeting_show_date_updated' => 'The date has been updated.',
+    'meeting_show_delete' => 'Delete the meeting',
+    'meeting_show_delete_success' => 'The meeting has been deleted.',
 ];
diff --git a/routes/web.php b/routes/web.php
index cfa860f32..bd2c1c1e6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -351,6 +351,7 @@
                 Route::get('{group}/meetings', 'Company\\Company\\Group\\GroupMeetingsController@index')->name('groups.meetings.index');
                 Route::get('{group}/meetings/create', 'Company\\Company\\Group\\GroupMeetingsController@create')->name('groups.meetings.new');
                 Route::get('{group}/meetings/{meeting}', 'Company\\Company\\Group\\GroupMeetingsController@show')->name('groups.meetings.show');
+                Route::delete('{group}/meetings/{meeting}', 'Company\\Company\\Group\\GroupMeetingsController@destroy');
                 Route::post('{group}/meetings/{meeting}/toggle', 'Company\\Company\\Group\\GroupMeetingsController@toggleParticipant');
                 Route::post('{group}/meetings/{meeting}/search', 'Company\\Company\\Group\\GroupMeetingsController@search');
                 Route::post('{group}/meetings/{meeting}/add', 'Company\\Company\\Group\\GroupMeetingsController@addParticipant');

From b08db0f102ee2172d1d7f0c3cc125913ab614160 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Fri, 2 Apr 2021 20:53:28 -0400
Subject: [PATCH 26/47] wip

---
 .../Company/Group/GroupMeetingsController.php |  31 ++-
 .../Company/Group/GroupMeetingsViewHelper.php |  53 ++++
 .../Group/Meetings/Partials/Agenda.vue        | 242 ++++++++++++++++++
 .../js/Pages/Company/Group/Meetings/Show.vue  |  11 +-
 resources/js/Shared/Layout.vue                |   2 +-
 routes/web.php                                |   1 +
 6 files changed, 332 insertions(+), 8 deletions(-)
 create mode 100644 resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index 1c84fabef..e5b2ab0dd 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -15,6 +15,7 @@
 use App\Http\Controllers\Controller;
 use App\Services\Company\Group\CreateMeeting;
 use App\Services\Company\Group\DestroyMeeting;
+use App\Services\Company\Group\CreateAgendaItem;
 use App\Services\Company\Group\AddGuestToMeeting;
 use App\Services\Company\Group\UpdateMeetingDate;
 use App\Services\Company\Group\RemoveGuestFromMeeting;
@@ -116,10 +117,12 @@ public function show(Request $request, int $companyId, int $groupId, int $meetin
 
         $groupInfo = GroupShowViewHelper::information($group, $loggedCompany);
         $meetingInfo = GroupMeetingsViewHelper::show($meeting, $loggedCompany);
+        $agenda = GroupMeetingsViewHelper::agenda($meeting, $loggedCompany);
 
         return Inertia::render('Company/Group/Meetings/Show', [
             'group' => $groupInfo,
             'meeting' => $meetingInfo,
+            'agenda' => $agenda,
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
         ]);
     }
@@ -196,7 +199,7 @@ public function search(Request $request, int $companyId, int $groupId, int $meet
      * @param int $groupId
      * @param int $meetingId
      */
-    public function addParticipant(Request $request, int $companyId, int $groupId, int $meetingId)
+    public function addParticipant(Request $request, int $companyId, int $groupId, int $meetingId): JsonResponse
     {
         $loggedCompany = InstanceHelper::getLoggedCompany();
         $loggedEmployee = InstanceHelper::getLoggedEmployee();
@@ -228,7 +231,7 @@ public function addParticipant(Request $request, int $companyId, int $groupId, i
      * @param int $groupId
      * @param int $meetingId
      */
-    public function removeParticipant(Request $request, int $companyId, int $groupId, int $meetingId)
+    public function removeParticipant(Request $request, int $companyId, int $groupId, int $meetingId): JsonResponse
     {
         $loggedCompany = InstanceHelper::getLoggedCompany();
         $loggedEmployee = InstanceHelper::getLoggedEmployee();
@@ -254,7 +257,7 @@ public function removeParticipant(Request $request, int $companyId, int $groupId
      * @param int $groupId
      * @param int $meetingId
      */
-    public function setDate(Request $request, int $companyId, int $groupId, int $meetingId)
+    public function setDate(Request $request, int $companyId, int $groupId, int $meetingId): JsonResponse
     {
         $loggedCompany = InstanceHelper::getLoggedCompany();
         $loggedEmployee = InstanceHelper::getLoggedEmployee();
@@ -282,7 +285,7 @@ public function setDate(Request $request, int $companyId, int $groupId, int $mee
      * @param int $groupId
      * @param int $meetingId
      */
-    public function destroy(Request $request, int $companyId, int $groupId, int $meetingId)
+    public function destroy(Request $request, int $companyId, int $groupId, int $meetingId): JsonResponse
     {
         $loggedCompany = InstanceHelper::getLoggedCompany();
         $loggedEmployee = InstanceHelper::getLoggedEmployee();
@@ -298,4 +301,24 @@ public function destroy(Request $request, int $companyId, int $groupId, int $mee
             'data' => true,
         ]);
     }
+
+    public function createAgendaItem(Request $request, int $companyId, int $groupId, int $meetingId): JsonResponse
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        (new CreateAgendaItem)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'summary' => $request->input('summary'),
+            'description' => $request->input('description'),
+            'presented_by_id' => $request->input('presented_by_id'),
+        ]);
+
+        return response()->json([
+            'data' => true,
+        ]);
+    }
 }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
index 6910ac7b7..8c36d503d 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
@@ -161,4 +161,57 @@ public static function potentialGuests(Meeting $meeting, Company $company, strin
 
         return $employeesCollection;
     }
+
+    /**
+     * Get agenda of the meeting.
+     *
+     * @param Meeting $meeting
+     * @param Company $company
+     * @return Collection
+     */
+    public static function agenda(Meeting $meeting, Company $company): Collection
+    {
+        $items = $meeting->agendaItems()
+            ->orderBy('id', 'asc')
+            ->with('presenter')
+            ->with('decisions')
+            ->get();
+
+        $agendaCollection = collect([]);
+        $counter = 1;
+        foreach ($items as $agendaItem) {
+            $presenter = $agendaItem->presenter;
+
+            // decisions
+            $decisionsCollection = collect([]);
+            foreach ($agendaItem->decisions as $decision) {
+                $decisionsCollection->push([
+                    'id' => $decision->id,
+                    'description' => $decision->description,
+                ]);
+            }
+
+            // preparing final collection
+            $agendaCollection->push([
+                'id' => $agendaItem->id,
+                'position' => $counter,
+                'summary' => $agendaItem->summary,
+                'description' => $agendaItem->description,
+                'presenter' => $presenter ? [
+                    'id' => $presenter->id,
+                    'name' => $presenter->name,
+                    'avatar' => ImageHelper::getAvatar($presenter, 23),
+                    'url' => route('employees.show', [
+                        'company' => $company,
+                        'employee' => $presenter,
+                    ]),
+                ] : null,
+                'decisions' => $decisionsCollection,
+            ]);
+
+            $counter++;
+        }
+
+        return $agendaCollection;
+    }
 }
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
new file mode 100644
index 000000000..c3b777d63
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -0,0 +1,242 @@
+<style lang="scss" scoped>
+.bg-gray {
+  background-color: #f5f5f5;
+}
+
+.decisions {
+  background-color: #f6f8ff;
+}
+
+.dot {
+  background-color: #06B6D4;
+  width: 24px;
+  color: #fff;
+  height: 24px;
+  padding: 3px 10px 5px 8px;
+  top: 16px;
+}
+
+.new-item {
+  left: 40px;
+}
+</style>
+
+<template>
+  <div>
+    <div class="db fw5 mb2 flex justify-between items-center">
+      <span>
+        <span class="mr1">
+          🎒
+        </span> Agenda of the meeting
+
+        <help :url="$page.props.help_links.project_tasks" :top="'3px'" />
+      </span>
+    </div>
+
+    <ul class="list pl0 ma0 relative">
+      <!-- list of agenda items -->
+      <li v-for="agendaItem in localAgenda" :key="agendaItem.id" class="flex relative mb3">
+        <div class="dot br-100 mr3 relative">
+          {{ agendaItem.position }}
+        </div>
+
+        <!-- agenda item -->
+        <div class="bg-white box pa3 w-100">
+          <ul class="list pl0 mb3">
+            <li class="di mb3 mr2 fw4 f4">{{ agendaItem.summary }}</li>
+            <li class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Edit</a></li>
+            <li class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Add more details</a></li>
+          </ul>
+
+          <!-- description -->
+          <div v-if="agendaItem.description" class="db parsed-content mb3">
+            <p>Nous souhaitons mettre en place la fonctionnalité de gestion de "template" pour gérer ce besoin.</p>
+          </div>
+
+          <!-- decisions -->
+          <div class="decisions pa3 br3">
+            <ul class="pa0 list mb3">
+              <li class="mb3">
+                <span class="db mb2 f7 fw6">👉 Decision #2</span>
+                <span>We will focus on making the most money for sure</span>
+              </li>
+              <li>
+                <span class="db mb2 f7 fw6">👉 Decision #2</span>
+                <span>We will focus on making the most money for sure</span>
+              </li>
+            </ul>
+            <span class="db f6">
+              <a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add decision or follow-up</a>
+            </span>
+          </div>
+        </div>
+      </li>
+
+      <!-- link to add a new agenda item -->
+      <li v-if="! addAgendaItemMode" class="mt3 flex relative new-item relative">
+        <a class="btn" @click.prevent="showAddAgendaItem()">Add new agenda item</a>
+      </li>
+
+      <!-- Modal - Add agenda item -->
+      <div v-if="addAgendaItemMode" class="bg-gray new-item relative">
+        <form @submit.prevent="storeAgendaItem()">
+          <!-- agenda item title + checkbox -->
+          <div class="">
+            <text-input :id="'summary'"
+                        :ref="'summary'"
+                        v-model="form.summary"
+                        :name="'summary'"
+                        :errors="$page.props.errors.summary"
+                        :label="'What should we talk about?'"
+                        :required="true"
+                        @esc-key-pressed="hideAddAgendaItem()"
+            />
+          </div>
+
+          <ul class="ma0 mb3 list pa0">
+            <li v-if="!addDescriptionMode" class="di mr2" @click="showAddDescription()"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add more details</a></li>
+            <li v-if="!addPresenterMode" class="di" @click="showAddPresenter()"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add a presenter</a></li>
+          </ul>
+
+          <!-- description -->
+          <div v-if="addDescriptionMode" class="lh-copy">
+            <text-area :ref="'description'"
+                       v-model="form.description"
+                       :label="$t('account.company_news_new_content')"
+                       :required="false"
+                       :rows="10"
+                       @esc-key-pressed="hideAddDescription()"
+            />
+          </div>
+
+          <!-- add presenter -->
+          <div v-if="addPresenterMode" class="cf mb2">
+            <select-box v-model="form.presented_by_id"
+                        :options="members"
+                        :errors="$page.props.errors.presented_by_id"
+                        :label="'Who will present?'"
+                        :placeholder="$t('app.choose_value')"
+                        :value="form.presented_by_id"
+            />
+          </div>
+
+          <!-- Actions -->
+          <div class="flex justify-between">
+            <div>
+              <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.update')" />
+              <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" @click.prevent="hideAddAgendaItem()">{{ $t('app.cancel') }}</a>
+            </div>
+          </div>
+        </form>
+      </div>
+    </ul>
+  </div>
+</template>
+
+<script>
+import TextInput from '@/Shared/TextInput';
+import TextArea from '@/Shared/TextArea';
+import SelectBox from '@/Shared/Select';
+import LoadingButton from '@/Shared/LoadingButton';
+
+export default {
+  components: {
+    TextInput,
+    TextArea,
+    SelectBox,
+    LoadingButton,
+  },
+
+  props: {
+    groupId: {
+      type: Number,
+      default: null,
+    },
+    meeting: {
+      type: Object,
+      default: null,
+    },
+    agenda: {
+      type: Array,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      loadingState: null,
+      localAgenda: null,
+      addAgendaItemMode: false,
+      addDescriptionMode: false,
+      addPresenterMode: false,
+      form: {
+        summary: null,
+        description: null,
+        presented_by_id: null,
+        errors: [],
+      },
+    };
+  },
+
+  created() {
+    this.localAgenda = this.agenda;
+  },
+
+  methods: {
+    showAddAgendaItem() {
+      this.addAgendaItemMode = true;
+
+      this.$nextTick(() => {
+        this.$refs['summary'].$refs['input'].focus();
+      });
+    },
+
+    hideAddAgendaItem() {
+      this.addAgendaItemMode = false;
+      this.form.summary = null;
+      this.hideAddDescription();
+      this.hideAddPresenter();
+    },
+
+    showAddDescription() {
+      this.addDescriptionMode = true;
+
+      this.$nextTick(() => {
+        this.$refs['description'].$refs['input'].focus();
+      });
+    },
+
+    hideAddDescription() {
+      this.addDescriptionMode = false;
+      this.form.description = null;
+    },
+
+    showAddPresenter() {
+      this.addPresenterMode = true;
+    },
+
+    hideAddPresenter() {
+      this.addPresenterMode = false;
+      this.form.presented_by_id = null;
+    },
+
+    storeAgendaItem() {
+      this.loadingState = 'loading';
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/addAgendaItem`, this.form)
+        .then(response => {
+          flash(this.$t('project.members_index_add_success'), 'success');
+          this.loadingState = null;
+          this.form.employee = null;
+          this.showModal = false;
+          this.localMembers.unshift(response.data.data);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    }
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Meetings/Show.vue b/resources/js/Pages/Company/Group/Meetings/Show.vue
index efc083227..06898dab5 100644
--- a/resources/js/Pages/Company/Group/Meetings/Show.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Show.vue
@@ -43,12 +43,11 @@
       </div>
 
       <div class="mw8 center br3 mb5 relative z-1">
-        <p>Meeting</p>
-
         <div class="cf center">
           <!-- LEFT COLUMN -->
           <div class="fl w-70-l w-100">
-            <p>left</p>
+            <!-- agenda -->
+            <agenda :group-id="group.id" :meeting="meeting" :agenda="agenda" />
           </div>
 
           <!-- RIGHT COLUMN -->
@@ -84,6 +83,7 @@ import Layout from '@/Shared/Layout';
 import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
 import Participants from '@/Pages/Company/Group/Meetings/Partials/Participants';
 import Date from '@/Pages/Company/Group/Meetings/Partials/Date';
+import Agenda from '@/Pages/Company/Group/Meetings/Partials/Agenda';
 
 export default {
   components: {
@@ -91,6 +91,7 @@ export default {
     GroupMenu,
     Participants,
     Date,
+    Agenda,
   },
 
   props: {
@@ -106,6 +107,10 @@ export default {
       type: Object,
       default: null,
     },
+    agenda: {
+      type: Array,
+      default: null,
+    },
     tab: {
       type: String,
       default: 'summary',
diff --git a/resources/js/Shared/Layout.vue b/resources/js/Shared/Layout.vue
index 98b85818e..3748d277a 100644
--- a/resources/js/Shared/Layout.vue
+++ b/resources/js/Shared/Layout.vue
@@ -30,7 +30,7 @@ nav {
     color: #4d4d4f;
 
     &:hover,
-    &:selected {
+    &:active {
       border-bottom-width: 0;
     }
 
diff --git a/routes/web.php b/routes/web.php
index bd2c1c1e6..81845240d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -357,6 +357,7 @@
                 Route::post('{group}/meetings/{meeting}/add', 'Company\\Company\\Group\\GroupMeetingsController@addParticipant');
                 Route::post('{group}/meetings/{meeting}/remove', 'Company\\Company\\Group\\GroupMeetingsController@removeParticipant');
                 Route::post('{group}/meetings/{meeting}/setDate', 'Company\\Company\\Group\\GroupMeetingsController@setDate');
+                Route::post('{group}/meetings/{meeting}/addAgendaItem', 'Company\\Company\\Group\\GroupMeetingsController@createAgendaItem');
             });
 
             Route::prefix('hr')->group(function () {

From 5154b64002fe165976c9bd70a409528da80ba1b3 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Fri, 2 Apr 2021 20:57:44 -0400
Subject: [PATCH 27/47] Update Group.php

---
 app/Models/Company/Group.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Models/Company/Group.php b/app/Models/Company/Group.php
index 8dc200722..f41d24bce 100644
--- a/app/Models/Company/Group.php
+++ b/app/Models/Company/Group.php
@@ -3,6 +3,7 @@
 namespace App\Models\Company;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -44,7 +45,7 @@ public function employees()
     /**
      * Get the meeting records associated with the group.
      *
-     * @return hasMany
+     * @return HasMany
      */
     public function meetings()
     {

From e0755b0deec7532529ab65a090a623cf228526c0 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sat, 3 Apr 2021 08:04:13 -0400
Subject: [PATCH 28/47] Update EmployeeEditController.php

---
 .../Controllers/Company/Employee/EmployeeEditController.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Http/Controllers/Company/Employee/EmployeeEditController.php b/app/Http/Controllers/Company/Employee/EmployeeEditController.php
index 873049acc..26e901533 100644
--- a/app/Http/Controllers/Company/Employee/EmployeeEditController.php
+++ b/app/Http/Controllers/Company/Employee/EmployeeEditController.php
@@ -109,8 +109,6 @@ public function update(Request $request, int $companyId, int $employeeId): JsonR
 
         (new SetPersonalDetails)->execute($data);
 
-        $date = Carbon::createFromDate($request->input('year'), $request->input('month'), $request->input('day'));
-
         $data = [
             'company_id' => $companyId,
             'author_id' => $loggedEmployee->id,

From 0e6d6b2941908dee5a5b485ce4bc9d169d8b67a7 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Wed, 14 Apr 2021 23:49:35 -0400
Subject: [PATCH 29/47] fix

---
 resources/lang/en/account.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index 8180428fc..977499577 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -313,12 +313,9 @@
     'log_meeting_decision_updated' => 'Updated a meeting decision about an agenda item in a meeting in the group called :group_name.',
     'log_file_added_to_project' => 'Added a file called :name in the project called :project_name.',
     'log_project_file_destroyed' => 'Deleted a file called :name in the project called :project_name.',
-<<<<<<< HEAD
     'log_add_guest_to_meeting' => 'Added :employee_name in a meeting of the project called :project_name.',
     'log_meeting_date_set' => 'Set the meeting date in a meeting of the project called :project_name.',
-=======
     'log_company_founded_date_updated' => 'Updated the founded date of the company to :founded_at.',
->>>>>>> main
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',

From aee8ad578b22de2f1367d1a0d44dc0a308c713a9 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 19 Apr 2021 20:56:00 -0400
Subject: [PATCH 30/47] wip

---
 .../Company/Group/GroupMeetingsController.php |  58 +++++++++-
 .../Company/Group/GroupMeetingsViewHelper.php |  11 +-
 app/Models/Company/AgendaItem.php             |   1 +
 .../Company/Group/CreateAgendaItem.php        |   5 +
 .../factories/Company/AgendaItemFactory.php   |   1 +
 .../2021_03_03_031835_create_groups_table.php |   1 +
 resources/js/Pages/Company/Group/Create.vue   |   4 +-
 .../js/Pages/Company/Group/Meetings/Index.vue |   4 +-
 .../Group/Meetings/Partials/Agenda.vue        | 101 ++++++++++++++----
 .../Company/Group/Meetings/Partials/Date.vue  |   4 +-
 .../Group/Meetings/Partials/Participants.vue  |  12 +--
 .../js/Pages/Company/Group/Members/Index.vue  |   8 +-
 .../Company/Group/Partials/GroupMenu.vue      |   2 +-
 resources/js/Shared/TextInput.vue             |   5 +
 routes/web.php                                |   1 +
 .../Company/Group/CreateAgendaItemTest.php    |   1 +
 16 files changed, 170 insertions(+), 49 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index e5b2ab0dd..299f3e8b5 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -16,6 +16,7 @@
 use App\Services\Company\Group\CreateMeeting;
 use App\Services\Company\Group\DestroyMeeting;
 use App\Services\Company\Group\CreateAgendaItem;
+use App\Services\Company\Group\UpdateAgendaItem;
 use App\Services\Company\Group\AddGuestToMeeting;
 use App\Services\Company\Group\UpdateMeetingDate;
 use App\Services\Company\Group\RemoveGuestFromMeeting;
@@ -36,6 +37,7 @@ class GroupMeetingsController extends Controller
     public function index(Request $request, int $companyId, int $groupId)
     {
         $company = InstanceHelper::getLoggedCompany();
+        $employee = InstanceHelper::getLoggedEmployee();
 
         try {
             $group = Group::where('company_id', $company->id)
@@ -51,7 +53,7 @@ public function index(Request $request, int $companyId, int $groupId)
             'group' => $info,
             'tab' => 'meetings',
             'data' => $meetings,
-            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+            'notifications' => NotificationHelper::getNotifications($employee),
         ]);
     }
 
@@ -302,12 +304,21 @@ public function destroy(Request $request, int $companyId, int $groupId, int $mee
         ]);
     }
 
+    /**
+     * Create an agenda item.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     * @return JsonResponse
+     */
     public function createAgendaItem(Request $request, int $companyId, int $groupId, int $meetingId): JsonResponse
     {
         $loggedCompany = InstanceHelper::getLoggedCompany();
         $loggedEmployee = InstanceHelper::getLoggedEmployee();
 
-        (new CreateAgendaItem)->execute([
+        $agendaItem = (new CreateAgendaItem)->execute([
             'company_id' => $loggedCompany->id,
             'author_id' => $loggedEmployee->id,
             'group_id' => $groupId,
@@ -318,7 +329,48 @@ public function createAgendaItem(Request $request, int $companyId, int $groupId,
         ]);
 
         return response()->json([
-            'data' => true,
+            'data' => [
+                'id' => $agendaItem->id,
+                'summary' => $agendaItem->summary,
+                'description' => $agendaItem->description,
+                'position' => $agendaItem->position,
+            ],
+        ]);
+    }
+
+    /**
+     * Update the agenda item summary.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     * @param int $agendaItemId
+     * @return JsonResponse
+     */
+    public function updateSummary(Request $request, int $companyId, int $groupId, int $meetingId, int $agendaItemId): JsonResponse
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        $agendaItem = (new UpdateAgendaItem)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'agenda_item_id' => $agendaItemId,
+            'summary' => $request->input('summary'),
+            'description' => $request->input('description'),
+            'presented_by_id' => $request->input('presented_by_id'),
+        ]);
+
+        return response()->json([
+            'data' => [
+                'id' => $agendaItem->id,
+                'summary' => $agendaItem->summary,
+                'description' => $agendaItem->description,
+                'position' => $agendaItem->position,
+            ],
         ]);
     }
 }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
index 8c36d503d..d9dba0416 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\ViewHelpers\Company\Group;
 
-use Carbon\Carbon;
 use App\Helpers\DateHelper;
 use App\Helpers\ImageHelper;
-use App\Models\Company\Group;
 use App\Models\Company\Company;
+use App\Models\Company\Group;
 use App\Models\Company\Meeting;
+use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
 class GroupMeetingsViewHelper
@@ -178,7 +178,6 @@ public static function agenda(Meeting $meeting, Company $company): Collection
             ->get();
 
         $agendaCollection = collect([]);
-        $counter = 1;
         foreach ($items as $agendaItem) {
             $presenter = $agendaItem->presenter;
 
@@ -194,7 +193,7 @@ public static function agenda(Meeting $meeting, Company $company): Collection
             // preparing final collection
             $agendaCollection->push([
                 'id' => $agendaItem->id,
-                'position' => $counter,
+                'position' => $agendaItem->position,
                 'summary' => $agendaItem->summary,
                 'description' => $agendaItem->description,
                 'presenter' => $presenter ? [
@@ -208,10 +207,10 @@ public static function agenda(Meeting $meeting, Company $company): Collection
                 ] : null,
                 'decisions' => $decisionsCollection,
             ]);
-
-            $counter++;
         }
 
         return $agendaCollection;
     }
+
+    public static function potentialPresenters(Meeting $meeting, Company $company): Collection
 }
diff --git a/app/Models/Company/AgendaItem.php b/app/Models/Company/AgendaItem.php
index 7ff134930..c880c00b9 100644
--- a/app/Models/Company/AgendaItem.php
+++ b/app/Models/Company/AgendaItem.php
@@ -21,6 +21,7 @@ class AgendaItem extends Model
      */
     protected $fillable = [
         'meeting_id',
+        'position',
         'checked',
         'summary',
         'description',
diff --git a/app/Services/Company/Group/CreateAgendaItem.php b/app/Services/Company/Group/CreateAgendaItem.php
index 6fb151598..f9f77665b 100644
--- a/app/Services/Company/Group/CreateAgendaItem.php
+++ b/app/Services/Company/Group/CreateAgendaItem.php
@@ -76,8 +76,13 @@ private function validate(): void
 
     private function createAgendaItem(): void
     {
+        // get the position of the agenda item
+        $max = AgendaItem::where('meeting_id', $this->meeting->id)
+            ->max('position');
+
         $this->agendaItem = AgendaItem::create([
             'meeting_id' => $this->data['meeting_id'],
+            'position' => $max + 1,
             'summary' => $this->data['summary'],
             'description' => $this->data['description'],
             'presented_by_id' => $this->data['presented_by_id'] ? $this->data['presented_by_id'] : null,
diff --git a/database/factories/Company/AgendaItemFactory.php b/database/factories/Company/AgendaItemFactory.php
index 0e0b68974..306dc7357 100644
--- a/database/factories/Company/AgendaItemFactory.php
+++ b/database/factories/Company/AgendaItemFactory.php
@@ -26,6 +26,7 @@ public function definition()
 
         return [
             'meeting_id' => $meeting->id,
+            'position' => 1,
             'summary' => 'This is the summary',
             'description' => 'This is the description',
         ];
diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
index 1538cd57a..8dc2979a3 100644
--- a/database/migrations/2021_03_03_031835_create_groups_table.php
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -43,6 +43,7 @@ public function up()
         Schema::create('agenda_items', function (Blueprint $table) {
             $table->id();
             $table->unsignedBigInteger('meeting_id');
+            $table->integer('position');
             $table->boolean('checked')->default(false);
             $table->string('summary');
             $table->text('description')->nullable();
diff --git a/resources/js/Pages/Company/Group/Create.vue b/resources/js/Pages/Company/Group/Create.vue
index 586a8aab1..6b22f8ca8 100644
--- a/resources/js/Pages/Company/Group/Create.vue
+++ b/resources/js/Pages/Company/Group/Create.vue
@@ -113,7 +113,7 @@
             <div v-show="form.employees.length > 0" class="ba bb-gray mb3 mt3">
               <div v-for="employee in form.employees" :key="employee.id" class="pa2 db bb-gray bb" data-cy="members-list">
                 <span class="pl3 db relative team-member">
-                  <avatar :avatar="employee.avatar" :size="23" :classes="'avatar absolute br-100'" />
+                  <avatar :avatar="employee.avatar" :size="23" :class="'avatar absolute br-100'" />
 
                   {{ employee.name }}
 
@@ -133,7 +133,7 @@
                     {{ $t('app.cancel') }}
                   </inertia-link>
                 </div>
-                <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.create')" :cypress-selector="'submit-create-project-button'" />
+                <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.create')" :cypress-selector="'submit-create-project-button'" />
               </div>
             </div>
           </form>
diff --git a/resources/js/Pages/Company/Group/Meetings/Index.vue b/resources/js/Pages/Company/Group/Meetings/Index.vue
index abfd25c0a..808003091 100644
--- a/resources/js/Pages/Company/Group/Meetings/Index.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Index.vue
@@ -1,5 +1,5 @@
 <style lang="scss" scoped>
-.small-avatar {
+.small-avatar:not(:first-child) {
   margin-left: -8px;
   box-shadow: 0 0 0 2px #fff;
 }
@@ -60,7 +60,7 @@
               <span v-if="meeting.preview_members" class="ma0 mb0 f7 grey">
                 <div class="flex items-center relative tr">
                   <avatar v-for="member in meeting.preview_members" :key="member.id" :avatar="member.avatar" :url="member.url" :size="25"
-                          :classes="'br-100 small-avatar'"
+                          :class="'br-100 small-avatar'"
                   />
                   <div v-if="meeting.remaining_members_count > 0" class="pl2 f7 more-members relative gray">
                     + {{ meeting.remaining_members_count }}
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index c3b777d63..f838ecb7b 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -15,10 +15,6 @@
   padding: 3px 10px 5px 8px;
   top: 16px;
 }
-
-.new-item {
-  left: 40px;
-}
 </style>
 
 <template>
@@ -41,16 +37,35 @@
         </div>
 
         <!-- agenda item -->
-        <div class="bg-white box pa3 w-100">
-          <ul class="list pl0 mb3">
-            <li class="di mb3 mr2 fw4 f4">{{ agendaItem.summary }}</li>
-            <li class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Edit</a></li>
-            <li class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Add more details</a></li>
-          </ul>
+        <div class="w-100">
+          <div class="bg-white box pa3 w-100">
+            <ul class="list pl0 mb0">
+              <!-- summary -->
+              <li v-if="agendaItemEditedId != agendaItem.id" class="di mr2 fw4 f4 pointer" @click="showEditSummary(agendaItem)">{{ agendaItem.summary }}</li>
 
-          <!-- description -->
-          <div v-if="agendaItem.description" class="db parsed-content mb3">
-            <p>Nous souhaitons mettre en place la fonctionnalité de gestion de "template" pour gérer ce besoin.</p>
+              <!-- edit summary -->
+              <li v-if="editSummaryMode && agendaItemEditedId == agendaItem.id">
+                <form @submit.prevent="editSummary(agendaItem)">
+                  <text-input :id="'summary'"
+                              :ref="'summary' + agendaItem.id"
+                              v-model="form.summary"
+                              :name="'summary'"
+                              :errors="$page.props.errors.summary"
+                              :required="true"
+                              @esc-key-pressed="hideEditAgendaItem()"
+                  />
+                </form>
+              </li>
+
+              <!-- add description -->
+              <li v-if="!agendaItem.description" class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Add more details</a></li>
+            </ul>
+
+            <!-- description -->
+            <div v-if="agendaItem.description">
+              <div class="db parsed-content mb3" v-html="agendaItem.description"></div>
+              <span class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Edit details</a></span>
+            </div>
           </div>
 
           <!-- decisions -->
@@ -78,7 +93,7 @@
       </li>
 
       <!-- Modal - Add agenda item -->
-      <div v-if="addAgendaItemMode" class="bg-gray new-item relative">
+      <li v-if="addAgendaItemMode" class="bg-white box pa3 bg-gray new-item relative">
         <form @submit.prevent="storeAgendaItem()">
           <!-- agenda item title + checkbox -->
           <div class="">
@@ -123,12 +138,12 @@
           <!-- Actions -->
           <div class="flex justify-between">
             <div>
-              <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.update')" />
+              <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3 mr2'" :state="loadingState" :text="$t('app.update')" />
               <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" @click.prevent="hideAddAgendaItem()">{{ $t('app.cancel') }}</a>
             </div>
           </div>
         </form>
-      </div>
+      </li>
     </ul>
   </div>
 </template>
@@ -169,6 +184,8 @@ export default {
       addAgendaItemMode: false,
       addDescriptionMode: false,
       addPresenterMode: false,
+      editSummaryMode: false,
+      agendaItemEditedId: 0,
       form: {
         summary: null,
         description: null,
@@ -187,22 +204,40 @@ export default {
       this.addAgendaItemMode = true;
 
       this.$nextTick(() => {
-        this.$refs['summary'].$refs['input'].focus();
+        this.$refs.summary.focus();
       });
     },
 
     hideAddAgendaItem() {
       this.addAgendaItemMode = false;
-      this.form.summary = null;
+      this.clearForm();
       this.hideAddDescription();
       this.hideAddPresenter();
     },
 
+    showEditSummary(agendaItem) {
+      this.form.summary = agendaItem.summary;
+      this.form.description = agendaItem.description;
+      this.form.presented_by_id = agendaItem.presented_by_id;
+      this.editSummaryMode = true;
+      this.agendaItemEditedId = agendaItem.id;
+
+      this.$nextTick(() => {
+        this.$refs[`summary${agendaItem.id}`].focus();
+      });
+    },
+
+    hideEditAgendaItem() {
+      this.clearForm();
+      this.editSummaryMode = false;
+      this.agendaItemEditedId = 0;
+    },
+
     showAddDescription() {
       this.addDescriptionMode = true;
 
       this.$nextTick(() => {
-        this.$refs['description'].$refs['input'].focus();
+        this.$refs.description.focus();
       });
     },
 
@@ -220,16 +255,36 @@ export default {
       this.form.presented_by_id = null;
     },
 
+    clearForm() {
+      this.form.summary = null;
+      this.form.description = null;
+      this.form.presented_by_id = null;
+    },
+
     storeAgendaItem() {
       this.loadingState = 'loading';
 
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/addAgendaItem`, this.form)
         .then(response => {
-          flash(this.$t('project.members_index_add_success'), 'success');
+          this.flash(this.$t('project.members_index_add_success'), 'success');
+          this.loadingState = null;
+          this.clearForm();
+          this.localAgenda.push(response.data.data);
+        })
+        .catch(error => {
           this.loadingState = null;
-          this.form.employee = null;
-          this.showModal = false;
-          this.localMembers.unshift(response.data.data);
+          this.form.errors = error.response.data;
+        });
+    },
+
+    editSummary(agendaItem) {
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/updateSummary/${agendaItem.id}`, this.form)
+        .then(response => {
+          this.clearForm();
+          this.editSummaryMode = false;
+          this.agendaItemEditedId = 0;
+
+          this.localAgenda[this.localAgenda.findIndex(x => x.id === agendaItem.id)] = response.data.data;
         })
         .catch(error => {
           this.loadingState = null;
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
index 7cc1ef8a2..7d41e2907 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
@@ -121,7 +121,7 @@ export default {
       this.editMode = true;
 
       this.$nextTick(() => {
-        this.$refs['year'].$refs['input'].focus();
+        this.$refs.year.focus();
       });
     },
 
@@ -130,7 +130,7 @@ export default {
 
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.localMeeting.id}/setDate`, this.form)
         .then(response => {
-          flash(this.$t('group.meeting_show_date_updated'), 'success');
+          this.flash(this.$t('group.meeting_show_date_updated'), 'success');
 
           this.localMeeting.happened_at = response.data.data;
           this.editMode = false;
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
index 2da5c4480..4c47790ac 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Participants.vue
@@ -44,7 +44,7 @@
           <svg class="check-icon mr2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
             <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
           </svg>
-          <avatar :avatar="participant.avatar" :size="23" :classes="'br-100 mr2'" />
+          <avatar :avatar="participant.avatar" :size="23" :class="'br-100 mr2'" />
           <span class="name f5 lh-copy">{{ participant.name }}</span>
         </li>
       </ul>
@@ -61,7 +61,7 @@
             <svg v-if="!editMode" class="check-icon mr2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
               <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
             </svg>
-            <avatar :avatar="guest.avatar" :size="23" :classes="'br-100 mr2'" />
+            <avatar :avatar="guest.avatar" :size="23" :class="'br-100 mr2'" />
             <span class="name f5 lh-copy mr2">{{ guest.name }}</span>
           </div>
 
@@ -171,7 +171,7 @@ export default {
 
   mounted() {
     if (localStorage.success) {
-      flash(localStorage.success, 'success');
+      this.flash(localStorage.success, 'success');
       localStorage.removeItem('success');
     }
   },
@@ -202,7 +202,7 @@ export default {
             this.localGuests[id].attended = ! this.localGuests[id].attended;
           }
 
-          flash(this.$t('app.saved'), 'success');
+          this.flash(this.$t('app.saved'), 'success');
           this.form.id = null;
         })
         .catch(error => {
@@ -237,7 +237,7 @@ export default {
 
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/add`, this.form)
         .then(response => {
-          flash(this.$t('group.meeting_show_add_guest_success'), 'success');
+          this.flash(this.$t('group.meeting_show_add_guest_success'), 'success');
 
           this.localGuests.push(response.data.data);
           this.addMode = false;
@@ -254,7 +254,7 @@ export default {
 
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/remove`, this.form)
         .then(response => {
-          flash(this.$t('group.meeting_show_remove_guest_success'), 'success');
+          this.flash(this.$t('group.meeting_show_remove_guest_success'), 'success');
 
           var removedGuestId = this.localGuests.findIndex(x => x.id === guest.id);
           this.localGuests.splice(removedGuestId, 1);
diff --git a/resources/js/Pages/Company/Group/Members/Index.vue b/resources/js/Pages/Company/Group/Members/Index.vue
index 0a813cebd..834e0ef95 100644
--- a/resources/js/Pages/Company/Group/Members/Index.vue
+++ b/resources/js/Pages/Company/Group/Members/Index.vue
@@ -113,7 +113,7 @@
             <li v-for="member in localMembers" :key="member.id" :data-cy="'member-' + member.id" class="pa3 bb bb-gray flex items-center">
               <!-- avatar -->
               <div class="mr3">
-                <avatar :avatar="member.avatar" :size="64" :classes="'br-100'" />
+                <avatar :avatar="member.avatar" :size="64" :class="'br-100'" />
               </div>
 
               <!-- name + information -->
@@ -233,7 +233,7 @@ export default {
 
   mounted() {
     if (localStorage.success) {
-      flash(localStorage.success, 'success');
+      this.flash(localStorage.success, 'success');
       localStorage.removeItem('success');
     }
   },
@@ -276,7 +276,7 @@ export default {
 
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/store`, this.form)
         .then(response => {
-          flash(this.$t('project.members_index_add_success'), 'success');
+          this.flash(this.$t('project.members_index_add_success'), 'success');
           this.loadingState = null;
           this.form.employee = null;
           this.showModal = false;
@@ -293,7 +293,7 @@ export default {
 
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/remove`, this.form)
         .then(response => {
-          flash(this.$t('project.members_index_remove_success'), 'success');
+          this.flash(this.$t('project.members_index_remove_success'), 'success');
 
           var id = this.localMembers.findIndex(x => x.id == employee.id);
           this.localMembers.splice(id, 1);
diff --git a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
index 8218c796a..3bbd6caae 100644
--- a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
+++ b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
@@ -25,7 +25,7 @@
 
     <div class="relative tc w-100 mb4">
       <div class="flex items-center justify-center">
-        <avatar v-for="member in group.members" :key="member.id" :avatar="member.avatar" :size="32" :classes="'br-100 small-avatar'" />
+        <avatar v-for="member in group.members" :key="member.id" :avatar="member.avatar" :size="32" :class="'br-100 small-avatar'" />
         <!-- <div v-if="group.other_members_counter > 0" class="pl2 f7 more-members relative gray">
           {{ $t('project.menu_other_member', { count: project.other_members_counter }) }}
         </div> -->
diff --git a/resources/js/Shared/TextInput.vue b/resources/js/Shared/TextInput.vue
index ef167d43e..ee9e7773f 100644
--- a/resources/js/Shared/TextInput.vue
+++ b/resources/js/Shared/TextInput.vue
@@ -42,6 +42,7 @@
            :placeholder="placeholder"
            :data-cy="datacy"
            @keydown.esc="sendEscKey"
+           @keydown.enter="sendEnterKey"
     />
     <div v-if="hasError" class="error-explanation pa3 ba br3 mt1">
       {{ errors }}
@@ -182,6 +183,10 @@ export default {
 
     sendEscKey() {
       this.$emit('esc-key-pressed');
+    },
+
+    sendEnterKey() {
+      this.$emit('enter-key-pressed');
     }
   },
 };
diff --git a/routes/web.php b/routes/web.php
index c876ea11d..eed1cc10b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -350,6 +350,7 @@
                 Route::post('{group}/meetings/{meeting}/remove', 'Company\\Company\\Group\\GroupMeetingsController@removeParticipant');
                 Route::post('{group}/meetings/{meeting}/setDate', 'Company\\Company\\Group\\GroupMeetingsController@setDate');
                 Route::post('{group}/meetings/{meeting}/addAgendaItem', 'Company\\Company\\Group\\GroupMeetingsController@createAgendaItem');
+                Route::post('{group}/meetings/{meeting}/updateSummary/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@updateSummary');
             });
 
             Route::prefix('hr')->group(function () {
diff --git a/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php b/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php
index f865e377a..49bd87443 100644
--- a/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php
+++ b/tests/Unit/Services/Company/Group/CreateAgendaItemTest.php
@@ -149,6 +149,7 @@ private function executeService(Employee $michael, Company $company, Group $grou
 
         $this->assertDatabaseHas('agenda_items', [
             'id' => $agendaItem->id,
+            'position' => 1,
             'meeting_id' => $meeting->id,
             'summary' => 'Super agenda item',
             'presented_by_id' => $presenter ? $presenter->id : null,

From 2fabf8ff1f3e96a1be8807f52901e3b16b82ed36 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 19 Apr 2021 21:33:03 -0400
Subject: [PATCH 31/47] wip

---
 .../Company/Group/GroupMeetingsController.php | 32 ++++++++++++
 .../Company/Group/GroupMeetingsViewHelper.php | 17 ++++++-
 .../Group/Meetings/Partials/Agenda.vue        | 49 +++++++++++++++++--
 routes/web.php                                |  1 +
 4 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index 299f3e8b5..92ca05ed6 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -373,4 +373,36 @@ public function updateSummary(Request $request, int $companyId, int $groupId, in
             ],
         ]);
     }
+
+    /**
+     * Get the potential presenters of the agenda item.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     * @return JsonResponse
+     */
+    public function getPresenters(Request $request, int $companyId, int $groupId, int $meetingId): JsonResponse
+    {
+        try {
+            $meeting = Meeting::where('group_id', $groupId)
+                ->findOrFail($meetingId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        try {
+            Group::where('company_id', $companyId)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
+
+        $presenters = GroupMeetingsViewHelper::potentialPresenters($meeting, InstanceHelper::getLoggedCompany());
+
+        return response()->json([
+            'data' => $presenters,
+        ]);
+    }
 }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
index d9dba0416..cb2b7e4e6 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\ViewHelpers\Company\Group;
 
+use Carbon\Carbon;
 use App\Helpers\DateHelper;
 use App\Helpers\ImageHelper;
-use App\Models\Company\Company;
 use App\Models\Company\Group;
+use App\Models\Company\Company;
 use App\Models\Company\Meeting;
-use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
 class GroupMeetingsViewHelper
@@ -213,4 +213,17 @@ public static function agenda(Meeting $meeting, Company $company): Collection
     }
 
     public static function potentialPresenters(Meeting $meeting, Company $company): Collection
+    {
+        $participants = $meeting->employees()->notLocked()->get();
+
+        $employeesCollection = collect([]);
+        foreach ($participants as $employee) {
+            $employeesCollection->push([
+                'value' => $employee->id,
+                'label' => $employee->name,
+            ]);
+        }
+
+        return $employeesCollection;
+    }
 }
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index f838ecb7b..236fc27d1 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -15,6 +15,13 @@
   padding: 3px 10px 5px 8px;
   top: 16px;
 }
+
+.small-avatar {
+  top: -16px;
+  background-color: #fff;
+  padding: 4px;
+  right: 17px;
+}
 </style>
 
 <template>
@@ -38,7 +45,20 @@
 
         <!-- agenda item -->
         <div class="w-100">
-          <div class="bg-white box pa3 w-100">
+          <div class="bg-white box pa3 w-100 relative">
+            <!-- presented by -->
+            <div class="absolute small-avatar box">
+              <small-name-and-avatar
+                v-if="agendaItem.presenter"
+                :name="agendaItem.presenter.name"
+                :avatar="agendaItem.presenter.avatar"
+                :class="'gray'"
+                :size="'18px'"
+                :top="'0px'"
+                :margin-between-name-avatar="'25px'"
+              />
+            </div>
+
             <ul class="list pl0 mb0">
               <!-- summary -->
               <li v-if="agendaItemEditedId != agendaItem.id" class="di mr2 fw4 f4 pointer" @click="showEditSummary(agendaItem)">{{ agendaItem.summary }}</li>
@@ -59,6 +79,17 @@
 
               <!-- add description -->
               <li v-if="!agendaItem.description" class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Add more details</a></li>
+
+              <!-- add description -->
+              <li v-if="addDescriptionMode" class="lh-copy">
+                <text-area :ref="'description'"
+                           v-model="form.description"
+                           :label="$t('account.company_news_new_content')"
+                           :required="false"
+                           :rows="10"
+                           @esc-key-pressed="hideAddDescription()"
+                />
+              </li>
             </ul>
 
             <!-- description -->
@@ -127,7 +158,7 @@
           <!-- add presenter -->
           <div v-if="addPresenterMode" class="cf mb2">
             <select-box v-model="form.presented_by_id"
-                        :options="members"
+                        :options="potentialPresenters"
                         :errors="$page.props.errors.presented_by_id"
                         :label="'Who will present?'"
                         :placeholder="$t('app.choose_value')"
@@ -153,6 +184,7 @@ import TextInput from '@/Shared/TextInput';
 import TextArea from '@/Shared/TextArea';
 import SelectBox from '@/Shared/Select';
 import LoadingButton from '@/Shared/LoadingButton';
+import SmallNameAndAvatar from '@/Shared/SmallNameAndAvatar';
 
 export default {
   components: {
@@ -160,6 +192,7 @@ export default {
     TextArea,
     SelectBox,
     LoadingButton,
+    SmallNameAndAvatar,
   },
 
   props: {
@@ -181,6 +214,7 @@ export default {
     return {
       loadingState: null,
       localAgenda: null,
+      potentialPresenters: [],
       addAgendaItemMode: false,
       addDescriptionMode: false,
       addPresenterMode: false,
@@ -248,6 +282,15 @@ export default {
 
     showAddPresenter() {
       this.addPresenterMode = true;
+
+      axios.get(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/presenters`)
+        .then(response => {
+          this.potentialPresenters = response.data.data;
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
     },
 
     hideAddPresenter() {
@@ -268,7 +311,7 @@ export default {
         .then(response => {
           this.flash(this.$t('project.members_index_add_success'), 'success');
           this.loadingState = null;
-          this.clearForm();
+          this.hideAddAgendaItem();
           this.localAgenda.push(response.data.data);
         })
         .catch(error => {
diff --git a/routes/web.php b/routes/web.php
index eed1cc10b..fe1f133fd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -351,6 +351,7 @@
                 Route::post('{group}/meetings/{meeting}/setDate', 'Company\\Company\\Group\\GroupMeetingsController@setDate');
                 Route::post('{group}/meetings/{meeting}/addAgendaItem', 'Company\\Company\\Group\\GroupMeetingsController@createAgendaItem');
                 Route::post('{group}/meetings/{meeting}/updateSummary/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@updateSummary');
+                Route::get('{group}/meetings/{meeting}/presenters', 'Company\\Company\\Group\\GroupMeetingsController@getPresenters');
             });
 
             Route::prefix('hr')->group(function () {

From 1518d1416cfe6981b4b0a5e4084666d8ad3316d8 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Wed, 21 Apr 2021 08:37:09 -0400
Subject: [PATCH 32/47] wip

---
 .../Group/Meetings/Partials/Agenda.vue        | 149 ++++++++++++------
 1 file changed, 100 insertions(+), 49 deletions(-)

diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index 236fc27d1..b864ecf00 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -47,9 +47,8 @@
         <div class="w-100">
           <div class="bg-white box pa3 w-100 relative">
             <!-- presented by -->
-            <div class="absolute small-avatar box">
+            <div v-if="agendaItem.presenter" class="absolute small-avatar box">
               <small-name-and-avatar
-                v-if="agendaItem.presenter"
                 :name="agendaItem.presenter.name"
                 :avatar="agendaItem.presenter.avatar"
                 :class="'gray'"
@@ -61,35 +60,59 @@
 
             <ul class="list pl0 mb0">
               <!-- summary -->
-              <li v-if="agendaItemEditedId != agendaItem.id" class="di mr2 fw4 f4 pointer" @click="showEditSummary(agendaItem)">{{ agendaItem.summary }}</li>
-
-              <!-- edit summary -->
-              <li v-if="editSummaryMode && agendaItemEditedId == agendaItem.id">
-                <form @submit.prevent="editSummary(agendaItem)">
-                  <text-input :id="'summary'"
-                              :ref="'summary' + agendaItem.id"
-                              v-model="form.summary"
-                              :name="'summary'"
-                              :errors="$page.props.errors.summary"
-                              :required="true"
-                              @esc-key-pressed="hideEditAgendaItem()"
-                  />
+              <li v-if="agendaItemEditedId != agendaItem.id" class="di mr2 fw4 f4 pointer" @click="showEditMode(agendaItem)">{{ agendaItem.summary }}</li>
+
+              <!-- edit agenda item -->
+              <li v-if="editAgendaItemMode && agendaItemEditedId == agendaItem.id">
+                <form @submit.prevent="storeAgendaItem()">
+                  <!-- agenda item title + checkbox -->
+                  <div class="">
+                    <text-input :id="'summary'"
+                                :ref="'summary' + agendaItem.id"
+                                v-model="form.summary"
+                                :name="'summary'"
+                                :errors="$page.props.errors.summary"
+                                :required="true"
+                                @esc-key-pressed="hideEditMode()"
+                    />
+                  </div>
+
+                  <ul class="ma0 mb3 list pa0">
+                    <li v-if="!agendaItem.description" class="di mr2" @click="showEditDescriptionMode(agendaItem)"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add more details</a></li>
+                    <li v-if="!agendaItem.presenter" class="di" @click="showEditPresenterMode(agendaItem)"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add a presenter</a></li>
+                  </ul>
+
+                  <!-- description -->
+                  <div v-if="editDescriptionMode && agendaItemEditedId == agendaItem.id" class="lh-copy">
+                    <text-area :ref="'description' + agendaItem.id"
+                               v-model="form.description"
+                               :label="$t('account.company_news_new_content')"
+                               :required="false"
+                               :rows="10"
+                               @esc-key-pressed="hideEditMode()"
+                    />
+                  </div>
+
+                  <!-- add presenter -->
+                  <div v-if="addPresenterMode" class="cf mb2">
+                    <select-box v-model="form.presented_by_id"
+                                :options="potentialPresenters"
+                                :errors="$page.props.errors.presented_by_id"
+                                :label="'Who will present?'"
+                                :placeholder="$t('app.choose_value')"
+                                :value="form.presented_by_id"
+                    />
+                  </div>
+
+                  <!-- Actions -->
+                  <div class="flex justify-between">
+                    <div>
+                      <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3 mr2'" :state="loadingState" :text="$t('app.update')" />
+                      <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" @click.prevent="hideEditMode()">{{ $t('app.cancel') }}</a>
+                    </div>
+                  </div>
                 </form>
               </li>
-
-              <!-- add description -->
-              <li v-if="!agendaItem.description" class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Add more details</a></li>
-
-              <!-- add description -->
-              <li v-if="addDescriptionMode" class="lh-copy">
-                <text-area :ref="'description'"
-                           v-model="form.description"
-                           :label="$t('account.company_news_new_content')"
-                           :required="false"
-                           :rows="10"
-                           @esc-key-pressed="hideAddDescription()"
-                />
-              </li>
             </ul>
 
             <!-- description -->
@@ -218,7 +241,9 @@ export default {
       addAgendaItemMode: false,
       addDescriptionMode: false,
       addPresenterMode: false,
-      editSummaryMode: false,
+      editDescriptionMode: false,
+      editPresenterMode: false,
+      editAgendaItemMode: false,
       agendaItemEditedId: 0,
       form: {
         summary: null,
@@ -234,6 +259,7 @@ export default {
   },
 
   methods: {
+    // when adding a new agenda item
     showAddAgendaItem() {
       this.addAgendaItemMode = true;
 
@@ -249,24 +275,6 @@ export default {
       this.hideAddPresenter();
     },
 
-    showEditSummary(agendaItem) {
-      this.form.summary = agendaItem.summary;
-      this.form.description = agendaItem.description;
-      this.form.presented_by_id = agendaItem.presented_by_id;
-      this.editSummaryMode = true;
-      this.agendaItemEditedId = agendaItem.id;
-
-      this.$nextTick(() => {
-        this.$refs[`summary${agendaItem.id}`].focus();
-      });
-    },
-
-    hideEditAgendaItem() {
-      this.clearForm();
-      this.editSummaryMode = false;
-      this.agendaItemEditedId = 0;
-    },
-
     showAddDescription() {
       this.addDescriptionMode = true;
 
@@ -298,6 +306,49 @@ export default {
       this.form.presented_by_id = null;
     },
 
+    // when editing an existing agenda item
+    showEditMode(agendaItem) {
+      this.agendaItemEditedId = agendaItem.id;
+      this.form.summary = agendaItem.summary;
+      this.form.description = agendaItem.description;
+      this.form.presented_by_id = agendaItem.presented_by_id;
+      this.editAgendaItemMode = true;
+      this.editDescriptionMode = false;
+      this.editPresenterMode = false;
+
+      if (agendaItem.description) {
+        this.editDescriptionMode = true;
+      }
+
+      if (agendaItem.presenter) {
+        this.editPresenterMode = true;
+      }
+
+      this.$nextTick(() => {
+        this.$refs[`summary${agendaItem.id}`].focus();
+      });
+    },
+
+    hideEditMode() {
+      this.clearForm();
+      this.editAgendaItemMode = false;
+      this.agendaItemEditedId = 0;
+      this.editDescriptionMode = false;
+      this.editPresenterMode = false;
+    },
+
+    showEditDescriptionMode(agendaItem) {
+      this.editDescriptionMode = true;
+
+      this.$nextTick(() => {
+        this.$refs[`description${agendaItem.id}`].focus();
+      });
+    },
+
+    showEditPresenterMode() {
+      this.editPresenterMode = true;
+    },
+
     clearForm() {
       this.form.summary = null;
       this.form.description = null;
@@ -324,7 +375,7 @@ export default {
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/updateSummary/${agendaItem.id}`, this.form)
         .then(response => {
           this.clearForm();
-          this.editSummaryMode = false;
+          this.editAgendaItemMode = false;
           this.agendaItemEditedId = 0;
 
           this.localAgenda[this.localAgenda.findIndex(x => x.id === agendaItem.id)] = response.data.data;

From e4b219c6c8095e810d8740a52102e77abd7d7d39 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sat, 1 May 2021 22:06:14 -0400
Subject: [PATCH 33/47] wip

---
 .../Company/Group/GroupMeetingsController.php | 20 ++++++-
 .../Group/Meetings/Partials/Agenda.vue        | 56 +++++++++++--------
 routes/web.php                                |  2 +-
 3 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index 92ca05ed6..dd0555693 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -334,6 +334,15 @@ public function createAgendaItem(Request $request, int $companyId, int $groupId,
                 'summary' => $agendaItem->summary,
                 'description' => $agendaItem->description,
                 'position' => $agendaItem->position,
+                'presenter' => $agendaItem->presenter ? [
+                    'id' => $agendaItem->presenter->id,
+                    'name' => $agendaItem->presenter->name,
+                    'avatar' => ImageHelper::getAvatar($agendaItem->presenter, 23),
+                    'url' => route('employees.show', [
+                        'company' => $loggedCompany,
+                        'employee' => $agendaItem->presenter,
+                    ]),
+                ] : null,
             ],
         ]);
     }
@@ -348,7 +357,7 @@ public function createAgendaItem(Request $request, int $companyId, int $groupId,
      * @param int $agendaItemId
      * @return JsonResponse
      */
-    public function updateSummary(Request $request, int $companyId, int $groupId, int $meetingId, int $agendaItemId): JsonResponse
+    public function updateAgendaItem(Request $request, int $companyId, int $groupId, int $meetingId, int $agendaItemId): JsonResponse
     {
         $loggedCompany = InstanceHelper::getLoggedCompany();
         $loggedEmployee = InstanceHelper::getLoggedEmployee();
@@ -370,6 +379,15 @@ public function updateSummary(Request $request, int $companyId, int $groupId, in
                 'summary' => $agendaItem->summary,
                 'description' => $agendaItem->description,
                 'position' => $agendaItem->position,
+                'presenter' => $agendaItem->presenter ? [
+                    'id' => $agendaItem->presenter->id,
+                    'name' => $agendaItem->presenter->name,
+                    'avatar' => ImageHelper::getAvatar($agendaItem->presenter, 23),
+                    'url' => route('employees.show', [
+                        'company' => $loggedCompany,
+                        'employee' => $agendaItem->presenter,
+                    ]),
+                ] : null,
             ],
         ]);
     }
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index b864ecf00..cd1e4c135 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -17,16 +17,20 @@
 }
 
 .small-avatar {
-  top: -16px;
+  top: -12px;
   background-color: #fff;
   padding: 4px;
-  right: 17px;
+  right: 14px;
+}
+
+.new-item div {
+  width: 24px;
 }
 </style>
 
 <template>
   <div>
-    <div class="db fw5 mb2 flex justify-between items-center">
+    <div class="db fw5 mb3 flex justify-between items-center">
       <span>
         <span class="mr1">
           🎒
@@ -47,7 +51,7 @@
         <div class="w-100">
           <div class="bg-white box pa3 w-100 relative">
             <!-- presented by -->
-            <div v-if="agendaItem.presenter" class="absolute small-avatar box">
+            <div v-if="agendaItem.presenter && agendaItemEditedId != agendaItem.id" class="absolute small-avatar box">
               <small-name-and-avatar
                 :name="agendaItem.presenter.name"
                 :avatar="agendaItem.presenter.avatar"
@@ -64,7 +68,7 @@
 
               <!-- edit agenda item -->
               <li v-if="editAgendaItemMode && agendaItemEditedId == agendaItem.id">
-                <form @submit.prevent="storeAgendaItem()">
+                <form @submit.prevent="editSummary(agendaItem)">
                   <!-- agenda item title + checkbox -->
                   <div class="">
                     <text-input :id="'summary'"
@@ -93,8 +97,8 @@
                     />
                   </div>
 
-                  <!-- add presenter -->
-                  <div v-if="addPresenterMode" class="cf mb2">
+                  <!-- edit presenter -->
+                  <div v-if="editPresenterMode && agendaItemEditedId == agendaItem.id" class="cf mb2">
                     <select-box v-model="form.presented_by_id"
                                 :options="potentialPresenters"
                                 :errors="$page.props.errors.presented_by_id"
@@ -116,9 +120,9 @@
             </ul>
 
             <!-- description -->
-            <div v-if="agendaItem.description">
-              <div class="db parsed-content mb3" v-html="agendaItem.description"></div>
-              <span class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7">Edit details</a></span>
+            <div v-if="agendaItem.description && agendaItemEditedId != agendaItem.id" class="mt2">
+              <div class="db parsed-content mb2" v-html="agendaItem.description"></div>
+              <span class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7" @click="showEditMode(agendaItem)">Edit details</a></span>
             </div>
           </div>
 
@@ -135,7 +139,7 @@
               </li>
             </ul>
             <span class="db f6">
-              <a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add decision or follow-up</a>
+              <a class="bb b--dotted bt-0 bl-0 br-0 pointer di">+ Add decision or follow-up</a>
             </span>
           </div>
         </div>
@@ -143,11 +147,12 @@
 
       <!-- link to add a new agenda item -->
       <li v-if="! addAgendaItemMode" class="mt3 flex relative new-item relative">
+        <div class="mr3"></div>
         <a class="btn" @click.prevent="showAddAgendaItem()">Add new agenda item</a>
       </li>
 
       <!-- Modal - Add agenda item -->
-      <li v-if="addAgendaItemMode" class="bg-white box pa3 bg-gray new-item relative">
+      <li v-if="addAgendaItemMode" class="bg-white box pa3 bg-gray relative">
         <form @submit.prevent="storeAgendaItem()">
           <!-- agenda item title + checkbox -->
           <div class="">
@@ -290,15 +295,7 @@ export default {
 
     showAddPresenter() {
       this.addPresenterMode = true;
-
-      axios.get(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/presenters`)
-        .then(response => {
-          this.potentialPresenters = response.data.data;
-        })
-        .catch(error => {
-          this.loadingState = null;
-          this.form.errors = error.response.data;
-        });
+      this.loadPotentialPresenters();
     },
 
     hideAddPresenter() {
@@ -322,6 +319,7 @@ export default {
 
       if (agendaItem.presenter) {
         this.editPresenterMode = true;
+        this.loadPotentialPresenters();
       }
 
       this.$nextTick(() => {
@@ -347,6 +345,7 @@ export default {
 
     showEditPresenterMode() {
       this.editPresenterMode = true;
+      this.loadPotentialPresenters();
     },
 
     clearForm() {
@@ -355,6 +354,17 @@ export default {
       this.form.presented_by_id = null;
     },
 
+    loadPotentialPresenters() {
+      axios.get(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/presenters`)
+        .then(response => {
+          this.potentialPresenters = response.data.data;
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+
     storeAgendaItem() {
       this.loadingState = 'loading';
 
@@ -372,11 +382,11 @@ export default {
     },
 
     editSummary(agendaItem) {
-      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/updateSummary/${agendaItem.id}`, this.form)
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/updateAgendaItem/${agendaItem.id}`, this.form)
         .then(response => {
-          this.clearForm();
           this.editAgendaItemMode = false;
           this.agendaItemEditedId = 0;
+          this.clearForm();
 
           this.localAgenda[this.localAgenda.findIndex(x => x.id === agendaItem.id)] = response.data.data;
         })
diff --git a/routes/web.php b/routes/web.php
index fe1f133fd..03073e0dd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -350,7 +350,7 @@
                 Route::post('{group}/meetings/{meeting}/remove', 'Company\\Company\\Group\\GroupMeetingsController@removeParticipant');
                 Route::post('{group}/meetings/{meeting}/setDate', 'Company\\Company\\Group\\GroupMeetingsController@setDate');
                 Route::post('{group}/meetings/{meeting}/addAgendaItem', 'Company\\Company\\Group\\GroupMeetingsController@createAgendaItem');
-                Route::post('{group}/meetings/{meeting}/updateSummary/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@updateSummary');
+                Route::post('{group}/meetings/{meeting}/updateAgendaItem/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@updateAgendaItem');
                 Route::get('{group}/meetings/{meeting}/presenters', 'Company\\Company\\Group\\GroupMeetingsController@getPresenters');
             });
 

From ed263930cb58b9c1a820e17d76551fe878d899f9 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sat, 1 May 2021 22:33:53 -0400
Subject: [PATCH 34/47] wip

---
 .../Company/Group/GroupMeetingsController.php | 28 ++++++++++++
 .../Company/Group/DestroyAgendaItem.php       | 15 +++++++
 resources/js/Pages/Company/Group/Delete.vue   |  2 +-
 .../Group/Meetings/Partials/Agenda.vue        | 43 +++++++++++++------
 .../Company/Group/Meetings/Partials/Date.vue  |  4 +-
 .../js/Pages/Company/Group/Meetings/Show.vue  |  6 +--
 resources/js/Pages/Team/Ship/Index.vue        |  2 +-
 resources/lang/en/group.php                   |  7 +++
 routes/web.php                                |  1 +
 9 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index dd0555693..1c6182883 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -18,6 +18,7 @@
 use App\Services\Company\Group\CreateAgendaItem;
 use App\Services\Company\Group\UpdateAgendaItem;
 use App\Services\Company\Group\AddGuestToMeeting;
+use App\Services\Company\Group\DestroyAgendaItem;
 use App\Services\Company\Group\UpdateMeetingDate;
 use App\Services\Company\Group\RemoveGuestFromMeeting;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -392,6 +393,33 @@ public function updateAgendaItem(Request $request, int $companyId, int $groupId,
         ]);
     }
 
+    /**
+     * Destroy the agenda item.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     * @param int $agendaItemId
+     */
+    public function destroyAgendaItem(Request $request, int $companyId, int $groupId, int $meetingId, int $agendaItemId): JsonResponse
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        (new DestroyAgendaItem)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'agenda_item_id' => $agendaItemId,
+        ]);
+
+        return response()->json([
+            'data' => true,
+        ]);
+    }
+
     /**
      * Get the potential presenters of the agenda item.
      *
diff --git a/app/Services/Company/Group/DestroyAgendaItem.php b/app/Services/Company/Group/DestroyAgendaItem.php
index fb912bc96..e4ee9916c 100644
--- a/app/Services/Company/Group/DestroyAgendaItem.php
+++ b/app/Services/Company/Group/DestroyAgendaItem.php
@@ -42,6 +42,7 @@ public function execute(array $data): void
         $this->data = $data;
         $this->validate();
         $this->destroy();
+        $this->reorderPosition();
         $this->log();
     }
 
@@ -69,6 +70,20 @@ private function destroy(): void
         $this->agendaItem->delete();
     }
 
+    private function reorderPosition(): void
+    {
+        $formerPosition = $this->agendaItem->position;
+
+        $agendaItems = AgendaItem::where('meeting_id', $this->meeting->id)
+            ->where('position', '>', $formerPosition)
+            ->get();
+
+        foreach ($agendaItems as $item) {
+            $item->position = $item->position - 1;
+            $item->save();
+        }
+    }
+
     private function log(): void
     {
         LogAccountAudit::dispatch([
diff --git a/resources/js/Pages/Company/Group/Delete.vue b/resources/js/Pages/Company/Group/Delete.vue
index f38686164..6b45d61a1 100644
--- a/resources/js/Pages/Company/Group/Delete.vue
+++ b/resources/js/Pages/Company/Group/Delete.vue
@@ -41,7 +41,7 @@
                     {{ $t('app.cancel') }}
                   </inertia-link>
                 </div>
-                <loading-button :classes="'btn destroy w-auto-ns w-100 pv2 ph3'" :state="loadingState" :text="$t('app.delete')" :cypress-selector="'submit-delete-project-button'" />
+                <loading-button :class="'btn destroy w-auto-ns w-100 pv2 ph3'" :state="loadingState" :text="$t('app.delete')" :cypress-selector="'submit-delete-project-button'" />
               </div>
             </div>
           </form>
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index cd1e4c135..bb7fd81d8 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -34,7 +34,7 @@
       <span>
         <span class="mr1">
           🎒
-        </span> Agenda of the meeting
+        </span> {{ $t('group.meeting_show_title') }}
 
         <help :url="$page.props.help_links.project_tasks" :top="'3px'" />
       </span>
@@ -68,7 +68,7 @@
 
               <!-- edit agenda item -->
               <li v-if="editAgendaItemMode && agendaItemEditedId == agendaItem.id">
-                <form @submit.prevent="editSummary(agendaItem)">
+                <form @submit.prevent="editAgendaItem(agendaItem)">
                   <!-- agenda item title + checkbox -->
                   <div class="">
                     <text-input :id="'summary'"
@@ -82,15 +82,15 @@
                   </div>
 
                   <ul class="ma0 mb3 list pa0">
-                    <li v-if="!agendaItem.description" class="di mr2" @click="showEditDescriptionMode(agendaItem)"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add more details</a></li>
-                    <li v-if="!agendaItem.presenter" class="di" @click="showEditPresenterMode(agendaItem)"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add a presenter</a></li>
+                    <li v-if="!agendaItem.description" class="di mr2" @click="showEditDescriptionMode(agendaItem)"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">{{ $t('group.meeting_show_add_agenda_item_details') }}</a></li>
+                    <li v-if="!agendaItem.presenter" class="di" @click="showEditPresenterMode(agendaItem)"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">{{ $t('group.meeting_show_add_agenda_item_presenter') }}</a></li>
                   </ul>
 
                   <!-- description -->
                   <div v-if="editDescriptionMode && agendaItemEditedId == agendaItem.id" class="lh-copy">
                     <text-area :ref="'description' + agendaItem.id"
                                v-model="form.description"
-                               :label="$t('account.company_news_new_content')"
+                               :label="$t('group.meeting_show_add_agenda_item_description')"
                                :required="false"
                                :rows="10"
                                @esc-key-pressed="hideEditMode()"
@@ -114,6 +114,8 @@
                       <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3 mr2'" :state="loadingState" :text="$t('app.update')" />
                       <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" @click.prevent="hideEditMode()">{{ $t('app.cancel') }}</a>
                     </div>
+
+                    <a :class="'btn destroy w-auto-ns w-100 mb2 pv2 ph3 mr2'" @click.prevent="destroyAgendaItem(agendaItem)">{{ $t('app.delete') }}</a>
                   </div>
                 </form>
               </li>
@@ -122,7 +124,8 @@
             <!-- description -->
             <div v-if="agendaItem.description && agendaItemEditedId != agendaItem.id" class="mt2">
               <div class="db parsed-content mb2" v-html="agendaItem.description"></div>
-              <span class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7" @click="showEditMode(agendaItem)">Edit details</a></span>
+
+              <span class="di"><a class="bb b--dotted mr2 bt-0 bl-0 br-0 pointer f7" @click="showEditMode(agendaItem)">{{ $t('group.meeting_show_edit_details') }}</a></span>
             </div>
           </div>
 
@@ -148,7 +151,7 @@
       <!-- link to add a new agenda item -->
       <li v-if="! addAgendaItemMode" class="mt3 flex relative new-item relative">
         <div class="mr3"></div>
-        <a class="btn" @click.prevent="showAddAgendaItem()">Add new agenda item</a>
+        <a class="btn" @click.prevent="showAddAgendaItem()">{{ $t('group.meeting_show_add_agenda_item_cta') }}</a>
       </li>
 
       <!-- Modal - Add agenda item -->
@@ -168,15 +171,15 @@
           </div>
 
           <ul class="ma0 mb3 list pa0">
-            <li v-if="!addDescriptionMode" class="di mr2" @click="showAddDescription()"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add more details</a></li>
-            <li v-if="!addPresenterMode" class="di" @click="showAddPresenter()"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">Add a presenter</a></li>
+            <li v-if="!addDescriptionMode" class="di mr2" @click="showAddDescription()"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">{{ $t('group.meeting_show_add_agenda_item_details') }}</a></li>
+            <li v-if="!addPresenterMode" class="di" @click="showAddPresenter()"><a class="bb b--dotted bt-0 bl-0 br-0 pointer di">{{ $t('group.meeting_show_add_agenda_item_presenter') }}</a></li>
           </ul>
 
           <!-- description -->
           <div v-if="addDescriptionMode" class="lh-copy">
             <text-area :ref="'description'"
                        v-model="form.description"
-                       :label="$t('account.company_news_new_content')"
+                       :label="$t('group.meeting_show_add_agenda_item_description')"
                        :required="false"
                        :rows="10"
                        @esc-key-pressed="hideAddDescription()"
@@ -188,7 +191,7 @@
             <select-box v-model="form.presented_by_id"
                         :options="potentialPresenters"
                         :errors="$page.props.errors.presented_by_id"
-                        :label="'Who will present?'"
+                        :label="$t('group.meeting_show_add_agenda_item_presenter_title')"
                         :placeholder="$t('app.choose_value')"
                         :value="form.presented_by_id"
             />
@@ -381,7 +384,7 @@ export default {
         });
     },
 
-    editSummary(agendaItem) {
+    editAgendaItem(agendaItem) {
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/updateAgendaItem/${agendaItem.id}`, this.form)
         .then(response => {
           this.editAgendaItemMode = false;
@@ -394,6 +397,22 @@ export default {
           this.loadingState = null;
           this.form.errors = error.response.data;
         });
+    },
+
+    destroyAgendaItem(agendaItem) {
+      axios.delete(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/agendaItem/${agendaItem.id}`)
+        .then(response => {
+          this.editAgendaItemMode = false;
+          this.agendaItemEditedId = 0;
+          this.clearForm();
+
+          var removedAgendaItemId = this.localAgenda.findIndex(x => x.id === agendaItem.id);
+          this.localAgenda.splice(removedAgendaItemId, 1);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
     }
   }
 };
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
index 7d41e2907..1242ea25c 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Date.vue
@@ -7,7 +7,7 @@
     <div class="pt3 pr3 pl3">
       <p class="silver f6 ma0 mb1">Date the meeting occurs</p>
 
-      <p v-if="!editMode">{{ localMeeting.happened_at }} <a class="ml2 bb b--dotted bt-0 bl-0 br-0 pointer f6" @click.prevent="showEditMode()">Edit</a></p>
+      <p v-if="!editMode">{{ localMeeting.happened_at }} <a class="ml2 bb b--dotted bt-0 bl-0 br-0 pointer f6" @click.prevent="showEditMode()">{{ $t('app.edit') }}</a></p>
     </div>
 
     <!-- edit date -->
@@ -67,7 +67,7 @@
           <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" @click.prevent="editMode = false">
             {{ $t('app.cancel') }}
           </a>
-          <loading-button :classes="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.save')" />
+          <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.save')" />
         </div>
       </div>
     </form>
diff --git a/resources/js/Pages/Company/Group/Meetings/Show.vue b/resources/js/Pages/Company/Group/Meetings/Show.vue
index 06898dab5..80f79ee1b 100644
--- a/resources/js/Pages/Company/Group/Meetings/Show.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Show.vue
@@ -53,7 +53,7 @@
           <!-- RIGHT COLUMN -->
           <div class="fl w-30-l w-100 pl4-l">
             <!-- date -->
-            <date :group-id="group.id" :meeting="meeting" />
+            <date-widget :group-id="group.id" :meeting="meeting" />
 
             <!-- participants -->
             <participants :group-id="group.id" :meeting="meeting" />
@@ -82,7 +82,7 @@
 import Layout from '@/Shared/Layout';
 import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
 import Participants from '@/Pages/Company/Group/Meetings/Partials/Participants';
-import Date from '@/Pages/Company/Group/Meetings/Partials/Date';
+import DateWidget from '@/Pages/Company/Group/Meetings/Partials/Date';
 import Agenda from '@/Pages/Company/Group/Meetings/Partials/Agenda';
 
 export default {
@@ -90,7 +90,7 @@ export default {
     Layout,
     GroupMenu,
     Participants,
-    Date,
+    DateWidget,
     Agenda,
   },
 
diff --git a/resources/js/Pages/Team/Ship/Index.vue b/resources/js/Pages/Team/Ship/Index.vue
index 977e38500..ebabb3e0d 100644
--- a/resources/js/Pages/Team/Ship/Index.vue
+++ b/resources/js/Pages/Team/Ship/Index.vue
@@ -41,7 +41,7 @@
             <!-- list of employees -->
             <ul class="list ma0">
               <li v-for="employee in recentShip.employees" :key="employee.id" class="mr1 di">
-                <avatar :avatar="employee.avatar" :url="employee.url" :size="23" :classes="'br-100 relative mr1 dib-ns dn'" />
+                <avatar :avatar="employee.avatar" :url="employee.url" :size="23" :class="'br-100 relative mr1 dib-ns dn'" />
               </li>
             </ul>
           </div>
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index 66e4cc06b..76db24ee4 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -28,4 +28,11 @@
     'meeting_show_date_updated' => 'The date has been updated.',
     'meeting_show_delete' => 'Delete the meeting',
     'meeting_show_delete_success' => 'The meeting has been deleted.',
+    'meeting_show_title' => 'Agenda of the meeting',
+    'meeting_show_add_agenda_item_details' => 'Add more details',
+    'meeting_show_add_agenda_item_presenter' => 'Add a presenter',
+    'meeting_show_add_agenda_item_presenter_title' => 'Who will present?',
+    'meeting_show_add_agenda_item_description' => 'Add more context below',
+    'meeting_show_add_agenda_item_cta' => 'Add new agenda item',
+    'meeting_show_edit_details' => 'Edit details',
 ];
diff --git a/routes/web.php b/routes/web.php
index 03073e0dd..071158926 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -351,6 +351,7 @@
                 Route::post('{group}/meetings/{meeting}/setDate', 'Company\\Company\\Group\\GroupMeetingsController@setDate');
                 Route::post('{group}/meetings/{meeting}/addAgendaItem', 'Company\\Company\\Group\\GroupMeetingsController@createAgendaItem');
                 Route::post('{group}/meetings/{meeting}/updateAgendaItem/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@updateAgendaItem');
+                Route::delete('{group}/meetings/{meeting}/agendaItem/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@destroyAgendaItem');
                 Route::get('{group}/meetings/{meeting}/presenters', 'Company\\Company\\Group\\GroupMeetingsController@getPresenters');
             });
 

From 63b0afa1e74b2f63bee25333090febf67773a3fc Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sun, 2 May 2021 10:11:27 -0400
Subject: [PATCH 35/47] Update Agenda.vue

---
 .../Pages/Company/Group/Meetings/Partials/Agenda.vue   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index bb7fd81d8..330ced675 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -408,6 +408,16 @@ export default {
 
           var removedAgendaItemId = this.localAgenda.findIndex(x => x.id === agendaItem.id);
           this.localAgenda.splice(removedAgendaItemId, 1);
+
+          // now, reset all the positions
+          // there has to be a better way to do this :-D
+          var numberOfEntries = this.localAgenda.length;
+          var counter = 0;
+          for (counter = 0; counter < numberOfEntries; counter++) {
+            if (this.localAgenda[counter].position > agendaItem.position) {
+              this.localAgenda[counter].position = this.localAgenda[counter].position - 1;
+            }
+          }
         })
         .catch(error => {
           this.loadingState = null;

From f891aa5cf83207127c6e5a5b280f02dbe9776029 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sun, 2 May 2021 17:31:15 -0400
Subject: [PATCH 36/47] wip

---
 app/Helpers/LogHelper.php                     |  2 -
 .../Company/Group/GroupMeetingsController.php | 33 +++++++
 .../Company/Group/DestroyAgendaItem.php       |  2 +
 .../Group/Meetings/Partials/Agenda.vue        | 86 ++++++++++++++++---
 resources/lang/en/group.php                   |  2 +
 routes/web.php                                |  1 +
 .../Company/Group/DestroyAgendaItemTest.php   |  4 +-
 7 files changed, 115 insertions(+), 15 deletions(-)

diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index b7e9f22ec..1f6db8734 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1175,8 +1175,6 @@ public static function processAuditLog(AuditLog $log): string
                 $sentence = trans('account.log_agenda_item_destroyed', [
                     'group_id' => $log->object->{'group_id'},
                     'group_name' => $log->object->{'group_name'},
-                    'employee_id' => $log->object->{'employee_id'},
-                    'employee_name' => $log->object->{'employee_name'},
                     'meeting_id' => $log->object->{'meeting_id'},
                 ]);
                 break;
diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index 1c6182883..a2012cefb 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -20,6 +20,7 @@
 use App\Services\Company\Group\AddGuestToMeeting;
 use App\Services\Company\Group\DestroyAgendaItem;
 use App\Services\Company\Group\UpdateMeetingDate;
+use App\Services\Company\Group\CreateMeetingDecision;
 use App\Services\Company\Group\RemoveGuestFromMeeting;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
@@ -451,4 +452,36 @@ public function getPresenters(Request $request, int $companyId, int $groupId, in
             'data' => $presenters,
         ]);
     }
+
+    /**
+     * Create a decision.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     * @param int $agendaItemId
+     * @return JsonResponse
+     */
+    public function createDecision(Request $request, int $companyId, int $groupId, int $meetingId, int $agendaItemId): JsonResponse
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        $meetingDecision = (new CreateMeetingDecision)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'agenda_item_id' => $agendaItemId,
+            'description' => $request->input('description'),
+        ]);
+
+        return response()->json([
+            'data' => [
+                'id' => $meetingDecision->id,
+                'description' => $meetingDecision->description,
+            ],
+        ]);
+    }
 }
diff --git a/app/Services/Company/Group/DestroyAgendaItem.php b/app/Services/Company/Group/DestroyAgendaItem.php
index e4ee9916c..974b6d4c1 100644
--- a/app/Services/Company/Group/DestroyAgendaItem.php
+++ b/app/Services/Company/Group/DestroyAgendaItem.php
@@ -93,7 +93,9 @@ private function log(): void
             'author_name' => $this->author->name,
             'audited_at' => Carbon::now(),
             'objects' => json_encode([
+                'group_id' => $this->group->id,
                 'group_name' => $this->group->name,
+                'meeting_id' => $this->meeting->id,
             ]),
         ])->onQueue('low');
     }
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index 330ced675..15ff2426a 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -47,7 +47,9 @@
           {{ agendaItem.position }}
         </div>
 
-        <!-- agenda item -->
+        <!---------------------- -->
+        <!-- AGENDA ITEM -->
+        <!---------------------- -->
         <div class="w-100">
           <div class="bg-white box pa3 w-100 relative">
             <!-- presented by -->
@@ -129,21 +131,51 @@
             </div>
           </div>
 
-          <!-- decisions -->
+          <!---------------------- -->
+          <!-- DECISIONS -->
+          <!---------------------- -->
           <div class="decisions pa3 br3">
-            <ul class="pa0 list mb3">
-              <li class="mb3">
-                <span class="db mb2 f7 fw6">👉 Decision #2</span>
-                <span>We will focus on making the most money for sure</span>
+            <div v-if="agendaItem.decisions">
+              <ul v-if="agendaItem.decisions.length > 0" class="pa0 list mb3">
+                <li v-for="decision in agendaItem.decisions" :key="decision.id" class="mb3">
+                  <span class="db mb2 f7 fw6 gray"><span class="mr1">👉</span> Decision</span>
+                  <span class="parsed-content" v-html="decision.description"></span>
+                </li>
+              </ul>
+            </div>
+
+            <!-- add decision -->
+            <div v-if="addDecisionMode && decisionForAgendaItemId == agendaItem.id" class="bg-white box pa3 bg-gray relative">
+              <form @submit.prevent="storeDecision(agendaItem)">
+                <div class="lh-copy">
+                  <text-area :ref="'description'"
+                             v-model="form.description"
+                             :label="$t('group.meeting_show_add_decision_label')"
+                             :required="false"
+                             :rows="3"
+                             @esc-key-pressed="hideAddDescription()"
+                  />
+                </div>
+
+                <!-- Actions -->
+                <div class="flex justify-between">
+                  <div>
+                    <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3 mr2'" :state="loadingState" :text="$t('app.save')" />
+                    <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" @click.prevent="hideAddDecision()">{{ $t('app.cancel') }}</a>
+                  </div>
+                </div>
+              </form>
+            </div>
+
+            <!-- CTA to add a decision -->
+            <ul class="db f6 ma0 pl0 list">
+              <li v-if="decisionForAgendaItemId != agendaItem.id" class="di mr3">
+                <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="showAddDecision(agendaItem)">{{ $t('group.meeting_show_add_decision') }}</a>
               </li>
-              <li>
-                <span class="db mb2 f7 fw6">👉 Decision #2</span>
-                <span>We will focus on making the most money for sure</span>
+              <li v-if="decisionForAgendaItemId != agendaItem.id" class="di">
+                <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="showAddDecision(agendaItem)">Edit decisions</a>
               </li>
             </ul>
-            <span class="db f6">
-              <a class="bb b--dotted bt-0 bl-0 br-0 pointer di">+ Add decision or follow-up</a>
-            </span>
           </div>
         </div>
       </li>
@@ -249,10 +281,14 @@ export default {
       addAgendaItemMode: false,
       addDescriptionMode: false,
       addPresenterMode: false,
+      addDecisionMode: false,
       editDescriptionMode: false,
       editPresenterMode: false,
       editAgendaItemMode: false,
+      editDecisionMode: false,
       agendaItemEditedId: 0,
+      decisionForAgendaItemId: 0,
+      decisionEditedId: 0,
       form: {
         summary: null,
         description: null,
@@ -306,6 +342,16 @@ export default {
       this.form.presented_by_id = null;
     },
 
+    showAddDecision(agendaItem) {
+      this.addDecisionMode = true;
+      this.decisionForAgendaItemId = agendaItem.id;
+    },
+
+    hideAddDecision() {
+      this.addDecisionMode = false;
+      this.decisionForAgendaItemId = 0;
+    },
+
     // when editing an existing agenda item
     showEditMode(agendaItem) {
       this.agendaItemEditedId = agendaItem.id;
@@ -423,6 +469,22 @@ export default {
           this.loadingState = null;
           this.form.errors = error.response.data;
         });
+    },
+
+    storeDecision(agendaItem) {
+      this.loadingState = 'loading';
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/agendaItem/${agendaItem.id}/addDecision`, this.form)
+        .then(response => {
+          this.loadingState = null;
+          this.hideAddDecision();
+
+          this.localAgenda[this.localAgenda.findIndex(x => x.id === agendaItem.id)].decisions.push(response.data.data);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
     }
   }
 };
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index 76db24ee4..1d88ce415 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -35,4 +35,6 @@
     'meeting_show_add_agenda_item_description' => 'Add more context below',
     'meeting_show_add_agenda_item_cta' => 'Add new agenda item',
     'meeting_show_edit_details' => 'Edit details',
+    'meeting_show_add_decision' => '+ Add decision or follow-up',
+    'meeting_show_add_decision_label' => 'Describe the decision',
 ];
diff --git a/routes/web.php b/routes/web.php
index 071158926..482d711bb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -352,6 +352,7 @@
                 Route::post('{group}/meetings/{meeting}/addAgendaItem', 'Company\\Company\\Group\\GroupMeetingsController@createAgendaItem');
                 Route::post('{group}/meetings/{meeting}/updateAgendaItem/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@updateAgendaItem');
                 Route::delete('{group}/meetings/{meeting}/agendaItem/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@destroyAgendaItem');
+                Route::post('{group}/meetings/{meeting}/agendaItem/{agendaItem}/addDecision', 'Company\\Company\\Group\\GroupMeetingsController@createDecision');
                 Route::get('{group}/meetings/{meeting}/presenters', 'Company\\Company\\Group\\GroupMeetingsController@getPresenters');
             });
 
diff --git a/tests/Unit/Services/Company/Group/DestroyAgendaItemTest.php b/tests/Unit/Services/Company/Group/DestroyAgendaItemTest.php
index 043aa3926..3851469f2 100644
--- a/tests/Unit/Services/Company/Group/DestroyAgendaItemTest.php
+++ b/tests/Unit/Services/Company/Group/DestroyAgendaItemTest.php
@@ -115,11 +115,13 @@ private function executeService(Employee $michael, Group $group, Meeting $meetin
             'id' => $agendaItem->id,
         ]);
 
-        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group) {
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group, $meeting) {
             return $job->auditLog['action'] === 'agenda_item_destroyed' &&
                 $job->auditLog['author_id'] === $michael->id &&
                 $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
                     'group_name' => $group->name,
+                    'meeting_id' => $meeting->id,
                 ]);
         });
     }

From 6bce7e40052048d50e6fb4d3b8975cdca9325fec Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sun, 2 May 2021 17:59:59 -0400
Subject: [PATCH 37/47] wip

---
 .../Company/Group/GroupMeetingsController.php | 31 ++++++++++
 .../Group/Meetings/Partials/Agenda.vue        | 56 +++++++++++++++++--
 resources/lang/en/group.php                   |  1 +
 routes/web.php                                |  1 +
 4 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
index a2012cefb..d9b8634ce 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupMeetingsController.php
@@ -21,6 +21,7 @@
 use App\Services\Company\Group\DestroyAgendaItem;
 use App\Services\Company\Group\UpdateMeetingDate;
 use App\Services\Company\Group\CreateMeetingDecision;
+use App\Services\Company\Group\DestroyMeetingDecision;
 use App\Services\Company\Group\RemoveGuestFromMeeting;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
@@ -484,4 +485,34 @@ public function createDecision(Request $request, int $companyId, int $groupId, i
             ],
         ]);
     }
+
+    /**
+     * Destroy a decision.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @param int $meetingId
+     * @param int $agendaItemId
+     * @param int $decisionId
+     * @return JsonResponse
+     */
+    public function destroyDecision(Request $request, int $companyId, int $groupId, int $meetingId, int $agendaItemId, int $decisionId): JsonResponse
+    {
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+
+        (new DestroyMeetingDecision)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'meeting_id' => $meetingId,
+            'agenda_item_id' => $agendaItemId,
+            'meeting_decision_id' => $decisionId,
+        ]);
+
+        return response()->json([
+            'data' => true,
+        ]);
+    }
 }
diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index 15ff2426a..81840b737 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -21,6 +21,10 @@
   background-color: #fff;
   padding: 4px;
   right: 14px;
+
+  a {
+    border-bottom: 0;
+  }
 }
 
 .new-item div {
@@ -61,6 +65,7 @@
                 :size="'18px'"
                 :top="'0px'"
                 :margin-between-name-avatar="'25px'"
+                :url="agendaItem.presenter.url"
               />
             </div>
 
@@ -139,7 +144,10 @@
               <ul v-if="agendaItem.decisions.length > 0" class="pa0 list mb3">
                 <li v-for="decision in agendaItem.decisions" :key="decision.id" class="mb3">
                   <span class="db mb2 f7 fw6 gray"><span class="mr1">👉</span> Decision</span>
-                  <span class="parsed-content" v-html="decision.description"></span>
+                  <span class="parsed-content mr3" v-html="decision.description"></span>
+
+                  <!-- remove decision -->
+                  <span v-if="editDecisionMode && decisionForAgendaItemId == agendaItem.id" class="f6 gray bb b--dotted bt-0 bl-0 br-0 pointer di c-delete" @click="destroyDecision(agendaItem, decision)">{{ $t('app.remove') }}</span>
                 </li>
               </ul>
             </div>
@@ -167,13 +175,21 @@
               </form>
             </div>
 
-            <!-- CTA to add a decision -->
-            <ul class="db f6 ma0 pl0 list">
+            <!-- CTA for decisions -->
+            <ul class="db f7 ma0 pl0 list">
+              <!-- Add decision -->
               <li v-if="decisionForAgendaItemId != agendaItem.id" class="di mr3">
                 <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="showAddDecision(agendaItem)">{{ $t('group.meeting_show_add_decision') }}</a>
               </li>
-              <li v-if="decisionForAgendaItemId != agendaItem.id" class="di">
-                <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="showAddDecision(agendaItem)">Edit decisions</a>
+
+              <!-- Edit decisions -->
+              <li v-if="decisionForAgendaItemId != agendaItem.id && agendaItem.decisions.length != 0" class="di">
+                <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="showEditDecisionMode(agendaItem)">{{ $t('group.meeting_show_edit_decision_cta') }}</a>
+              </li>
+
+              <!-- Exit edit decision mode -->
+              <li v-if="editDecisionMode && decisionForAgendaItemId == agendaItem.id" class="di">
+                <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="hideEditDecisionMode">Exit edit mode</a>
               </li>
             </ul>
           </div>
@@ -397,6 +413,16 @@ export default {
       this.loadPotentialPresenters();
     },
 
+    showEditDecisionMode(agendaItem) {
+      this.editDecisionMode = true;
+      this.decisionForAgendaItemId = agendaItem.id;
+    },
+
+    hideEditDecisionMode() {
+      this.editDecisionMode = false;
+      this.decisionForAgendaItemId = 0;
+    },
+
     clearForm() {
       this.form.summary = null;
       this.form.description = null;
@@ -478,6 +504,7 @@ export default {
         .then(response => {
           this.loadingState = null;
           this.hideAddDecision();
+          this.form.description = null;
 
           this.localAgenda[this.localAgenda.findIndex(x => x.id === agendaItem.id)].decisions.push(response.data.data);
         })
@@ -485,7 +512,24 @@ export default {
           this.loadingState = null;
           this.form.errors = error.response.data;
         });
-    }
+    },
+
+    destroyDecision(agendaItem, decision) {
+      axios.delete(`/${this.$page.props.auth.company.id}/company/groups/${this.groupId}/meetings/${this.meeting.meeting.id}/agendaItem/${agendaItem.id}/decisions/${decision.id}`)
+        .then(response => {
+          var agendaItemId = this.localAgenda.findIndex(x => x.id === agendaItem.id);
+          var decisionId = this.localAgenda[agendaItemId].decisions.findIndex(x => x.id === decision.id);
+          this.localAgenda[agendaItemId].decisions.splice(decisionId, 1);
+
+          if (this.localAgenda[agendaItemId].decisions.length == 0) {
+            this.hideEditDecisionMode();
+          }
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
   }
 };
 
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index 1d88ce415..57d60f12a 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -37,4 +37,5 @@
     'meeting_show_edit_details' => 'Edit details',
     'meeting_show_add_decision' => '+ Add decision or follow-up',
     'meeting_show_add_decision_label' => 'Describe the decision',
+    'meeting_show_edit_decision_cta' => 'Edit decisions',
 ];
diff --git a/routes/web.php b/routes/web.php
index 482d711bb..ae41418d1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -353,6 +353,7 @@
                 Route::post('{group}/meetings/{meeting}/updateAgendaItem/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@updateAgendaItem');
                 Route::delete('{group}/meetings/{meeting}/agendaItem/{agendaItem}', 'Company\\Company\\Group\\GroupMeetingsController@destroyAgendaItem');
                 Route::post('{group}/meetings/{meeting}/agendaItem/{agendaItem}/addDecision', 'Company\\Company\\Group\\GroupMeetingsController@createDecision');
+                Route::delete('{group}/meetings/{meeting}/agendaItem/{agendaItem}/decisions/{meetingDecision}', 'Company\\Company\\Group\\GroupMeetingsController@destroyDecision');
                 Route::get('{group}/meetings/{meeting}/presenters', 'Company\\Company\\Group\\GroupMeetingsController@getPresenters');
             });
 

From 38b96f4f111692ffad91a666f93d2e793fecf5f1 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sun, 2 May 2021 18:31:47 -0400
Subject: [PATCH 38/47] wip

---
 .../Group/Meetings/Partials/Agenda.vue        | 30 ++++++++++++++-----
 resources/js/Shared/SmallNameAndAvatar.vue    |  4 +++
 resources/lang/en/group.php                   |  4 +++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
index 81840b737..af8f733a7 100644
--- a/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Partials/Agenda.vue
@@ -109,7 +109,7 @@
                     <select-box v-model="form.presented_by_id"
                                 :options="potentialPresenters"
                                 :errors="$page.props.errors.presented_by_id"
-                                :label="'Who will present?'"
+                                :label="$t('group.meeting_show_add_agenda_item_presenter_title')"
                                 :placeholder="$t('app.choose_value')"
                                 :value="form.presented_by_id"
                     />
@@ -143,7 +143,10 @@
             <div v-if="agendaItem.decisions">
               <ul v-if="agendaItem.decisions.length > 0" class="pa0 list mb3">
                 <li v-for="decision in agendaItem.decisions" :key="decision.id" class="mb3">
-                  <span class="db mb2 f7 fw6 gray"><span class="mr1">👉</span> Decision</span>
+                  <!-- title -->
+                  <span class="db mb2 f7 fw6 gray"><span class="mr1">👉</span> {{ $t('group.meeting_show_decision_title') }}</span>
+
+                  <!-- description -->
                   <span class="parsed-content mr3" v-html="decision.description"></span>
 
                   <!-- remove decision -->
@@ -183,13 +186,13 @@
               </li>
 
               <!-- Edit decisions -->
-              <li v-if="decisionForAgendaItemId != agendaItem.id && agendaItem.decisions.length != 0" class="di">
-                <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="showEditDecisionMode(agendaItem)">{{ $t('group.meeting_show_edit_decision_cta') }}</a>
+              <li v-if="decisionForAgendaItemId != agendaItem.id && agendaItem.decisions" class="di">
+                <a v-if="agendaItem.decisions.length > 0" class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="showEditDecisionMode(agendaItem)">{{ $t('group.meeting_show_edit_decision_cta') }}</a>
               </li>
 
               <!-- Exit edit decision mode -->
               <li v-if="editDecisionMode && decisionForAgendaItemId == agendaItem.id" class="di">
-                <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="hideEditDecisionMode">Exit edit mode</a>
+                <a class="bb b--dotted bt-0 bl-0 br-0 pointer di" @click="hideEditDecisionMode">{{ $t('group.meeting_show_edit_decision_exit') }}</a>
               </li>
             </ul>
           </div>
@@ -197,11 +200,24 @@
       </li>
 
       <!-- link to add a new agenda item -->
-      <li v-if="! addAgendaItemMode" class="mt3 flex relative new-item relative">
+      <li v-if="! addAgendaItemMode && localAgenda.length != 0" class="mt3 flex relative new-item relative">
         <div class="mr3"></div>
         <a class="btn" @click.prevent="showAddAgendaItem()">{{ $t('group.meeting_show_add_agenda_item_cta') }}</a>
       </li>
 
+      <!-- blank state -->
+      <div v-if="localAgenda.length == 0" class="bg-white box pa3 tc mb2">
+        <h3 class="fw4 f5">
+          {{ $t('group.meeting_show_blank') }}
+        </h3>
+        <img loading="lazy" src="/img/streamline-icon-cyclist-1-4@140x140.png" width="140" height="140" alt="people hanging out"
+             class="di-ns dn top-1 left-1"
+        />
+        <div class="db mt3 mb3">
+          <a class="btn " @click.prevent="showAddAgendaItem()">{{ $t('group.meeting_show_add_agenda_item_cta') }}</a>
+        </div>
+      </div>
+
       <!-- Modal - Add agenda item -->
       <li v-if="addAgendaItemMode" class="bg-white box pa3 bg-gray relative">
         <form @submit.prevent="storeAgendaItem()">
@@ -212,7 +228,7 @@
                         v-model="form.summary"
                         :name="'summary'"
                         :errors="$page.props.errors.summary"
-                        :label="'What should we talk about?'"
+                        :label="$t('group.meeting_show_add_title')"
                         :required="true"
                         @esc-key-pressed="hideAddAgendaItem()"
             />
diff --git a/resources/js/Shared/SmallNameAndAvatar.vue b/resources/js/Shared/SmallNameAndAvatar.vue
index 4b7488457..280a582c8 100644
--- a/resources/js/Shared/SmallNameAndAvatar.vue
+++ b/resources/js/Shared/SmallNameAndAvatar.vue
@@ -2,6 +2,10 @@
 span {
   margin-left: 29px;
 }
+
+a {
+  border-bottom: 0;
+}
 </style>
 
 <template>
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index 57d60f12a..9bdc9351c 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -29,6 +29,7 @@
     'meeting_show_delete' => 'Delete the meeting',
     'meeting_show_delete_success' => 'The meeting has been deleted.',
     'meeting_show_title' => 'Agenda of the meeting',
+    'meeting_show_add_title' => 'What should we talk about?',
     'meeting_show_add_agenda_item_details' => 'Add more details',
     'meeting_show_add_agenda_item_presenter' => 'Add a presenter',
     'meeting_show_add_agenda_item_presenter_title' => 'Who will present?',
@@ -36,6 +37,9 @@
     'meeting_show_add_agenda_item_cta' => 'Add new agenda item',
     'meeting_show_edit_details' => 'Edit details',
     'meeting_show_add_decision' => '+ Add decision or follow-up',
+    'meeting_show_decision_title' => 'Decision',
     'meeting_show_add_decision_label' => 'Describe the decision',
     'meeting_show_edit_decision_cta' => 'Edit decisions',
+    'meeting_show_edit_decision_exit' => 'Exit edit mode',
+    'meeting_show_blank' => 'Add items on the agenda, assign a presenter for each item and start the meeting!',
 ];

From d82088d60ebededa42f730dd80d4af8d0dbe1885 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sun, 2 May 2021 18:49:32 -0400
Subject: [PATCH 39/47] wip

---
 .../Company/Company/Group/GroupController.php | 21 +++++++++++++++++++
 .../Company/Group/GroupShowViewHelper.php     |  8 +++++++
 resources/js/Pages/Company/Group/Show.vue     |  5 +++++
 resources/lang/en/group.php                   |  3 +++
 routes/web.php                                |  3 ++-
 .../Company/Group/GroupShowViewHelperTest.php | 10 +++++++++
 6 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index e19b617b7..0f1e2ac05 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -170,4 +170,25 @@ public function destroy(Request $request, int $companyId): JsonResponse
             ],
         ], 201);
     }
+
+    /**
+     * Display the Edit group page.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     * @return Response
+     */
+    public function edit(Request $request, int $companyId, int $groupId): Response
+    {
+        $company = InstanceHelper::getLoggedCompany();
+        $group = Group::where('company_id', $company->id)
+            ->findOrFail($groupId);
+
+        return Inertia::render('Company/Group/Edit', [
+            'group' => GroupShowViewHelper::information($group, $company),
+            'tab' => 'info',
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
 }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
index 71c0873e2..5b0939460 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
@@ -43,6 +43,14 @@ public static function information(Group $group, Company $company): array
             'id' => $group->id,
             'name' => $group->name,
             'members' => $membersCollection,
+            'url_edit' => route('groups.edit', [
+                'company' => $company,
+                'group' => $group,
+            ]),
+            'url_delete' => route('groups.destroy', [
+                'company' => $company,
+                'group' => $group,
+            ]),
         ];
     }
 }
diff --git a/resources/js/Pages/Company/Group/Show.vue b/resources/js/Pages/Company/Group/Show.vue
index e1c56459a..9489b3811 100644
--- a/resources/js/Pages/Company/Group/Show.vue
+++ b/resources/js/Pages/Company/Group/Show.vue
@@ -156,6 +156,11 @@
             <div class="bg-white box mb4">
               <p>sdfsd</p>
             </div>
+
+            <ul class="list pl0">
+              <li class="mb2 pl2"><inertia-link :href="localGroup.url_edit" class="f6 gray">{{ $t('group.summary_edit') }}</inertia-link></li>
+              <li class="pl2"><inertia-link :href="localGroup.url_delete" class="f6 gray c-delete">{{ $t('group.summary_delete') }}</inertia-link></li>
+            </ul>
           </div>
         </div>
       </div>
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index 9bdc9351c..8ea80e3fe 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -7,6 +7,9 @@
     'create_members' => 'Who should be part of this group?',
     'create_members_help' => 'Type the first letters of the employee',
 
+    'summary_edit' => 'Edit information',
+    'summary_delete' => 'Delete the group',
+
     'members_add_cta' => 'Add a new member',
     'members_add_placeholder' => 'Enter the first letters of a name',
     'members_index_blank' => ' Groups are more fun with employees. Add an employee now.',
diff --git a/routes/web.php b/routes/web.php
index ae41418d1..a1d9f8435 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -331,7 +331,8 @@
 
                 // group detail
                 Route::get('{group}', 'Company\\Company\\Group\\GroupController@show')->name('groups.show');
-                Route::delete('{group}', 'Company\\Company\\Group\\GroupController@destroy');
+                Route::get('{group}/edit', 'Company\\Company\\Group\\GroupController@edit')->name('groups.edit');
+                Route::get('{group}/delete', 'Company\\Company\\Group\\GroupController@destroy')->name('groups.destroy');
 
                 // members
                 Route::get('{group}/members', 'Company\\Company\\Group\\GroupMembersController@index')->name('groups.members.index');
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
index b03102e17..f948534a6 100644
--- a/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
@@ -44,5 +44,15 @@ public function it_gets_information_about_the_group(): void
             5,
             count($array['members']->toArray())
         );
+
+        $this->assertEquals(
+            env('APP_URL').'/'.$michael->company_id.'/company/groups/'.$group->id.'/edit',
+            $array['url_edit']
+        );
+
+        $this->assertEquals(
+            env('APP_URL').'/'.$michael->company_id.'/company/groups/'.$group->id.'/delete',
+            $array['url_delete']
+        );
     }
 }

From 50f30c2c96736cc8e05f41e5dc6c1074d6f308da Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 3 May 2021 23:04:36 -0400
Subject: [PATCH 40/47] wip

---
 .../Commands/Tests/SetupDummyAccount.php      |  93 +++++++++++
 app/Helpers/LogHelper.php                     |   8 +
 .../Company/Company/Group/GroupController.php | 112 +++++++++----
 .../Company/Group/GroupShowViewHelper.php     |  97 +++++++++++-
 app/Models/Company/Group.php                  |   1 +
 app/Services/Company/Group/UpdateGroup.php    |  82 ++++++++++
 database/factories/Company/GroupFactory.php   |   1 +
 .../2021_03_03_031835_create_groups_table.php |   1 +
 public/humans.txt                             |   6 +
 resources/js/Pages/Company/Group/Delete.vue   |   4 +-
 resources/js/Pages/Company/Group/Edit.vue     | 129 +++++++++++++++
 .../js/Pages/Company/Group/Meetings/Index.vue |   6 +-
 .../Pages/Company/Group/Partials/Mission.vue  | 147 ++++++++++++++++++
 resources/js/Pages/Company/Group/Show.vue     | 146 ++++++-----------
 .../Company/Project/Partials/Description.vue  |   2 +-
 resources/lang/en/account.php                 |   1 +
 resources/lang/en/app.php                     |   2 +
 resources/lang/en/group.php                   |  17 +-
 routes/web.php                                |   4 +-
 .../Company/Group/UpdateGroupTest.php         | 101 ++++++++++++
 .../Company/Group/GroupShowViewHelperTest.php |  57 +++++++
 21 files changed, 877 insertions(+), 140 deletions(-)
 create mode 100644 app/Services/Company/Group/UpdateGroup.php
 create mode 100644 resources/js/Pages/Company/Group/Edit.vue
 create mode 100644 resources/js/Pages/Company/Group/Partials/Mission.vue
 create mode 100644 tests/Unit/Services/Company/Group/UpdateGroupTest.php

diff --git a/app/Console/Commands/Tests/SetupDummyAccount.php b/app/Console/Commands/Tests/SetupDummyAccount.php
index f0bbeeccd..3e0b28ae5 100644
--- a/app/Console/Commands/Tests/SetupDummyAccount.php
+++ b/app/Console/Commands/Tests/SetupDummyAccount.php
@@ -21,18 +21,23 @@
 use App\Models\Company\EmployeeStatus;
 use App\Models\Company\ExpenseCategory;
 use App\Services\Company\Team\SetTeamLead;
+use App\Services\Company\Group\CreateGroup;
 use Illuminate\Database\Eloquent\Collection;
 use App\Models\Company\RateYourManagerAnswer;
 use App\Models\Company\RateYourManagerSurvey;
+use App\Services\Company\Group\CreateMeeting;
 use App\Services\Company\Project\StartProject;
 use App\Services\Company\Team\Ship\CreateShip;
 use App\Services\Company\Project\CreateProject;
+use App\Services\Company\Group\CreateAgendaItem;
+use App\Services\Company\Group\UpdateMeetingDate;
 use Symfony\Component\Console\Helper\ProgressBar;
 use App\Services\Company\Adminland\Team\CreateTeam;
 use App\Services\Company\Employee\Morale\LogMorale;
 use App\Services\Company\Project\CreateProjectLink;
 use App\Services\Company\Project\CreateProjectTask;
 use App\Services\Company\Employee\Worklog\LogWorklog;
+use App\Services\Company\Group\CreateMeetingDecision;
 use App\Services\Company\Project\CreateProjectStatus;
 use App\Services\Company\Employee\Answer\CreateAnswer;
 use App\Services\Company\Project\AddEmployeeToProject;
@@ -208,6 +213,7 @@ public function handle(): void
         $this->createTimeTrackingEntries();
         $this->setContractRenewalDates();
         $this->setECoffeeProcess();
+        $this->addGroups();
         $this->addSecondaryBlankAccount();
         $this->stop();
     }
@@ -2020,6 +2026,8 @@ private function setContractRenewalDates(): void
 
     private function setECoffeeProcess(): void
     {
+        $this->info('☐ Set e Coffee Process');
+
         $this->company->e_coffee_enabled = true;
         $this->company->save();
 
@@ -2041,6 +2049,91 @@ private function setECoffeeProcess(): void
         });
     }
 
+    private function addGroups(): void
+    {
+        $this->info('☐ Add groups');
+
+        $groupNames = collect([
+            'Party planning committee',
+            'Basketball lovers',
+            'Monetisation executive meeting',
+            'Front end developers guild',
+        ]);
+
+        $meetingAgendaItems = collect([
+            'What should we do about the negociations with Home Depot?',
+            'Discussion about strategic learnings',
+            'Sales update: previous quarter’s results',
+            'Team structure presentation',
+            'Impact on shareholders',
+            'iPhone 42 launch',
+        ]);
+
+        $decisionItems = collect([
+            'Schedule meeting with supplier',
+            'Angela to take responsability and pubicly apologize to Dwight',
+            'Prepare forecasts for Q4',
+            'Prepare UX for the future feature',
+        ]);
+
+        foreach ($groupNames as $name) {
+            $randomEmployees = $this->employees->shuffle()->take(rand(4, 9))->pluck('id')->toArray();
+
+            // create group with random employees
+            $group = (new CreateGroup)->execute([
+                'company_id' => $this->company->id,
+                'author_id' => $this->michael->id,
+                'name' => $name,
+                'employees' => $randomEmployees,
+            ]);
+
+            $group->mission = 'This group was created to discuss all decisions we have to take together.';
+            $group->save();
+
+            // create meetings
+            $date = Carbon::now()->subMonths(10);
+            for ($i = 0; $i < rand(4, 9); $i++) {
+                $meeting = (new CreateMeeting)->execute([
+                    'company_id' => $this->company->id,
+                    'author_id' => $this->michael->id,
+                    'group_id' => $group->id,
+                ]);
+
+                (new UpdateMeetingDate)->execute([
+                    'company_id' => $this->company->id,
+                    'author_id' => $this->michael->id,
+                    'group_id' => $group->id,
+                    'meeting_id' => $meeting->id,
+                    'date' => $date->addDays(rand(10, 57))->format('Y-m-d'),
+                ]);
+
+                // add agenda items
+                foreach ($meetingAgendaItems as $item) {
+                    $agendaItem = (new CreateAgendaItem)->execute([
+                        'company_id' => $this->company->id,
+                        'author_id' => $this->michael->id,
+                        'group_id' => $group->id,
+                        'meeting_id' => $meeting->id,
+                        'summary' => $item,
+                        'description' => null,
+                        'presented_by_id' => $this->employees->shuffle()->first()->id,
+                    ]);
+
+                    foreach ($decisionItems as $item) {
+                        (new CreateMeetingDecision)->execute([
+                            'company_id' => $this->company->id,
+                            'author_id' => $this->michael->id,
+                            'group_id' => $group->id,
+                            'meeting_id' => $meeting->id,
+                            'agenda_item_id' => $agendaItem->id,
+                            'description' => $item,
+                        ]);
+                    }
+                }
+            }
+        }
+    }
+
     private function addSecondaryBlankAccount(): void
     {
         $this->info('☐ Create a blank account');
diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index 1f6db8734..3605696ad 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1237,6 +1237,14 @@ public static function processAuditLog(AuditLog $log): string
                 ]);
                 break;
 
+            case 'group_updated':
+                $sentence = trans('account.log_group_updated', [
+                    'group_id' => $log->object->{'group_id'},
+                    'group_name' => $log->object->{'group_name'},
+                    'group_mission' => $log->object->{'group_mission'},
+                ]);
+                break;
+
             default:
                 $sentence = '';
                 break;
diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index 0f1e2ac05..c4dcb9284 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -12,6 +12,8 @@
 use App\Helpers\NotificationHelper;
 use App\Http\Controllers\Controller;
 use App\Services\Company\Group\CreateGroup;
+use App\Services\Company\Group\UpdateGroup;
+use App\Services\Company\Group\DestroyGroup;
 use App\Http\ViewHelpers\Company\CompanyViewHelper;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
 use App\Http\ViewHelpers\Company\Project\ProjectViewHelper;
@@ -45,16 +47,22 @@ public function index(Request $request, int $companyId): Response
      * @param Request $request
      * @param int $companyId
      * @param int $groupId
-     * @return Response
      */
-    public function show(Request $request, int $companyId, int $groupId): Response
+    public function show(Request $request, int $companyId, int $groupId)
     {
         $company = InstanceHelper::getLoggedCompany();
-        $group = Group::where('company_id', $company->id)
-            ->findOrFail($groupId);
+
+        try {
+            $group = Group::where('company_id', $company->id)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
 
         return Inertia::render('Company/Group/Show', [
             'group' => GroupShowViewHelper::information($group, $company),
+            'meetings' => GroupShowViewHelper::meetings($group, $company),
+            'stats' => GroupShowViewHelper::stats($group),
             'tab' => 'info',
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
         ]);
@@ -132,43 +140,48 @@ public function store(Request $request, int $companyId): JsonResponse
     }
 
     /**
-     * Destroy the group.
+     * Show the delete group page.
      *
      * @param Request $request
      * @param int $companyId
+     * @param int $groupId
+     * @return Response
+     */
+    public function delete(Request $request, int $companyId, int $groupId): Response
+    {
+        $company = InstanceHelper::getLoggedCompany();
+
+        $group = Group::where('company_id', $company->id)
+            ->findOrFail($groupId);
+
+        return Inertia::render('Company/Group/Delete', [
+            'group' => GroupShowViewHelper::information($group, $company),
+            'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
+        ]);
+    }
+
+    /**
+     * Actually destroy the group.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
      * @return JsonResponse
      */
-    public function destroy(Request $request, int $companyId): JsonResponse
+    public function destroy(Request $request, int $companyId, int $groupId): JsonResponse
     {
         $loggedEmployee = InstanceHelper::getLoggedEmployee();
         $loggedCompany = InstanceHelper::getLoggedCompany();
 
-        $employees = null;
-        if ($request->input('employees')) {
-            $employees = [];
-            foreach ($request->input('employees') as $employee) {
-                array_push($employees, $employee['id']);
-            }
-        }
-
-        $data = [
+        (new DestroyGroup)->execute([
             'company_id' => $loggedCompany->id,
             'author_id' => $loggedEmployee->id,
-            'name' => $request->input('name'),
-            'employees' => $employees,
-        ];
-
-        $group = (new CreateGroup)->execute($data);
+            'group_id' => $groupId,
+        ]);
 
         return response()->json([
-            'data' => [
-                'id' => $group->id,
-                'url' => route('groups.show', [
-                    'company' => $loggedCompany,
-                    'group' => $group,
-                ]),
-            ],
-        ], 201);
+            'data' => true,
+        ]);
     }
 
     /**
@@ -177,18 +190,51 @@ public function destroy(Request $request, int $companyId): JsonResponse
      * @param Request $request
      * @param int $companyId
      * @param int $groupId
-     * @return Response
      */
-    public function edit(Request $request, int $companyId, int $groupId): Response
+    public function edit(Request $request, int $companyId, int $groupId)
     {
         $company = InstanceHelper::getLoggedCompany();
-        $group = Group::where('company_id', $company->id)
-            ->findOrFail($groupId);
+
+        try {
+            $group = Group::where('company_id', $company->id)
+                ->findOrFail($groupId);
+        } catch (ModelNotFoundException $e) {
+            return redirect('home');
+        }
 
         return Inertia::render('Company/Group/Edit', [
             'group' => GroupShowViewHelper::information($group, $company),
-            'tab' => 'info',
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
         ]);
     }
+
+    /**
+     * Update the group information.
+     *
+     * @param Request $request
+     * @param int $companyId
+     * @param int $groupId
+     */
+    public function update(Request $request, int $companyId, int $groupId): JsonResponse
+    {
+        $loggedEmployee = InstanceHelper::getLoggedEmployee();
+        $loggedCompany = InstanceHelper::getLoggedCompany();
+
+        (new UpdateGroup)->execute([
+            'company_id' => $loggedCompany->id,
+            'author_id' => $loggedEmployee->id,
+            'group_id' => $groupId,
+            'name' => $request->input('name'),
+            'mission' => $request->input('mission'),
+        ]);
+
+        return response()->json([
+            'data' => [
+                'url' => route('groups.show', [
+                    'company' => $loggedCompany,
+                    'group' => $groupId,
+                ]),
+            ],
+        ]);
+    }
 }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
index 5b0939460..8b482f7b9 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
@@ -2,9 +2,13 @@
 
 namespace App\Http\ViewHelpers\Company\Group;
 
+use Carbon\Carbon;
+use App\Helpers\DateHelper;
 use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
 use App\Models\Company\Company;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 
 class GroupShowViewHelper
 {
@@ -42,15 +46,106 @@ public static function information(Group $group, Company $company): array
         return [
             'id' => $group->id,
             'name' => $group->name,
+            'mission' => $group->mission,
             'members' => $membersCollection,
             'url_edit' => route('groups.edit', [
                 'company' => $company,
                 'group' => $group,
             ]),
-            'url_delete' => route('groups.destroy', [
+            'url_delete' => route('groups.delete', [
                 'company' => $company,
                 'group' => $group,
             ]),
         ];
     }
+
+    /**
+     * Get the latest 3 meetings in the group.
+     *
+     * @param Group $group
+     * @return Collection
+     */
+    public static function meetings(Group $group): Collection
+    {
+        $meetings = $group->meetings()
+            ->orderBy('happened_at', 'desc')
+            ->with('employees')
+            ->take(3)
+            ->get();
+
+        $meetingsCollection = collect([]);
+        foreach ($meetings as $meeting) {
+            $members = $meeting->employees()
+                ->inRandomOrder()
+                ->take(3)
+                ->get();
+
+            $totalMembersCount = $meeting->employees()->count();
+            $totalMembersCount = $totalMembersCount - $members->count();
+
+            $membersCollection = collect([]);
+            foreach ($members as $member) {
+                $membersCollection->push([
+                    'id' => $member->id,
+                    'avatar' => ImageHelper::getAvatar($member, 25),
+                    'url' => route('employees.show', [
+                        'company' => $group->company_id,
+                        'employee' => $member,
+                    ]),
+                ]);
+            }
+
+            $meetingsCollection->push([
+                'id' => $meeting->id,
+                'happened_at' => trans('group.meeting_index_item_title', ['date' => DateHelper::formatDate($meeting->happened_at)]),
+                'url' => route('groups.meetings.show', [
+                    'company' => $group->company_id,
+                    'group' => $group,
+                    'meeting' => $meeting,
+                ]),
+                'preview_members' => $membersCollection,
+                'remaining_members_count' => $totalMembersCount,
+            ]);
+        }
+
+        return $meetingsCollection;
+    }
+
+    /**
+     * Get the statistics of the group.
+     *
+     * @param Group $group
+     * @return array
+     */
+    public static function stats(Group $group): array
+    {
+        $numberOfMeetings = $group->meetings()->count();
+
+        $allDatesOfMeetings = DB::table('meetings')
+            ->where('group_id', $group->id)
+            ->orderBy('happened_at', 'asc')
+            ->select('happened_at')
+            ->get()
+            ->pluck('happened_at')
+            ->toArray();
+
+        $datesCollection = collect();
+        for ($i = 0; $i < count($allDatesOfMeetings) - 1; $i++) {
+            $date = Carbon::createFromFormat('Y-m-d H:i:s', $allDatesOfMeetings[$i]);
+            $nextDate = Carbon::createFromFormat('Y-m-d H:i:s', $allDatesOfMeetings[$i + 1]);
+
+            $numberOfDays = $date->diffInDays($nextDate);
+            $datesCollection->push($numberOfDays);
+        }
+
+        $frequency = null;
+        if (count($allDatesOfMeetings) >= 2) {
+            $frequency = $datesCollection->avg();
+        }
+
+        return [
+            'number_of_meetings' => $numberOfMeetings,
+            'frequency' => $frequency,
+        ];
+    }
 }
diff --git a/app/Models/Company/Group.php b/app/Models/Company/Group.php
index f41d24bce..922d66a3a 100644
--- a/app/Models/Company/Group.php
+++ b/app/Models/Company/Group.php
@@ -20,6 +20,7 @@ class Group extends Model
     protected $fillable = [
         'company_id',
         'name',
+        'mission',
     ];
 
     /**
diff --git a/app/Services/Company/Group/UpdateGroup.php b/app/Services/Company/Group/UpdateGroup.php
new file mode 100644
index 000000000..bc60a53be
--- /dev/null
+++ b/app/Services/Company/Group/UpdateGroup.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Services\Company\Group;
+
+use Carbon\Carbon;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Services\BaseService;
+use App\Models\Company\Employee;
+
+class UpdateGroup extends BaseService
+{
+    private array $data;
+    private Employee $employee;
+    private Group $group;
+
+    /**
+     * Get the validation rules that apply to the service.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'company_id' => 'required|integer|exists:companies,id',
+            'author_id' => 'required|integer|exists:employees,id',
+            'group_id' => 'required|integer|exists:groups,id',
+            'name' => 'required|string',
+            'mission' => 'nullable|string|max:65535',
+        ];
+    }
+
+    /**
+     * Update group information.
+     *
+     * @param array $data
+     */
+    public function execute(array $data): void
+    {
+        $this->data = $data;
+        $this->validate();
+
+        $this->update();
+        $this->log();
+    }
+
+    private function validate(): void
+    {
+        $this->validateRules($this->data);
+
+        $this->author($this->data['author_id'])
+            ->inCompany($this->data['company_id'])
+            ->asNormalUser()
+            ->canExecuteService();
+
+        $this->group = Group::where('company_id', $this->data['company_id'])
+            ->findOrFail($this->data['group_id']);
+    }
+
+    private function update(): void
+    {
+        $this->group->name = $this->data['name'];
+        $this->group->mission = $this->valueOrNull($this->data, 'mission');
+        $this->group->save();
+    }
+
+    private function log(): void
+    {
+        LogAccountAudit::dispatch([
+            'company_id' => $this->data['company_id'],
+            'action' => 'group_updated',
+            'author_id' => $this->author->id,
+            'author_name' => $this->author->name,
+            'audited_at' => Carbon::now(),
+            'objects' => json_encode([
+                'group_id' => $this->group->id,
+                'group_name' => $this->group->name,
+                'group_mission' => $this->valueOrNull($this->data, 'mission'),
+            ]),
+        ])->onQueue('low');
+    }
+}
diff --git a/database/factories/Company/GroupFactory.php b/database/factories/Company/GroupFactory.php
index 4966d6764..6706f0519 100644
--- a/database/factories/Company/GroupFactory.php
+++ b/database/factories/Company/GroupFactory.php
@@ -27,6 +27,7 @@ public function definition()
         return [
             'company_id' => $company->id,
             'name' => 'Group name',
+            'mission' => 'Employees happiness',
         ];
     }
 }
diff --git a/database/migrations/2021_03_03_031835_create_groups_table.php b/database/migrations/2021_03_03_031835_create_groups_table.php
index 8dc2979a3..420ad5495 100644
--- a/database/migrations/2021_03_03_031835_create_groups_table.php
+++ b/database/migrations/2021_03_03_031835_create_groups_table.php
@@ -18,6 +18,7 @@ public function up()
             $table->id();
             $table->unsignedBigInteger('company_id');
             $table->string('name');
+            $table->text('mission')->nullable();
             $table->timestamps();
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
         });
diff --git a/public/humans.txt b/public/humans.txt
index 8850cecae..42fbbbe2c 100644
--- a/public/humans.txt
+++ b/public/humans.txt
@@ -4,3 +4,9 @@
 	Twitter: @djaiss
 	GitHub: @djaiss
 	From: Montréal, QC, Canada
+
+    Developer: Alexis Saettler
+	Contact: alexis [at] officelife.io
+	Twitter: @asbin
+	GitHub: @asbiin
+	From: Paris, France
diff --git a/resources/js/Pages/Company/Group/Delete.vue b/resources/js/Pages/Company/Group/Delete.vue
index 6b45d61a1..94e4eaa91 100644
--- a/resources/js/Pages/Company/Group/Delete.vue
+++ b/resources/js/Pages/Company/Group/Delete.vue
@@ -89,8 +89,8 @@ export default {
 
       axios.delete(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}`)
         .then(response => {
-          localStorage.success = this.$t('project.delete_success');
-          this.$inertia.visit(`${this.$page.props.auth.company.id}/company/projects`);
+          localStorage.success = this.$t('group.delete_success');
+          this.$inertia.visit(`/${this.$page.props.auth.company.id}/company/groups`);
         })
         .catch(error => {
           this.loadingState = null;
diff --git a/resources/js/Pages/Company/Group/Edit.vue b/resources/js/Pages/Company/Group/Edit.vue
new file mode 100644
index 000000000..3770a31f9
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Edit.vue
@@ -0,0 +1,129 @@
+<template>
+  <layout :notifications="notifications">
+    <div class="ph2 ph0-ns">
+      <!-- BREADCRUMB -->
+      <div class="mt4-l mt1 mw6 br3 bg-white box center breadcrumb relative z-0 f6 pb2">
+        <ul class="list ph0 tc-l tl">
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company'">{{ $t('app.breadcrumb_company') }}</inertia-link>
+          </li>
+          <li class="di">
+            ...
+          </li>
+          <li class="di">
+            <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id">{{ group.name }}</inertia-link>
+          </li>
+          <li class="di">
+            {{ $t('app.breadcrumb_group_edit') }}
+          </li>
+        </ul>
+      </div>
+
+      <!-- BODY -->
+      <div class="mw7 center br3 mb5 bg-white box relative z-1">
+        <div class="pa3 measure center">
+          <h2 class="tc normal mb4 lh-copy">
+            {{ $t('group.edit_title') }}
+          </h2>
+
+          <form @submit.prevent="submit">
+            <errors :errors="form.errors" />
+
+            <!-- Name -->
+            <text-input :id="'name'"
+                        v-model="form.name"
+                        :name="'name'"
+                        :errors="$page.props.errors.title"
+                        :label="$t('group.create_input_name')"
+                        :help="$t('group.create_input_name_help')"
+                        :required="true"
+            />
+
+            <!-- Mission -->
+            <text-area v-model="form.mission"
+                       :label="$t('group.create_input_mission')"
+                       :required="false"
+                       :rows="10"
+                       :help="$t('group.create_input_summary_help')"
+            />
+
+            <!-- Actions -->
+            <div class="mb4 mt3">
+              <div class="flex-ns justify-between">
+                <div>
+                  <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id" class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3">
+                    {{ $t('app.cancel') }}
+                  </inertia-link>
+                </div>
+                <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.update')" />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import TextInput from '@/Shared/TextInput';
+import TextArea from '@/Shared/TextArea';
+import Errors from '@/Shared/Errors';
+import LoadingButton from '@/Shared/LoadingButton';
+import Layout from '@/Shared/Layout';
+
+export default {
+  components: {
+    Layout,
+    TextInput,
+    TextArea,
+    Errors,
+    LoadingButton,
+  },
+
+  props: {
+    group: {
+      type: Object,
+      default: null,
+    },
+    notifications: {
+      type: Array,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      form: {
+        name: null,
+        mission: null,
+        errors: [],
+      },
+      loadingState: '',
+      errorTemplate: Error,
+    };
+  },
+
+  created() {
+    this.form.name = this.group.name;
+    this.form.mission = this.group.mission;
+  },
+
+  methods: {
+    submit() {
+      this.loadingState = 'loading';
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/update`, this.form)
+        .then(response => {
+          localStorage.success = this.$t('group.edit_success');
+          this.$inertia.visit(response.data.data.url);
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Meetings/Index.vue b/resources/js/Pages/Company/Group/Meetings/Index.vue
index 808003091..f85cc092e 100644
--- a/resources/js/Pages/Company/Group/Meetings/Index.vue
+++ b/resources/js/Pages/Company/Group/Meetings/Index.vue
@@ -135,7 +135,7 @@ export default {
 
   mounted() {
     if (localStorage.success) {
-      flash(localStorage.success, 'success');
+      this.flash(localStorage.success, 'success');
       localStorage.removeItem('success');
     }
   },
@@ -178,7 +178,7 @@ export default {
 
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/store`, this.form)
         .then(response => {
-          flash(this.$t('project.members_index_add_success'), 'success');
+          this.flash(this.$t('project.members_index_add_success'), 'success');
           this.loadingState = null;
           this.form.employee = null;
           this.showModal = false;
@@ -195,7 +195,7 @@ export default {
 
       axios.post(`/${this.$page.props.auth.company.id}/company/groups/${this.group.id}/members/remove`, this.form)
         .then(response => {
-          flash(this.$t('project.members_index_remove_success'), 'success');
+          this.flash(this.$t('project.members_index_remove_success'), 'success');
 
           var id = this.localMembers.findIndex(x => x.id == employee.id);
           this.localMembers.splice(id, 1);
diff --git a/resources/js/Pages/Company/Group/Partials/Mission.vue b/resources/js/Pages/Company/Group/Partials/Mission.vue
new file mode 100644
index 000000000..de0f70752
--- /dev/null
+++ b/resources/js/Pages/Company/Group/Partials/Mission.vue
@@ -0,0 +1,147 @@
+<template>
+  <div class="mb5">
+    <div class="mb2 fw5 relative">
+      <span class="mr1">
+        🏔
+      </span> {{ $t('project.summary_description') }}
+
+      <img src="/img/edit_button.svg" class="box-plus-button absolute br-100 pa2 bg-white pointer" data-cy="add-description-button"
+           width="22"
+           height="22" alt="add a description"
+           loading="lazy"
+           @click.prevent="displayEditBox()"
+      />
+    </div>
+
+    <div class="bg-white box pa3">
+      <div v-if="! showEdit">
+        <div v-if="localProject.parsed_description" class="parsed-content" v-html="localProject.parsed_description"></div>
+        <div v-else class="mb0 mt0 lh-copy f6 tc">
+          {{ $t('project.summary_description_blank') }}
+        </div>
+      </div>
+
+      <!-- edit description -->
+      <div v-if="showEdit" class="">
+        <form @submit.prevent="submit">
+          <template v-if="form.errors.length > 0">
+            <div class="cf pb1 w-100 mb2">
+              <errors :errors="form.errors" />
+            </div>
+          </template>
+
+          <text-area :ref="'editModal'"
+                     v-model="form.description"
+                     :label="$t('project.summary_description_title')"
+                     :datacy="'description-textarea'"
+                     :required="true"
+                     :rows="10"
+                     :help="$t('project.summary_description_title_help')"
+                     @esc-key-pressed="showEdit = false"
+          />
+
+          <!-- Actions -->
+          <div class="mt4">
+            <div class="flex-ns justify-between">
+              <div>
+                <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" data-cy="clear-description" @click="clear()">
+                  ❌ {{ $t('employee.description_clear') }}
+                </a>
+              </div>
+              <div class="">
+                <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3 mr2" data-cy="cancel-add-description" @click="showEdit = false">
+                  {{ $t('app.cancel') }}
+                </a>
+                <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.publish')" :cypress-selector="'submit-add-description'" />
+              </div>
+            </div>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import TextArea from '@/Shared/TextArea';
+import LoadingButton from '@/Shared/LoadingButton';
+import Errors from '@/Shared/Errors';
+
+export default {
+  components: {
+    TextArea,
+    Errors,
+    LoadingButton,
+  },
+
+  props: {
+    project: {
+      type: Object,
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      showEdit: false,
+      form: {
+        description: null,
+        errors: [],
+      },
+      loadingState: '',
+      errorTemplate: Error,
+      localProject: null,
+    };
+  },
+
+  created() {
+    this.localProject = this.project;
+  },
+
+  methods: {
+    displayEditBox() {
+      this.showEdit = true;
+      this.form.description = this.localProject.raw_description;
+
+      this.$nextTick(() => {
+        this.$refs.editModal.focus();
+      });
+    },
+
+    submit() {
+      this.loadingState = 'loading';
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/projects/${this.localProject.id}/description`, this.form)
+        .then(response => {
+          this.flash(this.$t('project.summary_description_success'), 'success');
+          this.localProject.raw_description = response.data.data.raw_description;
+          this.localProject.parsed_description = response.data.data.parsed_description;
+          this.loadingState = null;
+          this.showEdit = false;
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+
+    clear() {
+      this.loadingState = 'loading';
+      this.form.description = null;
+
+      axios.post(`/${this.$page.props.auth.company.id}/company/projects/${this.localProject.id}/description`, this.form)
+        .then(response => {
+          this.localProject.raw_description = null;
+          this.localProject.parsed_description = null;
+          this.loadingState = null;
+          this.showEdit = false;
+        })
+        .catch(error => {
+          this.loadingState = null;
+          this.form.errors = error.response.data;
+        });
+    },
+  }
+};
+
+</script>
diff --git a/resources/js/Pages/Company/Group/Show.vue b/resources/js/Pages/Company/Group/Show.vue
index 9489b3811..577db5e0a 100644
--- a/resources/js/Pages/Company/Group/Show.vue
+++ b/resources/js/Pages/Company/Group/Show.vue
@@ -39,122 +39,62 @@
 
       <!-- BODY -->
       <div class="mw7 center br3 mb5 relative z-1">
-        <group-menu :group="group" :tab="info" />
+        <group-menu :group="group" :tab="tab" />
 
         <div class="cf center">
           <!-- LEFT COLUMN -->
           <div class="fl w-70-l w-100">
+            <!-- mission -->
+            <div class="mb2 fw5 relative">
+              <span class="mr1">
+                🏔
+              </span> {{ $t('group.summary_description') }}
+            </div>
+            <div v-if="group.mission" class="bg-white box pa3" v-html="group.mission"></div>
+            <div v-if="!group.mission" class="bg-white box pa3">
+              {{ $t('group.summary_mission_blank') }}
+            </div>
+
             <!-- list of meetings -->
-            <div class="br3 bg-white box z-1">
-              <ul data-cy="e-coffee-list" class="list pl0 ma0">
-                <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
+            <div v-if="meetings.length > 0" class="mb2 fw5 relative mt4">
+              <span class="mr1">
+                🌮
+              </span> {{ $t('group.summary_meetings') }}
+            </div>
+            <div v-if="meetings.length > 0" class="br3 bg-white box z-1">
+              <ul class="list pl0 ma0">
+                <li v-for="meeting in meetings" :key="meeting.id" class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
                   <div class="mb1 relative">
-                    <span class="employee-name db">
-                      Meeting du 20 janvier
-                    </span>
+                    <inertia-link :href="meeting.url" class="employee-name db">
+                      {{ meeting.happened_at }}
+                    </inertia-link>
                   </div>
-                  <span class="ma0 mb0 f7 grey">
+
+                  <span v-if="meeting.preview_members" class="ma0 mb0 f7 grey">
                     <div class="flex items-center relative tr">
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
+                      <avatar v-for="member in meeting.preview_members" :key="member.id" :avatar="member.avatar" :url="member.url" :size="25"
+                              :class="'br-100 small-avatar'"
                       />
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                      <div class="pl2 f7 more-members relative gray">
-                        {{ $t('project.menu_other_member', { count: 3 }) }}
+                      <div v-if="meeting.remaining_members_count > 0" class="pl2 f7 more-members relative gray">
+                        + {{ meeting.remaining_members_count }}
                       </div>
                     </div>
                   </span>
                 </li>
-                <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
-                  <div class="mb1 relative">
-                    <span class="employee-name db">
-                      Meeting du 20 janvier
-                    </span>
-                  </div>
-                  <span class="ma0 mb0 f7 grey">
-                    <div class="flex items-center relative tr">
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                    </div>
-                  </span>
-                </li>
-                <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
-                  <div class="mb1 relative">
-                    <span class="employee-name db">
-                      Meeting du 20 janvier
-                    </span>
-                  </div>
-                  <span class="ma0 mb0 f7 grey">
-                    <div class="flex items-center relative tr">
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                    </div>
-                  </span>
-                </li>
-                <li class="pa3 bb bb-gray bb-gray-hover flex items-center justify-between meeting-item">
-                  <div class="mb1 relative">
-                    <span class="employee-name db">
-                      Meeting du 20 janvier
-                    </span>
-                  </div>
-                  <span class="ma0 mb0 f7 grey">
-                    <div class="flex items-center relative tr">
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                      <img src="https://ui-avatars.com/api/?name=Glenn%20Scott" alt="avatar" class="br-100 small-avatar"
-                           width="32" height="32"
-                      />
-                    </div>
-                  </span>
-                </li>
-                <li class="ph3 pv2 tc f6">
-                  <inertia-link href="ecoffees.view_all_url" data-cy="view-all-ecoffees">{{ $t('employee.e_coffee_view_all') }}</inertia-link>
-                </li>
               </ul>
             </div>
-
-            <!-- blank -->
-            <div class="br3 bg-white box z-1 tc pa3">
-              <h3 class="fw4 f5 lh-copy">
-                Meeting notes are great to prepare meetings, and record what was said.
-              </h3>
-              <img loading="lazy" src="/img/streamline-icon-meeting-table-3@140x140.png" width="140" height="140" alt="people hanging out"
-                   class="di-ns dn top-1 left-1"
-              />
-            </div>
           </div>
 
           <!-- RIGHT COLUMN -->
           <div class="fl w-30-l w-100 pl4-l">
-            <inertia-link class="w-100 btn dib-l db mb3" data-cy="add-position-button" @click.prevent="displayAddModal">
-              Add a meeting note
-            </inertia-link>
-
-            <div class="bg-white box mb4">
-              <p>sdfsd</p>
+            <div class="mb2 fw5 relative">
+              <span class="mr1">
+                💹
+              </span> {{ $t('group.summary_stat') }}
+            </div>
+            <div class="bg-white box mb4 pa3">
+              <p class="flex justify-between lh-copy f6 fw5 mb0 mt0 ml0 mr0">{{ $t('group.summary_stat_meeting') }} <span class="fw4 gray">{{ stats.number_of_meetings }}</span> </p>
+              <p v-if="stats.frequency" class="flex justify-between lh-copy f6 fw5 mb0 mt2">{{ $t('group.summary_stat_days') }} <span class="fw4 gray">{{ stats.frequency }}</span></p>
             </div>
 
             <ul class="list pl0">
@@ -170,11 +110,13 @@
 
 <script>
 import Layout from '@/Shared/Layout';
+import Avatar from '@/Shared/Avatar';
 import GroupMenu from '@/Pages/Company/Group/Partials/GroupMenu';
 
 export default {
   components: {
     Layout,
+    Avatar,
     GroupMenu,
   },
 
@@ -187,6 +129,14 @@ export default {
       type: Object,
       default: null,
     },
+    meetings: {
+      type: Object,
+      default: null,
+    },
+    stats: {
+      type: Object,
+      default: null,
+    },
     tab: {
       type: String,
       default: null,
@@ -199,7 +149,7 @@ export default {
 
   mounted() {
     if (localStorage.success) {
-      flash(localStorage.success, 'success');
+      this.flash(localStorage.success, 'success');
       localStorage.removeItem('success');
     }
   },
diff --git a/resources/js/Pages/Company/Project/Partials/Description.vue b/resources/js/Pages/Company/Project/Partials/Description.vue
index b6f5d2857..de0f70752 100644
--- a/resources/js/Pages/Company/Project/Partials/Description.vue
+++ b/resources/js/Pages/Company/Project/Partials/Description.vue
@@ -49,7 +49,7 @@
                 </a>
               </div>
               <div class="">
-                <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" data-cy="cancel-add-description" @click="showEdit = false">
+                <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3 mr2" data-cy="cancel-add-description" @click="showEdit = false">
                   {{ $t('app.cancel') }}
                 </a>
                 <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.publish')" :cypress-selector="'submit-add-description'" />
diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php
index a5ad8f355..1401b40b2 100644
--- a/resources/lang/en/account.php
+++ b/resources/lang/en/account.php
@@ -317,6 +317,7 @@
     'log_add_guest_to_meeting' => 'Added :employee_name in a meeting of the project called :project_name.',
     'log_meeting_date_set' => 'Set the meeting date in a meeting of the project called :project_name.',
     'log_company_founded_date_updated' => 'Updated the founded date of the company to :founded_at.',
+    'log_group_updated' => 'Updated the group called :group_name.',
 
     // employee logs
     'employee_log_employee_created' => 'Created this employee entry.',
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
index a710780b2..fac64d5c4 100644
--- a/resources/lang/en/app.php
+++ b/resources/lang/en/app.php
@@ -137,6 +137,8 @@
     'breadcrumb_group_list' => 'Group list',
     'breadcrumb_group_create' => 'Create a group',
     'breadcrumb_group_detail' => 'Detail of a group',
+    'breadcrumb_group_delete' => 'Delete the group',
+    'breadcrumb_group_edit' => 'Edit the group',
 
     'header_welcome' => 'Welcome',
     'header_home' => 'Summary',
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index 8ea80e3fe..fe3961c95 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -7,8 +7,14 @@
     'create_members' => 'Who should be part of this group?',
     'create_members_help' => 'Type the first letters of the employee',
 
-    'summary_edit' => 'Edit information',
+    'summary_description' => 'Mission of this group',
+    'summary_meetings' => 'Recent meetings',
+    'summary_edit' => 'Edit name and mission',
     'summary_delete' => 'Delete the group',
+    'summary_stat' => 'Some juicy stats',
+    'summary_stat_meeting' => 'Meetings in total',
+    'summary_stat_days' => 'Days between meetings on average',
+    'summary_mission_blank' => 'Add a mission to inform people what this group is for.',
 
     'members_add_cta' => 'Add a new member',
     'members_add_placeholder' => 'Enter the first letters of a name',
@@ -45,4 +51,13 @@
     'meeting_show_edit_decision_cta' => 'Edit decisions',
     'meeting_show_edit_decision_exit' => 'Exit edit mode',
     'meeting_show_blank' => 'Add items on the agenda, assign a presenter for each item and start the meeting!',
+
+    'edit_title' => 'Edit the group',
+    'edit_success' => 'The group has been updated.',
+    'create_input_mission' => 'What is the mission of the group?',
+    'create_input_summary_help' => 'Give insights of why we need this group.',
+
+    'delete_success' => 'The group has been deleted.',
+    'delete_title' => 'Delete the group',
+    'delete_description' => 'Deleting a group deletes all the data associated with it. Members who are part of this group won’t be deleted from the system.',
 ];
diff --git a/routes/web.php b/routes/web.php
index a1d9f8435..2d02d28c8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -332,7 +332,9 @@
                 // group detail
                 Route::get('{group}', 'Company\\Company\\Group\\GroupController@show')->name('groups.show');
                 Route::get('{group}/edit', 'Company\\Company\\Group\\GroupController@edit')->name('groups.edit');
-                Route::get('{group}/delete', 'Company\\Company\\Group\\GroupController@destroy')->name('groups.destroy');
+                Route::post('{group}/update', 'Company\\Company\\Group\\GroupController@update');
+                Route::get('{group}/delete', 'Company\\Company\\Group\\GroupController@delete')->name('groups.delete');
+                Route::delete('{group}', 'Company\\Company\\Group\\GroupController@destroy');
 
                 // members
                 Route::get('{group}/members', 'Company\\Company\\Group\\GroupMembersController@index')->name('groups.members.index');
diff --git a/tests/Unit/Services/Company/Group/UpdateGroupTest.php b/tests/Unit/Services/Company/Group/UpdateGroupTest.php
new file mode 100644
index 000000000..a1cbf0771
--- /dev/null
+++ b/tests/Unit/Services/Company/Group/UpdateGroupTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Tests\Unit\Services\Company\Group;
+
+use Tests\TestCase;
+use App\Jobs\LogAccountAudit;
+use App\Models\Company\Group;
+use App\Models\Company\Employee;
+use Illuminate\Support\Facades\Queue;
+use App\Services\Company\Group\UpdateGroup;
+use Illuminate\Validation\ValidationException;
+use App\Services\Company\Group\RemoveGuestFromMeeting;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class UpdateGroupTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_updates_the_details_of_the_group_as_administrator(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $group);
+    }
+
+    /** @test */
+    public function it_updates_the_details_of_the_group_as_hr(): void
+    {
+        $michael = $this->createHR();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $group);
+    }
+
+    /** @test */
+    public function it_updates_the_details_of_the_group_as_normal_user(): void
+    {
+        $michael = $this->createEmployee();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $this->executeService($michael, $group);
+    }
+
+    /** @test */
+    public function it_fails_if_wrong_parameters_are_given(): void
+    {
+        $request = [
+            'first_name' => 'Dwight',
+        ];
+
+        $this->expectException(ValidationException::class);
+        (new RemoveGuestFromMeeting)->execute($request);
+    }
+
+    /** @test */
+    public function it_fails_if_the_group_is_not_in_the_company(): void
+    {
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create();
+
+        $this->expectException(ModelNotFoundException::class);
+        $this->executeService($michael, $group);
+    }
+
+    private function executeService(Employee $michael, Group $group): void
+    {
+        Queue::fake();
+
+        $request = [
+            'company_id' => $michael->company_id,
+            'author_id' => $michael->id,
+            'group_id' => $group->id,
+            'name' => 'title',
+            'mission' => 'awesome mission',
+        ];
+
+        (new UpdateGroup)->execute($request);
+
+        $this->assertDatabaseHas('groups', [
+            'id' => $group->id,
+            'name' => 'title',
+            'mission' => 'awesome mission',
+        ]);
+
+        Queue::assertPushed(LogAccountAudit::class, function ($job) use ($michael, $group) {
+            return $job->auditLog['action'] === 'group_updated' &&
+                $job->auditLog['author_id'] === $michael->id &&
+                $job->auditLog['objects'] === json_encode([
+                    'group_id' => $group->id,
+                    'group_name' => 'title',
+                    'group_mission' => 'awesome mission',
+                ]);
+        });
+    }
+}
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
index f948534a6..cd0973ad7 100644
--- a/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
@@ -2,8 +2,11 @@
 
 namespace Tests\Unit\ViewHelpers\Company\Group;
 
+use Carbon\Carbon;
 use Tests\TestCase;
+use App\Helpers\ImageHelper;
 use App\Models\Company\Group;
+use App\Models\Company\Meeting;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
 
@@ -40,6 +43,11 @@ public function it_gets_information_about_the_group(): void
             $array['name']
         );
 
+        $this->assertEquals(
+            $group->mission,
+            $array['mission']
+        );
+
         $this->assertEquals(
             5,
             count($array['members']->toArray())
@@ -55,4 +63,53 @@ public function it_gets_information_about_the_group(): void
             $array['url_delete']
         );
     }
+
+    /** @test */
+    public function it_gets_a_list_of_meetings(): void
+    {
+        Carbon::setTestNow(Carbon::create(2019, 1, 1, 7, 0, 0));
+
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $meeting = Meeting::factory()->create([
+            'group_id' => $group->id,
+            'happened_at' => Carbon::now(),
+        ]);
+        $meeting->employees()->attach([$michael->id]);
+
+        $collection = GroupShowViewHelper::meetings($group);
+
+        $this->assertEquals(
+            $meeting->id,
+            $collection->toArray()[0]['id']
+        );
+
+        $this->assertEquals(
+            'Meeting of Jan 01, 2019',
+            $collection->toArray()[0]['happened_at']
+        );
+
+        $this->assertEquals(
+            env('APP_URL').'/'.$michael->company_id.'/company/groups/'.$group->id.'/meetings/'.$meeting->id,
+            $collection->toArray()[0]['url']
+        );
+
+        $this->assertEquals(
+            0,
+            $collection->toArray()[0]['remaining_members_count']
+        );
+
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $michael->id,
+                    'avatar' => ImageHelper::getAvatar($michael, 25),
+                    'url' => env('APP_URL').'/'.$michael->company_id.'/employees/'.$michael->id,
+                ],
+            ],
+            $collection->toArray()[0]['preview_members']->toArray()
+        );
+    }
 }

From f708f4d1f58c431fde371275106cd9c8d5b7dff8 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 3 May 2021 23:04:50 -0400
Subject: [PATCH 41/47] Update GroupController.php

---
 app/Http/Controllers/Company/Company/Group/GroupController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index c4dcb9284..be4e48906 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -15,6 +15,7 @@
 use App\Services\Company\Group\UpdateGroup;
 use App\Services\Company\Group\DestroyGroup;
 use App\Http\ViewHelpers\Company\CompanyViewHelper;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
 use App\Http\ViewHelpers\Company\Project\ProjectViewHelper;
 use App\Http\ViewHelpers\Company\Group\GroupCreateViewHelper;

From feb2c8ea32038d876f9fa691c617b6a84b528833 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 3 May 2021 23:09:37 -0400
Subject: [PATCH 42/47] wip

---
 resources/js/Pages/Company/Partials/Tab.vue | 3 +++
 resources/lang/en/company.php               | 1 +
 2 files changed, 4 insertions(+)

diff --git a/resources/js/Pages/Company/Partials/Tab.vue b/resources/js/Pages/Company/Partials/Tab.vue
index e2f338b67..e66b53eea 100644
--- a/resources/js/Pages/Company/Partials/Tab.vue
+++ b/resources/js/Pages/Company/Partials/Tab.vue
@@ -7,6 +7,9 @@
       <inertia-link :href="'/' + $page.props.auth.company.id + '/company/projects'" class="f6 fl ph3 pv2 dib pointer" :class="{'selected':(tab == 'projects')}">
         {{ $t('company.menu_projects') }}
       </inertia-link>
+      <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups'" class="f6 fl ph3 pv2 dib pointer" :class="{'selected':(tab == 'projects')}">
+        {{ $t('company.menu_groups') }}
+      </inertia-link>
       <inertia-link :href="'/' + $page.props.auth.company.id + '/company/hr'" class="f6 fl ph3 pv2 dib pointer" :class="{'selected':(tab == 'hr')}">
         {{ $t('company.menu_hr') }}
       </inertia-link>
diff --git a/resources/lang/en/company.php b/resources/lang/en/company.php
index 6e8b57fae..3a36059dc 100644
--- a/resources/lang/en/company.php
+++ b/resources/lang/en/company.php
@@ -3,6 +3,7 @@
 return [
     'menu_employees' => 'Employees & teams',
     'menu_projects' => 'Projects',
+    'menu_groups' => 'Groups',
     'menu_hr' => 'Human Resources',
 
     'stat_founded_at' => 'founded',

From b1de797d4148ab98e0e5e3bf10eed4411626e903 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Mon, 3 May 2021 23:19:49 -0400
Subject: [PATCH 43/47] wip

---
 .../Company/Company/Group/GroupController.php |   7 +-
 .../Company/Group/GroupViewHelper.php         | 151 ++++++++++++++++++
 resources/js/Pages/Company/Group/Index.vue    |   0
 resources/js/Pages/Company/Partials/Tab.vue   |   2 +-
 4 files changed, 155 insertions(+), 5 deletions(-)
 create mode 100644 app/Http/ViewHelpers/Company/Group/GroupViewHelper.php
 create mode 100644 resources/js/Pages/Company/Group/Index.vue

diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index be4e48906..726cf3264 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -17,7 +17,6 @@
 use App\Http\ViewHelpers\Company\CompanyViewHelper;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
-use App\Http\ViewHelpers\Company\Project\ProjectViewHelper;
 use App\Http\ViewHelpers\Company\Group\GroupCreateViewHelper;
 
 class GroupController extends Controller
@@ -34,10 +33,10 @@ public function index(Request $request, int $companyId): Response
         $company = InstanceHelper::getLoggedCompany();
         $statistics = CompanyViewHelper::information($company);
 
-        return Inertia::render('Company/Project/Index', [
+        return Inertia::render('Company/Group/Index', [
             'statistics' => $statistics,
-            'tab' => 'projects',
-            'projects' => ProjectViewHelper::index($company),
+            'tab' => 'groups',
+            'groups' => GroupViewHelper::index($company),
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
         ]);
     }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupViewHelper.php
new file mode 100644
index 000000000..8b482f7b9
--- /dev/null
+++ b/app/Http/ViewHelpers/Company/Group/GroupViewHelper.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace App\Http\ViewHelpers\Company\Group;
+
+use Carbon\Carbon;
+use App\Helpers\DateHelper;
+use App\Helpers\ImageHelper;
+use App\Models\Company\Group;
+use App\Models\Company\Company;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+
+class GroupShowViewHelper
+{
+    /**
+     * Get all the information about a group.
+     *
+     * @param Group $group
+     * @param Company $company
+     * @return array
+     */
+    public static function information(Group $group, Company $company): array
+    {
+        $groupMembers = $group->employees()
+            ->notLocked()
+            ->orderBy('last_name', 'asc')
+            ->get();
+
+        $membersCollection = collect([]);
+        foreach ($groupMembers as $employee) {
+            $membersCollection->push([
+                'id' => $employee->id,
+                'name' => $employee->name,
+                'avatar' => ImageHelper::getAvatar($employee, 32),
+                'position' => (! $employee->position) ? null : [
+                    'id' => $employee->position->id,
+                    'title' => $employee->position->title,
+                ],
+                'url' => route('employees.show', [
+                    'company' => $company,
+                    'employee' => $employee,
+                ]),
+            ]);
+        }
+
+        return [
+            'id' => $group->id,
+            'name' => $group->name,
+            'mission' => $group->mission,
+            'members' => $membersCollection,
+            'url_edit' => route('groups.edit', [
+                'company' => $company,
+                'group' => $group,
+            ]),
+            'url_delete' => route('groups.delete', [
+                'company' => $company,
+                'group' => $group,
+            ]),
+        ];
+    }
+
+    /**
+     * Get the latest 3 meetings in the group.
+     *
+     * @param Group $group
+     * @return Collection
+     */
+    public static function meetings(Group $group): Collection
+    {
+        $meetings = $group->meetings()
+            ->orderBy('happened_at', 'desc')
+            ->with('employees')
+            ->take(3)
+            ->get();
+
+        $meetingsCollection = collect([]);
+        foreach ($meetings as $meeting) {
+            $members = $meeting->employees()
+                ->inRandomOrder()
+                ->take(3)
+                ->get();
+
+            $totalMembersCount = $meeting->employees()->count();
+            $totalMembersCount = $totalMembersCount - $members->count();
+
+            $membersCollection = collect([]);
+            foreach ($members as $member) {
+                $membersCollection->push([
+                    'id' => $member->id,
+                    'avatar' => ImageHelper::getAvatar($member, 25),
+                    'url' => route('employees.show', [
+                        'company' => $group->company_id,
+                        'employee' => $member,
+                    ]),
+                ]);
+            }
+
+            $meetingsCollection->push([
+                'id' => $meeting->id,
+                'happened_at' => trans('group.meeting_index_item_title', ['date' => DateHelper::formatDate($meeting->happened_at)]),
+                'url' => route('groups.meetings.show', [
+                    'company' => $group->company_id,
+                    'group' => $group,
+                    'meeting' => $meeting,
+                ]),
+                'preview_members' => $membersCollection,
+                'remaining_members_count' => $totalMembersCount,
+            ]);
+        }
+
+        return $meetingsCollection;
+    }
+
+    /**
+     * Get the statistics of the group.
+     *
+     * @param Group $group
+     * @return array
+     */
+    public static function stats(Group $group): array
+    {
+        $numberOfMeetings = $group->meetings()->count();
+
+        $allDatesOfMeetings = DB::table('meetings')
+            ->where('group_id', $group->id)
+            ->orderBy('happened_at', 'asc')
+            ->select('happened_at')
+            ->get()
+            ->pluck('happened_at')
+            ->toArray();
+
+        $datesCollection = collect();
+        for ($i = 0; $i < count($allDatesOfMeetings) - 1; $i++) {
+            $date = Carbon::createFromFormat('Y-m-d H:i:s', $allDatesOfMeetings[$i]);
+            $nextDate = Carbon::createFromFormat('Y-m-d H:i:s', $allDatesOfMeetings[$i + 1]);
+
+            $numberOfDays = $date->diffInDays($nextDate);
+            $datesCollection->push($numberOfDays);
+        }
+
+        $frequency = null;
+        if (count($allDatesOfMeetings) >= 2) {
+            $frequency = $datesCollection->avg();
+        }
+
+        return [
+            'number_of_meetings' => $numberOfMeetings,
+            'frequency' => $frequency,
+        ];
+    }
+}
diff --git a/resources/js/Pages/Company/Group/Index.vue b/resources/js/Pages/Company/Group/Index.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/resources/js/Pages/Company/Partials/Tab.vue b/resources/js/Pages/Company/Partials/Tab.vue
index e66b53eea..52bdd2ee5 100644
--- a/resources/js/Pages/Company/Partials/Tab.vue
+++ b/resources/js/Pages/Company/Partials/Tab.vue
@@ -7,7 +7,7 @@
       <inertia-link :href="'/' + $page.props.auth.company.id + '/company/projects'" class="f6 fl ph3 pv2 dib pointer" :class="{'selected':(tab == 'projects')}">
         {{ $t('company.menu_projects') }}
       </inertia-link>
-      <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups'" class="f6 fl ph3 pv2 dib pointer" :class="{'selected':(tab == 'projects')}">
+      <inertia-link :href="'/' + $page.props.auth.company.id + '/company/groups'" class="f6 fl ph3 pv2 dib pointer" :class="{'selected':(tab == 'groups')}">
         {{ $t('company.menu_groups') }}
       </inertia-link>
       <inertia-link :href="'/' + $page.props.auth.company.id + '/company/hr'" class="f6 fl ph3 pv2 dib pointer" :class="{'selected':(tab == 'hr')}">

From 5cd68db8859275c7e4b065a6b9bba5031631a0d1 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Tue, 4 May 2021 17:42:40 -0400
Subject: [PATCH 44/47] wip

---
 .../Commands/Tests/SetupDummyAccount.php      |   3 +-
 .../Company/Company/Group/GroupController.php |   1 +
 .../Company/Group/GroupShowViewHelper.php     |   2 +-
 .../Company/Group/GroupViewHelper.php         |  67 +++++----
 resources/js/Pages/Company/Group/Index.vue    | 138 ++++++++++++++++++
 routes/web.php                                |   2 +-
 .../Company/Group/GroupViewHelperTest.php     |  70 +++++++++
 7 files changed, 251 insertions(+), 32 deletions(-)
 create mode 100644 tests/Unit/ViewHelpers/Company/Group/GroupViewHelperTest.php

diff --git a/app/Console/Commands/Tests/SetupDummyAccount.php b/app/Console/Commands/Tests/SetupDummyAccount.php
index 396c5ef97..6e9046b32 100644
--- a/app/Console/Commands/Tests/SetupDummyAccount.php
+++ b/app/Console/Commands/Tests/SetupDummyAccount.php
@@ -2121,6 +2121,7 @@ private function addGroups(): void
                         'presented_by_id' => $this->employees->shuffle()->first()->id,
                     ]);
 
+                    $decisionItems = $decisionItems->random()->take(rand(1, $decisionItems->count()));
                     foreach ($decisionItems as $item) {
                         (new CreateMeetingDecision)->execute([
                             'company_id' => $this->company->id,
@@ -2133,7 +2134,7 @@ private function addGroups(): void
                     }
                 }
             }
-          }
+        }
     }
 
     private function addPreviousPositionsHistory(): void
diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index 726cf3264..45dabee16 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -15,6 +15,7 @@
 use App\Services\Company\Group\UpdateGroup;
 use App\Services\Company\Group\DestroyGroup;
 use App\Http\ViewHelpers\Company\CompanyViewHelper;
+use App\Http\ViewHelpers\Company\Group\GroupViewHelper;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Http\ViewHelpers\Company\Group\GroupShowViewHelper;
 use App\Http\ViewHelpers\Company\Group\GroupCreateViewHelper;
diff --git a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
index 8b482f7b9..18c5f53a4 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
@@ -145,7 +145,7 @@ public static function stats(Group $group): array
 
         return [
             'number_of_meetings' => $numberOfMeetings,
-            'frequency' => $frequency,
+            'frequency' => round($frequency),
         ];
     }
 }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupViewHelper.php
index 8b482f7b9..2213b9998 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupViewHelper.php
@@ -10,51 +10,60 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
-class GroupShowViewHelper
+class GroupViewHelper
 {
     /**
-     * Get all the information about a group.
+     * Get all the information about the groups in the company.
      *
      * @param Group $group
      * @param Company $company
      * @return array
      */
-    public static function information(Group $group, Company $company): array
+    public static function index(Company $company): array
     {
-        $groupMembers = $group->employees()
-            ->notLocked()
-            ->orderBy('last_name', 'asc')
-            ->get();
+        $groups = $company->groups()
+            ->with('employees')
+            ->orderBy('id', 'desc')->get();
 
-        $membersCollection = collect([]);
-        foreach ($groupMembers as $employee) {
-            $membersCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-                'avatar' => ImageHelper::getAvatar($employee, 32),
-                'position' => (! $employee->position) ? null : [
-                    'id' => $employee->position->id,
-                    'title' => $employee->position->title,
-                ],
-                'url' => route('employees.show', [
+        $groupsCollection = collect([]);
+        foreach ($groups as $group) {
+            $members = $group->employees()
+                ->inRandomOrder()
+                ->take(3)
+                ->get();
+
+            $totalMembersCount = $group->employees()->count();
+            $totalMembersCount = $totalMembersCount - $members->count();
+
+            $membersCollection = collect([]);
+            foreach ($members as $member) {
+                $membersCollection->push([
+                    'id' => $member->id,
+                    'avatar' => ImageHelper::getAvatar($member, 25),
+                    'url' => route('employees.show', [
+                        'company' => $group->company_id,
+                        'employee' => $member,
+                    ]),
+                ]);
+            }
+
+            $groupsCollection->push([
+                'id' => $group->id,
+                'name' => $group->name,
+                'mission' => $group->mission,
+                'preview_members' => $membersCollection,
+                'remaining_members_count' => $totalMembersCount,
+                'url' => route('groups.show', [
                     'company' => $company,
-                    'employee' => $employee,
+                    'group' => $group,
                 ]),
             ]);
         }
 
         return [
-            'id' => $group->id,
-            'name' => $group->name,
-            'mission' => $group->mission,
-            'members' => $membersCollection,
-            'url_edit' => route('groups.edit', [
-                'company' => $company,
-                'group' => $group,
-            ]),
-            'url_delete' => route('groups.delete', [
+            'data' => $groupsCollection,
+            'url_create' => route('groups.new', [
                 'company' => $company,
-                'group' => $group,
             ]),
         ];
     }
diff --git a/resources/js/Pages/Company/Group/Index.vue b/resources/js/Pages/Company/Group/Index.vue
index e69de29bb..a6b42a018 100644
--- a/resources/js/Pages/Company/Group/Index.vue
+++ b/resources/js/Pages/Company/Group/Index.vue
@@ -0,0 +1,138 @@
+<style lang="scss" scoped>
+.small-avatar {
+  margin-left: -8px;
+  box-shadow: 0 0 0 2px #fff;
+}
+</style>
+
+<template>
+  <layout :notifications="notifications">
+    <!-- company cover -->
+    <div class="cover mb3" :style="'height: 25vh; background: url(https://images.unsplash.com/photo-1531973576160-7125cd663d86?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1500&q=80) no-repeat center center'"></div>
+
+    <!-- company name + data -->
+    <div class="ph2 ph5-ns mb2">
+      <div class="flex relative">
+        <div v-if="statistics.logo" class="company-logo relative ba bb-gray pa2 br3 bg-white mr3-ns">
+          <img :src="statistics.logo" alt="logo" />
+        </div>
+        <div class="mt3">
+          <h2 class="mt0 fw4 f3 mb4 company-name">
+            {{ $page.props.auth.company.name }} <a href="https://dundermifflin.com" class="ml3 f6 fw4 no-underline gray bb-0">https://dundermifflin.com</a>
+          </h2>
+          <div class="flex">
+            <div class="">
+              <p class="ttu f7 gray mb1 mt0 mr5">number of employees</p>
+              <p class="mt0">{{ statistics.number_of_employees }}</p>
+            </div>
+            <div class="">
+              <p class="ttu f7 gray mb1 mt0 mr5">number of teams</p>
+              <p class="mt0">{{ statistics.number_of_teams }}</p>
+            </div>
+            <div class="">
+              <p class="ttu f7 gray mb1 mt0 mr5">founded</p>
+              <p class="mt0">1987</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="ph2 ph5-ns">
+      <!-- central content -->
+      <tab :tab="tab" />
+
+      <!-- BODY -->
+      <div class="mw8 center br3 mb5 relative z-1">
+        <div v-if="groups.data.length > 0">
+          <div class="mt4 mt5-l center section-btn relative mb5">
+            <p>
+              <span class="pr2">
+                {{ $t('project.index_title') }}
+              </span>
+              <inertia-link :href="'/' + $page.props.auth.company.id + '/company/projects/create'" class="btn absolute db-l dn">
+                {{ $t('project.index_cta') }}
+              </inertia-link>
+            </p>
+          </div>
+
+          <!-- list of groups -->
+          <ul class="mt2 list pl0">
+            <li v-for="group in groups.data" :key="group.id" class="w-100 bg-white box pa3 mb3 mr3 flex justify-between items-center">
+              <div>
+                <h2 class="fw4 f4 mt0 mb2 lh-copy relative">
+                  <inertia-link :href="group.url">{{ group.name }}</inertia-link>
+                </h2>
+                <p class="mv0 lh-copy f6">{{ group.mission }}</p>
+              </div>
+
+              <!-- members -->
+              <span v-if="group.preview_members" class="ma0 mb0 f7 grey">
+                <div class="flex items-center relative tr">
+                  <avatar v-for="member in group.preview_members" :key="member.id" :avatar="member.avatar" :url="member.url" :size="25"
+                          :class="'br-100 small-avatar'"
+                  />
+                  <div v-if="group.remaining_members_count > 0" class="pl2 f7 more-members relative gray">
+                    + {{ group.remaining_members_count }}
+                  </div>
+                </div>
+              </span>
+            </li>
+          </ul>
+        </div>
+
+        <!-- blank state -->
+        <div v-else class="tc">
+          <img loading="lazy" src="/img/streamline-icon-projector-pie-chart@140x140.png" alt="project symbol" height="140"
+               width="140"
+          />
+          <p class="mb3">
+            <span class="db mb4">{{ $t('project.index_blank_title') }}</span>
+            <inertia-link :href="groups.url_create" class="btn dib">{{ $t('project.index_cta') }}</inertia-link>
+          </p>
+        </div>
+      </div>
+    </div>
+  </layout>
+</template>
+
+<script>
+import Layout from '@/Shared/Layout';
+import Avatar from '@/Shared/Avatar';
+import Tab from '@/Pages/Company/Partials/Tab';
+
+export default {
+  components: {
+    Layout,
+    Avatar,
+    Tab,
+  },
+
+  props: {
+    tab: {
+      type: String,
+      default: null,
+    },
+    statistics: {
+      type: Object,
+      default: null,
+    },
+    groups: {
+      type: Object,
+      default: null,
+    },
+    notifications: {
+      type: Array,
+      default: null,
+    },
+  },
+
+  mounted() {
+    if (localStorage.success) {
+      this.flash(localStorage.success, 'success');
+      localStorage.removeItem('success');
+    }
+  },
+};
+
+</script>
diff --git a/routes/web.php b/routes/web.php
index 2d02d28c8..1c0b9f82c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -325,7 +325,7 @@
 
             Route::prefix('groups')->group(function () {
                 Route::get('', 'Company\\Company\\Group\\GroupController@index');
-                Route::get('create', 'Company\\Company\\Group\\GroupController@create');
+                Route::get('create', 'Company\\Company\\Group\\GroupController@create')->name('groups.new');
                 Route::post('', 'Company\\Company\\Group\\GroupController@store');
                 Route::post('search', 'Company\\Company\\Group\\GroupController@search');
 
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupViewHelperTest.php
new file mode 100644
index 000000000..bca194f90
--- /dev/null
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupViewHelperTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Unit\ViewHelpers\Company\Group;
+
+use Carbon\Carbon;
+use Tests\TestCase;
+use App\Helpers\ImageHelper;
+use App\Models\Company\Group;
+use App\Http\ViewHelpers\Company\Group\GroupViewHelper;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class GroupViewHelperTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_gets_a_list_of_groups(): void
+    {
+        Carbon::setTestNow(Carbon::create(2019, 1, 1, 7, 0, 0));
+
+        $michael = $this->createAdministrator();
+        $group = Group::factory()->create([
+            'company_id' => $michael->company_id,
+        ]);
+        $group->employees()->attach([$michael->id]);
+
+        $array = GroupViewHelper::index($michael->company);
+
+        $this->assertEquals(
+            env('APP_URL') . '/' . $michael->company_id . '/company/groups/create',
+            $array['url_create']
+        );
+
+        $this->assertEquals(
+            $group->id,
+            $array['data']->toArray()[0]['id']
+        );
+
+        $this->assertEquals(
+            $group->name,
+            $array['data']->toArray()[0]['name']
+        );
+
+        $this->assertEquals(
+            $group->mission,
+            $array['data']->toArray()[0]['mission']
+        );
+
+        $this->assertEquals(
+            env('APP_URL').'/'.$michael->company_id.'/company/groups/'.$group->id,
+            $array['data']->toArray()[0]['url']
+        );
+
+        $this->assertEquals(
+            0,
+            $array['data']->toArray()[0]['remaining_members_count']
+        );
+
+        $this->assertEquals(
+            [
+                0 => [
+                    'id' => $michael->id,
+                    'avatar' => ImageHelper::getAvatar($michael, 25),
+                    'url' => env('APP_URL').'/'.$michael->company_id.'/employees/'.$michael->id,
+                ],
+            ],
+            $array['data']->toArray()[0]['preview_members']->toArray()
+        );
+    }
+}

From a9fc08955b46b67f902876d8797d11e6b6e75f2b Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Wed, 5 May 2021 19:56:59 -0400
Subject: [PATCH 45/47] wip

---
 .../Commands/Tests/SetupDummyAccount.php      |  10 +-
 app/Helpers/LogHelper.php                     |   2 -
 .../Company/Company/Group/GroupController.php |   2 +-
 .../Company/Group/GroupShowViewHelper.php     |  19 ++-
 resources/js/Pages/Company/Group/Index.vue    |  14 +-
 .../Company/Group/Partials/GroupMenu.vue      |   9 +-
 .../Pages/Company/Group/Partials/Mission.vue  | 147 ------------------
 resources/js/Pages/Company/Group/Show.vue     |   2 +-
 resources/js/Pages/Company/Project/Index.vue  |   6 +-
 resources/lang/en/group.php                   |   6 +
 10 files changed, 48 insertions(+), 169 deletions(-)
 delete mode 100644 resources/js/Pages/Company/Group/Partials/Mission.vue

diff --git a/app/Console/Commands/Tests/SetupDummyAccount.php b/app/Console/Commands/Tests/SetupDummyAccount.php
index 6e9046b32..3e252929a 100644
--- a/app/Console/Commands/Tests/SetupDummyAccount.php
+++ b/app/Console/Commands/Tests/SetupDummyAccount.php
@@ -15,6 +15,7 @@
 use App\Models\Company\Employee;
 use App\Models\Company\Position;
 use App\Models\Company\Question;
+use Illuminate\Support\Facades\DB;
 use App\Models\Company\ECoffeeMatch;
 use App\Services\User\CreateAccount;
 use App\Models\Company\ProjectStatus;
@@ -217,6 +218,7 @@ public function handle(): void
         $this->addGroups();
         $this->addPreviousPositionsHistory();
         $this->addSecondaryBlankAccount();
+        $this->validateUserAccounts();
         $this->stop();
     }
 
@@ -2121,7 +2123,7 @@ private function addGroups(): void
                         'presented_by_id' => $this->employees->shuffle()->first()->id,
                     ]);
 
-                    $decisionItems = $decisionItems->random()->take(rand(1, $decisionItems->count()));
+                    $decisionItems = $decisionItems->shuffle()->take(rand(1, 3));
                     foreach ($decisionItems as $item) {
                         (new CreateMeetingDecision)->execute([
                             'company_id' => $this->company->id,
@@ -2182,6 +2184,12 @@ private function addSecondaryBlankAccount(): void
         ]);
     }
 
+    private function validateUserAccounts(): void
+    {
+        DB::table('users')
+            ->update(['email_verified_at' => Carbon::now()]);
+    }
+
     private function artisan(string $message, string $command, array $arguments = []): void
     {
         $this->info($message);
diff --git a/app/Helpers/LogHelper.php b/app/Helpers/LogHelper.php
index 3605696ad..e076caed9 100644
--- a/app/Helpers/LogHelper.php
+++ b/app/Helpers/LogHelper.php
@@ -1183,8 +1183,6 @@ public static function processAuditLog(AuditLog $log): string
                 $sentence = trans('account.log_meeting_decision_created', [
                     'group_id' => $log->object->{'group_id'},
                     'group_name' => $log->object->{'group_name'},
-                    'employee_id' => $log->object->{'employee_id'},
-                    'employee_name' => $log->object->{'employee_name'},
                     'meeting_id' => $log->object->{'meeting_id'},
                 ]);
                 break;
diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index 45dabee16..1fa29505f 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -204,7 +204,7 @@ public function edit(Request $request, int $companyId, int $groupId)
         }
 
         return Inertia::render('Company/Group/Edit', [
-            'group' => GroupShowViewHelper::information($group, $company),
+            'group' => GroupShowViewHelper::edit($group),
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
         ]);
     }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
index 18c5f53a4..d1730ca1a 100644
--- a/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
+++ b/app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
@@ -5,6 +5,7 @@
 use Carbon\Carbon;
 use App\Helpers\DateHelper;
 use App\Helpers\ImageHelper;
+use App\Helpers\StringHelper;
 use App\Models\Company\Group;
 use App\Models\Company\Company;
 use Illuminate\Support\Collection;
@@ -46,7 +47,7 @@ public static function information(Group $group, Company $company): array
         return [
             'id' => $group->id,
             'name' => $group->name,
-            'mission' => $group->mission,
+            'mission' => StringHelper::parse($group->mission),
             'members' => $membersCollection,
             'url_edit' => route('groups.edit', [
                 'company' => $company,
@@ -148,4 +149,20 @@ public static function stats(Group $group): array
             'frequency' => round($frequency),
         ];
     }
+
+    /**
+     * Get the information about the group, required for editing it.
+     *
+     * @param Group $group
+     * @param Company $company
+     * @return array
+     */
+    public static function edit(Group $group): array
+    {
+        return [
+            'id' => $group->id,
+            'name' => $group->name,
+            'mission' => $group->mission,
+        ];
+    }
 }
diff --git a/resources/js/Pages/Company/Group/Index.vue b/resources/js/Pages/Company/Group/Index.vue
index a6b42a018..3b01aadb1 100644
--- a/resources/js/Pages/Company/Group/Index.vue
+++ b/resources/js/Pages/Company/Group/Index.vue
@@ -29,9 +29,9 @@
               <p class="ttu f7 gray mb1 mt0 mr5">number of teams</p>
               <p class="mt0">{{ statistics.number_of_teams }}</p>
             </div>
-            <div class="">
-              <p class="ttu f7 gray mb1 mt0 mr5">founded</p>
-              <p class="mt0">1987</p>
+            <div v-if="statistics.founded_at" class="">
+              <p class="ttu f7 gray mb1 mt0 mr5">{{ $t('company.stat_founded_at') }}</p>
+              <p class="mt0">{{ statistics.founded_at }}</p>
             </div>
           </div>
         </div>
@@ -48,10 +48,10 @@
           <div class="mt4 mt5-l center section-btn relative mb5">
             <p>
               <span class="pr2">
-                {{ $t('project.index_title') }}
+                {{ $t('group.index_title') }}
               </span>
-              <inertia-link :href="'/' + $page.props.auth.company.id + '/company/projects/create'" class="btn absolute db-l dn">
-                {{ $t('project.index_cta') }}
+              <inertia-link :href="groups.url_create" class="btn absolute db-l dn">
+                {{ $t('group.index_cta') }}
               </inertia-link>
             </p>
           </div>
@@ -63,7 +63,7 @@
                 <h2 class="fw4 f4 mt0 mb2 lh-copy relative">
                   <inertia-link :href="group.url">{{ group.name }}</inertia-link>
                 </h2>
-                <p class="mv0 lh-copy f6">{{ group.mission }}</p>
+                <p class="mv0 lh-copy f6 parsed-content">{{ group.mission }}</p>
               </div>
 
               <!-- members -->
diff --git a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
index 3bbd6caae..2be2b6048 100644
--- a/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
+++ b/resources/js/Pages/Company/Group/Partials/GroupMenu.vue
@@ -35,16 +35,13 @@
     <div class="center br3 mb5 tc">
       <div class="cf dib btn-group">
         <inertia-link :class="{'selected':(tab == 'info')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + ''" class="f6 fl ph3 pv2 dib pointer no-underline">
-          Summary
+          {{ $t('group.index_menu_summary') }}
         </inertia-link>
         <inertia-link :class="{'selected':(tab == 'meetings')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + '/meetings'" class="f6 fl ph3 pv2 dib pointer">
-          Meetings
+          {{ $t('group.index_menu_meetings') }}
         </inertia-link>
         <inertia-link :class="{'selected':(tab == 'members')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + '/members'" class="f6 fl ph3 pv2 dib pointer">
-          Members
-        </inertia-link>
-        <inertia-link :class="{'selected':(tab == 'members')}" :href="'/' + $page.props.auth.company.id + '/company/groups/' + group.id + '/members'" class="f6 fl ph3 pv2 dib pointer">
-          {{ $t('project.menu_files') }}
+          {{ $t('group.index_menu_members') }}
         </inertia-link>
       </div>
     </div>
diff --git a/resources/js/Pages/Company/Group/Partials/Mission.vue b/resources/js/Pages/Company/Group/Partials/Mission.vue
deleted file mode 100644
index de0f70752..000000000
--- a/resources/js/Pages/Company/Group/Partials/Mission.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
-  <div class="mb5">
-    <div class="mb2 fw5 relative">
-      <span class="mr1">
-        🏔
-      </span> {{ $t('project.summary_description') }}
-
-      <img src="/img/edit_button.svg" class="box-plus-button absolute br-100 pa2 bg-white pointer" data-cy="add-description-button"
-           width="22"
-           height="22" alt="add a description"
-           loading="lazy"
-           @click.prevent="displayEditBox()"
-      />
-    </div>
-
-    <div class="bg-white box pa3">
-      <div v-if="! showEdit">
-        <div v-if="localProject.parsed_description" class="parsed-content" v-html="localProject.parsed_description"></div>
-        <div v-else class="mb0 mt0 lh-copy f6 tc">
-          {{ $t('project.summary_description_blank') }}
-        </div>
-      </div>
-
-      <!-- edit description -->
-      <div v-if="showEdit" class="">
-        <form @submit.prevent="submit">
-          <template v-if="form.errors.length > 0">
-            <div class="cf pb1 w-100 mb2">
-              <errors :errors="form.errors" />
-            </div>
-          </template>
-
-          <text-area :ref="'editModal'"
-                     v-model="form.description"
-                     :label="$t('project.summary_description_title')"
-                     :datacy="'description-textarea'"
-                     :required="true"
-                     :rows="10"
-                     :help="$t('project.summary_description_title_help')"
-                     @esc-key-pressed="showEdit = false"
-          />
-
-          <!-- Actions -->
-          <div class="mt4">
-            <div class="flex-ns justify-between">
-              <div>
-                <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3" data-cy="clear-description" @click="clear()">
-                  ❌ {{ $t('employee.description_clear') }}
-                </a>
-              </div>
-              <div class="">
-                <a class="btn dib tc w-auto-ns w-100 mb2 pv2 ph3 mr2" data-cy="cancel-add-description" @click="showEdit = false">
-                  {{ $t('app.cancel') }}
-                </a>
-                <loading-button :class="'btn add w-auto-ns w-100 mb2 pv2 ph3'" :state="loadingState" :text="$t('app.publish')" :cypress-selector="'submit-add-description'" />
-              </div>
-            </div>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import TextArea from '@/Shared/TextArea';
-import LoadingButton from '@/Shared/LoadingButton';
-import Errors from '@/Shared/Errors';
-
-export default {
-  components: {
-    TextArea,
-    Errors,
-    LoadingButton,
-  },
-
-  props: {
-    project: {
-      type: Object,
-      default: null,
-    },
-  },
-
-  data() {
-    return {
-      showEdit: false,
-      form: {
-        description: null,
-        errors: [],
-      },
-      loadingState: '',
-      errorTemplate: Error,
-      localProject: null,
-    };
-  },
-
-  created() {
-    this.localProject = this.project;
-  },
-
-  methods: {
-    displayEditBox() {
-      this.showEdit = true;
-      this.form.description = this.localProject.raw_description;
-
-      this.$nextTick(() => {
-        this.$refs.editModal.focus();
-      });
-    },
-
-    submit() {
-      this.loadingState = 'loading';
-
-      axios.post(`/${this.$page.props.auth.company.id}/company/projects/${this.localProject.id}/description`, this.form)
-        .then(response => {
-          this.flash(this.$t('project.summary_description_success'), 'success');
-          this.localProject.raw_description = response.data.data.raw_description;
-          this.localProject.parsed_description = response.data.data.parsed_description;
-          this.loadingState = null;
-          this.showEdit = false;
-        })
-        .catch(error => {
-          this.loadingState = null;
-          this.form.errors = error.response.data;
-        });
-    },
-
-    clear() {
-      this.loadingState = 'loading';
-      this.form.description = null;
-
-      axios.post(`/${this.$page.props.auth.company.id}/company/projects/${this.localProject.id}/description`, this.form)
-        .then(response => {
-          this.localProject.raw_description = null;
-          this.localProject.parsed_description = null;
-          this.loadingState = null;
-          this.showEdit = false;
-        })
-        .catch(error => {
-          this.loadingState = null;
-          this.form.errors = error.response.data;
-        });
-    },
-  }
-};
-
-</script>
diff --git a/resources/js/Pages/Company/Group/Show.vue b/resources/js/Pages/Company/Group/Show.vue
index 577db5e0a..ce56004bc 100644
--- a/resources/js/Pages/Company/Group/Show.vue
+++ b/resources/js/Pages/Company/Group/Show.vue
@@ -50,7 +50,7 @@
                 🏔
               </span> {{ $t('group.summary_description') }}
             </div>
-            <div v-if="group.mission" class="bg-white box pa3" v-html="group.mission"></div>
+            <div v-if="group.mission" class="bg-white box pa3 parsed-content" v-html="group.mission"></div>
             <div v-if="!group.mission" class="bg-white box pa3">
               {{ $t('group.summary_mission_blank') }}
             </div>
diff --git a/resources/js/Pages/Company/Project/Index.vue b/resources/js/Pages/Company/Project/Index.vue
index 5af23f0ac..f7c89e7e6 100644
--- a/resources/js/Pages/Company/Project/Index.vue
+++ b/resources/js/Pages/Company/Project/Index.vue
@@ -64,9 +64,9 @@
               <p class="ttu f7 gray mb1 mt0 mr5">number of teams</p>
               <p class="mt0">{{ statistics.number_of_teams }}</p>
             </div>
-            <div class="">
-              <p class="ttu f7 gray mb1 mt0 mr5">founded</p>
-              <p class="mt0">1987</p>
+            <div v-if="statistics.founded_at" class="">
+              <p class="ttu f7 gray mb1 mt0 mr5">{{ $t('company.stat_founded_at') }}</p>
+              <p class="mt0">{{ statistics.founded_at }}</p>
             </div>
           </div>
         </div>
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index fe3961c95..d3f72cd03 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -7,6 +7,12 @@
     'create_members' => 'Who should be part of this group?',
     'create_members_help' => 'Type the first letters of the employee',
 
+    'index_title' => 'All the groups in the company',
+    'index_cta' => 'Create a group',
+    'index_menu_summary' => 'Summary',
+    'index_menu_meetings' => 'Meetings',
+    'index_menu_members' => 'Members',
+
     'summary_description' => 'Mission of this group',
     'summary_meetings' => 'Recent meetings',
     'summary_edit' => 'Edit name and mission',

From 1f2b9123c0ba29094a6bcdd230ebf67d2b7db17f Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Wed, 5 May 2021 20:05:08 -0400
Subject: [PATCH 46/47] wip

---
 app/Http/Controllers/Company/Company/Group/GroupController.php  | 2 +-
 phpstan.neon                                                    | 2 ++
 .../Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Company/Company/Group/GroupController.php b/app/Http/Controllers/Company/Company/Group/GroupController.php
index 1fa29505f..65b7b0dc6 100644
--- a/app/Http/Controllers/Company/Company/Group/GroupController.php
+++ b/app/Http/Controllers/Company/Company/Group/GroupController.php
@@ -62,7 +62,7 @@ public function show(Request $request, int $companyId, int $groupId)
 
         return Inertia::render('Company/Group/Show', [
             'group' => GroupShowViewHelper::information($group, $company),
-            'meetings' => GroupShowViewHelper::meetings($group, $company),
+            'meetings' => GroupShowViewHelper::meetings($group),
             'stats' => GroupShowViewHelper::stats($group),
             'tab' => 'info',
             'notifications' => NotificationHelper::getNotifications(InstanceHelper::getLoggedEmployee()),
diff --git a/phpstan.neon b/phpstan.neon
index fed46c34a..8863582c7 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -14,6 +14,8 @@ parameters:
         - app/Http/ViewHelpers/Company/Group/GroupMembersViewHelper.php
         - app/Services/Company/Group/CreateMeeting.php
         - app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
+        - app/Http/ViewHelpers/Company/Group/GroupShowViewHelper.php
+        - app/Http/ViewHelpers/Company/Group/GroupViewHelper.php
     inferPrivatePropertyTypeFromConstructor: true
     checkMissingIterableValueType: false
     reportUnmatchedIgnoredErrors: false
diff --git a/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php b/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
index cd0973ad7..113a9b264 100644
--- a/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
+++ b/tests/Unit/ViewHelpers/Company/Group/GroupShowViewHelperTest.php
@@ -44,7 +44,7 @@ public function it_gets_information_about_the_group(): void
         );
 
         $this->assertEquals(
-            $group->mission,
+            '<p>Employees happiness</p>',
             $array['mission']
         );
 

From c0bedb927ed3dfebc01ff0fd782b594dee84df50 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Wed, 5 May 2021 20:22:29 -0400
Subject: [PATCH 47/47] wip

---
 resources/js/Pages/Company/Group/Index.vue | 4 ++--
 resources/lang/en/group.php                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/Company/Group/Index.vue b/resources/js/Pages/Company/Group/Index.vue
index 3b01aadb1..410fba5f8 100644
--- a/resources/js/Pages/Company/Group/Index.vue
+++ b/resources/js/Pages/Company/Group/Index.vue
@@ -87,8 +87,8 @@
                width="140"
           />
           <p class="mb3">
-            <span class="db mb4">{{ $t('project.index_blank_title') }}</span>
-            <inertia-link :href="groups.url_create" class="btn dib">{{ $t('project.index_cta') }}</inertia-link>
+            <span class="db mb4">{{ $t('group.index_blank_title') }}</span>
+            <inertia-link :href="groups.url_create" class="btn dib">{{ $t('group.index_cta') }}</inertia-link>
           </p>
         </div>
       </div>
diff --git a/resources/lang/en/group.php b/resources/lang/en/group.php
index d3f72cd03..fdf0cc6f2 100644
--- a/resources/lang/en/group.php
+++ b/resources/lang/en/group.php
@@ -9,6 +9,7 @@
 
     'index_title' => 'All the groups in the company',
     'index_cta' => 'Create a group',
+    'index_blank_title' => 'Start a group, record meeting notes, and enjoy!',
     'index_menu_summary' => 'Summary',
     'index_menu_meetings' => 'Meetings',
     'index_menu_members' => 'Members',