mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
no message
This commit is contained in:
1 parent
611f028121
commit
5c93fb2918
3 files changed
+31
-4
No files matched your search
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
use App\Http\Resources\MasterTaskProjectCalendarResource;
|
||||||
use App\Http\Resources\MasterTaskSimpleResource;
|
use App\Http\Resources\MasterTaskSimpleResource;
|
||||||
use App\Models\Attachment;
|
use App\Models\Attachment;
|
||||||
use App\Models\MasterTask;
|
use App\Models\MasterTask;
|
||||||
@@ -77,7 +78,7 @@ class MasterTaskController extends Controller
|
|||||||
$mastertasks = $mastertasks->get();
|
$mastertasks = $mastertasks->get();
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'mastertasks' => (isset($parameters['simple'])) ? MasterTaskSimpleResource::collection($mastertasks) : MasterTaskSimpleResource::collection($mastertasks)
|
'mastertasks' => (isset($parameters['simple'])) ? MasterTaskSimpleResource::collection($mastertasks) : MasterTaskProjectCalendarResource::collection($mastertasks)
|
||||||
], 200);
|
], 200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class MasterTaskProjectCalendarResource extends JsonResource
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Transform the resource into an array.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
*
|
||||||
|
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
|
||||||
|
*/
|
||||||
|
public function toArray($request)
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'name' => $this->title,
|
||||||
|
'project_code' => ($this->project) ? $this->project->code . ' ' . $this->project->name : null,
|
||||||
|
'color' => $this->color,
|
||||||
|
'deadline' => $this->deadline,
|
||||||
|
'starts_at' => $this->created_at,
|
||||||
|
'is_finished' => $this->is_finished,
|
||||||
|
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,9 +20,6 @@ class MasterTaskSimpleResource extends JsonResource
|
|||||||
'name' => $this->title,
|
'name' => $this->title,
|
||||||
'project_code' => ($this->project) ? $this->project->code . ' ' . $this->project->name : null,
|
'project_code' => ($this->project) ? $this->project->code . ' ' . $this->project->name : null,
|
||||||
'color' => $this->color,
|
'color' => $this->color,
|
||||||
'deadline' => $this->deadline,
|
|
||||||
'starts_at' => $this->created_at,
|
|
||||||
'is_finished' => $this->is_finished,
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user