|
@@ -11,6 +11,8 @@ use App\Http\Resources\API\TaskResource;
|
|
|
use App\Models\CustomField;
|
|
|
use App\Models\NamingRule;
|
|
|
use App\Models\Project;
|
|
|
+use App\Models\Requirement;
|
|
|
+use App\Models\RequirementGroup;
|
|
|
use App\Models\Task;
|
|
|
use App\Repositories\CustomFieldRepository;
|
|
|
use Illuminate\Http\Request;
|
|
@@ -37,11 +39,23 @@ class TaskController extends Controller
|
|
|
*/
|
|
|
public function store(CreateOrUpdateRequest $request, CustomFieldRepository $customFieldRepo)
|
|
|
{
|
|
|
+ $asset_id=null;
|
|
|
+ $requirement_group_id=null;
|
|
|
+
|
|
|
+ if ($request->has('requirement_id')){
|
|
|
+ $requirementId=$request->get('requirement_id');
|
|
|
+ $requirement=Requirement::query()->findOrFail($requirementId);
|
|
|
+ $asset_id=$requirement->asset_id;
|
|
|
+ $requirement_group_id=$requirement->requirement_group_id;
|
|
|
+ }
|
|
|
+
|
|
|
$formData = [
|
|
|
...$request->all(),
|
|
|
'company_id' => Auth::user()->company_id,
|
|
|
'created_by' => Auth::id(),
|
|
|
'whitelist' => $request->whitelist ? sprintf(",%s", implode(',', $request->whitelist)) : null,
|
|
|
+ 'asset_id' => $asset_id,
|
|
|
+ 'requirement_group_id'=>$requirement_group_id,
|
|
|
];
|
|
|
|
|
|
if ($request->has("naming_rule_id") && $request->get("naming_rule_id") > 0) {
|
|
@@ -70,9 +84,17 @@ class TaskController extends Controller
|
|
|
public function update(CreateOrUpdateRequest $request, string $id, CustomFieldRepository $customFieldRepo)
|
|
|
{
|
|
|
$task = Task::query()->findOrFail($id);
|
|
|
+ $asset_id=null;
|
|
|
+
|
|
|
+ if ($requirementId=$request->get('requirement_id')!=$task->requirement_id){
|
|
|
+ $requirementId=$request->get('requirement_id');
|
|
|
+ $requirement=Requirement::query()->findOrFail($requirementId);
|
|
|
+ $asset_id=$requirement->asset_id;
|
|
|
+ }
|
|
|
|
|
|
$formData = [...$request->all(),
|
|
|
'whitelist' => $request->whitelist ? sprintf(",%s", implode(',', $request->whitelist)) : null,
|
|
|
+ '$asset_id' => $asset_id,
|
|
|
];
|
|
|
|
|
|
if ($request->has("naming_rule_id") && $request->get("naming_rule_id") > 0) {
|