From b81ec9326f9c43ffca17d84a3fd4f7625606be98 Mon Sep 17 00:00:00 2001 From: Fayyazi Date: Sat, 16 Nov 2019 14:01:55 +0330 Subject: [PATCH] change label show --- app/Cycle.php | 2 +- app/Http/Controllers/BarCodeController.php | 2 +- app/Http/Controllers/CycleController.php | 11 +- app/Http/Controllers/LabelController.php | 3 + app/Http/Controllers/PackageController.php | 6 + app/Http/Requests/StoreCycleRequest.php | 2 - resources/js/show/App.vue | 21 +- resources/js/show/components/index.js | 16 + resources/js/show/config/urls.js | 9 +- resources/js/show/main.js | 36 +- resources/js/show/router/index.js | 63 +- resources/js/show/router/paths.js | 5 + resources/js/show/views/Cycle/ShowCycle.vue | 191 +++++ .../{view => views}/Package/ShowPackage.vue | 21 +- resources/js/vue/App.vue | 1 + .../js/vue/components/modal/cycle/Show.vue | 79 +- .../js/vue/components/modal/label/Show.vue | 96 ++- .../js/vue/components/modal/package/Show.vue | 20 +- resources/js/vue/fontello/css/animation.css | 85 ++ .../js/vue/fontello/css/fontello-codes.css | 366 +++++++++ .../js/vue/fontello/css/fontello-embedded.css | 419 ++++++++++ .../vue/fontello/css/fontello-ie7-codes.css | 366 +++++++++ .../js/vue/fontello/css/fontello-ie7.css | 377 +++++++++ resources/js/vue/fontello/css/fontello.css | 422 ++++++++++ resources/js/vue/fontello/font/fontello.eot | Bin 0 -> 118872 bytes resources/js/vue/fontello/font/fontello.svg | 740 ++++++++++++++++++ resources/js/vue/fontello/font/fontello.ttf | Bin 0 -> 118704 bytes resources/js/vue/fontello/font/fontello.woff | Bin 0 -> 71768 bytes resources/js/vue/fontello/font/fontello.woff2 | Bin 0 -> 58164 bytes .../js/vue/fontello/fontello-embedded.css | 109 ++- .../js/vue/fontello/fontello-embedded2.css | 330 ++++++++ resources/js/vue/views/Cycle/AddEdit.vue | 13 +- resources/js/vue/views/Cycle/List.vue | 10 +- resources/js/vue/views/Label/AddEdit.vue | 9 +- resources/js/vue/views/Label/List.vue | 4 + routes/api.php | 2 +- routes/web.php | 5 + 37 files changed, 3602 insertions(+), 239 deletions(-) create mode 100644 resources/js/show/components/index.js create mode 100644 resources/js/show/views/Cycle/ShowCycle.vue rename resources/js/show/{view => views}/Package/ShowPackage.vue (90%) create mode 100644 resources/js/vue/fontello/css/animation.css create mode 100644 resources/js/vue/fontello/css/fontello-codes.css create mode 100644 resources/js/vue/fontello/css/fontello-embedded.css create mode 100644 resources/js/vue/fontello/css/fontello-ie7-codes.css create mode 100644 resources/js/vue/fontello/css/fontello-ie7.css create mode 100644 resources/js/vue/fontello/css/fontello.css create mode 100644 resources/js/vue/fontello/font/fontello.eot create mode 100644 resources/js/vue/fontello/font/fontello.svg create mode 100644 resources/js/vue/fontello/font/fontello.ttf create mode 100644 resources/js/vue/fontello/font/fontello.woff create mode 100644 resources/js/vue/fontello/font/fontello.woff2 create mode 100644 resources/js/vue/fontello/fontello-embedded2.css diff --git a/app/Cycle.php b/app/Cycle.php index 3b3af3d9..fe7d7071 100644 --- a/app/Cycle.php +++ b/app/Cycle.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model; class Cycle extends Model { - public $fillable = ['name', 'date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified', 'unique_id']; + public $fillable = ['date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified', 'unique_id']; public function user() { return $this->belongsTo('App\User'); diff --git a/app/Http/Controllers/BarCodeController.php b/app/Http/Controllers/BarCodeController.php index 79f5c961..48c19875 100644 --- a/app/Http/Controllers/BarCodeController.php +++ b/app/Http/Controllers/BarCodeController.php @@ -41,7 +41,7 @@ class BarCodeController extends Controller } public function generatePackageQRCode(Package $Package) { - $URL = 'https://www.cssd-doc.com/ShowPackage/'.$Package->id; + $URL = 'https://www.cssd-doc.com/Show/Package/'.$Package->id; $QRCode = DNS2D::getBarcodePNG($URL, "QRCODE"); return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]); } diff --git a/app/Http/Controllers/CycleController.php b/app/Http/Controllers/CycleController.php index 25a7be98..bbba84c1 100644 --- a/app/Http/Controllers/CycleController.php +++ b/app/Http/Controllers/CycleController.php @@ -24,8 +24,8 @@ class CycleController extends Controller } }) - ->when($request->has('name') && $request->name != '', function($query) use($request){ - $query->where('name', 'LIKE', '%'.$request->name.'%'); + ->when($request->has('cycle_id') && $request->cycle_id != '', function($query) use($request){ + $query->where('id', $request->cycle_id); }) ->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){ $query->where('sterilizer_id', $request->sterilizer_id); @@ -52,7 +52,6 @@ class CycleController extends Controller { $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10); $CycleData = [ - 'name' => $request->name, 'unique_id' => $UniqueID, 'date' => $request->date, 'sterilizer_id' => $request->sterilizer_id, @@ -143,4 +142,10 @@ class CycleController extends Controller $Cycle = $Cycle->load('user'); return \MessageResponse::success(trans('messages.success'), null, $Cycle); } + + public function showCycle(Cycle $Cycle) + { + $Cycle->load('user', 'labels', 'labels.package', 'labels.package.items'); + return \MessageResponse::data($Cycle); + } } diff --git a/app/Http/Controllers/LabelController.php b/app/Http/Controllers/LabelController.php index 19464d05..52639883 100644 --- a/app/Http/Controllers/LabelController.php +++ b/app/Http/Controllers/LabelController.php @@ -37,6 +37,9 @@ class LabelController extends Controller ->when($request->has('lot_number') && $request->lot_number != '', function($query) use($request){ $query->where('lot_number', $request->lot_number); }) + ->when($request->has('label_id') && $request->label_id != '', function($query) use($request){ + $query->where('id', $request->label_id); + }) ->when($medical_center_id, function($query) use($request){ $query->whereHas('user', function($query) use($request){ $query->where('medical_center_id', $request->medical_center_id); diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index 4c56a2c9..7849d7d6 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -41,6 +41,7 @@ class PackageController extends Controller public function show(Package $Package) { $Package->load('user', 'items'); + // dd($Package); return \MessageResponse::data($Package); } public function store(StorePackageRequest $request) @@ -161,4 +162,9 @@ class PackageController extends Controller $Packages = Package::with('user')->get(); return \MessageResponse::data($Packages); } + public function showPackage(Package $Package) + { + $Package->load('user', 'items'); + return \MessageResponse::data($Package); + } } diff --git a/app/Http/Requests/StoreCycleRequest.php b/app/Http/Requests/StoreCycleRequest.php index 646ea6a7..e5e83082 100644 --- a/app/Http/Requests/StoreCycleRequest.php +++ b/app/Http/Requests/StoreCycleRequest.php @@ -25,7 +25,6 @@ class StoreCycleRequest extends FormRequest switch ($this->method()) { case 'POST': { return [ - 'name' => 'required|max:100|unique:cycles', 'date' => 'required', 'sterilizer_id' => 'required', 'cycle_number' => 'required', @@ -38,7 +37,6 @@ class StoreCycleRequest extends FormRequest case 'PATCH': { $Cycle = $this->route('Cycle'); return [ - 'name' => 'required|max:100|unique:cycles,id,'.$Cycle->id, 'date' => 'required', 'sterilizer_id' => 'required', 'cycle_number' => 'required', diff --git a/resources/js/show/App.vue b/resources/js/show/App.vue index a7c6bad3..13ec1d83 100644 --- a/resources/js/show/App.vue +++ b/resources/js/show/App.vue @@ -1,35 +1,18 @@