diff --git a/app/Http/Controllers/CycleController.php b/app/Http/Controllers/CycleController.php index f44d89c5..8174c2e2 100644 --- a/app/Http/Controllers/CycleController.php +++ b/app/Http/Controllers/CycleController.php @@ -41,13 +41,16 @@ class CycleController extends Controller }); }) ->with(['user' => function($query){ + $query->select('id', 'name', 'medical_center_id'); + }, + 'user.medical_center' => function($query){ $query->select('id', 'name'); }, 'labels', 'labels.package' => function($query){ $query->select('id', 'name'); }, - ])->paginate(10); + ])->orderByDesc('id')->paginate(10); return \MessageResponse::data($Cycles); } diff --git a/app/Http/Controllers/LabelController.php b/app/Http/Controllers/LabelController.php index 8d5a6b41..6cebafed 100644 --- a/app/Http/Controllers/LabelController.php +++ b/app/Http/Controllers/LabelController.php @@ -50,7 +50,7 @@ class LabelController extends Controller 'user.medical_center' => function($query){ $query->select('id', 'name'); }, - ])->paginate(10); + ])->orderByDesc('id')->paginate(10); return \MessageResponse::data($Labels); } diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index 6f2e44ca..ee5033eb 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -39,7 +39,7 @@ class PackageController extends Controller }, 'user.medical_center' => function($query){ $query->select('id', 'name'); - }])->paginate(10); + }])->orderByDesc('id')->paginate(10); return \MessageResponse::data($Packages); } diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php index 76225841..fc521ed0 100644 --- a/app/Http/Controllers/TestResultController.php +++ b/app/Http/Controllers/TestResultController.php @@ -100,7 +100,7 @@ class TestResultController extends Controller 'test_type' => function($query){ $query->select('id', 'name'); }]) - ->paginate(10); + ->orderByDesc('id')->paginate(10); return \MessageResponse::data($TestResult); } diff --git a/app/Http/Controllers/TestTypeController.php b/app/Http/Controllers/TestTypeController.php index f7b0fae1..016fc192 100644 --- a/app/Http/Controllers/TestTypeController.php +++ b/app/Http/Controllers/TestTypeController.php @@ -47,7 +47,7 @@ class TestTypeController extends Controller }, 'user.medical_center' => function($query){ $query->select('id', 'name'); - }])->paginate(10); + }])->orderByDesc('id')->paginate(10); return \MessageResponse::data($TestTypes); diff --git a/config/debug-server.php b/config/debug-server.php new file mode 100644 index 00000000..f897262f --- /dev/null +++ b/config/debug-server.php @@ -0,0 +1,8 @@ + 'tcp://127.0.0.1:9912', +]; diff --git a/config/image.php b/config/image.php index 2b1d2c3e..0533d96c 100644 --- a/config/image.php +++ b/config/image.php @@ -15,6 +15,6 @@ return [ | */ - 'driver' => 'gd' + 'driver' => 'imagick' ]; diff --git a/packages/SMSSender/SMSSender.php b/packages/SMSSender/SMSSender.php index 7f80e911..e77c4107 100644 --- a/packages/SMSSender/SMSSender.php +++ b/packages/SMSSender/SMSSender.php @@ -66,7 +66,6 @@ class SMSSender $user = $this->getUserName(); $pass = $this->getPassword(); $fromNum = $this->getFromNumber(); - $client = new \SoapClient($this->getWebService()); $client->sendPatternSms($fromNum, $cellNumber, $user, $pass, $pattern_code, $input_data); diff --git a/public/uploads/TestResults/2/15911946070.jpeg b/public/uploads/TestResults/2/15911946070.jpeg new file mode 100644 index 00000000..15c7f4d9 Binary files /dev/null and b/public/uploads/TestResults/2/15911946070.jpeg differ diff --git a/public/uploads/TestResults/65/15911959760.jpeg b/public/uploads/TestResults/65/15911959760.jpeg new file mode 100644 index 00000000..15c7f4d9 Binary files /dev/null and b/public/uploads/TestResults/65/15911959760.jpeg differ