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

Merge branch 'master' of https://gitlab.com/Saeid74/cssd

Browse Source
This commit is contained in:
saeid
2019-07-20 13:40:09 +04:30
parent 279d73382e 85c87cb3fb
commit a0b7caada0
2 changed files with 67524 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TestResultController.php
+4 -4
View File
@@ -85,7 +85,6 @@ class TestResultController extends Controller
$TestResult = [
'user_id' => auth('api')->user()->id,
// 'autoclave_id' => $request->autoclave_id,
'cycle_number' => $request->cycle_number,
'device_id' => $request->device_id,
// 'device_label' => $request->device_label,
@@ -126,7 +125,7 @@ class TestResultController extends Controller
if(is_array($Value) && in_array($Option->id,$Value)){
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
}
if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
if ($InputChild['type'] == 'Radiobutton' && $Option->id == $Value) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
}
}
@@ -243,6 +242,7 @@ class TestResultController extends Controller
$TestResult[$input->name.'_'.$input->id] = $value->value;
}
}
$ImagesPath = [];
if (count($TestResult->TitleImage)) {
foreach ($TestResult->TitleImage as $Key => $TitleImage) {
@@ -309,7 +309,7 @@ class TestResultController extends Controller
if(is_array($Value) && in_array($Option->id,$Value)){
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
}
if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
if ($InputChild['type'] == 'Radiobutton' && $Option->id == $Value) {
$InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
}
}
@@ -322,7 +322,7 @@ class TestResultController extends Controller
}
/////////////////////////////////////////////////////////////////////Images
$images = '';
if (count($TestResult->TitleImage))
if (count($TestResult->TitleImage) && $request->imgs != null)
{
$images = $TestResult->TitleImage;
foreach ($images as $key => $image) {
public/js/vue/app.js
Vendored
+67520
View File
File diff suppressed because one or more lines are too long