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

fix

Browse Source
This commit is contained in:
sajjad
2023-09-23 02:41:07 -07:00
parent cf58a63013 b389ea5306
commit eb9a033de9
80 changed files with 1401 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+10 -10
View File
@@ -29,8 +29,8 @@
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
->when( $request->has( 'uid' ) && $request->uid != '' , function ( $query ) use ( $request ) {
$query->where( 'uid' , 'LIKE' , '%' . $request->uid . '%' );
} )
->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
$query->where( 'size' , $request->size );
@@ -68,15 +68,15 @@
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' );
} ] );
} ] );
$FilesPath = [];
if ( count( $Item->files ) ) {
foreach ( $Item->files as $Key => $File ) {
$FilesPath[] = $File->path;
}
$Item[ 'filesPath' ] = $FilesPath;
$FilesPath = [];
if ( count( $Item->files ) ) {
foreach ( $Item->files as $Key => $File ) {
$FilesPath[] = $File->path;
}
$Item[ 'filesPath' ] = $FilesPath;
}
return \MessageResponse::data( $Item );
}
@@ -89,7 +89,7 @@
'unique_id' => $request->unique_id ,
'specific' => $request->specific ,
'note' => $request->note ,
'udi' => $request->udi ,
'uid' => $request->uid ,
'user_id' => auth( 'api' )->user()->id ,
];
$ItemObj = Item::create( $ItemData );
app/Http/Controllers/PackageController.php
+3 -3
View File
@@ -28,8 +28,8 @@
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
->when( $request->has( 'uid' ) && $request->uid != '' , function ( $query ) use ( $request ) {
$query->where( 'uid' , 'LIKE' , '%' . $request->uid . '%' );
} )
->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->package_id );
@@ -73,7 +73,7 @@
'name' => $request->name ,
'unique_id' => $request->unique_id ,
'note' => $request->note ,
'udi' => $request->udi ,
'uid' => $request->uid ,
'user_id' => auth( 'api' )->user()->id ,
'verified' => 'NotVerified' ,
];
app/Http/Controllers/TestResultController.php
+13 -17
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
<<<<<<< HEAD
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Requests\StoreTestResultRequest;
@@ -15,26 +16,21 @@
use App\Media;
use Intervention\Image\ImageManagerStatic as Image;
use Intervention\Image\ImageManager;
=======
use App\Http\Requests\StoreTestResultRequest;
use App\Input;
use App\InputValue;
use App\Media;
use App\MedicalCenter;
use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
>>>>>>> b389ea53068b2084084b9704400a50529ba035eb
use Illuminate\Support\Facades\Storage;
class TestResultController extends Controller
{
// private function filterByInputs($inputArray){
// $searchArray = ['Patient ID' => 1111, 'Autoclave ID' => 2222];
//
// $TestResults = TestResult::query();
//
// foreach ($inputArray as $key => $value) {
// $TestResults .= $TestResults->whereHas('input_values', function($query) use($value, $key){
// $query->whereHas('input', function($query) use($key){
// $query->where('name', $key);
// })->where('value', $value);
// });
// }
// return $query;
// }
public function index( Request $request )
{
$user = auth( 'api' )->user();
@@ -56,7 +52,7 @@
}
$TestResult = TestResult::when( $request->has( 'verified' ) , function ( $query ) use ( $request ) {
return $query->where( 'verified' , $request->verified )->orWhere( 'verified' , "None" );
return $query->where( 'verified' , $request->verified )->orWhere('verified' , "None" );
} )
->when( ( $request->has( 'fromPicker' ) && $request->fromPicker ) || ( $request->has( 'upToPicker' ) && $request->upToPicker ) , function ( $query ) use ( $request ) {
$from = ( $request->fromPicker ) ? date( $request->fromPicker . ' 00:00:00' ) : date( '2010-01-01' . ' 00:00:00' );
@@ -445,7 +441,6 @@
return \MessageResponse::data( [ 'labels' => [ 'Number Of Accepted Test Results' , 'Number Of Rejected Test Results' ] , 'data' => [ $AcceptCount , $RejectCount ] ] );
}
//--------------------------------------------------------------------------Show
public function showTestResult( $id )
{
$TestResult = TestResult::with( 'input_values' , 'user.medical_center' , 'test_type' )->select( 'result' , 'verified' , 'device_id' , 'user_id' , 'id' , 'test_type_id' , 'created_at' )->findOrFail( $id );
@@ -501,4 +496,5 @@
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return \MessageResponse::data( $TestResult );
}
}
app/Http/Kernel.php
+1 -1
View File
@@ -19,7 +19,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
\App\Http\Middleware\Cors::class,
// \App\Http\Middleware\Cors::class,
];
/**
app/Http/Middleware/Cors.php
+28 -26
View File
@@ -1,30 +1,32 @@
<?php // /app/Http/Middleware/Cors.php
namespace App\Http\Middleware;
use Closure;
class Cors {
<?php
namespace App\Http\Middleware;
use Closure;
class Cors {
public function handle($request, Closure $next)
{
/* @var $response Response */
$response = $next($request)
->header('Access-Control-Allow-Origin', '*')
->header('Access-Control-Allow-credentials', true)
->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
if (!$request->isMethod('OPTIONS')) {
return $response;
public function handle($request, Closure $next)
{
/* @var $response Response */
$response = $next($request)
->header('Access-Control-Allow-Origin', '*')
->header('Access-Control-Allow-credentials', true)
->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
if (!$request->isMethod('OPTIONS')) {
return $response;
}
$allow = $response->headers->get('Allow'); // true list of allowed methods
if (!$allow) {
return $response;
}
$headers = [
'Access-Control-Allow-Methods' => $allow,
'Access-Control-Max-Age' => 3600,
'Access-Control-Allow-Headers' => 'X-Requested-With, Origin, X-Csrftoken, Content-Type, Accept',
];
return $response->withHeaders($headers);
}
$allow = $response->headers->get('Allow'); // true list of allowed methods
if (!$allow) {
return $response;
}
$headers = [
'Access-Control-Allow-Methods' => $allow,
'Access-Control-Max-Age' => 3600,
'Access-Control-Allow-Headers' => 'X-Requested-With, Origin, X-Csrftoken, Content-Type, Accept',
];
return $response->withHeaders($headers);
}
}
app/Http/Requests/StoreItemRequest.php
+2 -2
View File
@@ -30,7 +30,7 @@ class StoreItemRequest extends FormRequest
'size' => 'required',
'specific' => 'required',
'note' => 'nullable',
'udi' => 'required|max:100|unique:items',
'uid' => 'required|max:100|unique:items',
];
break;
}
@@ -43,7 +43,7 @@ class StoreItemRequest extends FormRequest
'size' => 'required',
'specific' => 'required',
'note' => 'nullable',
'udi' => 'required|max:100|unique:items,udi,'.$Item->id,
'uid' => 'required|max:100|unique:items,uid,'.$Item->id,
];
break;
}
app/Http/Requests/StorePackageRequest.php
+2 -2
View File
@@ -29,7 +29,7 @@ class StorePackageRequest extends FormRequest
'unique_id' => 'nullable|max:250|unique:packages',
'note' => 'nullable',
'items' => 'required',
'udi' => 'required|max:100|unique:packages',
'uid' => 'required|max:100|unique:packages',
];
break;
}
@@ -41,7 +41,7 @@ class StorePackageRequest extends FormRequest
'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
'note' => 'nullable',
'items' => 'required',
'udi' => 'required|max:100|unique:packages',
'uid' => 'required|max:100|unique:packages',
];
break;