cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 05: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/City.php
+11
View File
@@ -0,0 +1,11 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
use Kalnoy\Nestedset\NodeTrait;
class City extends Model
{
use NodeTrait;
}
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);
}
}
app/Http/Requests/StoreMedicalCenterRequest.php
+6 -3
View File
@@ -26,6 +26,9 @@ class StoreMedicalCenterRequest extends FormRequest
case 'POST': {
return [
'name' => 'required|max:100|unique:medical_centers',
'phone_number' => 'required|digits_between:10,11',
'address' => 'required',
'city_id' => 'required|max:100|exists:cities,id',
// 'operatores.*.name'=>'required|string|max:255',
// 'operatores.*.cell_number'=>'required|digits_between:10,11|unique:users',
// 'operatores.*.password'=>'required|string|min:6',
@@ -37,9 +40,9 @@ class StoreMedicalCenterRequest extends FormRequest
$MedicalCenter = $this->route('MedicalCenter');
return [
'name' => 'required|max:100|unique:medical_centers,id,'.$MedicalCenter->id,
// 'operatores.*.name'=>'required|string|max:255',
// 'operatores.*.cell_number'=>'required|digits_between:10,11|unique:users',
// 'operatores.*.password'=>'required|string|min:6',
'phone_number' => 'required|digits_between:10,11',
'address' => 'required',
'city_id' => 'required|max:100|exists:cities,id',
];
break;
app/MedicalCenter.php
+5 -1
View File
@@ -6,9 +6,13 @@ use Illuminate\Database\Eloquent\Model;
class MedicalCenter extends Model
{
public $fillable = ['name'];
public $fillable = ['name', 'city_id', 'address', 'phone_number'];
public function users()
{
return $this->hasMany('App\User');
}
public function city()
{
return $this->belongsTo('App\City');
}
}
composer.json
+1
View File
@@ -10,6 +10,7 @@
"require": {
"php": "^7.1.3",
"fideloper/proxy": "^4.0",
"kalnoy/nestedset": "^5.0",
"laravel/framework": "5.8.*",
"laravel/passport": "^7.2",
"laravel/tinker": "^1.0",
composer.lock
Generated
+60 -1
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "282319c473e3a4fae1950c36e3c9832a",
"content-hash": "f4ebb660109a5b97e817e1ccec1328e1",
"packages": [
{
"name": "defuse/php-encryption",
@@ -751,6 +751,65 @@
"description": "Highlight PHP code in terminal",
"time": "2018-09-29T18:48:56+00:00"
},
{
"name": "kalnoy/nestedset",
"version": "v5.0.0",
"source": {
"type": "git",
"url": "https://github.com/lazychaser/laravel-nestedset.git",
"reference": "9c0ae248f38289147a5094fa0c5ba9bb9e93104b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/lazychaser/laravel-nestedset/zipball/9c0ae248f38289147a5094fa0c5ba9bb9e93104b",
"reference": "9c0ae248f38289147a5094fa0c5ba9bb9e93104b",
"shasum": ""
},
"require": {
"illuminate/database": "~5.7.0|~5.8.0|~6.0",
"illuminate/events": "~5.7.0|~5.8.0|~6.0",
"illuminate/support": "~5.7.0|~5.8.0|~6.0",
"php": ">=7.1.3"
},
"require-dev": {
"phpunit/phpunit": "7.*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "v5.0.x-dev"
},
"laravel": {
"providers": [
"Kalnoy\\Nestedset\\NestedSetServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Kalnoy\\Nestedset\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Alexander Kalnoy",
"email": "lazychaser@gmail.com"
}
],
"description": "Nested Set Model for Laravel 5.7 and up",
"keywords": [
"database",
"hierarchy",
"laravel",
"nested sets",
"nsm"
],
"time": "2019-09-06T06:18:32+00:00"
},
{
"name": "laravel/framework",
"version": "v5.8.13",
resources/js/show/config/urls.js
Vendored
+12
View File
@@ -1,13 +1,25 @@
const urls = {
showItem: function(id) {
return `/ShowItem/${id}`;
},
showPackage: function(id) {
return `/ShowPackage/${id}`;
},
showLabel: function(id) {
return `/ShowLabel/${id}`;
},
showCycle: function(id) {
return `/ShowCycle/${id}`;
},
Barcode: function(code) {
return `/BarCode/${code}`;
},
packageBarcode: function(code) {
return `/Package/Barcode/${code}`;
},
packageQRCode: function(code) {
return `/Package/QRCode/${code}`;
}
};
export { urls };
resources/js/show/router/paths.js
Vendored
+10
View File
@@ -10,11 +10,21 @@ export default [
name: 'home',
view: 'Package/ShowPackage'
},
{
path: '/Show/Item/:item',
name: 'ShowItem',
view: 'Item/ShowItem'
},
{
path: '/Show/Package/:package',
name: 'ShowPackage',
view: 'Package/ShowPackage'
},
{
path: '/Show/Label/:label',
name: 'ShowLabel',
view: 'Label/ShowLabel'
},
{
path: '/Show/Cycle/:cycle',
name: 'ShowCycle',
resources/js/show/views/Cycle/ShowCycle.vue
+9 -5
View File
@@ -2,7 +2,7 @@
<v-container grid-list-xs>
<material-card id="printMe" color="black" title="Show Cycle">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Info</h3>
<h3 class="ml-3">Cycle - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
@@ -13,8 +13,6 @@
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div>
<span class="title">Sterilizer ID :</span>
@@ -30,8 +28,8 @@
<v-flex xs12 md6 sm6>
<div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
<span class="title">Cycle Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
@@ -40,6 +38,12 @@
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.date }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
</div>
</v-flex>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Barcode And QRCode Image</h3>
resources/js/show/views/Item/ShowItem.vue
+116
View File
@@ -0,0 +1,116 @@
<template>
<v-container grid-list-xs>
<material-card color="black" title="Show Item">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3"> Item - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6>
<div class>
<span class="title">ID :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Name :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.name }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Size :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.size }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Specific :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.specific }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Register User :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Date Register:</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
</div>
</v-flex>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Barcode And QRCode Image</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<span>{{data.unique_id}}</span>
</v-flex>
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
</v-flex>
</v-layout>
</v-layout>
</v-layout>
</material-card>
</v-container>
</template>
<script>
export default {
data: () => ({
data: {}
})
};
</script>
<script>
import { urls } from "@show/config/urls";
import axios from "axios";
export default {
data: () => ({
data : {},
QRCodeimg : '',
barcodeimg : ''
}),
methods: {
async load(id) {
const result = await axios.get(urls.showItem(id));
console.log(result,'re');
if (result.status == 200) {
this.data = result.data.data;
this.generateBarcode(this.data.id);
}
},
async generateBarcode(itemId) {
const result = await axios.post(urls.Barcode(itemId));
if (result && result.status == 200) {
this.QRCodeimg = result.data.data.QRCode ? result.data.data.QRCode : null;
this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
}
},
},
created() {
if (this.$route.params.item) {
// console.log(this.$route.params.item);
this.load(this.$route.params.item);
}
},
// mounted() {
// this.generateBarcode(this.data.id);
// }
};
</script>
resources/js/show/views/Label/ShowLabel.vue
+205
View File
@@ -0,0 +1,205 @@
<template>
<v-container grid-list-xs>
<material-card color="black" title="Show Label">
<v-layout align-left justify-left wrap class="px-2 my-3">
<h3 class="ml-3">Label</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout id="printMe">
<v-flex xs10 md12 sm12>
<v-layout row wrap class="ml-4">
<v-flex xs12 md12 sm12>
<div class="WM-d-flex">
<span class="title">Lot Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
</div>
</v-flex>
<v-flex xs6 md7 sm7>
<div class="">
<!-- <v-icon class="WMi-location"></v-icon> -->
<span class="headline ml-1" style="letter-spacing:0 !important">{{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</span>
</div>
</v-flex>
<v-flex xs6 md5 sm5>
<div class="WM-d-flex">
<v-icon class="WMi-Industry"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.sterile_date }}</span>
</div>
</v-flex>
<v-flex xs6 md7 sm7>
<div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
</div>
</v-flex>
<v-flex xs6 md5 sm5>
<div class="WM-d-flex">
<v-icon class="WMi-hourglass"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.expire_date }}</span>
</div>
</v-flex>
<v-flex xs6 md7 sm7>
<div class>
<span class="title">Sterilizer ID :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.sterilizer_id}}</span>
</div>
</v-flex>
<v-flex xs6 md5 sm5>
<div class>
<span class="title">Cycle No :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div>
</v-flex>
<!-- text-align:center;margin-top:50px ml-4 -->
<v-flex xs6 md7 sm7>
<div class="mt-5">
<v-layout row wrap class="" style="">
<v-flex xs6 md12 sm12 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<span>{{data.id}}</span>
</v-flex>
</v-layout>
</div>
</v-flex>
<v-flex xs6 md5 sm5>
<div class="mt-5">
<v-flex xs6 md6 sm6 v-if="QRCodeimg">
<a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</div>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-2 my-3">
<h3 class="ml-3">Package</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="mx-3">
<template>
<v-expansion-panel class="WM-Panel">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ data.package.name }}</div>
</template>
<v-card>
<v-card-text>note : {{ data.package.note }}</v-card-text>
<v-card-text> Items :
<v-expansion-panel class="WM-Panel" v-for="item in data.package.items" :key="item.key">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ item.name }} ({{ item.pivot.count }})</div>
</template>
<v-card>
<v-card-text>note : {{ item.note }}</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</template>
</v-layout>
</v-layout>
<v-layout row wrap align-center justify-center style="margin-left: -15%;">
<v-flex class xs12 md2 sm2 @click="print" >
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span>
</v-btn>
</v-flex>
</v-layout>
</material-card>
</v-container>
</template>
<style media="screen">
.WM-d-flex{
display: flex;
}
</style>
<script>
import axios from "axios";
import { urls } from "@show/config/urls";
export default {
data: () => ({
data : {},
QRCodeimg : '',
barcodeimg : ''
}),
methods: {
async load(id) {
const result = await axios.get(urls.showLabel(id));
console.log(result.data);
if (result.status == 200) {
this.data = result.data.data;
this.generateBarcode(this.data.id);
this.generateQRcodePackage(this.data.package.id)
}
},
async generateQRcodePackage(packageId) {
const result = await axios.post(urls.packageQRCode(packageId));
if (result && result.status == 200) {
this.QRCodeimg = result.data.data.QRCode ? result.data.data.QRCode : null;
}
},
async generateBarcode(labelId) {
const result = await axios.post(urls.Barcode(labelId));
if (result && result.status == 200) {
this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
}
},
print() {
const prtHtml = document.getElementById("printMe").innerHTML;
// Get all stylesheets HTML
let stylesHtml = "";
for (const node of [
...document.querySelectorAll('link[rel="stylesheet"], style')
]) {
stylesHtml += node.outerHTML;
}
// Open the print window
const WinPrint = window.open(
"",
"",
"left=0,top=0,width=800,height=900,toolbar=0,scrollbars=0,status=0"
);
WinPrint.document.write(`<!DOCTYPE html>
<html>
<head>
${stylesHtml}
</head>
<body>
${prtHtml}
</body>
</html>`);
WinPrint.document.close();
WinPrint.focus();
WinPrint.print();
WinPrint.close();
}
},
created() {
if (this.$route.params.label) {
console.log(this.$route.params);
this.load(this.$route.params.label);
}
},
};
</script>
resources/js/show/views/Package/ShowPackage.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Package">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Info</h3>
<h3 class="ml-3">Package - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
resources/js/vue/components/core/Drawer.vue
-1
View File
@@ -128,7 +128,6 @@ export default {
to: {name: 'AllPackage'},
icon: 'fas fa-archive',
text: 'Packages',
role: 'Admin'
},
{
to: {name: 'AllLabels'},
resources/js/vue/components/modal/barcode/Barcode.vue
+6 -4
View File
@@ -13,7 +13,7 @@
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
<a :href="ShowLink" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</v-layout>
</v-layout>
@@ -33,14 +33,16 @@ import { mapGetters } from "vuex";
export default {
data: () => ({
barcodeimg : null,
QRCodeimg : null
QRCodeimg : null,
ShowLink : ''
}),
created() {
this.barcodeimg = this.getModalProperties.result.data.data.Barcode ? this.getModalProperties.result.data.data.Barcode : null;
this.QRCodeimg = this.getModalProperties.result.data.data.QRCode ? this.getModalProperties.result.data.data.QRCode : null;
this.ShowLink = this.getModalProperties.result.data.data.ShowLink ? this.getModalProperties.result.data.data.ShowLink : '#';
},
computed: {
...mapGetters("modal", ["getModalProperties"])
...mapGetters("modal", ["getModalProperties", "getModalLink"])
},
methods: {
print() {
@@ -78,4 +80,4 @@ export default {
}
}
};
</script>
</script>
resources/js/vue/components/modal/cycle/Show.vue
+11 -6
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card id="printMe" color="black" title="Show Cycle">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Info</h3>
<h3 class="ml-3">Cycle - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
@@ -28,11 +28,10 @@
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
<span class="title">Cycle Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
@@ -41,6 +40,12 @@
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.date }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
</div>
</v-flex>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Barcode And QRCode Image</h3>
@@ -55,7 +60,7 @@
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
<a :href="'/Show/Cycle/'+data.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</v-layout>
</v-layout>
@@ -118,7 +123,7 @@
</v-btn>
</v-flex>
</v-layout>
</material-card>
</v-container>
</template>
resources/js/vue/components/modal/item/show.vue
+33 -2
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Item">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3"> Info</h3>
<h3 class="ml-3"> Item - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
@@ -44,7 +44,26 @@
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
</div>
</v-flex>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Barcode And QRCode Image</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<span>{{data.unique_id}}</span>
</v-flex>
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<a :href="'/Show/Item/'+data.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</v-layout>
</v-layout>
</v-layout>
</material-card>
</v-container>
@@ -62,16 +81,28 @@ import { ApiService } from "@/services";
import { urls } from "@/config/urls";
export default {
data: () => ({
data : {}
data : {},
QRCodeimg : '',
barcodeimg : ''
}),
methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]),
async generateBarcode(itemId) {
const result = await ApiService.post(urls.Barcode(itemId));
if (result && result.status == 200) {
this.QRCodeimg = result.data.data.QRCode ? result.data.data.QRCode : null;
this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
}
},
},
created() {
this.data = this.getModalProperties.result.data.data;
},
computed: {
...mapGetters("modal", ["getModalProperties"])
},
mounted() {
this.generateBarcode(this.data.id);
}
};
</script>
resources/js/vue/components/modal/label/Show.vue
+2 -2
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Label">
<v-layout align-left justify-left wrap class="px-2 my-3">
<h3 class="ml-3">Info</h3>
<h3 class="ml-3">Label</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
@@ -67,7 +67,7 @@
<v-flex xs6 md5 sm5>
<div class="mt-5">
<v-flex xs6 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
<a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</div>
</v-flex>
resources/js/vue/components/modal/package/Show.vue
+2 -9
View File
@@ -3,18 +3,11 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Package">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Info</h3>
<h3 class="ml-3">Package - {{ data.user.medical_center.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<!-- <v-flex xs12 md6 sm6>
<div class>
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
</v-flex>
</div>
</v-flex> -->
<v-flex xs12 md6 sm6>
<div class="WM-d-flex">
<v-icon class="WMi-info"></v-icon>
@@ -53,7 +46,7 @@
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
<a :href="'/Show/Package/'+data.id+''" target="_blank"><img :src="QRCodeimg"></a>
</v-flex>
</v-layout>
</v-layout>
resources/js/vue/components/modal/testresult/Show.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Test Result" id="printMe">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Common Info</h3>
<h3 class="ml-3">Test Type : {{ data.test_type.name }}</h3>
<v-flex xs12>
<hr class="v-divider theme--light" />
</v-flex>
resources/js/vue/config/urls.js
Vendored
+3 -2
View File
@@ -3,6 +3,7 @@ const urls = {
getInfo: "/GetInfo",
login: "/login",
logout: "/logout",
allCities: "/GetCities",
storeMedicalCenter: "/MedicalCenters",
storeTestResult: "/TestResults",
listFilterItemsTestResult: `/TestResults/ListFilterItems`,
@@ -171,8 +172,8 @@ const urls = {
verifyItem: function(id) {
return `/Item/Verify/${id}`;
},
Barcode: function(code) {
return `/BarCode/${code}`;
Barcode: function(code, type) {
return `/BarCode/${code}/${type}`;
},
packageBarcode: function(code) {
return `/Package/Barcode/${code}`;
resources/js/vue/store/modules/modal/getters.js
Vendored
+3
View File
@@ -7,6 +7,9 @@ export default {
},
getModalResult: (state) => {
return state.currentModal.result;
},
getModalLink: (state) => {
return state.currentModal.link;
}
}
resources/js/vue/store/modules/modal/state.js
Vendored
+2 -1
View File
@@ -2,6 +2,7 @@ export default {
currentModal: {
name: '',
properties: {},
result: {}
result: {},
link : ''
},
}
resources/js/vue/views/Auth/Register.vue
+3 -3
View File
@@ -29,7 +29,7 @@
</v-flex>
<v-flex xs2 md2 sm2>
<v-text-field
v-model="country_code"
v-model="form.country_code"
name="country_code"
label="Country Code"
color="black"
@@ -39,7 +39,7 @@
</v-flex>
<v-flex xs10 md10 sm10>
<v-text-field
v-model="cell_number"
v-model="form.cell_number"
name="cellnumber"
label="Cell Number"
color="black"
@@ -130,4 +130,4 @@ export default {
}
}
};
</script>
</script>
resources/js/vue/views/Cycle/List.vue
+3 -3
View File
@@ -109,7 +109,7 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span>
</v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_id)">
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_id, 'Cycle')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
@@ -208,8 +208,8 @@ export default {
});
}
},
async generateBarcode(code) {
const result = await ApiService.post(urls.Barcode(code));
async generateBarcode(code, type) {
const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
resources/js/vue/views/Dashboard.vue
+2 -3
View File
@@ -1,12 +1,11 @@
<template>
<v-container fluid>
<material-card class=""
v-if="$hasRole('Admin')"
color="black"
title="Admin"
text=""
>
text="">
<v-layout row wrap >
<template v-for="(AdminCard, Key ) in AdminCards">
<v-flex v-if="!AdminCard.role || $hasRole(AdminCard.role)" :class="[AdminCard.column , 'pa-2']" :key="Key">
resources/js/vue/views/Item/List.vue
+19 -6
View File
@@ -3,6 +3,15 @@
<v-container fluid>
<material-card class color="black" title="All Instrument" text>
<v-layout align-center wrap class="my-3">
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field
class="py-3 pr-3"
v-model="filter.item_id"
label="Item ID"
color="black"
></v-text-field>
</v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<v-text-field
@@ -74,7 +83,7 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span>
</v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.id)">
<v-btn color="orange darken-1" @click="generateBarcode(item.id, 'Item')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
@@ -109,7 +118,7 @@ export default {
headers: [
{
sortable: true,
text: "ID",
text: "Item ID",
value: "id"
},
{
@@ -132,10 +141,12 @@ export default {
filter: {
name: '',
size: '',
item_id : ''
},
items: [],
currentPage: 1,
lastPage: 1,
}),
created() {
this.load();
@@ -159,12 +170,13 @@ export default {
this.lastPage = result.data.data.last_page;
}
},
async generateBarcode(code) {
const result = await ApiService.post(urls.Barcode(code));
async generateBarcode(code, type = null) {
const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
properties: { result }
properties: { result },
// link : 'Show/Item/'+code
});
}
},
@@ -175,7 +187,8 @@ export default {
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-item-show",
properties: { result }
properties: { result },
});
}
},
resources/js/vue/views/Label/AddEdit.vue
+11 -3
View File
@@ -30,8 +30,8 @@
name="lot_number"
label="Lot Number"
color="black"
v-model="formData.lot_number"
readonly
v-model="lotNumber"
class="py-3 pr-3"
></v-text-field>
</v-flex>
@@ -136,7 +136,9 @@ export default {
formData: {
result: "",
package_id: "",
expire_date : "2020-01-01"
expire_date : "2020-01-01",
sterilizer_id : '',
cycle_number : ''
},
items: [],
rules: {
@@ -155,6 +157,11 @@ export default {
}
this.loadItems();
},
computed:{
lotNumber(){
return this.formData.sterilizer_id + ' - ' + this.formData.cycle_number;
}
},
methods: {
async load(id) {
const result = await ApiService.get(urls.editLabel(id));
@@ -170,6 +177,7 @@ export default {
},
async submitForm() {
let result;
this.formData['lot_number'] = this.lotNumber;
if (this.$route.params.label) {
result = await ApiService.put(
urls.updateLabel(this.$route.params.label),
resources/js/vue/views/Label/List.vue
+11 -9
View File
@@ -7,7 +7,8 @@
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field class="py-3" v-model="filter.label_id" label="Label ID" color="black"></v-text-field>
</v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3" v-if="$hasRole('Admin')">
<v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"></v-icon>
<v-autocomplete
class="py-3 pr-3"
@@ -21,8 +22,8 @@
></v-autocomplete>
</v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-user mr-2 WM-Margin-B-8"></v-icon>
<v-autocomplete
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<!-- <v-autocomplete
class="py-3 pr-3"
v-model="filter.user_id"
item-text="name"
@@ -30,7 +31,8 @@
label="Users"
color="black"
:items="users"
></v-autocomplete>
></v-autocomplete> -->
<v-text-field class="py-3" v-model="filter.sterilizer_id" label="Sterilizer ID" color="black"></v-text-field>
</v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
@@ -90,7 +92,7 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span>
</v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.id)">
<v-btn color="orange darken-1" @click="generateBarcode(item.id, 'Label')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
@@ -125,8 +127,8 @@ export default {
headers: [
{
sortable: true,
text: "LabelID",
value: "LabelID"
text: "Label ID",
value: "Label ID"
},
{
sortable: true,
@@ -221,8 +223,8 @@ export default {
}
}
},
async generateBarcode(code) {
const result = await ApiService.post(urls.Barcode(code));
async generateBarcode(code, type) {
const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
resources/js/vue/views/MedicalCenter/AddEdit.vue
+41 -3
View File
@@ -12,6 +12,33 @@
:rules="[rules.required, rules.counter]"
></v-text-field>
</v-flex>
<v-flex xs12 md3 xs3>
<v-combobox
:items="cities"
item-text="name_en"
item-value="id"
v-model="medicalCenter.city_id"
label="Select City"
></v-combobox>
</v-flex>
<v-flex xs12 md3 xs3>
<v-text-field
v-model="medicalCenter.address"
label="Address"
color="black"
class="pa-2"
:rules="[rules.required]"
></v-text-field>
</v-flex>
<v-flex xs12 md3 xs3>
<v-text-field
v-model="medicalCenter.phone_number"
label="Phone Number"
color="black"
class="pa-2"
:rules="[rules.required]"
></v-text-field>
</v-flex>
</v-layout>
<v-layout row wrap align-center justify-center class="mt-3">
<v-btn class="WM-CyanBlueGradient-BG" @click="AddMedicalCenter" style="padding:10px 60px">
@@ -42,18 +69,23 @@ export default {
data() {
return {
medicalCenter: {
name: ""
name: "",
address : "",
city_id : "",
phone_number : ""
},
rules: {
required: value => !!value || "Required.",
counter: value => value.length <= 30 || "Max 30 characters"
}
},
cities : []
};
},
created() {
if (this.$route.params.medicalCenter) {
this.load(this.$route.params.medicalCenter);
}
}
this.loadCities();
},
methods: {
async load(id) {
@@ -62,6 +94,12 @@ export default {
this.medicalCenter = result.data.data;
}
},
async loadCities() {
const result = await ApiService.get(urls.allCities);
if (result.status == 200) {
this.cities = result.data.data;
}
},
async AddMedicalCenter() {
if (this.$refs.form.validate()) {
if (this.$route.params.medicalCenter) {
resources/js/vue/views/Package/List.vue
+19 -4
View File
@@ -3,6 +3,15 @@
<v-container fluid>
<material-card class color="black" title="All Packages" text>
<v-layout align-center wrap class="my-3">
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field
class="py-3 pr-3"
v-model="filter.package_id"
label="Package ID"
color="black"
></v-text-field>
</v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<v-text-field
@@ -48,6 +57,7 @@
/>
</template>
<template slot="items" slot-scope="{ item }">
<td class="title font-weight-light">{{ item.id }}</td>
<td class="title font-weight-light">{{ item.unique_id }}</td>
<td class="title font-weight-light">{{ item.name }}</td>
<td class="title font-weight-light">{{ item.user.name }}</td>
@@ -75,7 +85,7 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span>
</v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_id)">
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_id, 'Package')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
@@ -108,6 +118,11 @@ import { mapMutations, mapGetters } from "vuex";
export default {
data: () => ({
headers: [
{
sortable: true,
text: "Package ID",
value: "Package ID"
},
{
sortable: true,
text: "Unique ID",
@@ -138,7 +153,7 @@ export default {
filter: {
unique_id: '',
name: '',
result: '',
package_id : ''
},
result: ['Pass', 'Fail'],
items: [],
@@ -193,8 +208,8 @@ export default {
}
}
},
async generateBarcode(code) {
const result = await ApiService.post(urls.packageBarcode(code));
async generateBarcode(code, type) {
const result = await ApiService.post(urls.packageBarcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
resources/js/vue/views/Package/ShowPackage.vue
-176
View File
@@ -1,176 +0,0 @@
<template>
<v-container grid-list-xs>
<material-card color="black" title="Show Package">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Info</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<!-- <v-flex xs12 md6 sm6>
<div class>
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
</v-flex>
</div>
</v-flex> -->
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Name :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.name }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Description :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Register User :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Date :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
</div>
</v-flex>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Barcode And QRCode Image</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg"><br />
<span>{{data.unique_id}}</span>
</v-flex>
</v-layout>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<img :src="QRCodeimg">
</v-flex>
</v-layout>
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Items</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<template>
<v-expansion-panel class="WM-Panel">
<v-expansion-panel-content
v-for="(item, key) in data.items" :key="key"
>
<template v-slot:header>
<div>{{ key+1 + ": " + item.name }} ({{ item.pivot.count }})</div>
</template>
<v-card>
<v-card-text>note : {{ item.note }}</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</template>
</v-layout>
</v-layout>
<v-layout row wrap align-center justify-center>
<v-flex class xs12 md2 sm2 @click="print" >
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span>
</v-btn>
</v-flex>
</v-layout>
</material-card>
</v-container>
</template>
<script>
import { mapGetters, mapMutations } from "vuex";
import { ApiService } from "@/services";
import { urls } from "@/config/urls";
export default {
data: () => ({
data : {},
barcodeimg : '',
QRCodeimg : ''
}),
methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]),
async load(id) {
const result = await ApiService.get(urls.showPackage(id));
if (result.status == 200) {
this.data = result.data.data;
this.generateBarcode(this.data.unique_id);
}
},
async verify(id) {
const result = await ApiService.post(urls.verifyPackage(id));
if (result && result.status == 200) {
this.setResultModal(result.data.data);
this.closeModal();
}
},
async generateBarcode(packageId) {
const result = await ApiService.post(urls.Barcode(packageId));
if (result && result.status == 200) {
this.QRCodeimg = result.data.data.QRCode ? result.data.data.QRCode : null;
this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
}
},
print() {
const prtHtml = document.getElementById("printMe").innerHTML;
// Get all stylesheets HTML
let stylesHtml = "";
for (const node of [
...document.querySelectorAll('link[rel="stylesheet"], style')
]) {
stylesHtml += node.outerHTML;
}
// Open the print window
const WinPrint = window.open(
"",
"",
"left=0,top=0,width=800,height=900,toolbar=0,scrollbars=0,status=0"
);
WinPrint.document.write(`<!DOCTYPE html>
<html>
<head>
${stylesHtml}
</head>
<body>
${prtHtml}
</body>
</html>`);
WinPrint.document.close();
WinPrint.focus();
WinPrint.print();
WinPrint.close();
}
},
created() {
if (this.$route.params.package) {
this.load(this.$route.params.package);
}
},
computed: {
...mapGetters("modal", ["getModalProperties"])
}
};
</script>
routes/api.php
+4 -3
View File
@@ -37,7 +37,6 @@ Route::middleware('auth:api')->group(function () {
// Route::get('/TestTypes/All', 'TestTypeController@AllTestTypes');
// Route::get('/MedicalCenters/All', 'MedicalCenterController@listMedicalCenters');
Route::post('/BarCode/{Code}', 'BarCodeController@generateBarcode');
Route::post('/TestResult/QRCode/{TestResult}', 'BarCodeController@generateQRcode');
Route::get('/GetInfo', 'UserController@getInfo');
@@ -59,11 +58,13 @@ Route::middleware('auth:api')->group(function () {
Route::get('/GetItems', 'ItemController@getItems');
Route::get('/GetPackages', 'PackageController@getPackages');
Route::get('/GetLabels', 'LabelController@getLabels');
Route::get('/GetCities', 'MedicalCenterController@getCities');
Route::resource('Cycles', 'CycleController');
Route::post('Package/Barcode/{Code}', 'BarCodeController@generatePackageBarcode');
Route::post('Package/QRCode/{Package}', 'BarCodeController@generatePackageQRCode');
});
Route::post('/BarCode/{Code}/{Type?}', 'BarCodeController@generateBarcode');
Route::post('Package/Barcode/{Code}', 'BarCodeController@generatePackageBarcode');
Route::post('Package/QRCode/{Package}', 'BarCodeController@generatePackageQRCode');
Route::get('TestResults/{id}', 'TestResultController@show');
routes/web.php
+3
View File
@@ -60,9 +60,12 @@ Route::get('/test',function(){
Route::get('/Show/{any?}/{any2?}',function(){
return view('showMaster');
});
Route::get('ShowItem/{Item}', 'ItemController@showItem');
Route::get('ShowPackage/{Package}', 'PackageController@showPackage');
Route::get('ShowLabel/{Label}', 'LabelController@showLabel');
Route::get('ShowCycle/{Cycle}', 'CycleController@showCycle');
Route::post('/BarCode/{Code}', 'BarCodeController@generateBarcode');
Route::post('Package/QRCode/{Package}', 'BarCodeController@generatePackageQRCode');
Route::any('{all}', function(){
return view('welcome');