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

add package

Browse Source
This commit is contained in:
saeid_01
2019-06-15 19:05:17 +04:30
parent d26188d274
commit 7e8dd3c8e4
54 changed files with 946 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BarCodeController.php
+16
View File
@@ -0,0 +1,16 @@
<?php
namespace App\Http\Controllers;
use \Milon\Barcode\DNS1D;
use \Milon\Barcode\DNS2D;
class BarCodeController extends Controller
{
public function generateBarcode($Number)
{
$Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
$QRCode = DNS2D::getBarcodePNGUri($Number, "QRCODE");
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
}
}
app/Http/Controllers/MedicalCenterController.php
+5
View File
@@ -57,4 +57,9 @@ class MedicalCenterController extends Controller
$MedicalCenter->delete();
return \MessageResponse::success(trans('messages.success'));
}
public function listMedicalCenters(){
$MedicalCenters = MedicalCenter::select('id','name')->get();
return \MessageResponse::data($MedicalCenters);
}
}
app/Http/Controllers/MessageController.php
+56
View File
@@ -0,0 +1,56 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Requests\StoreMessageRequest;
use App\Message;
class MessageController extends Controller
{
public function index()
{
$Messages = Message::with('recipient_user', 'sender_user')->paginate(10);
// $User = auth('api')->user();
// $MyReceivedMessages = $User->messagesReceived;
// $MySentMessages = $User->messagesSent;
// dd($MyMessages);
return \MessageResponse::data($Messages);
}
public function create()
{
}
public function show(Message $Message)
{
return \MessageResponse::data($Message);
}
public function store(StoreMessageRequest $request)
{
$MessageData = [
'title' => $request->title,
'text' => $request->text,
'sender_user_id' => auth('api')->user()->id,
'recipient_user_id' => $request->recipient_user_id,
];
Message::create($MessageData);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Message $Message)
{
// return \MessageResponse::data($Message);
}
public function update(StoreMessageRequest $request, Message $Message)
{
// $Message->update($request->all());
// return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Message $Message)
{
if (!auth('api')->user()->can('delete', $Message)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
$Message->delete();
return \MessageResponse::success(trans('messages.success'));
}
}
app/Http/Controllers/PackageController.php
+53
View File
@@ -0,0 +1,53 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Requests\StorePackageRequest;
use App\Package;
class PackageController extends Controller
{
public function index()
{
$Packages = Package::paginate(10);
return \MessageResponse::data($Packages);
}
public function create()
{
}
public function show(Package $Package)
{
return \MessageResponse::data($Package);
}
public function store(StorePackageRequest $request)
{
$UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$PackageData = [
'name' => $request->name,
'unique_id' => $UniqueID,
'result' => $request->result,
'description' => $request->description,
];
Package::create($PackageData);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Package $Package)
{
return \MessageResponse::data($Package);
}
public function update(StorePackageRequest $request, Package $Package)
{
$Package->update($request->all());
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Package $Package)
{
if (!auth('api')->user()->can('delete', $Package)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
$Package->delete();
return \MessageResponse::success(trans('messages.success'));
}
}
app/Http/Controllers/TestResultController.php
+40 -20
View File
@@ -20,18 +20,52 @@ class TestResultController extends Controller
public function index(Request $request)
{
$user = auth('api')->user();
if ($user->hasRole('Supervisor|User')) {
$medical_center_id = $user->medical_center_id;
}
elseif($request->has('medicalCenter_id') && $request->medicalCenter_id) {
$medical_center_id = $request->medicalCenter_id;
} else {
$medical_center_id = null;
}
if ($user->hasRole('User')) {
$user_name = $user->name;
}
elseif($request->has('user_name') && $request->user_name) {
$user_name = $request->user_name;
}
else {
$user_name = null;
}
$TestResult = TestResult::with('test_type', 'user', 'user.medical_center')
->when($request->has('verified'), function ($query) use ($request)
{
return $query->where('verified', $request->verified);
})
->when($user->hasRole('Supervisor') , function($query) {
return $query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
->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');
$upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
return $query->whereBetween('created_at', [$from, $upTo]);
})
->when($user->hasRole('User') || ( !$user->hasRole('Admin') && !$user->hasRole('Supervisor')), function($query) use ($user) {
return $query->where('user_id', $user->id);
->when($request->has('testType_id') && $request->testType_id, function($query) use($request){
$query->where('test_type_id', $request->testType_id);
})
->when($request->has('auto_clave_id') && $request->auto_clave_id, function($query) use($request){
$query->where('autoclave_id', 'LIKE', '%'.$request->auto_clave_id.'%');
})
->when($user_name, function($query) use($user_name){
$query->whereHas('user', function($query) use($user_name){
$query->where('name', 'LIKE', '%'.$user_name.'%');
});
})
->when($medical_center_id, function($query) use($medical_center_id){
$query->whereHas('user', function($query) use ($medical_center_id) {
$query->where('medical_center_id', $medical_center_id);
});
})
->paginate(10);
@@ -43,20 +77,6 @@ class TestResultController extends Controller
//
}
// public function CreateChildFormValue2($Input,$TestResultObj,$TestResultInfo)
// {
// if ($Input['type'] != 'Form') {
// $Value = $TestResultInfo[$Input->name];
// $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'value' => $Value]);
// }
// else {
// foreach ($Input->children as $InputChild) {
// $this->CreateChildFormValue2($InputChild,$TestResultObj,$TestResultInfo[$Input->name]);
// }
// }
//
// }
public function store(StoreTestResultRequest $request)
{
app/Http/Controllers/TestTypeController.php
+17 -8
View File
@@ -20,15 +20,19 @@ class TestTypeController extends Controller
$TestTypes = TestType::when($request->has('name') && $request->name, function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('date') && $request->date, function($query) use($request){
$Date = ($request->date) ? date($request->date . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
$query->where('created_at', $Date);
->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');
$upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
return $query->whereBetween('created_at', [$from, $upTo]);
})
->when($request->has('unique_code') && $request->unique_code, function($query) use($request){
$query->where('unique_code', $request->unique_code);
->when($request->has('unique_id') && $request->unique_id, function($query) use($request){
$query->where('unique_code', $request->unique_id);
})
->when($request->has('user_id') && $request->user_id, function($query) use($request){
$query->where('user_id', $request->user_id);
->when($request->has('user_name') && $request->user_name, function($query) use($request){
$query->whereHas('user', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->user_name.'%');
});
})
->withCount('test_results')->with('user','user.medical_center')->paginate(10);
return \MessageResponse::data($TestTypes);
@@ -400,10 +404,15 @@ class TestTypeController extends Controller
public function destroy(TestType $TestType)
{
if (!auth('api')->user()->can('delete', $TestType)) {
return \MessageResponse::error(trans('You dont have permission or this test type has a test result'));
return \MessageResponse::error(trans('messages.access_denied'));
}
$TestType->delete();
return \MessageResponse::success(trans('messages.success'));
}
// public function AllTestTypes()
// {
// $testTypes = TestType::pluck('id', 'name');
// return \MessageResponse::data($testTypes);
// }
}
app/Http/Controllers/UserController.php
+13 -7
View File
@@ -27,7 +27,7 @@ class UserController extends Controller
if ($user->hasRole('Supervisor')) {
$medical_center_id = $user->medical_center_id;
}
elseif($request->has('medical_center_id') && $request->medical_center_id) {
elseif($request->has('medicalCenter_id') && $request->medicalCenter_id) {
$medical_center_id = $request->medical_center_id;
} else {
$medical_center_id = null;
@@ -35,9 +35,17 @@ class UserController extends Controller
$Users = User::when($request->has('name') && $request->name, function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('date') && $request->date, function($query) use($request){
$Date = ($request->date) ? date($request->date . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
$query->where('created_at', $Date);
->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');
$upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
return $query->whereBetween('created_at', [$from, $upTo]);
})
->when($request->has('cell_number') && $request->cell_number, function($query) use($request){
$query->where('cell_number', 'LIKE', '%'.$request->cell_number.'%');
})
->when($request->has('role') && $request->role, function($query) use($request){
$query->role($request->role);
})
->when($medical_center_id, function($query) use ($medical_center_id){
$query->where('medical_center_id', $medical_center_id);
@@ -89,14 +97,12 @@ class UserController extends Controller
public function destroy(User $User)
{
if (auth('api')->user()->cant('delete', $User)) {
return \MessageResponse::error(trans('messages.failed'));
return \MessageResponse::error(trans('messages.access_denied'));
}
$User->delete();
return \MessageResponse::success(trans('messages.success'));
}
public function getByMedicalCenter(MedicalCenter $MedicalCenter)
{
$user = auth('api')->user();