diff --git a/app/Http/Controllers/TestTypeController.php b/app/Http/Controllers/TestTypeController.php
index 016fc192..7831dcc7 100644
--- a/app/Http/Controllers/TestTypeController.php
+++ b/app/Http/Controllers/TestTypeController.php
@@ -86,6 +86,9 @@ class TestTypeController extends Controller
'test_type_id' => $TestType->id,
'parent_id' => $ParentID
];
+ if ($Input['type'] == 'Text') {
+ $InputData['require_scanner'] = $Input['require_scanner'];
+ }
$InputObj = Input::create($InputData);
//---------------------------------------------Input
//---------------------------------------------Option
@@ -112,6 +115,7 @@ class TestTypeController extends Controller
public function store(StoreTestTypeRequest $request)
{
+ // dd($request->all());
try {
$return_value = \DB::transaction(function () use ($request) {
@@ -160,6 +164,7 @@ class TestTypeController extends Controller
'name' => $Input->name,
'type' => $Input->type,
'size' => $Input->size ,
+ 'require_scanner' => $Input->require_scanner ,
'parent_id' => $Input->parent_id,
'options' => [],
'children' => []
@@ -242,6 +247,9 @@ class TestTypeController extends Controller
'test_type_id' => $TestType->id,
'parent_id' => $ParentID
];
+ if ($Input['type'] == 'Text') {
+ $InputData['require_scanner'] = $Input['require_scanner'];
+ }
Input::where('id',$Input['id'])->update($InputData);
$InputObj = Input::findOrFail($Input['id']);
//---------------------------------------------Input
@@ -395,12 +403,12 @@ class TestTypeController extends Controller
}
if (isset($testType) && $testType) {
- $inputs = Input::select('id', 'name', 'type', 'size', 'parent_id')->with(
+ $inputs = Input::select('id', 'name', 'type', 'size', 'parent_id', 'require_scanner')->with(
['options' => function ($query) {
$query->select('id', 'title','input_id');
},
'children' => function ($query) {
- $query->select('id', 'name', 'type', 'size', 'parent_id', 'test_type_id');
+ $query->select('id', 'name', 'type', 'size', 'parent_id', 'test_type_id', 'require_scanner');
},
'children.options' => function ($query) {
$query->select('id', 'title', 'input_id');
diff --git a/app/Input.php b/app/Input.php
index aceae5a6..b60b2ef8 100644
--- a/app/Input.php
+++ b/app/Input.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
class Input extends Model
{
- public $fillable = ['name','type','size','test_type_id','parent_id'];
+ public $fillable = ['name','type','size','test_type_id','parent_id','require_scanner'];
public function test_type()
{
return $this->belongsTo('App\TestType');
diff --git a/resources/js/vue/views/TestType/AddEdit.vue b/resources/js/vue/views/TestType/AddEdit.vue
index 621cbd8b..96adbdc3 100644
--- a/resources/js/vue/views/TestType/AddEdit.vue
+++ b/resources/js/vue/views/TestType/AddEdit.vue
@@ -88,6 +88,18 @@
prepend-icon="fa fa-sort-numeric-asc"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+