diff --git a/be/app/Http/Resources/MasterTaskResource.php b/be/app/Http/Resources/MasterTaskResource.php index bf0ced3..5b426e6 100644 --- a/be/app/Http/Resources/MasterTaskResource.php +++ b/be/app/Http/Resources/MasterTaskResource.php @@ -28,6 +28,7 @@ class MasterTaskResource extends JsonResource 'employees' => UserResource::collection($this->usersOutsideTeam), 'subtasks' => SubTaskResource::collection($this->subtasks), 'files' => AttachmentResource::collection($this->attachments), + 'color' => $this->color, ]; } } diff --git a/be/config/taskmanager.php b/be/config/taskmanager.php new file mode 100644 index 0000000..f44780c --- /dev/null +++ b/be/config/taskmanager.php @@ -0,0 +1,5 @@ + ['#E9FFE5', '#F6ECD3', '#FDE1FF', '#FFC9C9', '#DADEF8', '#EDFFFE'] + ]; diff --git a/be/database/factories/MasterTaskFactory.php b/be/database/factories/MasterTaskFactory.php index ce41620..0a53ca7 100644 --- a/be/database/factories/MasterTaskFactory.php +++ b/be/database/factories/MasterTaskFactory.php @@ -38,6 +38,7 @@ class MasterTaskFactory extends Factory 'tracked_time' => fake()->numberBetween(4,20), 'deadline' => fake()->dateTimeBetween('now', '+3 weeks'), 'is_finished' => 0, + 'color' => fake()->randomElement(['#E9FFE5', '#F6ECD3', '#FDE1FF', '#FFC9C9', '#DADEF8', '#EDFFFE']), ]; } } diff --git a/be/database/migrations/2023_01_27_090804_add_hexacolor_to_master_task_table.php b/be/database/migrations/2023_01_27_090804_add_hexacolor_to_master_task_table.php new file mode 100644 index 0000000..2999f4f --- /dev/null +++ b/be/database/migrations/2023_01_27_090804_add_hexacolor_to_master_task_table.php @@ -0,0 +1,32 @@ +string('color')->after('is_finished'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('master_task', function (Blueprint $table) { + // + }); + } +};