Limit-Status im Upload-Flow anzeigen (Warnbanner + Sperrzustände).
Upload-Fehlercodes auswerten und freundliche Dialoge zeigen.
This commit is contained in:
@@ -6,20 +6,19 @@ use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Tenant\TaskStoreRequest;
|
||||
use App\Http\Requests\Tenant\TaskUpdateRequest;
|
||||
use App\Http\Resources\Tenant\TaskResource;
|
||||
use App\Models\Event;
|
||||
use App\Models\Task;
|
||||
use App\Models\TaskCollection;
|
||||
use App\Models\Event;
|
||||
use App\Support\ApiError;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
class TaskController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the tenant's tasks.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return AnonymousResourceCollection
|
||||
*/
|
||||
public function index(Request $request): AnonymousResourceCollection
|
||||
{
|
||||
@@ -38,7 +37,7 @@ class TaskController extends Controller
|
||||
// Search and filters
|
||||
if ($search = $request->get('search')) {
|
||||
$query->where(function ($inner) use ($search) {
|
||||
$like = '%' . $search . '%';
|
||||
$like = '%'.$search.'%';
|
||||
$inner->where('title->de', 'like', $like)
|
||||
->orWhere('title->en', 'like', $like)
|
||||
->orWhere('description->de', 'like', $like)
|
||||
@@ -47,11 +46,11 @@ class TaskController extends Controller
|
||||
}
|
||||
|
||||
if ($collectionId = $request->get('collection_id')) {
|
||||
$query->whereHas('taskCollection', fn($q) => $q->where('id', $collectionId));
|
||||
$query->whereHas('taskCollection', fn ($q) => $q->where('id', $collectionId));
|
||||
}
|
||||
|
||||
if ($eventId = $request->get('event_id')) {
|
||||
$query->whereHas('assignedEvents', fn($q) => $q->where('id', $eventId));
|
||||
$query->whereHas('assignedEvents', fn ($q) => $q->where('id', $eventId));
|
||||
}
|
||||
|
||||
$perPage = $request->get('per_page', 15);
|
||||
@@ -62,9 +61,6 @@ class TaskController extends Controller
|
||||
|
||||
/**
|
||||
* Store a newly created task in storage.
|
||||
*
|
||||
* @param TaskStoreRequest $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function store(TaskStoreRequest $request): JsonResponse
|
||||
{
|
||||
@@ -91,10 +87,6 @@ class TaskController extends Controller
|
||||
|
||||
/**
|
||||
* Display the specified task.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Task $task
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function show(Request $request, Task $task): JsonResponse
|
||||
{
|
||||
@@ -109,10 +101,6 @@ class TaskController extends Controller
|
||||
|
||||
/**
|
||||
* Update the specified task in storage.
|
||||
*
|
||||
* @param TaskUpdateRequest $request
|
||||
* @param Task $task
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function update(TaskUpdateRequest $request, Task $task): JsonResponse
|
||||
{
|
||||
@@ -142,10 +130,6 @@ class TaskController extends Controller
|
||||
|
||||
/**
|
||||
* Remove the specified task from storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Task $task
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function destroy(Request $request, Task $task): JsonResponse
|
||||
{
|
||||
@@ -162,11 +146,6 @@ class TaskController extends Controller
|
||||
|
||||
/**
|
||||
* Assign task to an event.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Task $task
|
||||
* @param Event $event
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function assignToEvent(Request $request, Task $task, Event $event): JsonResponse
|
||||
{
|
||||
@@ -187,10 +166,6 @@ class TaskController extends Controller
|
||||
|
||||
/**
|
||||
* Bulk assign tasks to an event.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Event $event
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function bulkAssignToEvent(Request $request, Event $event): JsonResponse
|
||||
{
|
||||
@@ -200,7 +175,12 @@ class TaskController extends Controller
|
||||
|
||||
$taskIds = $request->input('task_ids', []);
|
||||
if (empty($taskIds)) {
|
||||
return response()->json(['error' => 'Keine Task-IDs angegeben.'], 400);
|
||||
return ApiError::response(
|
||||
'task_ids_missing',
|
||||
'Keine Aufgaben angegeben',
|
||||
'Bitte wähle mindestens eine Aufgabe aus.',
|
||||
Response::HTTP_BAD_REQUEST
|
||||
);
|
||||
}
|
||||
|
||||
$tasks = Task::whereIn('id', $taskIds)
|
||||
@@ -209,7 +189,7 @@ class TaskController extends Controller
|
||||
|
||||
$attached = 0;
|
||||
foreach ($tasks as $task) {
|
||||
if (!$task->assignedEvents()->where('event_id', $event->id)->exists()) {
|
||||
if (! $task->assignedEvents()->where('event_id', $event->id)->exists()) {
|
||||
$task->assignedEvents()->attach($event->id);
|
||||
$attached++;
|
||||
}
|
||||
@@ -222,10 +202,6 @@ class TaskController extends Controller
|
||||
|
||||
/**
|
||||
* Get tasks for a specific event.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Event $event
|
||||
* @return AnonymousResourceCollection
|
||||
*/
|
||||
public function forEvent(Request $request, Event $event): AnonymousResourceCollection
|
||||
{
|
||||
@@ -233,7 +209,7 @@ class TaskController extends Controller
|
||||
abort(404);
|
||||
}
|
||||
|
||||
$tasks = Task::whereHas('assignedEvents', fn($q) => $q->where('event_id', $event->id))
|
||||
$tasks = Task::whereHas('assignedEvents', fn ($q) => $q->where('event_id', $event->id))
|
||||
->with(['taskCollection'])
|
||||
->orderBy('created_at', 'desc')
|
||||
->paginate($request->get('per_page', 15));
|
||||
@@ -243,10 +219,6 @@ class TaskController extends Controller
|
||||
|
||||
/**
|
||||
* Get tasks from a specific collection.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param TaskCollection $collection
|
||||
* @return AnonymousResourceCollection
|
||||
*/
|
||||
public function fromCollection(Request $request, TaskCollection $collection): AnonymousResourceCollection
|
||||
{
|
||||
@@ -321,9 +293,7 @@ class TaskController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* @param mixed $value
|
||||
* @param array<string, string>|null $fallback
|
||||
*
|
||||
* @param array<string, string>|null $fallback
|
||||
* @return array<string, string>|null
|
||||
*/
|
||||
protected function normalizeTranslations(mixed $value, ?array $fallback = null, bool $allowNull = false): ?array
|
||||
|
||||
Reference in New Issue
Block a user