cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-12 11:31:06 +03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/Saeid74/cssd

Browse Source
This commit is contained in:
Fayyazi
2019-07-18 19:17:29 +04:30
parent 58038a778c 21a7984ffb
commit 1a263e28d3
35971 changed files with 334 additions and 3726963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+2 -9
View File
@@ -19,7 +19,6 @@ class ItemController extends Controller
})->paginate(10);
return \MessageResponse::data($Items);
}
public function create()
{
@@ -34,12 +33,11 @@ class ItemController extends Controller
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$ItemData = [
'name' => $request->name,
'result' => $request->result,
'description' => $request->description,
'user_id' => auth('api')->user()->id,
];
$ItemObj = Item::create($ItemData);
$ItemObj->packages()->attach($request->package_id);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Item $Item)
@@ -48,8 +46,8 @@ class ItemController extends Controller
}
public function update(StoreItemRequest $request, Item $Item)
{
// dd($request->all());
$Item->update($request->all());
$ItemObj->packages()->sync($request->package_ids);
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Item $Item)
@@ -61,9 +59,4 @@ class ItemController extends Controller
return \MessageResponse::success(trans('messages.success'));
}
public function getItems(){
$Items = Item::with('user')->get();
return \MessageResponse::data($Items);
}
}
app/Http/Controllers/PackageController.php
+2 -6
View File
@@ -28,7 +28,6 @@ class PackageController extends Controller
}
public function show(Package $Package)
{
$Package->load('user', 'items');
return \MessageResponse::data($Package);
}
public function store(StorePackageRequest $request)
@@ -42,19 +41,16 @@ class PackageController extends Controller
'user_id' => auth('api')->user()->id,
'verified' => 'NotVerified',
];
$PackageObj = Package::create($PackageData);
$PackageObj->items()->attach($request->items);
Package::create($PackageData);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Package $Package)
{
$Package->load('user', 'items');
return \MessageResponse::data($Package);
}
public function update(StorePackageRequest $request, Package $Package)
{
$Package->update($request->except(['items']));
$Package->items()->sync($request->items);
$Package->update($request->all());
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Package $Package)
app/Http/Controllers/TestResultController.php
+86 -88
View File
@@ -79,7 +79,7 @@ class TestResultController extends Controller
public function store(StoreTestResultRequest $request)
{
// dd($request->result);
try {
$return_value = \DB::transaction(function () use ($request) {
@@ -88,7 +88,7 @@ class TestResultController extends Controller
// 'autoclave_id' => $request->autoclave_id,
'cycle_number' => $request->cycle_number,
'device_id' => $request->device_id,
// 'device_label' => $request->device_label,
'device_label' => $request->device_label,
'test_type_id' => $request->test_type_id,
'result' => $request->result,
'verified' => 'NotVerified',
@@ -102,15 +102,15 @@ class TestResultController extends Controller
foreach ($Inputs as $Input) {
if ($Input['type'] != 'Form') {
$Value = $TestResultInfo[$Input->name.'_'.$Input->id];
if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton') {
if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
// foreach ($Value as $Option) {
// $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option]);
// }
foreach ($Input->options as $Option) {//--2
if(is_array($Value) && in_array($Option->id,$Value)){
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
}
if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
}
if(in_array($Option->id,$Value)){
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
}
}
} else {
@@ -120,15 +120,14 @@ class TestResultController extends Controller
foreach ($Input->children as $InputChild) {
$Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id];
if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') {
if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
// foreach ($Value as $Option) {
// $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option]);
// }
foreach ($InputChild->options as $Option) {//--2
if(is_array($Value) && in_array($Option->id,$Value)){
if(in_array($Option->id,$Value)){
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
}
if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
}
}
}
else {
@@ -140,16 +139,32 @@ class TestResultController extends Controller
}
}
///////////////////////////////////////////////////////////////////////////Inputs
///////////////////////////////////////////////////////////////////////////Images
///////////////////////////////////////////////////////////////////////////Image
// if ($request->img != null) {
//
// $Image = $request->img;
// $InterventionImage = Image::make($Image);
// $Mime = explode('/', $InterventionImage->mime());
//
// $ImageName = time().'.'.$Mime[1];
// $Path = 'uploads'.'/TestResults'.'/'.$TestResultObj->id .'/'.$ImageName;
//
// Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResultObj->id);
// $InterventionImage->save(public_path($Path));
//
// $GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]);
// $Uploadable = Uploadable::create(['uploadable_id' => $TestResultObj->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
// }
//-------------------------------------------------imgs
if ($request->imgs != null) {
foreach ($request->imgs as $key => $img) {
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
foreach ($request->imgs as $img) {
$Image = $img;
$InterventionImage = Image::make($Image);
$Mime = explode('/', $InterventionImage->mime());
$ImageName = time().$key.'.'.$Mime[1];
$ImageName = time().'.'.$Mime[1];
$Path = 'uploads'.'/TestResults'.'/'.$TestResultObj->id .'/'.$ImageName;
Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResultObj->id);
@@ -159,7 +174,7 @@ class TestResultController extends Controller
$Uploadable = Uploadable::create(['uploadable_id' => $TestResultObj->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
}
}
///////////////////////////////////////////////////////////////////////////Images
///////////////////////////////////////////////////////////////////////////Image
});
} catch (\Exception $e) {
@@ -178,7 +193,7 @@ class TestResultController extends Controller
if ($input->parent_id != null && $input->parent['type'] == 'Form') {
//----------------------------------------------------------------------FormType
if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') {
if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
$input_options = InputValue::with('option')->where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get();
$options = [];
foreach ($input_options as $input_option) {
@@ -198,7 +213,7 @@ class TestResultController extends Controller
}
else {
//-----------------------------------------------------------------------Anothertype
if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') {
if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
$input_options = InputValue::with('option')->where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get();
$options = [];
foreach ($input_options as $input_option) {
@@ -216,12 +231,8 @@ class TestResultController extends Controller
}
}
$ImagesPath = [];
if (count($TestResult->TitleImage)) {
foreach ($TestResult->TitleImage as $Key => $TitleImage) {
$ImagesPath[] = $TitleImage->path;
}
$TestResult['imagesPath'] = $ImagesPath;
$TestResult['imagePath'] = $TestResult->TitleImage[0]->path;
}
return \MessageResponse::data($TestResult);
}
@@ -230,25 +241,16 @@ class TestResultController extends Controller
{
foreach ($TestResult->input_values as $key => $value) {
$input = $value->input;
if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') {
if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
$input_options = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get()->pluck('option_id')->toArray();
if ($input['type'] == 'Radiobutton') {
$TestResult[$input->name.'_'.$input->id] = $input_options[0];
}
else {
$TestResult[$input->name.'_'.$input->id] = $input_options;
}
$TestResult[$input->name.'_'.$input->id] = $input_options;
}
else {
$TestResult[$input->name.'_'.$input->id] = $value->value;
}
}
$ImagesPath = [];
if (count($TestResult->TitleImage)) {
foreach ($TestResult->TitleImage as $Key => $TitleImage) {
$ImagesPath[] = $TitleImage->path;
}
$TestResult['imagesPath'] = $ImagesPath;
$TestResult['imagePath'] = $TestResult->TitleImage[0]->path;
}
return \MessageResponse::data($TestResult);
}
@@ -267,7 +269,7 @@ class TestResultController extends Controller
// 'autoclave_id' => $request->autoclave_id,
'cycle_number' => $request->cycle_number,
'device_id' => $request->device_id,
// 'device_label' => $request->device_label,
'device_label' => $request->device_label,
'test_type_id' => $request->test_type_id,
'result' => $request->result,
'verified' => 'NotVerified',
@@ -280,17 +282,19 @@ class TestResultController extends Controller
foreach ($Inputs as $Input) {
if ($Input['type'] != 'Form') {
$Value = $TestResultInfo[$Input->name.'_'.$Input->id];
if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton') {
if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
$InputOptions = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $Input->id)->get()->each->delete();
// $option_array = $Input->options->pluck('id')->toArray();
// foreach ($Value as $Option) {//--1
// $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option]);
// }
foreach ($Input->options as $Option) {//--2
if(is_array($Value) && in_array($Option->id,$Value)){
if(in_array($Option->id,$Value)){
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
}
if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
}
}
}
else {
@@ -302,16 +306,16 @@ class TestResultController extends Controller
$Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id];
if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') {
if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
$InputOptions = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $InputChild->id)->get()->each->delete();
// foreach ($Value as $Option) {
// $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option]);
// }
foreach ($InputChild->options as $Option) {//--2
if(is_array($Value) && in_array($Option->id,$Value)){
if(in_array($Option->id,$Value)){
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
}
if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
}
}
}
else {
@@ -320,38 +324,42 @@ class TestResultController extends Controller
}
}
}
/////////////////////////////////////////////////////////////////////Images
$images = '';
if (count($TestResult->TitleImage))
{
$images = $TestResult->TitleImage;
foreach ($images as $key => $image) {
/////////////////////////////////////////////////////////////////////Image
$image = '';
if (count($TestResult->TitleImage))
$image = $TestResult->TitleImage[0];
if ($request->img != null) {
$Image = $request->img;
$InterventionImage = Image::make($Image);
$Mime = explode('/', $InterventionImage->mime());
$ImageName = time().'.'.$Mime[1];
$Path = 'uploads'.'/TestResults'.'/'.$TestResult->id .'/'.$ImageName;
Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResult->id);
$InterventionImage->save(public_path($Path));
if ($image !== ''){
Storage::disk('public')->delete(static::storage_path($image->path));
Uploadable::where('gallery_id', $image->id)->where('uploadable_id', $TestResult->id)->where('uploadable_type', get_class($TestResult))->delete();
Gallery::where('id', $image->id)->delete();
//--------------------------------------------------------
$GalleryObj = Gallery::where('id', $image->id)->update(['path' => $Path]);
$Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => get_class($TestResult), 'gallery_id' => $image->id, 'image_role' => 'TitleImage']);
//--------------------------------------------------------
}
else {
//--------------------------------------------------------
$GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]);
$Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
//--------------------------------------------------------
}
}
if ($request->imgs != null) {
foreach ($request->imgs as $key => $img) {//
$Image = $img;
$InterventionImage = Image::make($Image);
$Mime = explode('/', $InterventionImage->mime());
$ImageName = time().$key.'.'.$Mime[1];
$Path = 'uploads'.'/TestResults'.'/'.$TestResult->id .'/'.$ImageName;
Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResult->id);
$InterventionImage->save(public_path($Path));
//--------------------------------------------------------
$GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]);
$Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
//--------------------------------------------------------
}//
}
//////////////////////////////////////////////////////////////////Image
return \MessageResponse::success(null,trans('messages.update'));
}
@@ -361,16 +369,6 @@ class TestResultController extends Controller
if (!auth('api')->user()->can('delete', $TestResult)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
if (count($TestResult->input_values)) {
InputValue::where('test_result_id', $TestResult->id)->get()->each->delete();
}
if (count($TestResult->TitleImage)){
foreach ($TestResult->TitleImage as $image) {
Storage::disk('public')->delete(static::storage_path($image->path));
Uploadable::where('gallery_id', $image->id)->where('uploadable_id', $TestResult->id)->where('uploadable_type', get_class($TestResult))->delete();
Gallery::where('id', $image->id)->delete();
}
}
$TestResult->delete();
return \MessageResponse::success(null, trans('messages.success'));
}
app/Http/Controllers/TestTypeController.php
-2
View File
@@ -105,7 +105,6 @@ class TestTypeController extends Controller
$TestType = [
'name' => $request['name'],
'unique_code' => $request['unique_code'],
'device_label' => $request['device_label'],
'user_id' => auth('api')->user()->id
];
@@ -322,7 +321,6 @@ class TestTypeController extends Controller
$TestTypeData = [
'name' => $request['name'],
'unique_code' => $request['unique_code'],
'device_label' => $request['device_label'],
];
$TestType->update($TestTypeData);
$TestTypeInfo = $request['info'];
app/Http/Requests/StoreItemRequest.php
+2 -4
View File
@@ -26,8 +26,7 @@ class StoreItemRequest extends FormRequest
case 'POST': {
return [
'name' => 'required|max:100|unique:Items',
'result' => 'required',
// 'description' => 'required',
'description' => 'required',
];
break;
}
@@ -36,8 +35,7 @@ class StoreItemRequest extends FormRequest
$Item = $this->route('Item');
return [
'name' => 'required|max:100|unique:Items,id,'.$Item->id,
'result' => 'required',
// 'description' => 'required',
'description' => 'required',
];
break;
app/Http/Requests/StoreTestResultRequest.php
+14
View File
@@ -25,7 +25,14 @@ class StoreTestResultRequest extends FormRequest
switch ($this->method()) {
case 'POST': {
return [
<<<<<<< HEAD
// 'user_id' => 'required',
// 'autoclave_id' => 'required',
'device_id' => 'required',
'device_label' => 'required',
=======
'device_id' => 'requisred',
>>>>>>> 217b6c09ce951ac0d121943a26c39cd531946b74
'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
@@ -36,7 +43,14 @@ class StoreTestResultRequest extends FormRequest
case 'PATCH': {
// $TestResult = $this->route('TestResult');
return [
<<<<<<< HEAD
// 'user_id' => 'required',
// 'autoclave_id' => 'required',
'device_id' => 'required',
'device_label' => 'required',
=======
'device_id' => 'required',
>>>>>>> 217b6c09ce951ac0d121943a26c39cd531946b74
'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
app/Http/Requests/StoreTestTypeRequest.php
-2
View File
@@ -27,7 +27,6 @@ class StoreTestTypeRequest extends FormRequest
return [
'name' => 'required|max:100|unique:test_types',
'unique_code' => 'required|max:100|unique:test_types',
'device_label' => 'required',
'info.*.name'=>'required',
'info.*.type'=>'required',
'info.*.size'=>'nullable',
@@ -41,7 +40,6 @@ class StoreTestTypeRequest extends FormRequest
return [
'name' => 'required|max:100|unique:test_types,id,'.$TestType->id,
'unique_code' => 'required|max:100|unique:test_types,id,'.$TestType->id,
'device_label' => 'required',
'info.*.name'=>'required',
'info.*.type'=>'required',
'info.*.size'=>'nullable',