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

update

Browse Source
This commit is contained in:
Fayyazi
2019-12-01 14:23:29 +03:30
parent 94d1bda083
commit 9526ec80fd
38 changed files with 658 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BarCodeController.php
+13 -7
View File
@@ -6,17 +6,21 @@ use \Milon\Barcode\DNS1D;
use \Milon\Barcode\DNS2D;
use App\TestResult;
use App\Package;
use App\Cycle;
class BarCodeController extends Controller
{
public function generateBarcode($Number)
public function generateBarcode($Number, $Type = null)
{
if($Number != "undefined")
{
// $Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
$Barcode = DNS1D::getBarcodePNG($Number, "C128");
$QRCode = DNS2D::getBarcodePNG($Number, "QRCODE");
return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode]);
if ($Type == 'Cycle') {
$Cycle = Cycle::where('unique_id', $Number)->first();
$Number = $Cycle->id;
}
return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode, 'ShowLink' => 'Show/'.$Type.'/'.$Number]);
}
}
public function generateQRcode(TestResult $TestResult)
@@ -33,10 +37,12 @@ class BarCodeController extends Controller
{
if($Number != "undefined")
{
$Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
$QRCode = DNS2D::getBarcodePNGUri($Number, "QRCODE");
Package::where('unique_id', $Number)->update(['bar_code' => $Barcode, 'qr_code' => $QRCode]);
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
// $Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
// $QRCode = DNS2D::getBarcodePNGUri($Number, "QRCODE");
$Barcode = DNS1D::getBarcodePNG($Number, "C128");
$QRCode = DNS2D::getBarcodePNG($Number, "QRCODE");
$Package = Package::where('unique_id', $Number)->first();
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode, 'ShowLink' => 'Show/Package/'.$Package->id]);
}
}
public function generatePackageQRCode(Package $Package)
app/Http/Controllers/CycleController.php
+2 -3
View File
@@ -23,7 +23,6 @@ class CycleController extends Controller
$query->where('user_id', $user->id);
}
})
->when($request->has('cycle_id') && $request->cycle_id != '', function($query) use($request){
$query->where('id', $request->cycle_id);
})
@@ -45,7 +44,7 @@ class CycleController extends Controller
}
public function show(Cycle $Cycle)
{
$Cycle->load('user', 'labels', 'labels.package', 'labels.package.items');
$Cycle->load('user', 'user.medical_center', 'labels', 'labels.package', 'labels.package.items');
return \MessageResponse::data($Cycle);
}
public function store(StoreCycleRequest $request)
@@ -145,7 +144,7 @@ class CycleController extends Controller
public function showCycle(Cycle $Cycle)
{
$Cycle->load('user', 'labels', 'labels.package', 'labels.package.items');
$Cycle->load('user', 'user.medical_center', 'labels', 'labels.package', 'labels.package.items');
return \MessageResponse::data($Cycle);
}
}
app/Http/Controllers/ItemController.php
+8 -3
View File
@@ -31,8 +31,8 @@ class ItemController extends Controller
->when($request->has('size') && $request->size != '', function($query) use($request){
$query->where('size', $request->size);
})
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
$query->where('unique_id', $request->unique_id);
->when($request->has('item_id') && $request->item_id != '', function($query) use($request){
$query->where('id', $request->item_id);
})
->when($request->has('specific') && $request->specific != '', function($query) use($request){
$query->where('specific', $request->specific);
@@ -47,7 +47,7 @@ class ItemController extends Controller
}
public function show(Item $Item)
{
$Item->load('user');
$Item->load('user', 'user.medical_center');
return \MessageResponse::data($Item);
}
public function store(StoreItemRequest $request)
@@ -91,4 +91,9 @@ class ItemController extends Controller
return \MessageResponse::data($Items);
}
public function showItem(Item $Item)
{
$Item->load('user', 'user.medical_center');
return \MessageResponse::data($Item);
}
}
app/Http/Controllers/LabelController.php
+8 -2
View File
@@ -16,8 +16,8 @@ class LabelController extends Controller
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;
elseif($request->has('medical_center_id') && $request->medical_center_id != '') {
$medical_center_id = $request->medical_center_id;
} else {
$medical_center_id = null;
}
@@ -105,4 +105,10 @@ class LabelController extends Controller
return \MessageResponse::data($Labels);
}
public function showLabel(Label $Label)
{
$Label->load('user', 'package', 'package.items', 'user.medical_center');
return \MessageResponse::data($Label);
}
}
app/Http/Controllers/MedicalCenterController.php
+7 -1
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\MedicalCenter;
use App\User;
use App\City;
use App\Http\Requests\StoreMedicalCenterRequest;
class MedicalCenterController extends Controller
@@ -39,7 +40,7 @@ class MedicalCenterController extends Controller
public function edit(MedicalCenter $MedicalCenter)
{
$MedicalCenter = $MedicalCenter->load('users');
$MedicalCenter->load('users');
return \MessageResponse::data($MedicalCenter);
}
@@ -62,4 +63,9 @@ class MedicalCenterController extends Controller
$MedicalCenters = MedicalCenter::select('id','name')->get();
return \MessageResponse::data($MedicalCenters);
}
public function getCities(){
$Cities = City::whereNull('parent_id')->get();
return \MessageResponse::data($Cities);
}
}
app/Http/Controllers/PackageController.php
+5 -2
View File
@@ -27,6 +27,9 @@ class PackageController extends Controller
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('package_id') && $request->package_id != '', function($query) use($request){
$query->where('id', $request->package_id);
})
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
$query->where('unique_id', $request->unique_id);
})
@@ -40,7 +43,7 @@ class PackageController extends Controller
}
public function show(Package $Package)
{
$Package->load('user', 'items');
$Package->load('user', 'items', 'user.medical_center');
// dd($Package);
return \MessageResponse::data($Package);
}
@@ -164,7 +167,7 @@ class PackageController extends Controller
}
public function showPackage(Package $Package)
{
$Package->load('user', 'items');
$Package->load('user', 'user.medical_center', 'items');
return \MessageResponse::data($Package);
}
}