|
@@ -55,11 +55,12 @@ class ContainerController extends Controller
|
|
->groupBy("object_id")
|
|
->groupBy("object_id")
|
|
->pluck("cut", "object_id");
|
|
->pluck("cut", "object_id");
|
|
|
|
|
|
-
|
|
|
|
- $containers = $containers->map(function (Container $container) use ($foldsCount,$fileCount) {
|
|
|
|
|
|
+ $index=1;
|
|
|
|
+ $containers = $containers->map(function (Container $container) use ($foldsCount,$fileCount,&$index) {
|
|
$container->itemCount =$foldsCount->get($container->id, 0)+$fileCount->get($container->id, 0);
|
|
$container->itemCount =$foldsCount->get($container->id, 0)+$fileCount->get($container->id, 0);
|
|
$container->type = 'container';
|
|
$container->type = 'container';
|
|
$container->uniId = $container->type . '_' . $container->id;
|
|
$container->uniId = $container->type . '_' . $container->id;
|
|
|
|
+ $container->display_id=(string)$index++;
|
|
return $container;
|
|
return $container;
|
|
});
|
|
});
|
|
|
|
|
|
@@ -231,6 +232,7 @@ class ContainerController extends Controller
|
|
public function attachments(Request $request){
|
|
public function attachments(Request $request){
|
|
$folderObjectType = FileObjectType::from($request->object_type);
|
|
$folderObjectType = FileObjectType::from($request->object_type);
|
|
$object=$folderObjectType->modelBuilderAllowed()->findOrFail($request->object_id);
|
|
$object=$folderObjectType->modelBuilderAllowed()->findOrFail($request->object_id);
|
|
|
|
+ $pageSize = $request->get('page_size') ?? 10;
|
|
if($folderObjectType->value==='asset'){
|
|
if($folderObjectType->value==='asset'){
|
|
$object->load('requirements');
|
|
$object->load('requirements');
|
|
$requirementsId=$object->requirements->pluck('id');
|
|
$requirementsId=$object->requirements->pluck('id');
|
|
@@ -239,14 +241,15 @@ class ContainerController extends Controller
|
|
->whereIn('object_id',$requirementsId)
|
|
->whereIn('object_id',$requirementsId)
|
|
->where('is_latest_version',1)
|
|
->where('is_latest_version',1)
|
|
->where('source',1)
|
|
->where('source',1)
|
|
- ->get()->map(function (File $file) use($object){
|
|
|
|
- $requirement = $object->requirements->where('id',$file->object_id)->first();
|
|
|
|
- $file->source_name =$requirement ? $requirement->title : null;
|
|
|
|
- $file->type='requirement';
|
|
|
|
- return $file;
|
|
|
|
- });
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ ->paginate($pageSize);
|
|
|
|
+
|
|
|
|
+ $filesWithRequirements->transform(function (File $file) use ($object) {
|
|
|
|
+ $requirement = $object->requirements->where('id',$file->object_id)->first();
|
|
|
|
+ $file->source_name = $requirement ? $requirement->title : null;
|
|
|
|
+ $file->type = 'requirement';
|
|
|
|
+ return $file;
|
|
|
|
+ });
|
|
|
|
+ make_display_id($filesWithRequirements,$pageSize);
|
|
return FileAttachmentResource::collection($filesWithRequirements);
|
|
return FileAttachmentResource::collection($filesWithRequirements);
|
|
}
|
|
}
|
|
}else if($folderObjectType->value==='project'){
|
|
}else if($folderObjectType->value==='project'){
|
|
@@ -257,13 +260,16 @@ class ContainerController extends Controller
|
|
->whereIn('object_id',$tasksId)
|
|
->whereIn('object_id',$tasksId)
|
|
->where('is_latest_version',1)
|
|
->where('is_latest_version',1)
|
|
->where('source',1)
|
|
->where('source',1)
|
|
- ->get()->map(function ($file) use($object){
|
|
|
|
- $task = $object->tasks->where('id',$file->object_id)->first();
|
|
|
|
- $file->source_name =$task ? $task->name : null;
|
|
|
|
- $file->type='task';
|
|
|
|
- return $file;
|
|
|
|
|
|
+ ->paginate($pageSize);
|
|
|
|
+
|
|
|
|
+ $filesWithTasks->transform(function (File $file) use ($object) {
|
|
|
|
+ $task = $object->tasks->where('id',$file->object_id)->first();
|
|
|
|
+ $file->source_name = $task ? $task->name : null;
|
|
|
|
+ $file->type = 'requirement';
|
|
|
|
+ return $file;
|
|
|
|
+ });
|
|
|
|
|
|
- });
|
|
|
|
|
|
+ make_display_id($filesWithTasks,$pageSize);
|
|
return FileAttachmentResource::collection($filesWithTasks);
|
|
return FileAttachmentResource::collection($filesWithTasks);
|
|
}
|
|
}
|
|
}
|
|
}
|